diff --git a/CHANGELOG.md b/CHANGELOG.md index fd3ed82..ab88aae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# 0.8.2 + +- support for pod annotations/labels +- explicit registry (docker.io) for relevant images + # 0.6.3 - api version support for csidriver diff --git a/stable/democratic-csi/Chart.yaml b/stable/democratic-csi/Chart.yaml index 41f1760..2c0d466 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.8.1 +version: 0.8.2 diff --git a/stable/democratic-csi/templates/controller.yaml b/stable/democratic-csi/templates/controller.yaml index a04013c..f6689ae 100644 --- a/stable/democratic-csi/templates/controller.yaml +++ b/stable/democratic-csi/templates/controller.yaml @@ -20,10 +20,16 @@ spec: template: metadata: annotations: + {{- with .Values.controller.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} {{- if not .Values.driver.existingConfigSecret }} checksum/secret: {{ include (print $.Template.BasePath "/driver-config-secret.yaml") . | sha256sum }} {{- end }} labels: + {{- with .Values.controller.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} app.kubernetes.io/name: {{ include "democratic-csi.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/csi-role: "controller" diff --git a/stable/democratic-csi/templates/node.yaml b/stable/democratic-csi/templates/node.yaml index 188b3d4..fe8b6df 100644 --- a/stable/democratic-csi/templates/node.yaml +++ b/stable/democratic-csi/templates/node.yaml @@ -21,10 +21,16 @@ spec: template: metadata: annotations: + {{- with .Values.node.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} {{- if not .Values.driver.existingConfigSecret }} checksum/secret: {{ include (print $.Template.BasePath "/driver-config-secret.yaml") . | sha256sum }} {{- end }} labels: + {{- with .Values.node.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} app.kubernetes.io/name: {{ include "democratic-csi.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/csi-role: "node" diff --git a/stable/democratic-csi/values.yaml b/stable/democratic-csi/values.yaml index fec496e..fa0c4f7 100644 --- a/stable/democratic-csi/values.yaml +++ b/stable/democratic-csi/values.yaml @@ -54,6 +54,8 @@ controller: enabled: true hostNetwork: false hostIPC: false + podAnnotations: {} + podLabels: {} # deployment = deploy controller parts in a distinct deployment # node = deploy controller as sidecars with node daemonset @@ -145,7 +147,7 @@ controller: # democratic-csi controller driver: enabled: true - image: democraticcsi/democratic-csi:latest + image: docker.io/democraticcsi/democratic-csi:latest # imagePullPolicy: Always logLevel: info lifecycle: @@ -189,6 +191,8 @@ node: hostNetwork: true hostIPC: true kubeletHostPath: /var/lib/kubelet + podAnnotations: {} + podLabels: {} livenessProbe: enabled: true @@ -209,7 +213,7 @@ node: # democratic-csi node driver: enabled: true - image: democraticcsi/democratic-csi:latest + image: docker.io/democraticcsi/democratic-csi:latest # imagePullPolicy: Always logLevel: info # set path to null if your OS has no localtime file