feat: saleor image name

trieb-work · Feb 9, 2022 · 2bd75c1 · 2bd75c1
1 parent cae8155
commit 2bd75c1
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/charts/saleor/Chart.yaml b/charts/saleor/Chart.yaml
@@ -14,7 +14,7 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 0.1.20
+version: 0.1.21
 
 dependencies:
 - name: postgresql

diff --git a/charts/saleor/templates/celery_deployment.yaml b/charts/saleor/templates/celery_deployment.yaml
@@ -26,7 +26,11 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             runAsUser: 999
-          image: "{{ .Values.image.repository }}:{{ .Values.appVersion }}"
+          {{- if .Values.image.imageName }}
+          image: "{{ lower .Values.image.imageName }}"
+          {{- else }}
+          image: "{{ lower .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          {{- end }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
           {{- range .Values.global.env }}

diff --git a/charts/saleor/templates/saleor_deployment.yaml b/charts/saleor/templates/saleor_deployment.yaml
@@ -25,7 +25,11 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.appVersion }}"
+          {{- if .Values.image.imageName }}
+          image: "{{ lower .Values.image.imageName }}"
+          {{- else }}
+          image: "{{ lower .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          {{- end }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
           {{- range .Values.global.env }}

diff --git a/charts/saleor/values.yaml b/charts/saleor/values.yaml
@@ -3,12 +3,11 @@
 # Declare variables to be passed into your templates.
 
 image:
+  # image name overrides repository and tag.
+  imageName: ""
   repository: registry.gitlab.com/trieb.work/saleor
   pullPolicy: IfNotPresent
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application.
-appVersion: 3.0-triebwork11
+  tag: "3.0.0"
 
 fullnameOverride: saleor-api