This is an automated email from the ASF dual-hosted git repository.

abhishek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git


The following commit(s) were added to refs/heads/master by this push:
     new de7ef81dff helm: add Kubernetes discovery support (#13262)
de7ef81dff is described below

commit de7ef81dff02175bad35177dc745534b40468960
Author: Alejandro del Castillo <[email protected]>
AuthorDate: Fri Oct 28 04:39:48 2022 -0500

    helm: add Kubernetes discovery support (#13262)
    
    The K8 discovery mechanism, enabled by the druid-kubernetes-extension,
    relies on each pod advertising its name and namespace on the env
    variables POD_NAME and POD_NAMESPACE [1]. Add env variables to all
    deployments/statefulsets.
    
    [1] 
https://druid.apache.org/docs/latest/development/extensions-core/kubernetes.html
    
    Signed-off-by: Alejandro del Castillo <[email protected]>
    
    Signed-off-by: Alejandro del Castillo <[email protected]>
---
 helm/druid/templates/broker/deployment.yaml         | 4 ++++
 helm/druid/templates/coordinator/deployment.yaml    | 4 ++++
 helm/druid/templates/historical/statefulset.yaml    | 4 ++++
 helm/druid/templates/middleManager/statefulset.yaml | 4 ++++
 helm/druid/templates/overlord/deployment.yaml       | 4 ++++
 helm/druid/templates/router/deployment.yaml         | 4 ++++
 6 files changed, 24 insertions(+)

diff --git a/helm/druid/templates/broker/deployment.yaml 
b/helm/druid/templates/broker/deployment.yaml
index cd5bb1c1d3..d320cf1cbf 100644
--- a/helm/druid/templates/broker/deployment.yaml
+++ b/helm/druid/templates/broker/deployment.yaml
@@ -52,6 +52,10 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           args: [ "broker" ]
           env:
+          - name: POD_NAME
+            valueFrom:  {fieldRef: {fieldPath: metadata.name}}
+          - name: POD_NAMESPACE
+            valueFrom: {fieldRef: {fieldPath: metadata.namespace}}
           {{- range $key, $val := .Values.broker.config }}
           - name: {{ $key }}
             value: {{ $val | quote }}
diff --git a/helm/druid/templates/coordinator/deployment.yaml 
b/helm/druid/templates/coordinator/deployment.yaml
index 18402c5900..fc26757ef2 100644
--- a/helm/druid/templates/coordinator/deployment.yaml
+++ b/helm/druid/templates/coordinator/deployment.yaml
@@ -52,6 +52,10 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           args: [ "coordinator" ]
           env:
+          - name: POD_NAME
+            valueFrom:  {fieldRef: {fieldPath: metadata.name}}
+          - name: POD_NAMESPACE
+            valueFrom: {fieldRef: {fieldPath: metadata.namespace}}
           {{- range $key, $val := .Values.coordinator.config }}
           - name: {{ $key }}
             value: {{ $val | quote }}
diff --git a/helm/druid/templates/historical/statefulset.yaml 
b/helm/druid/templates/historical/statefulset.yaml
index 9065ae2767..1a575ac720 100644
--- a/helm/druid/templates/historical/statefulset.yaml
+++ b/helm/druid/templates/historical/statefulset.yaml
@@ -95,6 +95,10 @@ spec:
       - name: druid
         args: [ "historical" ]
         env:
+        - name: POD_NAME
+          valueFrom:  {fieldRef: {fieldPath: metadata.name}}
+        - name: POD_NAMESPACE
+          valueFrom: {fieldRef: {fieldPath: metadata.namespace}}
         {{- range $key, $val := .Values.historical.config }}
         - name: {{ $key }}
           value: {{ $val | quote }}
diff --git a/helm/druid/templates/middleManager/statefulset.yaml 
b/helm/druid/templates/middleManager/statefulset.yaml
index ccbb35b5b5..827ed561fe 100644
--- a/helm/druid/templates/middleManager/statefulset.yaml
+++ b/helm/druid/templates/middleManager/statefulset.yaml
@@ -95,6 +95,10 @@ spec:
       - name: druid
         args: [ "middleManager" ]
         env:
+        - name: POD_NAME
+          valueFrom:  {fieldRef: {fieldPath: metadata.name}}
+        - name: POD_NAMESPACE
+          valueFrom: {fieldRef: {fieldPath: metadata.namespace}}
         {{- range $key, $val := .Values.middleManager.config }}
         - name: {{ $key }}
           value: {{ $val | quote }}
diff --git a/helm/druid/templates/overlord/deployment.yaml 
b/helm/druid/templates/overlord/deployment.yaml
index 2484beb5ec..8eebbe2b3a 100644
--- a/helm/druid/templates/overlord/deployment.yaml
+++ b/helm/druid/templates/overlord/deployment.yaml
@@ -52,6 +52,10 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           args: [ "overlord" ]
           env:
+          - name: POD_NAME
+            valueFrom:  {fieldRef: {fieldPath: metadata.name}}
+          - name: POD_NAMESPACE
+            valueFrom: {fieldRef: {fieldPath: metadata.namespace}}
           {{- range $key, $val := .Values.overlord.config }}
           - name: {{ $key }}
             value: {{ $val | quote }}
diff --git a/helm/druid/templates/router/deployment.yaml 
b/helm/druid/templates/router/deployment.yaml
index d669a60c9c..31e2728582 100644
--- a/helm/druid/templates/router/deployment.yaml
+++ b/helm/druid/templates/router/deployment.yaml
@@ -52,6 +52,10 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           args: [ "router" ]
           env:
+          - name: POD_NAME
+            valueFrom:  {fieldRef: {fieldPath: metadata.name}}
+          - name: POD_NAMESPACE
+            valueFrom: {fieldRef: {fieldPath: metadata.namespace}}
           {{- range $key, $val := .Values.router.config }}
           - name: {{ $key }}
             value: {{ $val | quote }}


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to