Support configuring image repository and tags through helm-charts

Signed-off-by: Michael Hotan <[email protected]>

Author: mhotan

charts/controlplane/Chart.yaml

@@ -3,7 +3,7 @@ name: controlplane
 description: Deploys the Union controlplane components to onboard a kubernetes cluster to the Union Cloud.
 type: application
 icon: https://i.ibb.co/JxfDQsL/Union-Symbol-yellow-2.png
-version: 2025.10.3
+version: 2025.11.0
 appVersion: 2025.10.0
 kubeVersion: '>= 1.28.0-0'
 dependencies:

charts/controlplane/templates/_helpers.tpl

@@ -106,19 +106,19 @@ false
 
 {{- define "unionai.image.repository" -}}
 {{- if and (hasKey .config "image") (hasKey .config.image "repository") }}
-{{ .config.image.repository }}
+{{ tpl .config.image.repository . }}
 {{- else if and (hasKey .Values "image") (hasKey .Values.image "repository") }}
-{{ .Values.image.repository }}
+{{ tpl .Values.image.repository . }}
 {{- else }}
 ""
 {{- end }}
 {{- end }}
 
 {{- define "unionai.image.tag" -}}
-{{- if and (hasKey .config "image") (hasKey .config.image "tag") }}
-{{ .config.image.tag }}
+{{- if and (hasKey .config "image") (hasKey .config.image "tag") (ne (tpl .config.image.tag .) "") }}
+{{ tpl .config.image.tag . }}
 {{- else if and (hasKey .Values "image") (hasKey .Values.image "tag") }}
-{{ .Values.image.tag }}
+{{ tpl .Values.image.tag . }}
 {{- else }}
 ""
 {{- end }}
@@ -252,15 +252,15 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{- $tag := "" }}
 
 {{- if and (hasKey .config "image") (hasKey .config.image "repository") }}
-  {{- $repo = .config.image.repository }}
+  {{- $repo = tpl .config.image.repository . }}
 {{- else if and (hasKey .Values "image") (hasKey .Values.image "repository") }}
-  {{- $repo = .Values.image.repository }}
+  {{- $repo = tpl .Values.image.repository . }}
 {{- end }}
 
 {{- if and (hasKey .config "image") (hasKey .config.image "tag") }}
-  {{- $tag = .config.image.tag }}
+  {{- $tag = tpl (.config.image.tag | toString) . }}
 {{- else if and (hasKey .Values "image") (hasKey .Values.image "tag") }}
-  {{- $tag = .Values.image.tag }}
+  {{- $tag = tpl (.Values.image.tag | toString) . }}
 {{- else if hasKey .Chart "AppVersion" }}
   {{- $tag = .Chart.AppVersion }}
 {{- end }}

charts/controlplane/templates/console/deployment.yaml

@@ -36,7 +36,7 @@ spec:
       - name: {{ include "console.name" . }}
         securityContext:
           {{- toYaml .Values.console.securityContext | nindent 10 }}
-        image: "{{ .Values.console.image.repository }}:{{ .Values.console.image.tag | default .Values.image.tag }}"
+        image: "{{ tpl .Values.console.image.repository . }}:{{ (tpl .Values.console.image.tag .) | default (tpl .Values.image.tag .) }}"
         imagePullPolicy: {{ .Values.console.image.pullPolicy }}
         ports:
         - name: http

charts/controlplane/values.yaml

@@ -47,6 +47,10 @@ global:
   # Note: Secret must contain "pass.txt" key
   KUBERNETES_SECRET_NAME: ""
 
+  # Union Private ECR repository prefix for control plane images
+  # Contact Union for controlplane access and distribution.
+  IMAGE_REPOSITORY_PREFIX: "643379628101.dkr.ecr.us-east-1.amazonaws.com/union-cp"
+
 # ----------------------------------------------------------------------------
 # Additional Configuration
 # ----------------------------------------------------------------------------
@@ -58,9 +62,9 @@ global:
 dbPass: ""
 # -- Set the image used for control plane services
 image:
-  repository: ""
+  repository: "{{ .Values.global.IMAGE_REPOSITORY_PREFIX }}/services"
   pullPolicy: IfNotPresent
-  tag: ""
+  tag: "{{ .Chart.AppVersion }}"
 
 # -- Default config for Union services (excluding flyte subchart)
 defaults:
@@ -512,9 +516,9 @@ console:
   replicaCount: 1
 
   image:
-    repository: ""
+    repository: "{{ .Values.global.IMAGE_REPOSITORY_PREFIX }}/unionconsole"
     pullPolicy: IfNotPresent
-    tag: ""
+    tag: "{{ .Chart.AppVersion }}"
 
   nameOverride: ""
   # More readable resource names.
@@ -590,7 +594,9 @@ flyte:
     replicaCount: 1
     # -- Set the image used for flyteadmin
     image:
-      repository: ""
+      # TODO flyte-core does not render templated repository and tag correctly.
+      # PR: https://github.com/flyteorg/flyte/pull/6711
+      repository: "643379628101.dkr.ecr.us-east-1.amazonaws.com/union-cp/services"
       pullPolicy: IfNotPresent
       tag:  ""
     serviceAccount:
@@ -630,6 +636,14 @@ flyte:
         ephemeral-storage: 200Mi
         memory: 500Mi
 
+  flytescheduler:
+    image:
+      # TODO flyte-core does not render templated repository and tag correctly.
+      # PR: https://github.com/flyteorg/flyte/pull/6711
+      repository: "643379628101.dkr.ecr.us-east-1.amazonaws.com/union-cp/flytescheduler"
+      pullPolicy: IfNotPresent
+      tag:  ""
+
   workflow_scheduler:
     enabled: false
     type: native
@@ -638,7 +652,9 @@ flyte:
     enabled: true
     replicaCount: 1
     image:
-      repository: "" # -- Set the repository for the public datacatalog image"
+      # TODO flyte-core does not render templated repository and tag correctly.
+      # PR: https://github.com/flyteorg/flyte/pull/6711
+      repository: "643379628101.dkr.ecr.us-east-1.amazonaws.com/union-cp/datacatalog" # -- Set the repository for the public datacatalog image"
       tag: "" # -- Set the tag for the public datacatalog image
       pullPolicy: "IfNotPresent" # -- Set the pull policy for the datacatalog image
     resources:
@@ -662,7 +678,9 @@ flyte:
     podEnv: {}
     replicaCount: 1
     image:
-      repository: "" # -- Set the repository for the console image"
+      # TODO flyte-core does not render templated repository and tag correctly.
+      # PR: https://github.com/flyteorg/flyte/pull/6711
+      repository: "643379628101.dkr.ecr.us-east-1.amazonaws.com/union-cp/flyteconsole" # -- Set the repository for the console image"
       tag: "" # -- Set the tag for the console image
     resources:
       # flyteconsole service has less memory footprint but cpu goes up depends on traffic, If CPU use is high then we will use HPA
@@ -697,7 +715,9 @@ flyte:
     enabled: true
     replicaCount: 1
     image:
-      repository: "" # -- Set the repository for the private cacheservice image"
+      # TODO flyte-core does not render templated repository and tag correctly.
+      # PR: https://github.com/flyteorg/flyte/pull/6711
+      repository: "643379628101.dkr.ecr.us-east-1.amazonaws.com/union-cp/services" # -- Set the repository for the private cacheservice image"
       tag: "" # -- Set the tag for the private cacheservice datacatalog image
       pullPolicy: "IfNotPresent" # -- Set the pull policy for the private cacheservice  image
     serviceAccount:

charts/dataplane/values.aws.selfhosted-intracluster.yaml

@@ -43,37 +43,37 @@ global:
   #    Note: Bucket must exist before deployment
   METADATA_BUCKET: ""
 
-  # 6. S3_FAST_REGISTRATION_BUCKET - S3 bucket for code uploads
+  #    S3_FAST_REGISTRATION_BUCKET - S3 bucket for code uploads
   #    Format: Valid S3 bucket name
   #    Example: "my-union-fast-registration-bucket"
   #    Note: Can be same as metadata bucket or separate
   FAST_REGISTRATION_BUCKET: ""
 
-  # 1. AWS_REGION - AWS region for S3 buckets
+  #    AWS_REGION - AWS region for S3 buckets
   #    Format: AWS region code
   #    Example: "us-east-1", "us-west-2", "eu-west-1"
   AWS_REGION: ""
 
-  # 2. BACKEND_IAM_ROLE_ARN - IAM role for Union backend services
+  #    BACKEND_IAM_ROLE_ARN - IAM role for Union backend services
   #    Format: Full ARN
   #    Example: "arn:aws:iam::123456789012:role/union-backend-role"
   #    Permissions: S3 access, ECR (if private images)
   BACKEND_IAM_ROLE_ARN: ""
 
-  # 3. WORKER_IAM_ROLE_ARN - IAM role for workflow execution pods
+  #    WORKER_IAM_ROLE_ARN - IAM role for workflow execution pods
   #    Format: Full ARN
   #    Example: "arn:aws:iam::123456789012:role/union-worker-role"
   #    Permissions: S3 access, AWS services used by workflows
   WORKER_IAM_ROLE_ARN: ""
 
-  # 1. CONTROLPLANE_INTRA_CLUSTER_HOST - Control plane ingress controller FQDN
+  #    CONTROLPLANE_INTRA_CLUSTER_HOST - Control plane ingress controller FQDN
   #    Format: "SERVICE-NAME.NAMESPACE.svc.cluster.local"
   #    Example: "controlplane-nginx-controller.union-cp.svc.cluster.local"
   #    How to find: kubectl get svc -n union-cp | grep nginx-controller
   #    Note: Used for direct communication with control plane
   CONTROLPLANE_INTRA_CLUSTER_HOST: ""
 
-  # 2. FLYTEADMIN_ENDPOINT - Internal Flyteadmin service endpoint
+  #    FLYTEADMIN_ENDPOINT - Internal Flyteadmin service endpoint
   #    Format: "SERVICE-NAME.NAMESPACE.svc.cluster.local:PORT"
   #    Example: "flyteadmin.union-cp.svc.cluster.local:81"
   #    How to find: kubectl get svc -n union-cp flyteadmin