Skip to content

Commit e7938d6

Browse files
committed
refactor: move image configuration to global values for consistent container image management
1 parent 07fd754 commit e7938d6

File tree

5 files changed

+15
-17
lines changed

5 files changed

+15
-17
lines changed

charts/saleor/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ type: application
1414

1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
17-
version: 2.3.0
17+
version: 2.3.1
1818
appVersion: "3.21.2"
1919

2020
maintainers:

charts/saleor/templates/migration_job.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ spec:
2323
{{- end }}
2424
containers:
2525
- name: migrations
26-
image: "{{ .Values.api.image.repository }}:{{ .Values.api.image.tag | default .Chart.AppVersion }}"
27-
imagePullPolicy: {{ .Values.api.image.pullPolicy }}
26+
image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.tag | default .Chart.AppVersion }}"
27+
imagePullPolicy: {{ .Values.global.image.pullPolicy }}
2828
command: ["python", "manage.py", "migrate", "--no-input"]
2929
env:
3030
# Core database configuration

charts/saleor/templates/saleor_deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ spec:
4949
- name: {{ .Chart.Name }}-api
5050
securityContext:
5151
{{- toYaml .Values.api.securityContext | nindent 12 }}
52-
image: "{{ .Values.api.image.repository }}:{{ .Values.api.image.tag | default .Chart.AppVersion }}"
53-
imagePullPolicy: {{ .Values.api.image.pullPolicy }}
52+
image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.tag | default .Chart.AppVersion }}"
53+
imagePullPolicy: {{ .Values.global.image.pullPolicy }}
5454
ports:
5555
- name: http
5656
containerPort: {{ .Values.api.service.port }}

charts/saleor/templates/worker_deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ spec:
4949
- name: {{ .Chart.Name }}-worker
5050
securityContext:
5151
{{- toYaml .Values.securityContext | nindent 12 }}
52-
image: "{{ .Values.worker.image.repository }}:{{ .Values.worker.image.tag | default .Chart.AppVersion }}"
53-
imagePullPolicy: {{ .Values.worker.image.pullPolicy }}
52+
image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.tag | default .Chart.AppVersion }}"
53+
imagePullPolicy: {{ .Values.global.image.pullPolicy }}
5454
command: ["celery"]
5555
args: ["--app=saleor.celeryconf:app", "worker", "-E", "--loglevel=info" ]
5656
livenessProbe:

charts/saleor/values.yaml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,14 @@ global:
1111
redisUrl: ""
1212
# -- External Celery Redis URL (if not using internal Redis). Use /0 for general usage and /1 for Celery for example
1313
celeryRedisUrl: ""
14+
# -- Global image configuration for Saleor components
15+
image:
16+
# -- Global image repository for Saleor components
17+
repository: ghcr.io/saleor/saleor
18+
# -- Global image tag for Saleor components
19+
tag: "3.21.2"
20+
# -- Global image pull policy for Saleor components
21+
pullPolicy: IfNotPresent
1422
# -- Database configuration
1523
database:
1624
# -- External primary database URL
@@ -56,11 +64,6 @@ api:
5664
enabled: true
5765
replicaCount: 2
5866

59-
image:
60-
repository: ghcr.io/saleor/saleor
61-
tag: "3.21.2"
62-
pullPolicy: IfNotPresent
63-
6467
extraEnv:
6568
# -- List of allowed hosts for Django. Must be exact hostnames, wildcards (*) are not supported.
6669
# For development, you can use ["*"] to allow all hosts (not recommended for production).
@@ -142,11 +145,6 @@ worker:
142145
enabled: true
143146
replicaCount: 1
144147

145-
image:
146-
repository: ghcr.io/saleor/saleor
147-
tag: "3.21.2"
148-
pullPolicy: IfNotPresent
149-
150148
extraEnv:
151149

152150
resources:

0 commit comments

Comments
 (0)