Merge pull request #235 from port-labs/PORT-16801-bug-port-ocean-helm-chart-does-not-support-custom-container-image-names

(feat): Add support for custom container image name in port-ocean chart

Author: yaelibarg

charts/port-ocean/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: port-ocean
 description: A Helm chart for Port Ocean integrations
 type: application
-version: 0.11.0
+version: 0.11.1
 appVersion: "0.1.0"
 home: https://getport.io/
 sources:

charts/port-ocean/templates/_helpers.tpl

@@ -179,6 +179,20 @@ Get container name
 {{- printf "%s-container" $prefix }}
 {{- end }}
 
+{{/*
+Get default image
+*/}}
+{{- define "port-ocean.defaultImage" -}}
+port-ocean-{{ .Values.integration.type }}:{{ .Values.integration.version | default "latest" }}
+{{- end }}
+
+{{/*
+Get container image (registry + image name)
+*/}}
+{{- define "port-ocean.image" -}}
+{{ .Values.imageRegistry }}/{{ .Values.image | default (include "port-ocean.defaultImage" .) }}
+{{- end }}
+
 {{/*
 Get deployment name
 */}}

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

@@ -44,7 +44,7 @@ spec:
       containers:
       - name: {{ include "port-ocean.containerName" . }}
         imagePullPolicy: {{ .Values.imagePullPolicy }}
-        image: '{{ .Values.imageRegistry }}/port-ocean-{{ .Values.integration.type }}:{{ .Values.integration.version | default "latest" }}'
+        image: {{ include "port-ocean.image" . }}
         {{- if .Values.service.enabled }}
         securityContext:
           {{- if .Values.containerSecurityContext }}

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

@@ -132,7 +132,7 @@ spec:
           containers:
           - name: {{ include "port-ocean.containerName" . }}
             imagePullPolicy: {{ .Values.imagePullPolicy }}
-            image: '{{ .Values.imageRegistry }}/port-ocean-{{ .Values.integration.type }}:{{ .Values.integration.version | default "latest" }}'
+            image: {{ include "port-ocean.image" . }}
             {{- if .Values.service.enabled }}
             securityContext:
               {{- if .Values.containerSecurityContext }}

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

@@ -57,7 +57,7 @@ spec:
       containers:
       - name: {{ include "port-ocean.containerName" . }}
         imagePullPolicy: {{ .Values.imagePullPolicy }}
-        image: '{{ .Values.imageRegistry }}/port-ocean-{{ .Values.integration.type }}:{{ .Values.integration.version | default "latest" }}'
+        image: {{ include "port-ocean.image" . }}
         {{- if .Values.service.enabled }}
         securityContext:
           {{- if .Values.containerSecurityContext }}

charts/port-ocean/templates/deployment.yaml

@@ -55,7 +55,7 @@ spec:
       containers:
       - name: {{ include "port-ocean.containerName" . }}
         imagePullPolicy: {{ .Values.imagePullPolicy }}
-        image: '{{ .Values.imageRegistry }}/port-ocean-{{ .Values.integration.type }}:{{ .Values.integration.version | default "latest" }}'
+        image: {{ include "port-ocean.image" . }}
         {{- if .Values.service.enabled }}
         securityContext:
           {{- if .Values.containerSecurityContext }}

charts/port-ocean/values.yaml

@@ -78,6 +78,11 @@ extraLabels: { }
 
 imageRegistry: "ghcr.io/port-labs"
 
+# image: Custom container image name (without registry, but including tag)
+# If not specified, defaults to "port-ocean-{integration.type}:{integration.version}"
+# Example: "my-custom-ocean-image:v1.0.0" or "port-ocean-custom:latest"
+image: ""
+
 imagePullPolicy: Always
 
 imagePullSecrets: [ ]