From 3846fb34e38c947e3143cb2cba9b715bf945828a Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Thu, 17 Oct 2024 11:49:45 +0200 Subject: [PATCH 1/2] add KUBERNETES_CLUSTER_DOMAIN only if set (removed default) --- .../deploy/helm/[[operator]]/templates/deployment.yaml.j2 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/template/deploy/helm/[[operator]]/templates/deployment.yaml.j2 b/template/deploy/helm/[[operator]]/templates/deployment.yaml.j2 index a15a5c9c..9c1ccefd 100644 --- a/template/deploy/helm/[[operator]]/templates/deployment.yaml.j2 +++ b/template/deploy/helm/[[operator]]/templates/deployment.yaml.j2 @@ -48,8 +48,10 @@ spec: valueFrom: fieldRef: fieldPath: metadata.annotations['internal.stackable.tech/image'] + {{- if .Values.kubernetesClusterDomain }} - name: KUBERNETES_CLUSTER_DOMAIN - value: {{ .Values.kubernetesClusterDomain | default "cluster.local" | quote }} + value: {{ .Values.kubernetesClusterDomain | quote }} + {{- end }} {[% if operator.product_string in ['kafka'] %}] - name: KAFKA_BROKER_CLUSTERROLE value: {{ include "operator.fullname" . }}-kafka-broker-clusterrole From 8475bb013c2a8f8ee77fbf92f7f9175b3226a284 Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Thu, 17 Oct 2024 11:53:54 +0200 Subject: [PATCH 2/2] fix whitespace --- template/deploy/helm/[[operator]]/templates/deployment.yaml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/deploy/helm/[[operator]]/templates/deployment.yaml.j2 b/template/deploy/helm/[[operator]]/templates/deployment.yaml.j2 index 9c1ccefd..6bbd1e5e 100644 --- a/template/deploy/helm/[[operator]]/templates/deployment.yaml.j2 +++ b/template/deploy/helm/[[operator]]/templates/deployment.yaml.j2 @@ -51,7 +51,7 @@ spec: {{- if .Values.kubernetesClusterDomain }} - name: KUBERNETES_CLUSTER_DOMAIN value: {{ .Values.kubernetesClusterDomain | quote }} - {{- end }} + {{- end }} {[% if operator.product_string in ['kafka'] %}] - name: KAFKA_BROKER_CLUSTERROLE value: {{ include "operator.fullname" . }}-kafka-broker-clusterrole