Merge branch 'main' into jm/NET-10194

hashicorp · Jul 29, 2024 · f6e89d3 · f6e89d3
2 parents 3ab9325 + 7a34565
commit f6e89d3
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 3 deletions.
diff --git a/.changelog/4210.txt b/.changelog/4210.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+helm: adds imagePullSecret to the gateway-resources job and the gateway-cleanup job, would fail before if the image was in a private registry
+```
diff --git a/charts/consul/templates/gateway-cleanup-serviceaccount.yaml b/charts/consul/templates/gateway-cleanup-serviceaccount.yaml
@@ -10,4 +10,10 @@ metadata:
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
     component: gateway-cleanup
+{{- with .Values.global.imagePullSecrets }}
+imagePullSecrets:
+{{- range . }}
+  - name: {{ .name }}
+{{- end }}
+{{- end }}
 {{- end }}
diff --git a/charts/consul/templates/gateway-resources-serviceaccount.yaml b/charts/consul/templates/gateway-resources-serviceaccount.yaml
@@ -10,4 +10,10 @@ metadata:
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
     component: gateway-resources
+{{- with .Values.global.imagePullSecrets }}
+imagePullSecrets:
+{{- range . }}
+  - name: {{ .name }}
+{{- end }}
+{{- end }}
 {{- end }}
diff --git a/charts/consul/test/unit/dns-proxy-deployment.bats b/charts/consul/test/unit/dns-proxy-deployment.bats
@@ -9,12 +9,10 @@ load _helpers
         .
 }
 
-@test "dnsProxy/Deployment: enable with global.enabled false, client.enabled true" {
+@test "dnsProxy/Deployment: enable with dns.proxy.enabled" {
   cd `chart_dir`
   local actual=$(helm template \
       -s templates/dns-proxy-deployment.yaml  \
-      --set 'global.enabled=false' \
-      --set 'client.enabled=true' \
       --set 'dns.proxy.enabled=true' \
       . | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)

diff --git a/charts/consul/test/unit/gateway-cleanup-serviceaccount.bats b/charts/consul/test/unit/gateway-cleanup-serviceaccount.bats
@@ -21,3 +21,25 @@ target=templates/gateway-cleanup-serviceaccount.yaml
         . 
 }
 
+#--------------------------------------------------------------------
+# global.imagePullSecrets
+
+@test "gatewaycleanup/ServiceAccount: can set image pull secrets" {
+  cd `chart_dir`
+  local object=$(helm template \
+      -s templates/gateway-cleanup-serviceaccount.yaml  \
+      --set 'connectInject.enabled=true' \
+      --set 'global.imagePullSecrets[0].name=my-secret' \
+      --set 'global.imagePullSecrets[1].name=my-secret2' \
+      . | tee /dev/stderr)
+
+  local actual=$(echo "$object" |
+      yq -r '.imagePullSecrets[0].name' | tee /dev/stderr)
+  [ "${actual}" = "my-secret" ]
+
+  local actual=$(echo "$object" |
+      yq -r '.imagePullSecrets[1].name' | tee /dev/stderr)
+  [ "${actual}" = "my-secret2" ]
+}
+
+
diff --git a/charts/consul/test/unit/gateway-resources-serviceaccount.bats b/charts/consul/test/unit/gateway-resources-serviceaccount.bats
@@ -21,3 +21,23 @@ target=templates/gateway-resources-serviceaccount.yaml
         . 
 }
 
+#--------------------------------------------------------------------
+# global.imagePullSecrets
+
+@test "gatewayresources/ServiceAccount: can set image pull secrets" {
+  cd `chart_dir`
+  local object=$(helm template \
+      -s templates/gateway-resources-serviceaccount.yaml  \
+      --set 'connectInject.enabled=true' \
+      --set 'global.imagePullSecrets[0].name=my-secret' \
+      --set 'global.imagePullSecrets[1].name=my-secret2' \
+      . | tee /dev/stderr)
+
+  local actual=$(echo "$object" |
+      yq -r '.imagePullSecrets[0].name' | tee /dev/stderr)
+  [ "${actual}" = "my-secret" ]
+
+  local actual=$(echo "$object" |
+      yq -r '.imagePullSecrets[1].name' | tee /dev/stderr)
+  [ "${actual}" = "my-secret2" ]
+}