Template dataPlaneDomain for Self Hosted Installations

charts/conductor/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.5.2
+version: 0.5.3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/conductor/templates/_helpers.tpl

@@ -85,3 +85,17 @@ Create the name of the service account to use
 {{- define "conductor.serviceAccountName" -}}
 {{- default (include "conductor.fullname" .) .Values.serviceAccount.name }}
 {{- end }}
+
+{{/*
+If .Values.global.baseDomain is present, create dataPlaneDomain.
+This is for Self Hosted installations.
+*/}}
+{{- define "conductor.dataPlaneDomain" -}}
+{{- if .Values.env | toString | regexMatch "DATA_PLANE_BASEDOMAIN" -}}
+{{- else -}}
+{{- if .Values.global.baseDomain }}
+- name: DATA_PLANE_BASEDOMAIN
+  value: {{- printf " dataplane.%s" .Values.global.baseDomain }}
+{{- end }}
+{{- end }}
+{{- end -}}

charts/conductor/templates/deployment.yaml

@@ -45,6 +45,7 @@ spec:
             value: "false"
           - name: RUST_LOG
             value: {{ .Values.logLevel }}
+          {{ include "conductor.dataPlaneDomain" . | nindent 10 }}
           {{- if .Values.env }}{{ .Values.env | default list | toYaml | nindent 10 }}{{- end }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}

charts/conductor/templates/metrics-deployment.yaml

@@ -47,6 +47,7 @@ spec:
             value: "true"
           - name: RUST_LOG
             value: {{ .Values.logLevel }}
+          {{ include "conductor.dataPlaneDomain" . | nindent 10 }}
           {{- if .Values.env }}{{ .Values.env | default list | toYaml | nindent 10 }}{{- end }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}

charts/conductor/templates/watcher-deployment.yaml

@@ -45,6 +45,7 @@ spec:
             value: "true"
           - name: RUST_LOG
             value: {{ .Values.logLevel }}
+          {{ include "conductor.dataPlaneDomain" . | nindent 10 }}
           {{- if .Values.env }}{{ .Values.env | default list | toYaml | nindent 10 }}{{- end }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}

charts/tembo-operator/Chart.yaml

@@ -3,7 +3,7 @@ name: tembo-operator
 description: "Helm chart to deploy the tembo-operator"
 type: application
 icon: https://cloud.tembo.io/images/TemboElephant.png
-version: 0.7.2
+version: 0.7.3
 home: https://tembo.io
 sources:
   - https://github.com/tembo-io/tembo

charts/tembo-operator/templates/_helpers.yaml

@@ -84,3 +84,17 @@ app.kubernetes.io/name: {{ include "controller.fullname" . | quote }}
 app.kubernetes.io/version: {{ default (index .Values "controller").image.tag .Chart.Version }}
 app.kubernetes.io/component: "controller"
 {{- end }}
+
+{{/*
+If .Values.global.baseDomain is present, create dataPlaneDomain.
+This is for Self Hosted installations.
+*/}}
+{{- define "controller.dataPlaneDomain" -}}
+{{- if .Values.controller.extraEnv | toString | regexMatch "DATA_PLANE_BASEDOMAIN" -}}
+{{- else -}}
+{{- if .Values.global.baseDomain }}
+- name: DATA_PLANE_BASEDOMAIN
+  value: {{- printf " dataplane.%s" .Values.global.baseDomain }}
+{{- end }}
+{{- end }}
+{{- end -}}

charts/tembo-operator/templates/deployment-operator.yaml

@@ -33,6 +33,7 @@ spec:
           imagePullPolicy: {{ (index .Values "controller").image.pullPolicy }}
           name: tembo-controller
           env:
+            {{ include "controller.dataPlaneDomain" . | nindent 12 }}
             {{- with (index .Values "controller").env }}
             {{- range . }}
             - name: {{ .name }}

tembo-operator/testdata/operator-values.yaml

@@ -8,6 +8,8 @@ pod-init:
   extraEnv:
     - name: OPENTELEMETRY_ENDPOINT_URL
       value: http://tempo.monitoring.svc.cluster.local:4317
+    - name: DATA_PLANE_BASEDOMAIN
+      value: data-1.example.tembo.io
   resources:
     requests:
       cpu: 50m