Skip to content

Commit 2e192a9

Browse files
committed
refactor: Simplify image reference in port-ocean chart
- Introduced a new helper function to standardize the container image retrieval process. - Updated deployment and cron job templates to utilize the new helper function for image definition, enhancing maintainability and clarity.
1 parent 20d1ad6 commit 2e192a9

File tree

5 files changed

+11
-4
lines changed

5 files changed

+11
-4
lines changed

charts/port-ocean/templates/_helpers.tpl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,13 @@ Get default image
186186
port-ocean-{{ .Values.integration.type }}:{{ .Values.integration.version | default "latest" }}
187187
{{- end }}
188188

189+
{{/*
190+
Get container image (registry + image name)
191+
*/}}
192+
{{- define "port-ocean.image" -}}
193+
{{ .Values.imageRegistry }}/{{ .Values.image | default (include "port-ocean.defaultImage" .) }}
194+
{{- end }}
195+
189196
{{/*
190197
Get deployment name
191198
*/}}

charts/port-ocean/templates/actions-processor/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ spec:
4444
containers:
4545
- name: {{ include "port-ocean.containerName" . }}
4646
imagePullPolicy: {{ .Values.imagePullPolicy }}
47-
image: '{{ .Values.imageRegistry }}/{{ .Values.image | default (include "port-ocean.defaultImage" .) }}'
47+
image: {{ include "port-ocean.image" . }}
4848
{{- if .Values.service.enabled }}
4949
securityContext:
5050
{{- if .Values.containerSecurityContext }}

charts/port-ocean/templates/cron-job/cron.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ spec:
132132
containers:
133133
- name: {{ include "port-ocean.containerName" . }}
134134
imagePullPolicy: {{ .Values.imagePullPolicy }}
135-
image: '{{ .Values.imageRegistry }}/{{ .Values.image | default (include "port-ocean.defaultImage" .) }}'
135+
image: {{ include "port-ocean.image" . }}
136136
{{- if .Values.service.enabled }}
137137
securityContext:
138138
{{- if .Values.containerSecurityContext }}

charts/port-ocean/templates/deployment-live-events.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ spec:
5757
containers:
5858
- name: {{ include "port-ocean.containerName" . }}
5959
imagePullPolicy: {{ .Values.imagePullPolicy }}
60-
image: '{{ .Values.imageRegistry }}/{{ .Values.image | default (include "port-ocean.defaultImage" .) }}'
60+
image: {{ include "port-ocean.image" . }}
6161
{{- if .Values.service.enabled }}
6262
securityContext:
6363
{{- if .Values.containerSecurityContext }}

charts/port-ocean/templates/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ spec:
5555
containers:
5656
- name: {{ include "port-ocean.containerName" . }}
5757
imagePullPolicy: {{ .Values.imagePullPolicy }}
58-
image: '{{ .Values.imageRegistry }}/{{ .Values.image | default (include "port-ocean.defaultImage" .) }}'
58+
image: {{ include "port-ocean.image" . }}
5959
{{- if .Values.service.enabled }}
6060
securityContext:
6161
{{- if .Values.containerSecurityContext }}

0 commit comments

Comments
 (0)