feat: deployment in helm chart can define extra annotations and envir… (

#8453)
apecloud · Nov 15, 2024 · af342ea · af342ea
1 parent 6c08d23
commit af342ea
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 1 deletion.
diff --git a/deploy/helm/templates/dataprotection.yaml b/deploy/helm/templates/dataprotection.yaml
@@ -4,6 +4,10 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "kubeblocks.fullname" . }}-dataprotection
+  {{- with .Values.dataProtection.deployAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   labels:
     {{- include "kubeblocks.labels" . | nindent 4 }}
     app.kubernetes.io/component: "dataprotection"
@@ -24,7 +28,7 @@ spec:
   {{- end }}
   template:
     metadata:
-      {{- with .Values.podAnnotations }}
+      {{- with .Values.dataProtection.podAnnotations }}
       annotations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
@@ -143,6 +147,9 @@ spec:
               value: {{ .Values.dataProtection.worker.serviceAccount.annotations | toJson | quote }}
             - name: WORKER_CLUSTER_ROLE_NAME
               value: {{ include "dataprotection.workerClusterRoleName" . }}
+            {{- if .Values.dataProtection.extraEnvs }}
+            {{- toYaml .Values.dataProtection.extraEnvs | nindent 12 }}
+            {{- end }}
           {{- with .Values.securityContext }}
           securityContext:
             {{- toYaml . | nindent 12 }}

diff --git a/deploy/helm/templates/deployment.yaml b/deploy/helm/templates/deployment.yaml
@@ -2,6 +2,10 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "kubeblocks.fullname" . }}
+  {{- with .Values.deployAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   labels:
     {{- include "kubeblocks.labels" . | nindent 4 }}
     app.kubernetes.io/component: "apps"
@@ -179,6 +183,9 @@ spec:
               value: {{ .Values.featureGates.componentReplicasAnnotation.enabled | quote }}
             - name: IN_PLACE_POD_VERTICAL_SCALING
               value: {{ .Values.featureGates.inPlacePodVerticalScaling.enabled | quote }}
+            {{- if .Values.extraEnvs }}
+            {{- toYaml .Values.extraEnvs | nindent 12 }}
+            {{- end }}
           {{- with .Values.securityContext }}
           securityContext:
             {{- toYaml . | nindent 12 }}

diff --git a/deploy/helm/values.yaml b/deploy/helm/values.yaml
@@ -317,6 +317,12 @@ dataPlane:
 # Add extra pod labels to KubeBlocks Deployment
 extraLabels: {}
 
+# Add extra annotations to KubeBlocks Deployment
+deployAnnotations: {}
+
+# Add extra pod envs to KubeBlocks Deployment
+extraEnvs: []
+
 ## webhooks settings
 ##
 ## @param webhooks.conversionEnabled
@@ -392,6 +398,16 @@ dataProtection:
   # Add extra pod labels to KubeBlocks-DataProtection Deployment
   extraLabels: {}
 
+  # Add extra annotations to KubeBlocks-DataProtection Deployment
+  deployAnnotations: {}
+
+  # Add extra pod envs to KubeBlocks-DataProtection Deployment
+  extraEnvs: []
+
+  ## @param podAnnotations
+  ##
+  podAnnotations: {}
+
 ## BackupRepo settings
 ##
 ## @param backupRepo.create - creates a backup repo during installation