Allow using kind cluster with imagePullPolicy=Never

Makefile

@@ -403,6 +403,7 @@ kind-reset: kind-delete kind-cluster
 .local/kind-kubeconfig:
 	mkdir -p $(CURDIR)/.local
 	kind get kubeconfig --name $(KIND_CLUSTER_NAME) > $(CURDIR)/.local/kind-kubeconfig
+	chmod 0600 $(CURDIR)/.local/kind-kubeconfig
 
 # This guard is a fail-early way to save needing to debug nginz container not
 # starting up in the second namespace of the kind cluster in some cases. Error
@@ -429,11 +430,11 @@ guard-inotify:
 
 .PHONY: kind-integration-setup
 kind-integration-setup: guard-inotify .local/kind-kubeconfig
-	ENABLE_KIND_VALUES="1" KUBECONFIG=$(CURDIR)/.local/kind-kubeconfig make kube-integration-setup
+	HELMFILE_ENV="kind" KUBECONFIG=$(CURDIR)/.local/kind-kubeconfig make kube-integration-setup
 
 .PHONY: kind-integration-test
 kind-integration-test: .local/kind-kubeconfig
-	ENABLE_KIND_VALUES="1" KUBECONFIG=$(CURDIR)/.local/kind-kubeconfig make kube-integration-test
+	HELMFILE_ENV="kind" KUBECONFIG=$(CURDIR)/.local/kind-kubeconfig make kube-integration-test
 
 kind-integration-e2e: .local/kind-kubeconfig
 	cd services/brig && KUBECONFIG=$(CURDIR)/.local/kind-kubeconfig ./federation-tests.sh $(NAMESPACE)

changelog.d/5-internal/reenable-kind

@@ -0,0 +1 @@
+Update helm to 3.6.3 in developer tooling (nix-shell)

hack/bin/integration-setup-federation.sh

@@ -5,6 +5,7 @@ set -euo pipefail
 DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 TOP_LEVEL="$DIR/../.."
 export NAMESPACE=${NAMESPACE:-test-integration}
+HELMFILE_ENV=${HELMFILE_ENV:-default}
 CHARTS_DIR="${TOP_LEVEL}/.local/charts"
 
 . "$DIR/helm_overrides.sh"
@@ -38,7 +39,7 @@ export FEDERATION_DOMAIN_2="federation-test-helper.$FEDERATION_DOMAIN_BASE"
 
 echo "Installing charts..."
 
-helmfile --file ${TOP_LEVEL}/hack/helmfile.yaml sync
+helmfile --environment "$HELMFILE_ENV" --file "${TOP_LEVEL}/hack/helmfile.yaml" sync
 
 # wait for fakeSNS to create resources. TODO, cleaner: make initiate-fake-aws-sns a post hook. See cassandra-migrations chart for an example.
 resourcesReady() {

hack/bin/integration-setup.sh

@@ -5,6 +5,7 @@ set -euo pipefail
 DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 TOP_LEVEL="$DIR/../.."
 export NAMESPACE=${NAMESPACE:-test-integration}
+HELMFILE_ENV=${HELMFILE_ENV:-default}
 CHARTS_DIR="${TOP_LEVEL}/.local/charts"
 
 . "$DIR/helm_overrides.sh"
@@ -24,7 +25,7 @@ export FEDERATION_DOMAIN="federation-test-helper.$FEDERATION_DOMAIN_BASE"
 
 echo "Installing charts..."
 
-helmfile --file "${TOP_LEVEL}/hack/helmfile-single.yaml" sync
+helmfile --environment "$HELMFILE_ENV" --file "${TOP_LEVEL}/hack/helmfile-single.yaml" sync
 
 # wait for fakeSNS to create resources. TODO, cleaner: make initiate-fake-aws-sns a post hook. See cassandra-migrations chart for an example.
 resourcesReady() {

hack/helm_vars/wire-server/values.yaml → hack/helm_vars/wire-server/values.yaml.gotmpl

@@ -15,12 +15,12 @@ tags:
   sftd: false
 
 cassandra-migrations:
-  imagePullPolicy: Always
+  imagePullPolicy: {{ .Values.imagePullPolicy }}
   cassandra:
     host: cassandra-ephemeral
     replicaCount: 1
 elasticsearch-index:
-  imagePullPolicy: Always
+  imagePullPolicy: {{ .Values.imagePullPolicy }}
   elasticsearch:
     host: elasticsearch-ephemeral
     index: directory_test
@@ -29,7 +29,7 @@ elasticsearch-index:
 
 brig:
   replicaCount: 1
-  imagePullPolicy: Always
+  imagePullPolicy: {{ .Values.imagePullPolicy }}
   resources:
     requests: {}
     limits:
@@ -106,7 +106,7 @@ brig:
     enableFederationTests: true
 cannon:
   replicaCount: 2
-  imagePullPolicy: Always
+  imagePullPolicy: {{ .Values.imagePullPolicy }}
   resources:
     requests: {}
     limits:
@@ -115,7 +115,7 @@ cannon:
   drainTimeout: 0
 cargohold:
   replicaCount: 1
-  imagePullPolicy: Always
+  imagePullPolicy: {{ .Values.imagePullPolicy }}
   resources:
     requests: {}
     limits:
@@ -130,7 +130,7 @@ cargohold:
     awsSecretKey: dummysecret
 galley:
   replicaCount: 1
-  imagePullPolicy: Always
+  imagePullPolicy: {{ .Values.imagePullPolicy }}
   config:
     cassandra:
       host: cassandra-ephemeral
@@ -160,7 +160,7 @@ galley:
     awsSecretKey: dummysecret
 gundeck:
   replicaCount: 1
-  imagePullPolicy: Always
+  imagePullPolicy: {{ .Values.imagePullPolicy }}
   resources:
     requests: {}
     limits:
@@ -188,7 +188,7 @@ gundeck:
     awsSecretKey: dummysecret
 nginz:
   replicaCount: 1
-  imagePullPolicy: Always
+  imagePullPolicy: {{ .Values.imagePullPolicy }}
   nginx_conf:
     env: staging
     external_env_domain: zinfra.io
@@ -199,7 +199,7 @@ nginz:
       publicKeys: 0UW38se1yeoc5bVNEvf5LyrHWGZkyvcGTVilK2geGdU=
 proxy:
   replicaCount: 1
-  imagePullPolicy: Always
+  imagePullPolicy: {{ .Values.imagePullPolicy }}
   secrets:
     proxy_config: |-
       secrets {
@@ -211,7 +211,7 @@ proxy:
        }
 spar:
   replicaCount: 1
-  imagePullPolicy: Always
+  imagePullPolicy: {{ .Values.imagePullPolicy }}
   resources:
     requests: {}
     limits:
@@ -237,7 +237,7 @@ federator:
   replicaCount: 1
   resources:
     requests: {}
-  imagePullPolicy: Always
+  imagePullPolicy: {{ .Values.imagePullPolicy }}
   config:
     optSettings:
       federationStrategy:

hack/helmfile-single.yaml

@@ -56,7 +56,7 @@ releases:
     namespace: '{{ .Values.namespace }}'
     chart: '../.local/charts/wire-server'
     values:
-      - './helm_vars/wire-server/values.yaml'
+      - './helm_vars/wire-server/values.yaml.gotmpl'
       - './helm_vars/wire-server/certificates-namespace1.yaml'
     set:
       - name: brig.config.optSettings.setFederationDomain

hack/helmfile.yaml

@@ -9,6 +9,7 @@ helmDefaults:
   wait: true
   timeout: 600
   devel: true
+  createNamespace: true
 
 environments:
   default:
@@ -17,6 +18,14 @@ environments:
       - federationDomain: {{ requiredEnv "FEDERATION_DOMAIN_1" }}
       - namespaceFed2: {{ requiredEnv "NAMESPACE_2" }}
       - federationDomainFed2: {{ requiredEnv "FEDERATION_DOMAIN_2" }}
+      - imagePullPolicy: Always
+  kind:
+    values:
+      - namespace: {{ requiredEnv "NAMESPACE_1" }}
+      - federationDomain: {{ requiredEnv "FEDERATION_DOMAIN_1" }}
+      - namespaceFed2: {{ requiredEnv "NAMESPACE_2" }}
+      - federationDomainFed2: {{ requiredEnv "FEDERATION_DOMAIN_2" }}
+      - imagePullPolicy: Never
 
 repositories:
   - name: stable
@@ -92,7 +101,7 @@ releases:
     namespace: '{{ .Values.namespace }}'
     chart: '../.local/charts/wire-server'
     values:
-      - './helm_vars/wire-server/values.yaml'
+      - './helm_vars/wire-server/values.yaml.gotmpl'
       - './helm_vars/wire-server/certificates-namespace1.yaml'
     set:
       - name: brig.config.optSettings.setFederationDomain
@@ -104,7 +113,7 @@ releases:
     namespace: '{{ .Values.namespaceFed2 }}'
     chart: '../.local/charts/wire-server'
     values:
-      - './helm_vars/wire-server/values.yaml'
+      - './helm_vars/wire-server/values.yaml.gotmpl'
       - './helm_vars/wire-server/certificates-namespace2.yaml'
     set:
       - name: brig.config.optSettings.setFederationDomain

shell.nix

@@ -58,13 +58,13 @@ let
 
     helm = staticBinaryInTarball {
       pname = "helm";
-      version = "3.1.1";
+      version = "3.6.3";
 
-      darwinAmd64Url = "https://get.helm.sh/helm-v3.1.1-darwin-amd64.tar.gz";
-      darwinAmd64Sha256 = "2ce00e6c44ba18fbcbec21c493476e919128710d480789bb35bd228ae695cd66";
+      darwinAmd64Url = "https://get.helm.sh/helm-v3.6.3-darwin-amd64.tar.gz";
+      darwinAmd64Sha256 = "0djjvgla8cw27h8s4y6jby19f74j58byb2vfv590cd03vlbzz8c4";
 
-      linuxAmd64Url = "https://get.helm.sh/helm-v3.1.1-linux-amd64.tar.gz";
-      linuxAmd64Sha256 = "cdd7ad304e2615c583dde0ffb0cb38fc1336cd7ce8ff3b5f237434dcadb28c98";
+      linuxAmd64Url = "https://get.helm.sh/helm-v3.6.3-linux-amd64.tar.gz";
+      linuxAmd64Sha256 = "0qp28fq137b07haz4vsdbc5biagh60dcs29jj70ksqi5k6201h87";
     };
 
     helmfile = staticBinary {