From 134c47d5c62bc7c53ae68129ff40f115cdb062d1 Mon Sep 17 00:00:00 2001 From: Tarik02 Date: Sun, 29 Oct 2023 15:10:45 +0200 Subject: [PATCH 1/3] Support annotations on controllers --- stable/democratic-csi/templates/controller.yaml | 7 +++++++ stable/democratic-csi/values.yaml | 2 ++ 2 files changed, 9 insertions(+) diff --git a/stable/democratic-csi/templates/controller.yaml b/stable/democratic-csi/templates/controller.yaml index 05ffb3a..72159ee 100644 --- a/stable/democratic-csi/templates/controller.yaml +++ b/stable/democratic-csi/templates/controller.yaml @@ -8,6 +8,10 @@ apiVersion: apps/v1 metadata: name: {{ include "democratic-csi.fullname" . }}-controller namespace: {{ .Release.Namespace }} + {{- with .Values.controller.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} labels: app.kubernetes.io/name: {{ include "democratic-csi.name" . }} helm.sh/chart: {{ include "democratic-csi.chart" . }} @@ -15,6 +19,9 @@ metadata: app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/csi-role: "controller" app.kubernetes.io/component: "controller-linux" + {{- with .Values.controller.labels }} + {{- toYaml . | nindent 4 }} + {{- end }} spec: replicas: {{ .Values.controller.replicaCount }} selector: diff --git a/stable/democratic-csi/values.yaml b/stable/democratic-csi/values.yaml index 5bc370a..f5c5307 100644 --- a/stable/democratic-csi/values.yaml +++ b/stable/democratic-csi/values.yaml @@ -63,6 +63,8 @@ controller: hostNetwork: false hostAliases: [] hostIPC: false + annotations: {} + labels: {} podAnnotations: {} podLabels: {} priorityClassName: "" From 2b81d585ce4198c05eaf6c6ca04bd733c63756a2 Mon Sep 17 00:00:00 2001 From: Tarik02 Date: Sun, 29 Oct 2023 15:35:57 +0200 Subject: [PATCH 2/3] Support annotations on node and node-windows daemonsets --- stable/democratic-csi/templates/node-windows.yaml | 7 +++++++ stable/democratic-csi/templates/node.yaml | 7 +++++++ stable/democratic-csi/values.yaml | 2 ++ 3 files changed, 16 insertions(+) diff --git a/stable/democratic-csi/templates/node-windows.yaml b/stable/democratic-csi/templates/node-windows.yaml index b351fc8..dc6638b 100644 --- a/stable/democratic-csi/templates/node-windows.yaml +++ b/stable/democratic-csi/templates/node-windows.yaml @@ -11,6 +11,10 @@ apiVersion: apps/v1 metadata: name: {{ include "democratic-csi.fullname" . }}-node-windows namespace: {{ .Release.Namespace }} + {{- with .Values.node.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} labels: app.kubernetes.io/name: {{ include "democratic-csi.name" . }} helm.sh/chart: {{ include "democratic-csi.chart" . }} @@ -18,6 +22,9 @@ metadata: app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/csi-role: "node" app.kubernetes.io/component: "node-windows" + {{- with .Values.node.labels }} + {{- toYaml . | nindent 4 }} + {{- end }} spec: selector: matchLabels: diff --git a/stable/democratic-csi/templates/node.yaml b/stable/democratic-csi/templates/node.yaml index 64cfa5c..d9bbb30 100644 --- a/stable/democratic-csi/templates/node.yaml +++ b/stable/democratic-csi/templates/node.yaml @@ -9,6 +9,10 @@ apiVersion: apps/v1 metadata: name: {{ include "democratic-csi.fullname" . }}-node namespace: {{ .Release.Namespace }} + {{- with .Values.node.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} labels: app.kubernetes.io/name: {{ include "democratic-csi.name" . }} helm.sh/chart: {{ include "democratic-csi.chart" . }} @@ -16,6 +20,9 @@ metadata: app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/csi-role: "node" app.kubernetes.io/component: "node-linux" + {{- with .Values.node.labels }} + {{- toYaml . | nindent 4 }} + {{- end }} spec: selector: matchLabels: diff --git a/stable/democratic-csi/values.yaml b/stable/democratic-csi/values.yaml index f5c5307..d7deae2 100644 --- a/stable/democratic-csi/values.yaml +++ b/stable/democratic-csi/values.yaml @@ -215,6 +215,8 @@ node: hostIPC: true hostPID: false kubeletHostPath: /var/lib/kubelet + annotations: {} + labels: {} podAnnotations: {} podLabels: {} priorityClassName: "" From c1ed0c875baaca53344f2e0471add792f0249b82 Mon Sep 17 00:00:00 2001 From: Tarik02 Date: Sun, 29 Oct 2023 15:36:27 +0200 Subject: [PATCH 3/3] Bump chart version --- stable/democratic-csi/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stable/democratic-csi/Chart.yaml b/stable/democratic-csi/Chart.yaml index 0daf423..7d83bf0 100644 --- a/stable/democratic-csi/Chart.yaml +++ b/stable/democratic-csi/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: csi storage for container orchestration systems name: democratic-csi -version: 0.14.1 +version: 0.14.2