fix: add missing JOB_KUBE_CONNECTOR_IMAGE_REGISTRY (#16855)

Author: perangel

charts/helm-tests/tests/v2/workloads_test.go

@@ -0,0 +1,47 @@
+package tests
+
+import (
+	"testing"
+
+	helmtests "github.com/airbytehq/airbyte-platform-internal/oss/charts/helm-tests"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestDefaultConnectorImageRegistry(t *testing.T) {
+	opts := helmtests.BaseHelmOptions()
+	chartYaml, err := helmtests.RenderHelmChart(t, opts, chartPath, "airbyte", nil)
+	assert.NoError(t, err)
+
+	expectedEnvVars := []helmtests.ExpectedEnvVar{
+		helmtests.ExpectedConfigMapVar().RefName("airbyte-airbyte-env").RefKey("JOB_KUBE_CONNECTOR_IMAGE_REGISTRY").Value(""),
+	}
+
+	releaseApps := appsForRelease("airbyte")
+	rapp := releaseApps["workload-launcher"]
+	app := chartYaml.GetResourceByKindAndName(rapp.Kind, rapp.FQN())
+	assert.NotNil(t, app, "unable to find %s named '%s'", rapp.Kind, rapp.FQN())
+
+	pod := helmtests.GetPodSpec(app)
+	assert.NotNil(t, pod, "unable to extract pod spec from %s: %s", rapp.Kind, rapp.FQN())
+	chartYaml.VerifyEnvVarsForApp(t, rapp.Kind, rapp.FQN(), expectedEnvVars)
+}
+
+func TestOverrideConnectorImageRegistry(t *testing.T) {
+	opts := helmtests.BaseHelmOptions()
+	opts.SetValues["global.image.registry"] = "not-the-default"
+	chartYaml, err := helmtests.RenderHelmChart(t, opts, chartPath, "airbyte", nil)
+	assert.NoError(t, err)
+
+	expectedEnvVars := []helmtests.ExpectedEnvVar{
+		helmtests.ExpectedConfigMapVar().RefName("airbyte-airbyte-env").RefKey("JOB_KUBE_CONNECTOR_IMAGE_REGISTRY").Value("not-the-default"),
+	}
+
+	releaseApps := appsForRelease("airbyte")
+	rapp := releaseApps["workload-launcher"]
+	app := chartYaml.GetResourceByKindAndName(rapp.Kind, rapp.FQN())
+	assert.NotNil(t, app, "unable to find %s named '%s'", rapp.Kind, rapp.FQN())
+
+	pod := helmtests.GetPodSpec(app)
+	assert.NotNil(t, pod, "unable to extract pod spec from %s: %s", rapp.Kind, rapp.FQN())
+	chartYaml.VerifyEnvVarsForApp(t, rapp.Kind, rapp.FQN(), expectedEnvVars)
+}

charts/v2/airbyte/config.yaml

@@ -1481,6 +1481,10 @@ workloadLauncher.dataPlane:
 workloadLauncher.images:
   keyBasePath: workloadLauncher
   config:
+    - env: JOB_KUBE_CONNECTOR_IMAGE_REGISTRY 
+      keyBasePath: global.image
+      key: registry
+
     - env: CONNECTOR_PROFILER_IMAGE
       key: connectorProfiler.image
       valueExp: include "imageUrl" (list .Values.workloadLauncher.connectorProfiler.image $)

charts/v2/airbyte/templates/config/_workloadLauncher.tpl

@@ -244,6 +244,24 @@ DATAPLANE_CLIENT_ID: {{ include "airbyte.workloadLauncher.dataPlane.clientId" .
 DATAPLANE_CLIENT_SECRET: {{ include "airbyte.workloadLauncher.dataPlane.clientSecret" . | quote }}
 {{- end }}
 
+{{/*
+Renders the global.image.registry value
+*/}}
+{{- define "airbyte.workloadLauncher.images.registry" }}
+    {{- .Values.global.image.registry }}
+{{- end }}
+
+{{/*
+Renders the workloadLauncher.images.registry environment variable
+*/}}
+{{- define "airbyte.workloadLauncher.images.registry.env" }}
+- name: JOB_KUBE_CONNECTOR_IMAGE_REGISTRY
+  valueFrom:
+    configMapKeyRef:
+      name: {{ .Release.Name }}-airbyte-env
+      key: JOB_KUBE_CONNECTOR_IMAGE_REGISTRY
+{{- end }}
+
 {{/*
 Renders the workloadLauncher.connectorProfiler.image value
 */}}
@@ -338,6 +356,7 @@ Renders the workloadLauncher.images.workloadInit.image environment variable
 Renders the set of all workloadLauncher.images environment variables
 */}}
 {{- define "airbyte.workloadLauncher.images.envs" }}
+{{- include "airbyte.workloadLauncher.images.registry.env" . }}
 {{- include "airbyte.workloadLauncher.images.connectorProfiler.image.env" . }}
 {{- include "airbyte.workloadLauncher.images.connectorSidecar.image.env" . }}
 {{- include "airbyte.workloadLauncher.images.containerOrchestrator.enabled.env" . }}
@@ -349,6 +368,7 @@ Renders the set of all workloadLauncher.images environment variables
 Renders the set of all workloadLauncher.images config map variables
 */}}
 {{- define "airbyte.workloadLauncher.images.configVars" }}
+JOB_KUBE_CONNECTOR_IMAGE_REGISTRY: {{ include "airbyte.workloadLauncher.images.registry" . | quote }}
 CONNECTOR_PROFILER_IMAGE: {{ include "airbyte.workloadLauncher.images.connectorProfiler.image" . | quote }}
 CONNECTOR_SIDECAR_IMAGE: {{ include "airbyte.workloadLauncher.images.connectorSidecar.image" . | quote }}
 CONTAINER_ORCHESTRATOR_ENABLED: {{ include "airbyte.workloadLauncher.images.containerOrchestrator.enabled" . | quote }}