fix: helm - image tag and imagePullPolicy to correctly inherit from values (#2472)

* fix image tag and imagePullPolicy to correcy inherit from values, with sane defaults (ifNotPresent and latest) * fix default service ports for http and https in service.yaml Co-authored-by: Jeffrey Forman <jforman@gmail.com> ***NO_CI***

fix: helm - image tag and imagePullPolicy to correctly inherit from values (#2472)
de19d379 · Jeffrey Forman · GitHub · 5a9df24f · de19d379 · de19d379
Unverified Commit de19d379 authored Sep 19, 2020 by Jeffrey Forman Committed by GitHub Sep 19, 2020
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

deployment.yaml dev/helm/templates/deployment.yaml +2 -2

service.yaml dev/helm/templates/service.yaml +2 -2

No files found.
--- a/dev/helm/templates/deployment.yaml
+++ b/dev/helm/templates/deployment.yaml
@@ -25,8 +25,8 @@ spec:
        - name: {{ .Chart.Name }}
          securityContext:
            {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Chart.AppVersion }}"
+          image: "{{ .Values.image.repository }}:{{ default "latest" .Values.image.tag }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ default "IfNotPresent" .Values.image.imagePullPolicy }}
          env:
            - name: DB_TYPE
              value: postgres

--- a/dev/helm/templates/service.yaml
+++ b/dev/helm/templates/service.yaml
@@ -12,11 +12,11 @@ metadata:
 spec:
  type: {{.Values.service.type}}
  ports:
-    - port: {{.Values.service.port}}
+    - port: {{ default "80" .Values.service.port}}
      targetPort: http
      protocol: TCP
      name: http
-    - port: {{.Values.service.httpsPort}}
+    - port: {{ default "443" .Values.service.httpsPort}}
      targetPort: http
      protocol: TCP
      name: https