Merge pull request #327 from bluicezhen/master

 Add support for pod annotations in doris Helm charts

Author: catpineapple

helm-charts/doris/templates/doriscluster.yaml

@@ -38,6 +38,10 @@ spec:
   authSecret: {{ template "doriscluster.secret.name" . }}
   {{- end }}
   feSpec:
+    {{- if .Values.feSpec.annotations }}
+    annotations:
+    {{- toYaml .Values.feSpec.annotations | nindent 6 }}
+    {{- end }}
     replicas: {{ .Values.feSpec.replicas }}
     {{- if .Values.feSpec.electionNumber }}
     electionNumber: {{ .Values.feSpec.electionNumber }}
@@ -123,6 +127,10 @@ spec:
     {{- end }}
     {{- end }}
   beSpec:
+    {{- if .Values.beSpec.annotations }}
+    annotations:
+    {{- toYaml .Values.beSpec.annotations | nindent 6 }}
+    {{- end }}
     replicas: {{ .Values.beSpec.replicas }}
     {{- if .Values.beSpec.labels }}
     podLabels:
@@ -206,6 +214,10 @@ spec:
     {{- end }}
   {{- if .Values.dorisCluster.enabledCn }}
   cnSpec:
+    {{- if .Values.cnSpec.annotations }}
+    annotations:
+    {{- toYaml .Values.cnSpec.annotations | nindent 6 }}
+    {{- end }}
     replicas: {{ .Values.cnSpec.replicas }}
 
     {{- if .Values.cnSpec.labels }}
@@ -300,6 +312,10 @@ spec:
 
   {{- if .Values.dorisCluster.enabledBroker }}
   brokerSpec:
+    {{- if .Values.brokerSpec.annotations }}
+    annotations:
+    {{- toYaml .Values.brokerSpec.annotations | nindent 6 }}
+    {{- end }}
     replicas: {{ .Values.brokerSpec.replicas }}
 
     {{- if .Values.brokerSpec.labels }}

helm-charts/doris/values.yaml

@@ -44,6 +44,8 @@ dorisCluster:
   # password: dDBwLVNlY3JldA==
 
 feSpec:
+  # annotations for fe pods and service
+  annotations: {}
   replicas: 3
   # electionNumber represents `FOLLOWER` number, replicas - electionNumber as `OBSERVER`
   # electionNumber: 3
@@ -210,6 +212,8 @@ feSpec:
     # command: [ "/sbin/sysctl", "-w", "vm.max_map_count=2000000" ]
 
 beSpec:
+  # annotations for be pods and service
+  annotations: {}
   replicas: 3
   # the pod labels for user select or classify pods.
   labels: {}
@@ -375,6 +379,8 @@ beSpec:
     # command: [ "/sbin/sysctl", "-w", "vm.max_map_count=2000000" ]
 
 cnSpec:
+  # annotations for cn pods and service
+  annotations: {}
   replicas: 3
   # the pod labels for user select or classify pods.
   labels: {}
@@ -556,6 +562,8 @@ cnSpec:
       #       averageUtilization: 30
 
 brokerSpec:
+  # annotations for broker pods and service
+  annotations: {}
   replicas: 3
   # the pod labels for user select or classify pods.
   labels: {}