Merge pull request #95 from juicedata/add-extra-labels-annotations

Add extra labels and annotations
juicedata · Mar 20, 2024 · 8891b0e · 8891b0e
2 parents 11b561a + 1f7a961
commit 8891b0e
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 0 deletions.
diff --git a/charts/juicefs-csi-driver/templates/controller.yaml b/charts/juicefs-csi-driver/templates/controller.yaml
@@ -5,6 +5,13 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     {{- include "juicefs-csi.labels" . | nindent 4 }}
+    {{- if .Values.controller.labels }}
+    {{- toYaml .Values.controller.labels | nindent 4}}
+    {{- end}}
+  {{- with .Values.controller.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   name: juicefs-csi-controller
   namespace: {{ .Release.Namespace | quote }}
 spec:
@@ -19,6 +26,13 @@ spec:
       labels:
         app: juicefs-csi-controller
         {{- include "juicefs-csi.selectorLabels" . | nindent 8 }}
+        {{- if .Values.controller.labels }}
+        {{- toYaml .Values.controller.labels | nindent 8}}
+        {{- end}}
+      {{- with .Values.controller.annotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
     spec:
     {{- with .Values.imagePullSecrets }}
       imagePullSecrets:

diff --git a/charts/juicefs-csi-driver/templates/daemonset.yaml b/charts/juicefs-csi-driver/templates/daemonset.yaml
@@ -5,6 +5,13 @@ metadata:
   labels:
     app.kubernetes.io/component: node
     {{- include "juicefs-csi.labels" . | nindent 4 }}
+    {{- if .Values.node.labels }}
+    {{- toYaml .Values.node.labels | nindent 4}}
+    {{- end}}
+  {{- with .Values.node.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   name: juicefs-csi-node
   namespace: {{ .Release.Namespace | quote }}
 spec:
@@ -21,6 +28,13 @@ spec:
       labels:
         app: juicefs-csi-node
         {{- include "juicefs-csi.selectorLabels" . | nindent 8 }}
+        {{- if .Values.node.labels }}
+        {{- toYaml .Values.node.labels | nindent 8}}
+        {{- end}}
+      {{- with .Values.node.annotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
     spec:
     {{- with .Values.imagePullSecrets }}
       imagePullSecrets:

diff --git a/charts/juicefs-csi-driver/templates/deployment.yaml b/charts/juicefs-csi-driver/templates/deployment.yaml
@@ -5,6 +5,13 @@ metadata:
   labels:
     app.kubernetes.io/component: dashboard
     {{- include "juicefs-csi.labels" . | nindent 4 }}
+    {{- if .Values.dashboard.labels }}
+    {{- toYaml .Values.dashboard.labels | nindent 4}}
+    {{- end}}
+  {{- with .Values.dashboard.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   name: juicefs-csi-dashboard
   namespace: {{ .Release.Namespace | quote }}
 spec:
@@ -18,6 +25,13 @@ spec:
       labels:
         app: juicefs-csi-dashboard
         {{- include "juicefs-csi.selectorLabels" . | nindent 8 }}
+        {{- if .Values.dashboard.labels }}
+        {{- toYaml .Values.dashboard.labels | nindent 8}}
+        {{- end}}
+      {{- with .Values.dashboard.annotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
     spec:
       serviceAccountName: {{ include "juicefs-csi.dashboard.serviceAccountName" . }}
       {{- with .Values.imagePullSecrets }}

diff --git a/charts/juicefs-csi-driver/values.yaml b/charts/juicefs-csi-driver/values.yaml
@@ -124,6 +124,8 @@ controller:
       memory: 512Mi
   # Grace period to allow the CSI Controller pod to shutdown before it is killed
   terminationGracePeriodSeconds: 30
+  labels: {}
+  annotations: {}
   # Affinity for CSI Controller pod
   affinity: {}
   # Node selector for CSI Controller pod
@@ -163,6 +165,8 @@ node:
   mountPodNonPreempting: false
   # Grace period to allow the CSI Node Service pods to shutdown before it is killed
   terminationGracePeriodSeconds: 30
+  labels: {}
+  annotations: {}
   # Affinity for CSI Node Service pods
   affinity: {}
   # Node selector for CSI Node Service pods, ref: https://juicefs.com/docs/csi/guide/resource-optimization#csi-node-node-selector
@@ -214,6 +218,8 @@ dashboard:
     requests:
       cpu: 100m
       memory: 200Mi
+  labels: {}
+  annotations: {}
   affinity: {}
   nodeSelector: {}
   tolerations: