From 757eda25012dd382057767ca1386a51ce9a2d7c7 Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Tue, 15 Oct 2024 09:27:38 +0200 Subject: [PATCH 1/2] add CLUSTER_DNS_DOMAIN to deployment templating --- template/deploy/helm/[[operator]]/templates/deployment.yaml.j2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/template/deploy/helm/[[operator]]/templates/deployment.yaml.j2 b/template/deploy/helm/[[operator]]/templates/deployment.yaml.j2 index a8f56f5b..67c6fdd8 100644 --- a/template/deploy/helm/[[operator]]/templates/deployment.yaml.j2 +++ b/template/deploy/helm/[[operator]]/templates/deployment.yaml.j2 @@ -48,6 +48,8 @@ spec: valueFrom: fieldRef: fieldPath: metadata.annotations['internal.stackable.tech/image'] + - name: CLUSTER_DNS_DOMAIN + value: {{ .Values.clusterDnsDomain | default "cluster.local" | quote }} {[% if operator.product_string in ['kafka'] %}] - name: KAFKA_BROKER_CLUSTERROLE value: {{ include "operator.fullname" . }}-kafka-broker-clusterrole From ea6761bbbd88b1729fb574bdf40dbf47b2c83348 Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Tue, 15 Oct 2024 10:15:46 +0200 Subject: [PATCH 2/2] change env var name --- .../deploy/helm/[[operator]]/templates/deployment.yaml.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/template/deploy/helm/[[operator]]/templates/deployment.yaml.j2 b/template/deploy/helm/[[operator]]/templates/deployment.yaml.j2 index 67c6fdd8..b0265b1b 100644 --- a/template/deploy/helm/[[operator]]/templates/deployment.yaml.j2 +++ b/template/deploy/helm/[[operator]]/templates/deployment.yaml.j2 @@ -48,8 +48,8 @@ spec: valueFrom: fieldRef: fieldPath: metadata.annotations['internal.stackable.tech/image'] - - name: CLUSTER_DNS_DOMAIN - value: {{ .Values.clusterDnsDomain | default "cluster.local" | quote }} + - name: KUBERNETES_SERVICE_DNS_DOMAIN + value: {{ .Values.kubernetesServiceDnsDomain | default "cluster.local" | quote }} {[% if operator.product_string in ['kafka'] %}] - name: KAFKA_BROKER_CLUSTERROLE value: {{ include "operator.fullname" . }}-kafka-broker-clusterrole