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***
This commit is contained in:
Jeffrey Forman 2020-09-19 20:32:36 -04:00 committed by GitHub
parent 5a9df24f04
commit de19d37953
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View File

@ -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 }}" image: "{{ .Values.image.repository }}:{{ default "latest" .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ default "IfNotPresent" .Values.image.imagePullPolicy }}
env: env:
- name: DB_TYPE - name: DB_TYPE
value: postgres value: postgres

View File

@ -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