Revert "Makefile: Add target to template helmfile (wireapp#4201)" (wi…

…reapp#4294)

This reverts commit e0296a9.

Makefile

@@ -586,7 +586,7 @@ kind-restart-%: .local/kind-kubeconfig
 # templating issues without actually installing anything, and without needing
 # access to a kubernetes cluster. e.g.:
 #   make helm-template-wire-server
-helm-template-%: # clean-charts charts-integration
+helm-template-%: clean-charts charts-integration
 	./hack/bin/helm-template.sh $(*)
 
 # Ask the security team for the `DEPENDENCY_TRACK_API_KEY` (if you need it)

hack/bin/helm-template.sh

@@ -6,51 +6,23 @@
 # access to a kubernetes cluster
 USAGE="Usage: $0"
 
-set -x
-
 set -e
 
-release=${1:?$USAGE}
+chart=${1:?$USAGE}
 
 DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 TOP_LEVEL="$DIR/../.."
 CHARTS_DIR="${TOP_LEVEL}/.local/charts"
 
-
-# for f in "${DIR}/../helm_vars/${chart}"/*; do
-#     options+=(-f "$f")
-# done
-
-# valuesfile="${DIR}/../helm_vars/${chart}/values.yaml"
-# valuestmplfile="${DIR}/../helm_vars/${chart}/values.yaml.gotmpl"
-# certificatesfile="${DIR}/../helm_vars/${chart}/certificates.yaml"
-# if [ -f "$valuesfile" ]; then
-#     options+=(-f "$valuesfile")
-# fi
-# if [ -f "$certificatesfile" ]; then
-#     options+=(-f "$certificatesfile")
-# fi
-
-# "$DIR/update.sh" "$CHARTS_DIR/$chart"
-# helm template "$chart" "$CHARTS_DIR/$chart" ${options[*]}
-
-export NAMESPACE_1="test-template"
-export FEDERATION_DOMAIN_BASE_1="$NAMESPACE_1.svc.cluster.local"
-export FEDERATION_DOMAIN_1="federation-test-helper.$FEDERATION_DOMAIN_BASE_1"
-
-export NAMESPACE_2="test-template-fed2"
-export FEDERATION_DOMAIN_BASE_2="$NAMESPACE_2.svc.cluster.local"
-export FEDERATION_DOMAIN_2="federation-test-helper.$FEDERATION_DOMAIN_BASE_2"
-
-FEDERATION_CA_CERTIFICATE=$(cat "$TOP_LEVEL/deploy/dockerephemeral/federation-v0/integration-ca.pem")
-export FEDERATION_CA_CERTIFICATE
-
-export INGRESS_CHART="ingress-nginx-controller"
-
-charts=(fake-aws databases-ephemeral redis-cluster rabbitmq wire-server ingress-nginx-controller nginx-ingress-controller nginx-ingress-services)
-
-# for chart in "${charts[@]}"; do
-#   "$DIR"/update.sh "$CHARTS_DIR/$chart"
-# done
-
-helmfile template --environment kind  --skip-deps -f "$TOP_LEVEL/hack/helmfile.yaml" "$release"
+valuesfile="${DIR}/../helm_vars/${chart}/values.yaml"
+certificatesfile="${DIR}/../helm_vars/${chart}/certificates.yaml"
+declare -a options=()
+if [ -f "$valuesfile" ]; then
+    options+=(-f "$valuesfile")
+fi
+if [ -f "$certificatesfile" ]; then
+    options+=(-f "$certificatesfile")
+fi
+
+"$DIR/update.sh" "$CHARTS_DIR/$chart"
+helm template $"chart" "$CHARTS_DIR/$chart" ${options[*]}

hack/bin/integration-setup-federation.sh

@@ -35,7 +35,6 @@ else
     export INGRESS_CHART="nginx-ingress-controller"
 fi
 echo "kubeVersion: $KUBERNETES_VERSION and ingress controller=$INGRESS_CHART"
-
 export NAMESPACE_1="$NAMESPACE"
 export FEDERATION_DOMAIN_BASE_1="$NAMESPACE_1.svc.cluster.local"
 export FEDERATION_DOMAIN_1="federation-test-helper.$FEDERATION_DOMAIN_BASE_1"

nix/wire-server.nix

@@ -315,7 +315,6 @@ let
     openssl
     nix-output-monitor
     which
-    awscli2
   ];
 
   images = localMods@{ enableOptimization, enableDocs, enableTests }: