Allow override of specific image repositories

Author: maor-rozenfeld

chart/templates/_helpers.tpl

@@ -559,3 +559,19 @@ Check if public URL uses HTTPS
 true
 {{- end -}}
 {{- end }}
+
+{{/*
+Get image repository for a component
+Expected dict: { "root": $, "component": "app" }
+Returns the repository to use, either component-specific or global
+*/}}
+{{- define "openops.imageRepository" -}}
+{{- $root := .root -}}
+{{- $component := .component -}}
+{{- $componentConfig := index $root.Values $component -}}
+{{- if and $componentConfig.repository (ne $componentConfig.repository "") -}}
+{{- $componentConfig.repository -}}
+{{- else -}}
+{{- $root.Values.image.repository -}}
+{{- end -}}
+{{- end }}

chart/templates/deployment-analytics.yaml

@@ -47,7 +47,7 @@ spec:
       {{- include "openops.initContainers" (dict "root" . "component" "analytics") | nindent 6 }}
       containers:
       - name: {{ .Values.analytics.name }}
-        image: "{{ .Values.image.repository }}/{{ .Values.analytics.image }}:{{ .Values.analytics.tag }}"
+        image: "{{ include "openops.imageRepository" (dict "root" . "component" "analytics") }}/{{ .Values.analytics.image }}:{{ .Values.analytics.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         {{- include "openops.containerSecurityContext" (dict "root" .) | nindent 8 }}
         env:

chart/templates/deployment-app.yaml

@@ -51,7 +51,7 @@ spec:
       {{- include "openops.initContainers" (dict "root" . "component" "app") | nindent 6 }}
       containers:
         - name: {{ .Values.app.name }}
-          image: "{{ .Values.image.repository }}/{{ .Values.app.image }}:{{ .Values.global.version }}"
+          image: "{{ include "openops.imageRepository" (dict "root" . "component" "app") }}/{{ .Values.app.image }}:{{ .Values.global.version }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           {{- if .Values.global.containerSecurityContext.enabled }}
           securityContext:

chart/templates/deployment-engine.yaml

@@ -47,7 +47,7 @@ spec:
       {{- include "openops.initContainers" (dict "root" . "component" "engine") | nindent 6 }}
       containers:
         - name: {{ .Values.engine.name }}
-          image: "{{ .Values.image.repository }}/{{ .Values.engine.image }}:{{ .Values.global.version }}"
+          image: "{{ include "openops.imageRepository" (dict "root" . "component" "engine") }}/{{ .Values.engine.image }}:{{ .Values.global.version }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           {{- include "openops.containerSecurityContext" (dict "root" .) | nindent 10 }}
           command: [ "/bin/sh", "-c", "cp -r /var/tmp-base/. /tmp/ && node main.js" ]

chart/templates/deployment-tables.yaml

@@ -49,7 +49,7 @@ spec:
       {{- include "openops.initContainers" (dict "root" . "component" "tables") | nindent 6 }}
       containers:
       - name: {{ .Values.tables.name }}
-        image: "{{ .Values.image.repository }}/{{ .Values.tables.image }}:{{ .Values.tables.tag }}"
+        image: "{{ include "openops.imageRepository" (dict "root" . "component" "tables") }}/{{ .Values.tables.image }}:{{ .Values.tables.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         {{- if .Values.global.containerSecurityContext.enabled }}
         securityContext:

chart/values.schema.json

@@ -45,6 +45,10 @@
         "image": {
           "type": "string"
         },
+        "repository": {
+          "type": "string",
+          "description": "Override global image.repository for app (empty = use global)"
+        },
         "replicas": {
           "type": "integer",
           "minimum": 0
@@ -61,6 +65,10 @@
         "image": {
           "type": "string"
         },
+        "repository": {
+          "type": "string",
+          "description": "Override global image.repository for engine (empty = use global)"
+        },
         "replicas": {
           "type": "integer",
           "minimum": 0
@@ -77,6 +85,10 @@
         "image": {
           "type": "string"
         },
+        "repository": {
+          "type": "string",
+          "description": "Image repository for tables (defaults to public.ecr.aws/openops)"
+        },
         "tag": {
           "type": "string",
           "description": "Immutable version tag for tables image",
@@ -98,6 +110,10 @@
         "image": {
           "type": "string"
         },
+        "repository": {
+          "type": "string",
+          "description": "Image repository for analytics (defaults to public.ecr.aws/openops)"
+        },
         "tag": {
           "type": "string",
           "description": "Immutable version tag for analytics image",

chart/values.yaml

@@ -164,6 +164,7 @@ secretEnv:
 app:
   name: openops-app
   image: openops-app
+  repository: ""  # Override global image.repository (empty = use global)
   replicas: 2  # Minimum 2 for high availability
   resources:
     requests:
@@ -199,6 +200,7 @@ app:
 engine:
   name: openops-engine
   image: openops-engine
+  repository: ""  # Override global image.repository (empty = use global)
   replicas: 2  # Minimum 2 for high availability
   resources:
     requests:
@@ -237,6 +239,7 @@ engine:
 tables:
   name: openops-tables
   image: openops-tables
+  repository: "public.ecr.aws/openops"  # Always use public ECR for tables
   tag: "0.2.17"
   replicas: 1
   resources:
@@ -299,6 +302,7 @@ tables:
 analytics:
   name: openops-analytics
   image: openops-analytics
+  repository: "public.ecr.aws/openops"  # Always use public ECR for analytics
   tag: "0.14.4"
   replicas: 1
   resources: