Merge pull request #47 from tarik02/master

Support annotations on controllers

Author: travisghansen

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

stable/democratic-csi/templates/controller.yaml

@@ -8,13 +8,20 @@ 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" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     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:

stable/democratic-csi/templates/node-windows.yaml

@@ -11,13 +11,20 @@ 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" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     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:

stable/democratic-csi/templates/node.yaml

@@ -9,13 +9,20 @@ 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" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     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:

stable/democratic-csi/values.yaml

@@ -63,6 +63,8 @@ controller:
   hostNetwork: false
   hostAliases: []
   hostIPC: false
+  annotations: {}
+  labels: {}
   podAnnotations: {}
   podLabels: {}
   priorityClassName: ""
@@ -213,6 +215,8 @@ node:
   hostIPC: true
   hostPID: false
   kubeletHostPath: /var/lib/kubelet
+  annotations: {}
+  labels: {}
   podAnnotations: {}
   podLabels: {}
   priorityClassName: ""