Sfoglia il codice sorgente

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***
Jeffrey Forman 4 anni fa
parent
commit
de19d37953
2 ha cambiato i file con 4 aggiunte e 4 eliminazioni
  1. 2 2
      dev/helm/templates/deployment.yaml
  2. 2 2
      dev/helm/templates/service.yaml

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

@@ -25,8 +25,8 @@ spec:
         - name: {{ .Chart.Name }}
         - name: {{ .Chart.Name }}
           securityContext:
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: "{{ .Values.image.repository }}:{{ default "latest" .Values.image.tag }}"
+          imagePullPolicy: {{ default "IfNotPresent" .Values.image.imagePullPolicy }}
           env:
           env:
             - name: DB_TYPE
             - name: DB_TYPE
               value: postgres
               value: postgres

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

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