adding extraLabels to kibana, move apigw extralabels into pod

SoftwareAG · Dec 7, 2023 · 1cca359 · 1cca359
1 parent 195199a
commit 1cca359
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/apigateway/helm/templates/deployment.yaml b/apigateway/helm/templates/deployment.yaml
@@ -25,9 +25,6 @@ metadata:
     {{- with .Values.extraLabels -}}
     {{ toYaml . | nindent 4 }}
     {{- end }}
-    {{- with .Values.apigw.extraLabels -}}
-    {{ toYaml . | nindent 4 }}
-    {{- end }}
 spec:
   {{- if not .Values.autoscaling.enabled }}
   replicas: {{ .Values.replicaCount }}
@@ -48,6 +45,9 @@ spec:
         {{- with .Values.extraLabels -}}
         {{ toYaml . | nindent 8 }}
         {{- end }}
+        {{- with .Values.apigw.extraLabels -}}
+        {{ toYaml . | nindent 8 }}
+        {{- end }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:

diff --git a/apigateway/helm/templates/kibana.yaml b/apigateway/helm/templates/kibana.yaml
@@ -51,6 +51,9 @@ spec:
         {{- with .Values.extraLabels -}}
         {{ toYaml . | nindent 8 }}
         {{- end }}
+        {{- with .Values.kibana.extraLabels -}}
+        {{ toYaml . | nindent 8 }}
+        {{- end }}
       annotations:
         {{- with .Values.kibana.annotations -}}
         {{ toYaml . | nindent 8 }}

diff --git a/apigateway/helm/values.yaml b/apigateway/helm/values.yaml
@@ -373,6 +373,8 @@ apigw:
   #   properties:
   #     location: apigw-config.yml
   extraConfigSources: []
+
+  # -- Additional labels to be added to apigw pod labels.
   extraLabels: {}
 
 prometheus:
@@ -563,6 +565,9 @@ kibana:
   #   memory: 128Mi  
   resources: {}
 
+  # -- Additional labels to be added to kibana pod labels.
+  extraLabels: {}
+
   # -- Enable and configure service account creation.
   serviceAccount:
     # -- Whether to create a ServiceAccount for Kibana