feat: support podLabel and podAnnotation for toolset and console (#1152)

* support podLabel and podAnnotation for toolset and console Signed-off-by: ericsyh <[email protected]> * apply to sn-platform chart Signed-off-by: ericsyh <[email protected]> --------- Signed-off-by: ericsyh <[email protected]> (cherry picked from commit 6638474)
streamnative · Mar 11, 2024 · b15043c · b15043c
1 parent 152bd9a
commit b15043c
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 8 deletions.
diff --git a/charts/sn-platform-slim/templates/streamnative-console/streamnative-console-statefulset.yaml b/charts/sn-platform-slim/templates/streamnative-console/streamnative-console-statefulset.yaml
@@ -48,11 +48,11 @@ spec:
       labels:
         {{- include "pulsar.template.labels" . | nindent 8 }}
         component: {{ .Values.streamnative_console.component }}
-{{- with .Values.streamnative_console.labels }}
+{{- with .Values.streamnative_console.podLabels }}
 {{ toYaml . | indent 8 }}
 {{- end }}
       annotations:
-{{- with .Values.streamnative_console.annotations }}
+{{- with .Values.streamnative_console.podAnnotations }}
 {{ toYaml . | indent 8 }}
 {{- end }}
     spec:

diff --git a/charts/sn-platform-slim/templates/toolset/toolset-statefulset.yaml b/charts/sn-platform-slim/templates/toolset/toolset-statefulset.yaml
@@ -48,14 +48,14 @@ spec:
       labels:
         {{- include "pulsar.template.labels" . | nindent 8 }}
         component: {{ .Values.toolset.component }}
-{{- with .Values.toolset.labels }}
+{{- with .Values.toolset.podLabels }}
 {{ toYaml . | indent 8 }}
 {{- end }}
       annotations:
         {{- if .Values.toolset.autoRollDeployment }}
         checksum/config: {{ include (print $.Template.BasePath "/toolset/toolset-configmap.yaml") . | sha256sum }}
         {{- end }}
-{{- with .Values.toolset.annotations }}
+{{- with .Values.toolset.podAnnotations }}
 {{ toYaml . | indent 8 }}
 {{- end }}
     spec:

diff --git a/charts/sn-platform-slim/values.yaml b/charts/sn-platform-slim/values.yaml
@@ -1561,6 +1561,8 @@ toolset:
     # cloud.google.com/gke-nodepool: default-pool
   labels: {}
   annotations: {}
+  podLabels: {}
+  podAnnotations: {}
   tolerations: []
   gracePeriod: 0
   resources:
@@ -1985,6 +1987,8 @@ streamnative_console:
     # cloud.google.com/gke-nodepool: default-pool
   labels: {}
   annotations: {}
+  podLabels: {}
+  podAnnotations: {}
   tolerations: []
   gracePeriod: 0
   # Resources requests/limits for both init containers and app containers

diff --git a/charts/sn-platform/templates/streamnative-console/streamnative-console-statefulset.yaml b/charts/sn-platform/templates/streamnative-console/streamnative-console-statefulset.yaml
@@ -48,11 +48,11 @@ spec:
       labels:
         {{- include "pulsar.template.labels" . | nindent 8 }}
         component: {{ .Values.streamnative_console.component }}
-{{- with .Values.streamnative_console.labels }}
+{{- with .Values.streamnative_console.podLabels }}
 {{ toYaml . | indent 8 }}
 {{- end }}
       annotations:
-{{- with .Values.streamnative_console.annotations }}
+{{- with .Values.streamnative_console.podAnnotations }}
 {{ toYaml . | indent 8 }}
 {{- end }}
     spec:

diff --git a/charts/sn-platform/templates/toolset/toolset-statefulset.yaml b/charts/sn-platform/templates/toolset/toolset-statefulset.yaml
@@ -48,14 +48,14 @@ spec:
       labels:
         {{- include "pulsar.template.labels" . | nindent 8 }}
         component: {{ .Values.toolset.component }}
-{{- with .Values.toolset.labels }}
+{{- with .Values.toolset.podLabels }}
 {{ toYaml . | indent 8 }}
 {{- end }}
       annotations:
         {{- if .Values.toolset.autoRollDeployment }}
         checksum/config: {{ include (print $.Template.BasePath "/toolset/toolset-configmap.yaml") . | sha256sum }}
         {{- end }}
-{{- with .Values.toolset.annotations }}
+{{- with .Values.toolset.podAnnotations }}
 {{ toYaml . | indent 8 }}
 {{- end }}
     spec:

diff --git a/charts/sn-platform/values.yaml b/charts/sn-platform/values.yaml
@@ -1638,6 +1638,8 @@ toolset:
     # cloud.google.com/gke-nodepool: default-pool
   labels: {}
   annotations: {}
+  podLabels: {}
+  podAnnotations: {}
   tolerations: []
   kafka:
     enabled: false
@@ -2072,6 +2074,8 @@ streamnative_console:
     # cloud.google.com/gke-nodepool: default-pool
   labels: {}
   annotations: {}
+  podLabels: {}
+  podAnnotations: {}
   tolerations: []
   gracePeriod: 0
   # Resources requests/limits for both init containers and app containers