Deployment: Align image.

giantswarm · Mar 15, 2023 · 7932078 · 7932078
1 parent 58fae45
commit 7932078
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -57,6 +57,7 @@ and this project's packages adheres to [Semantic Versioning](http://semver.org/s
   - Deployment: Align `name` & `namespace`.
   - Deployment: Align indention.
   - Pod Security Policy: Disable `privileged`.
+  - Deployment: Align `image`.
 
 ### Removed
 

diff --git a/helm/nginx-ingress-controller-app/templates/controller-deployment.yaml b/helm/nginx-ingress-controller-app/templates/controller-deployment.yaml
@@ -107,7 +107,10 @@ spec:
       terminationGracePeriodSeconds: {{ .Values.controller.terminationGracePeriodSeconds }}
       containers:
         - name: {{ .Values.controller.containerName }}
-          image: "{{ .Values.image.registry }}/{{ .Values.controller.image.repository }}:{{ .Values.controller.image.tag }}"
+          {{- with .Values.controller.image }}
+          image: "{{- if .repository -}}{{ .repository }}{{ else }}{{ $.Values.image.registry }}/{{ include "ingress-nginx.image" . }}{{- end -}}:{{ .tag }}{{ include "ingress-nginx.imageDigest" . }}"
+          {{- end }}
+          imagePullPolicy: {{ .Values.controller.image.pullPolicy }}
           args:
           - /nginx-ingress-controller
           - --configmap={{ .Release.Namespace }}/{{ include "ingress-nginx.fullname" . }}

diff --git a/helm/nginx-ingress-controller-app/values.schema.json b/helm/nginx-ingress-controller-app/values.schema.json
@@ -358,6 +358,18 @@
                         "chroot": {
                             "type": "boolean"
                         },
+                        "digest": {
+                            "type": "string"
+                        },
+                        "digestChroot": {
+                            "type": "string"
+                        },
+                        "image": {
+                            "type": "string"
+                        },
+                        "pullPolicy": {
+                            "type": "string"
+                        },
                         "repository": {
                             "type": "string"
                         },

diff --git a/helm/nginx-ingress-controller-app/values.yaml b/helm/nginx-ingress-controller-app/values.yaml
@@ -148,18 +148,17 @@ controller:
   image:
     ## Keep false as default for now!
     chroot: false
-
-    # controller.image.repository
-    repository: giantswarm/ingress-nginx-controller
-
-    # controller.image.tag
-    # When updating tag make sure to also keep appVersion in Chart.yaml in sync
+    image: giantswarm/ingress-nginx-controller
+    ## for backwards compatibility consider setting the full image url via the repository value below
+    ## use *either* current default registry/image or repository format or installing chart by providing the values.yaml will fail
+    ## repository:
     tag: v1.4.0
-
+    digest: ""
+    digestChroot: ""
+    pullPolicy: IfNotPresent
     # www-data -> uid 101
     runAsUser: 101
     allowPrivilegeEscalation: true
-
   # -- Use an existing PSP instead of creating one
   existingPsp: ""
   # -- Configures the controller container name