From ca5fbc180c89b351c0442631bf27add9a0bb6856 Mon Sep 17 00:00:00 2001 From: wilmardo Date: Mon, 29 Jul 2019 12:36:24 +0200 Subject: [PATCH] Rework of helm charts Signed-off-by: wilmardo --- .../cephfs/kubernetes/v1.13/helm/Chart.yaml | 4 +- .../v1.13/helm/templates/csidriver-crd.yaml | 3 +- .../helm/templates/csiplugin-configmap.yaml | 1 + .../nodeplugin-clusterrolebinding.yaml | 2 +- .../helm/templates/nodeplugin-daemonset.yaml | 23 ++++---- .../templates/nodeplugin-serviceaccount.yaml | 1 + .../helm/templates/provisioner-role.yaml | 1 + .../templates/provisioner-rolebinding.yaml | 1 + .../provisioner-rules-clusterrole.yaml | 4 +- .../helm/templates/provisioner-service.yaml | 1 + .../templates/provisioner-serviceaccount.yaml | 1 + .../templates/provisioner-statefulset.yaml | 37 +++++++------ .../cephfs/kubernetes/v1.13/helm/values.yaml | 39 +++++--------- .../cephfs/kubernetes/v1.14+/helm/Chart.yaml | 4 +- .../v1.14+/helm/templates/csidriver-crd.yaml | 3 +- .../helm/templates/csiplugin-configmap.yaml | 1 + .../nodeplugin-clusterrolebinding.yaml | 2 +- .../helm/templates/nodeplugin-daemonset.yaml | 27 +++++----- .../templates/nodeplugin-serviceaccount.yaml | 1 + .../templates/provisioner-deployment.yaml | 35 ++++++------ .../helm/templates/provisioner-role.yaml | 1 + .../templates/provisioner-rolebinding.yaml | 2 +- .../provisioner-rules-clusterrole.yaml | 4 +- .../templates/provisioner-serviceaccount.yaml | 1 + .../cephfs/kubernetes/v1.14+/helm/values.yaml | 37 +++++-------- deploy/rbd/kubernetes/v1.13/helm/Chart.yaml | 4 +- .../helm/templates/csiplugin-configmap.yaml | 1 + .../nodeplugin-clusterrolebinding.yaml | 2 +- .../helm/templates/nodeplugin-daemonset.yaml | 23 ++++---- .../templates/nodeplugin-serviceaccount.yaml | 1 + .../helm/templates/provisioner-role.yaml | 3 +- .../templates/provisioner-rolebinding.yaml | 2 +- .../provisioner-rules-clusterrole.yaml | 4 +- .../helm/templates/provisioner-service.yaml | 1 + .../templates/provisioner-serviceaccount.yaml | 1 + .../templates/provisioner-statefulset.yaml | 45 ++++++++-------- deploy/rbd/kubernetes/v1.13/helm/values.yaml | 54 +++++++------------ .../v1.14+/helm/templates/csidriver-crd.yaml | 3 +- .../helm/templates/csiplugin-configmap.yaml | 1 + .../nodeplugin-clusterrolebinding.yaml | 2 +- .../helm/templates/nodeplugin-daemonset.yaml | 25 ++++----- .../templates/nodeplugin-serviceaccount.yaml | 1 + .../templates/provisioner-deployment.yaml | 45 ++++++++-------- .../helm/templates/provisioner-role.yaml | 1 + .../templates/provisioner-rolebinding.yaml | 2 +- .../provisioner-rules-clusterrole.yaml | 4 +- .../templates/provisioner-serviceaccount.yaml | 1 + deploy/rbd/kubernetes/v1.14+/helm/values.yaml | 53 ++++++++---------- 48 files changed, 254 insertions(+), 261 deletions(-) diff --git a/deploy/cephfs/kubernetes/v1.13/helm/Chart.yaml b/deploy/cephfs/kubernetes/v1.13/helm/Chart.yaml index 5efb6e250..cf50a29f3 100644 --- a/deploy/cephfs/kubernetes/v1.13/helm/Chart.yaml +++ b/deploy/cephfs/kubernetes/v1.13/helm/Chart.yaml @@ -1,10 +1,10 @@ --- apiVersion: v1 -appVersion: "1.0.0" +appVersion: "1.3.0" description: "Container Storage Interface (CSI) driver, provisioner, and attacher for Ceph cephfs" name: ceph-csi-cephfs -version: 0.8.0 +version: 0.9.0 keywords: - ceph - cephfs diff --git a/deploy/cephfs/kubernetes/v1.13/helm/templates/csidriver-crd.yaml b/deploy/cephfs/kubernetes/v1.13/helm/templates/csidriver-crd.yaml index 4c5021a72..8bdb83c4a 100644 --- a/deploy/cephfs/kubernetes/v1.13/helm/templates/csidriver-crd.yaml +++ b/deploy/cephfs/kubernetes/v1.13/helm/templates/csidriver-crd.yaml @@ -1,9 +1,10 @@ --- -{{ if not .Values.attacher.enabled }} +{{ if not .Values.provisioner.attacher.enabled }} apiVersion: storage.k8s.io/v1beta1 kind: CSIDriver metadata: name: {{ .Values.driverName }} + namespace: {{ .Release.Namespace }} spec: attachRequired: false podInfoOnMount: false diff --git a/deploy/cephfs/kubernetes/v1.13/helm/templates/csiplugin-configmap.yaml b/deploy/cephfs/kubernetes/v1.13/helm/templates/csiplugin-configmap.yaml index 66b4a5545..b89bd9e43 100644 --- a/deploy/cephfs/kubernetes/v1.13/helm/templates/csiplugin-configmap.yaml +++ b/deploy/cephfs/kubernetes/v1.13/helm/templates/csiplugin-configmap.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: {{ .Values.configMapName | quote }} + namespace: {{ .Release.Namespace }} labels: app: {{ include "ceph-csi-cephfs.name" . }} chart: {{ include "ceph-csi-cephfs.chart" . }} diff --git a/deploy/cephfs/kubernetes/v1.13/helm/templates/nodeplugin-clusterrolebinding.yaml b/deploy/cephfs/kubernetes/v1.13/helm/templates/nodeplugin-clusterrolebinding.yaml index 24e21351c..2fa8b38bf 100644 --- a/deploy/cephfs/kubernetes/v1.13/helm/templates/nodeplugin-clusterrolebinding.yaml +++ b/deploy/cephfs/kubernetes/v1.13/helm/templates/nodeplugin-clusterrolebinding.yaml @@ -16,5 +16,5 @@ subjects: roleRef: kind: ClusterRole name: {{ include "ceph-csi-cephfs.nodeplugin.fullname" . }} - apiGroup: rbac.authorization.k8s.io + apiGroup: rbac.authorization.k8s.io {{- end -}} diff --git a/deploy/cephfs/kubernetes/v1.13/helm/templates/nodeplugin-daemonset.yaml b/deploy/cephfs/kubernetes/v1.13/helm/templates/nodeplugin-daemonset.yaml index 6413daba4..33f613e2e 100644 --- a/deploy/cephfs/kubernetes/v1.13/helm/templates/nodeplugin-daemonset.yaml +++ b/deploy/cephfs/kubernetes/v1.13/helm/templates/nodeplugin-daemonset.yaml @@ -2,6 +2,7 @@ kind: DaemonSet apiVersion: apps/v1 metadata: name: {{ include "ceph-csi-cephfs.nodeplugin.fullname" . }} + namespace: {{ .Release.Namespace }} labels: app: {{ include "ceph-csi-cephfs.name" . }} chart: {{ include "ceph-csi-cephfs.chart" . }} @@ -41,7 +42,7 @@ spec: exec: command: [ "/bin/sh", "-c", - 'rm -rf /registration/{{ .Values.driverName }} + 'rm -rf /registration/{{ .Values.driverName }} /registration/{{ .Values.driverName }}-reg.sock' ] env: @@ -90,7 +91,7 @@ spec: - name: plugin-dir mountPath: {{ .Values.pluginDir }} mountPropagation: "Bidirectional" - - name: mointpoint-dir + - name: mountpoint-dir mountPath: /var/lib/kubelet/pods mountPropagation: "Bidirectional" - mountPath: /dev @@ -146,15 +147,15 @@ spec: emptyDir: { medium: "Memory" } - {{- if .Values.nodeplugin.affinity -}} +{{- if .Values.nodeplugin.affinity }} affinity: -{{ toYaml .Values.nodeplugin.affinity . | indent 8 }} - {{- end -}} - {{- if .Values.nodeplugin.nodeSelector -}} +{{ toYaml .Values.nodeplugin.affinity . | indent 8 -}} +{{- end -}} +{{- if .Values.nodeplugin.nodeSelector }} nodeSelector: -{{ toYaml .Values.nodeplugin.nodeSelector | indent 8 }} - {{- end -}} - {{- if .Values.nodeplugin.tolerations -}} +{{ toYaml .Values.nodeplugin.nodeSelector | indent 8 -}} +{{- end -}} +{{- if .Values.nodeplugin.tolerations }} tolerations: -{{ toYaml .Values.nodeplugin.tolerations | indent 8 }} - {{- end -}} +{{ toYaml .Values.nodeplugin.tolerations | indent 8 -}} +{{- end -}} diff --git a/deploy/cephfs/kubernetes/v1.13/helm/templates/nodeplugin-serviceaccount.yaml b/deploy/cephfs/kubernetes/v1.13/helm/templates/nodeplugin-serviceaccount.yaml index 88bd8f1bc..5dedaf4b0 100644 --- a/deploy/cephfs/kubernetes/v1.13/helm/templates/nodeplugin-serviceaccount.yaml +++ b/deploy/cephfs/kubernetes/v1.13/helm/templates/nodeplugin-serviceaccount.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: {{ include "ceph-csi-cephfs.serviceAccountName.nodeplugin" . }} + namespace: {{ .Release.Namespace }} labels: app: {{ include "ceph-csi-cephfs.name" . }} chart: {{ include "ceph-csi-cephfs.chart" . }} diff --git a/deploy/cephfs/kubernetes/v1.13/helm/templates/provisioner-role.yaml b/deploy/cephfs/kubernetes/v1.13/helm/templates/provisioner-role.yaml index 4ca24f212..5a112619b 100644 --- a/deploy/cephfs/kubernetes/v1.13/helm/templates/provisioner-role.yaml +++ b/deploy/cephfs/kubernetes/v1.13/helm/templates/provisioner-role.yaml @@ -3,6 +3,7 @@ kind: Role apiVersion: rbac.authorization.k8s.io/v1 metadata: name: {{ include "ceph-csi-cephfs.provisioner.fullname" . }} + namespace: {{ .Release.Namespace }} labels: app: {{ include "ceph-csi-cephfs.name" . }} chart: {{ include "ceph-csi-cephfs.chart" . }} diff --git a/deploy/cephfs/kubernetes/v1.13/helm/templates/provisioner-rolebinding.yaml b/deploy/cephfs/kubernetes/v1.13/helm/templates/provisioner-rolebinding.yaml index 63dc9503b..608b05c59 100644 --- a/deploy/cephfs/kubernetes/v1.13/helm/templates/provisioner-rolebinding.yaml +++ b/deploy/cephfs/kubernetes/v1.13/helm/templates/provisioner-rolebinding.yaml @@ -3,6 +3,7 @@ kind: RoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: name: {{ include "ceph-csi-cephfs.provisioner.fullname" . }} + namespace: {{ .Release.Namespace }} labels: app: {{ include "ceph-csi-cephfs.name" . }} chart: {{ include "ceph-csi-cephfs.chart" . }} diff --git a/deploy/cephfs/kubernetes/v1.13/helm/templates/provisioner-rules-clusterrole.yaml b/deploy/cephfs/kubernetes/v1.13/helm/templates/provisioner-rules-clusterrole.yaml index 2308b60cf..6356851ad 100644 --- a/deploy/cephfs/kubernetes/v1.13/helm/templates/provisioner-rules-clusterrole.yaml +++ b/deploy/cephfs/kubernetes/v1.13/helm/templates/provisioner-rules-clusterrole.yaml @@ -32,9 +32,9 @@ rules: - apiGroups: ["csi.storage.k8s.io"] resources: ["csinodeinfos"] verbs: ["get", "list", "watch"] - {{ if .Values.attacher.enabled }} +{{ if .Values.provisioner.attacher.enabled }} - apiGroups: ["storage.k8s.io"] resources: ["volumeattachments"] verbs: ["get", "list", "watch", "update"] - {{ end }} +{{ end }} {{- end -}} diff --git a/deploy/cephfs/kubernetes/v1.13/helm/templates/provisioner-service.yaml b/deploy/cephfs/kubernetes/v1.13/helm/templates/provisioner-service.yaml index 93d62ffb7..a1f92dcde 100644 --- a/deploy/cephfs/kubernetes/v1.13/helm/templates/provisioner-service.yaml +++ b/deploy/cephfs/kubernetes/v1.13/helm/templates/provisioner-service.yaml @@ -2,6 +2,7 @@ kind: Service apiVersion: v1 metadata: name: {{ include "ceph-csi-cephfs.provisioner.fullname" . }} + namespace: {{ .Release.Namespace }} labels: app: {{ include "ceph-csi-cephfs.name" . }} chart: {{ include "ceph-csi-cephfs.chart" . }} diff --git a/deploy/cephfs/kubernetes/v1.13/helm/templates/provisioner-serviceaccount.yaml b/deploy/cephfs/kubernetes/v1.13/helm/templates/provisioner-serviceaccount.yaml index 2c1d9f74f..c4ba5c188 100644 --- a/deploy/cephfs/kubernetes/v1.13/helm/templates/provisioner-serviceaccount.yaml +++ b/deploy/cephfs/kubernetes/v1.13/helm/templates/provisioner-serviceaccount.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: {{ include "ceph-csi-cephfs.serviceAccountName.provisioner" . }} + namespace: {{ .Release.Namespace }} labels: app: {{ include "ceph-csi-cephfs.name" . }} chart: {{ include "ceph-csi-cephfs.chart" . }} diff --git a/deploy/cephfs/kubernetes/v1.13/helm/templates/provisioner-statefulset.yaml b/deploy/cephfs/kubernetes/v1.13/helm/templates/provisioner-statefulset.yaml index 604ac2f72..2e51787e8 100644 --- a/deploy/cephfs/kubernetes/v1.13/helm/templates/provisioner-statefulset.yaml +++ b/deploy/cephfs/kubernetes/v1.13/helm/templates/provisioner-statefulset.yaml @@ -2,6 +2,7 @@ kind: StatefulSet apiVersion: apps/v1 metadata: name: {{ include "ceph-csi-cephfs.provisioner.fullname" . }} + namespace: {{ .Release.Namespace }} labels: app: {{ include "ceph-csi-cephfs.name" . }} chart: {{ include "ceph-csi-cephfs.chart" . }} @@ -10,7 +11,7 @@ metadata: heritage: {{ .Release.Service }} spec: serviceName: {{ include "ceph-csi-cephfs.provisioner.fullname" . }} - replicas: {{ .Values.provisioner.replicas }} + replicas: {{ .Values.provisioner.replicaCount }} selector: matchLabels: app: {{ include "ceph-csi-cephfs.name" . }} @@ -28,7 +29,8 @@ spec: serviceAccountName: {{ include "ceph-csi-cephfs.serviceAccountName.provisioner" . }} containers: - name: csi-provisioner - image: "{{ .Values.provisioner.image.repository }}:{{ .Values.provisioner.image.tag }}" + image: "{{ .Values.provisioner.provisioner.image.repository }}:{{ .Values.provisioner.provisioner.image.tag }}" + imagePullPolicy: {{ .Values.provisioner.provisioner.image.pullPolicy }} args: - "--csi-address=$(ADDRESS)" - "--v=5" @@ -37,26 +39,27 @@ spec: env: - name: ADDRESS value: "{{ .Values.socketDir }}/{{ .Values.socketFile }}" - imagePullPolicy: {{ .Values.provisioner.image.pullPolicy }} volumeMounts: - name: socket-dir mountPath: {{ .Values.socketDir }} resources: {{ toYaml .Values.provisioner.resources | indent 12 }} - {{ if .Values.attacher.enabled }} +{{- if .Values.provisioner.attacher.enabled }} - name: csi-attacher - image: "{{ .Values.attacher.image.repository }}:{{ .Values.attacher.image.tag }}" + image: "{{ .Values.provisioner.attacher.image.repository }}:{{ .Values.provisioner.attacher.image.tag }}" + imagePullPolicy: {{ .Values.provisioner.attacher.image.pullPolicy }} args: - "--v=5" - "--csi-address=$(ADDRESS)" env: - name: ADDRESS value: "{{ .Values.socketDir }}/{{ .Values.socketFile }}" - imagePullPolicy: {{ .Values.attacher.image.pullPolicy }} volumeMounts: - name: socket-dir mountPath: {{ .Values.socketDir }} - {{ end }} + resources: +{{ toYaml .Values.provisioner.attacher.resources | indent 12 }} +{{- end }} - name: csi-cephfsplugin securityContext: privileged: true @@ -64,6 +67,7 @@ spec: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true image: "{{ .Values.nodeplugin.plugin.image.repository }}:{{ .Values.nodeplugin.plugin.image.tag }}" + imagePullPolicy: {{ .Values.nodeplugin.plugin.image.pullPolicy }} args : - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -81,7 +85,6 @@ spec: fieldPath: spec.nodeName - name: CSI_ENDPOINT value: "unix:/{{ .Values.socketDir }}/{{ .Values.socketFile }}" - imagePullPolicy: {{ .Values.nodeplugin.plugin.image.pullPolicy }} volumeMounts: - name: socket-dir mountPath: {{ .Values.socketDir }} @@ -107,15 +110,15 @@ spec: emptyDir: { medium: "Memory" } - {{- if .Values.provisioner.affinity -}} +{{- if .Values.provisioner.affinity }} affinity: -{{ toYaml .Values.provisioner.affinity . | indent 8 }} - {{- end -}} - {{- if .Values.provisioner.nodeSelector -}} +{{ toYaml .Values.provisioner.affinity | indent 8 -}} +{{- end -}} +{{- if .Values.provisioner.nodeSelector }} nodeSelector: -{{ toYaml .Values.provisioner.nodeSelector | indent 8 }} - {{- end -}} - {{- if .Values.provisioner.tolerations -}} +{{ toYaml .Values.provisioner.nodeSelector | indent 8 -}} +{{- end -}} +{{- if .Values.provisioner.tolerations }} tolerations: -{{ toYaml .Values.provisioner.tolerations | indent 8 }} - {{- end -}} +{{ toYaml .Values.provisioner.tolerations | indent 8 -}} +{{- end -}} diff --git a/deploy/cephfs/kubernetes/v1.13/helm/values.yaml b/deploy/cephfs/kubernetes/v1.13/helm/values.yaml index 35b6cd30a..6538a4336 100644 --- a/deploy/cephfs/kubernetes/v1.13/helm/values.yaml +++ b/deploy/cephfs/kubernetes/v1.13/helm/values.yaml @@ -19,23 +19,6 @@ registrationDir: /var/lib/kubelet/plugins_registry pluginDir: /var/lib/kubelet/plugins driverName: cephfs.csi.ceph.com configMapName: ceph-csi-config -attacher: - name: attacher - enabled: true - replicaCount: 1 - - image: - repository: quay.io/k8scsi/csi-attacher - tag: v1.2.0 - pullPolicy: IfNotPresent - - resources: {} - - nodeSelector: {} - - tolerations: [] - - affinity: {} nodeplugin: name: nodeplugin @@ -45,7 +28,6 @@ nodeplugin: repository: quay.io/k8scsi/csi-node-driver-registrar tag: v1.1.0 pullPolicy: IfNotPresent - resources: {} plugin: @@ -54,7 +36,6 @@ nodeplugin: # for stable functionality replace canary with latest release version tag: canary pullPolicy: IfNotPresent - resources: {} nodeSelector: {} @@ -65,15 +46,23 @@ nodeplugin: provisioner: name: provisioner - replicaCount: 1 - image: - repository: quay.io/k8scsi/csi-provisioner - tag: v1.3.0 - pullPolicy: IfNotPresent + provisioner: + image: + repository: quay.io/k8scsi/csi-provisioner + tag: v1.3.0 + pullPolicy: IfNotPresent + resources: {} - resources: {} + attacher: + name: attacher + enabled: true + image: + repository: quay.io/k8scsi/csi-attacher + tag: v1.2.0 + pullPolicy: IfNotPresent + resources: {} nodeSelector: {} diff --git a/deploy/cephfs/kubernetes/v1.14+/helm/Chart.yaml b/deploy/cephfs/kubernetes/v1.14+/helm/Chart.yaml index 5efb6e250..cf50a29f3 100644 --- a/deploy/cephfs/kubernetes/v1.14+/helm/Chart.yaml +++ b/deploy/cephfs/kubernetes/v1.14+/helm/Chart.yaml @@ -1,10 +1,10 @@ --- apiVersion: v1 -appVersion: "1.0.0" +appVersion: "1.3.0" description: "Container Storage Interface (CSI) driver, provisioner, and attacher for Ceph cephfs" name: ceph-csi-cephfs -version: 0.8.0 +version: 0.9.0 keywords: - ceph - cephfs diff --git a/deploy/cephfs/kubernetes/v1.14+/helm/templates/csidriver-crd.yaml b/deploy/cephfs/kubernetes/v1.14+/helm/templates/csidriver-crd.yaml index 4c5021a72..8bdb83c4a 100644 --- a/deploy/cephfs/kubernetes/v1.14+/helm/templates/csidriver-crd.yaml +++ b/deploy/cephfs/kubernetes/v1.14+/helm/templates/csidriver-crd.yaml @@ -1,9 +1,10 @@ --- -{{ if not .Values.attacher.enabled }} +{{ if not .Values.provisioner.attacher.enabled }} apiVersion: storage.k8s.io/v1beta1 kind: CSIDriver metadata: name: {{ .Values.driverName }} + namespace: {{ .Release.Namespace }} spec: attachRequired: false podInfoOnMount: false diff --git a/deploy/cephfs/kubernetes/v1.14+/helm/templates/csiplugin-configmap.yaml b/deploy/cephfs/kubernetes/v1.14+/helm/templates/csiplugin-configmap.yaml index 66b4a5545..b89bd9e43 100644 --- a/deploy/cephfs/kubernetes/v1.14+/helm/templates/csiplugin-configmap.yaml +++ b/deploy/cephfs/kubernetes/v1.14+/helm/templates/csiplugin-configmap.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: {{ .Values.configMapName | quote }} + namespace: {{ .Release.Namespace }} labels: app: {{ include "ceph-csi-cephfs.name" . }} chart: {{ include "ceph-csi-cephfs.chart" . }} diff --git a/deploy/cephfs/kubernetes/v1.14+/helm/templates/nodeplugin-clusterrolebinding.yaml b/deploy/cephfs/kubernetes/v1.14+/helm/templates/nodeplugin-clusterrolebinding.yaml index 24e21351c..2fa8b38bf 100644 --- a/deploy/cephfs/kubernetes/v1.14+/helm/templates/nodeplugin-clusterrolebinding.yaml +++ b/deploy/cephfs/kubernetes/v1.14+/helm/templates/nodeplugin-clusterrolebinding.yaml @@ -16,5 +16,5 @@ subjects: roleRef: kind: ClusterRole name: {{ include "ceph-csi-cephfs.nodeplugin.fullname" . }} - apiGroup: rbac.authorization.k8s.io + apiGroup: rbac.authorization.k8s.io {{- end -}} diff --git a/deploy/cephfs/kubernetes/v1.14+/helm/templates/nodeplugin-daemonset.yaml b/deploy/cephfs/kubernetes/v1.14+/helm/templates/nodeplugin-daemonset.yaml index 6413daba4..c23002640 100644 --- a/deploy/cephfs/kubernetes/v1.14+/helm/templates/nodeplugin-daemonset.yaml +++ b/deploy/cephfs/kubernetes/v1.14+/helm/templates/nodeplugin-daemonset.yaml @@ -2,6 +2,7 @@ kind: DaemonSet apiVersion: apps/v1 metadata: name: {{ include "ceph-csi-cephfs.nodeplugin.fullname" . }} + namespace: {{ .Release.Namespace }} labels: app: {{ include "ceph-csi-cephfs.name" . }} chart: {{ include "ceph-csi-cephfs.chart" . }} @@ -32,6 +33,7 @@ spec: containers: - name: driver-registrar image: "{{ .Values.nodeplugin.registrar.image.repository }}:{{ .Values.nodeplugin.registrar.image.tag }}" + imagePullPolicy: {{ .Values.nodeplugin.registrar.image.pullPolicy }} args: - "--v=5" - "--csi-address=/csi/{{ .Values.socketFile }}" @@ -41,15 +43,14 @@ spec: exec: command: [ "/bin/sh", "-c", - 'rm -rf /registration/{{ .Values.driverName }} - /registration/{{ .Values.driverName }}-reg.sock' + 'rm -rf /registration/{{ .Values.driverName }} + /registration/{{ .Values.driverName }}-reg.sock' ] env: - name: KUBE_NODE_NAME valueFrom: fieldRef: fieldPath: spec.nodeName - imagePullPolicy: {{ .Values.nodeplugin.registrar.image.pullPolicy }} volumeMounts: - name: plugin-dir mountPath: /csi @@ -90,7 +91,7 @@ spec: - name: plugin-dir mountPath: {{ .Values.pluginDir }} mountPropagation: "Bidirectional" - - name: mointpoint-dir + - name: mountpoint-dir mountPath: /var/lib/kubelet/pods mountPropagation: "Bidirectional" - mountPath: /dev @@ -146,15 +147,15 @@ spec: emptyDir: { medium: "Memory" } - {{- if .Values.nodeplugin.affinity -}} +{{- if .Values.nodeplugin.affinity }} affinity: -{{ toYaml .Values.nodeplugin.affinity . | indent 8 }} - {{- end -}} - {{- if .Values.nodeplugin.nodeSelector -}} +{{ toYaml .Values.nodeplugin.affinity . | indent 8 -}} +{{- end -}} +{{- if .Values.nodeplugin.nodeSelector }} nodeSelector: -{{ toYaml .Values.nodeplugin.nodeSelector | indent 8 }} - {{- end -}} - {{- if .Values.nodeplugin.tolerations -}} +{{ toYaml .Values.nodeplugin.nodeSelector | indent 8 -}} +{{- end -}} +{{- if .Values.nodeplugin.tolerations }} tolerations: -{{ toYaml .Values.nodeplugin.tolerations | indent 8 }} - {{- end -}} +{{ toYaml .Values.nodeplugin.tolerations | indent 8 -}} +{{- end -}} \ No newline at end of file diff --git a/deploy/cephfs/kubernetes/v1.14+/helm/templates/nodeplugin-serviceaccount.yaml b/deploy/cephfs/kubernetes/v1.14+/helm/templates/nodeplugin-serviceaccount.yaml index 88bd8f1bc..5dedaf4b0 100644 --- a/deploy/cephfs/kubernetes/v1.14+/helm/templates/nodeplugin-serviceaccount.yaml +++ b/deploy/cephfs/kubernetes/v1.14+/helm/templates/nodeplugin-serviceaccount.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: {{ include "ceph-csi-cephfs.serviceAccountName.nodeplugin" . }} + namespace: {{ .Release.Namespace }} labels: app: {{ include "ceph-csi-cephfs.name" . }} chart: {{ include "ceph-csi-cephfs.chart" . }} diff --git a/deploy/cephfs/kubernetes/v1.14+/helm/templates/provisioner-deployment.yaml b/deploy/cephfs/kubernetes/v1.14+/helm/templates/provisioner-deployment.yaml index 1bcb49e47..d204e0463 100644 --- a/deploy/cephfs/kubernetes/v1.14+/helm/templates/provisioner-deployment.yaml +++ b/deploy/cephfs/kubernetes/v1.14+/helm/templates/provisioner-deployment.yaml @@ -2,6 +2,7 @@ kind: Deployment apiVersion: apps/v1 metadata: name: {{ include "ceph-csi-cephfs.provisioner.fullname" . }} + namespace: {{ .Release.Namespace }} labels: app: {{ include "ceph-csi-cephfs.name" . }} chart: {{ include "ceph-csi-cephfs.chart" . }} @@ -9,7 +10,7 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} spec: - replicas: {{ .Values.provisioner.replicas }} + replicas: {{ .Values.provisioner.replicaCount }} selector: matchLabels: app: {{ include "ceph-csi-cephfs.name" . }} @@ -27,7 +28,7 @@ spec: serviceAccountName: {{ include "ceph-csi-cephfs.serviceAccountName.provisioner" . }} containers: - name: csi-provisioner - image: "{{ .Values.provisioner.image.repository }}:{{ .Values.provisioner.image.tag }}" + image: "{{ .Values.provisioner.provisioner.image.repository }}:{{ .Values.provisioner.provisioner.image.tag }}" args: - "--csi-address=$(ADDRESS)" - "--v=5" @@ -38,15 +39,16 @@ spec: env: - name: ADDRESS value: "{{ .Values.socketDir }}/{{ .Values.socketFile }}" - imagePullPolicy: {{ .Values.provisioner.image.pullPolicy }} + imagePullPolicy: {{ .Values.provisioner.provisioner.image.pullPolicy }} volumeMounts: - name: socket-dir mountPath: {{ .Values.socketDir }} resources: {{ toYaml .Values.provisioner.resources | indent 12 }} - {{ if .Values.attacher.enabled }} +{{- if .Values.provisioner.attacher.enabled }} - name: csi-attacher - image: "{{ .Values.attacher.image.repository }}:{{ .Values.attacher.image.tag }}" + image: "{{ .Values.provisioner.attacher.image.repository }}:{{ .Values.provisioner.attacher.image.tag }}" + imagePullPolicy: {{ .Values.provisioner.attacher.image.pullPolicy }} args: - "--v=5" - "--csi-address=$(ADDRESS)" @@ -55,11 +57,12 @@ spec: env: - name: ADDRESS value: "{{ .Values.socketDir }}/{{ .Values.socketFile }}" - imagePullPolicy: {{ .Values.attacher.image.pullPolicy }} volumeMounts: - name: socket-dir mountPath: {{ .Values.socketDir }} - {{ end }} + resources: +{{ toYaml .Values.nodeplugin.plugin.resources | indent 12 }} +{{- end }} - name: csi-cephfsplugin securityContext: privileged: true @@ -110,15 +113,15 @@ spec: emptyDir: { medium: "Memory" } - {{- if .Values.provisioner.affinity -}} +{{- if .Values.provisioner.affinity }} affinity: -{{ toYaml .Values.provisioner.affinity . | indent 8 }} - {{- end -}} - {{- if .Values.provisioner.nodeSelector -}} +{{ toYaml .Values.provisioner.affinity . | indent 8 -}} +{{- end -}} +{{- if .Values.provisioner.nodeSelector }} nodeSelector: -{{ toYaml .Values.provisioner.nodeSelector | indent 8 }} - {{- end -}} - {{- if .Values.provisioner.tolerations -}} +{{ toYaml .Values.provisioner.nodeSelector | indent 8 -}} +{{- end -}} +{{- if .Values.provisioner.tolerations }} tolerations: -{{ toYaml .Values.provisioner.tolerations | indent 8 }} - {{- end -}} +{{ toYaml .Values.provisioner.tolerations | indent 8 -}} +{{- end -}} diff --git a/deploy/cephfs/kubernetes/v1.14+/helm/templates/provisioner-role.yaml b/deploy/cephfs/kubernetes/v1.14+/helm/templates/provisioner-role.yaml index dc572ed24..c169f9bfd 100644 --- a/deploy/cephfs/kubernetes/v1.14+/helm/templates/provisioner-role.yaml +++ b/deploy/cephfs/kubernetes/v1.14+/helm/templates/provisioner-role.yaml @@ -3,6 +3,7 @@ kind: Role apiVersion: rbac.authorization.k8s.io/v1 metadata: name: {{ include "ceph-csi-cephfs.provisioner.fullname" . }} + namespace: {{ .Release.Namespace }} labels: app: {{ include "ceph-csi-cephfs.name" . }} chart: {{ include "ceph-csi-cephfs.chart" . }} diff --git a/deploy/cephfs/kubernetes/v1.14+/helm/templates/provisioner-rolebinding.yaml b/deploy/cephfs/kubernetes/v1.14+/helm/templates/provisioner-rolebinding.yaml index 63dc9503b..66fb72580 100644 --- a/deploy/cephfs/kubernetes/v1.14+/helm/templates/provisioner-rolebinding.yaml +++ b/deploy/cephfs/kubernetes/v1.14+/helm/templates/provisioner-rolebinding.yaml @@ -3,6 +3,7 @@ kind: RoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: name: {{ include "ceph-csi-cephfs.provisioner.fullname" . }} + namespace: {{ .Release.Namespace }} labels: app: {{ include "ceph-csi-cephfs.name" . }} chart: {{ include "ceph-csi-cephfs.chart" . }} @@ -17,5 +18,4 @@ roleRef: kind: Role name: {{ include "ceph-csi-cephfs.provisioner.fullname" . }} apiGroup: rbac.authorization.k8s.io - namespace: {{ .Release.Namespace }} {{- end -}} diff --git a/deploy/cephfs/kubernetes/v1.14+/helm/templates/provisioner-rules-clusterrole.yaml b/deploy/cephfs/kubernetes/v1.14+/helm/templates/provisioner-rules-clusterrole.yaml index 2308b60cf..6356851ad 100644 --- a/deploy/cephfs/kubernetes/v1.14+/helm/templates/provisioner-rules-clusterrole.yaml +++ b/deploy/cephfs/kubernetes/v1.14+/helm/templates/provisioner-rules-clusterrole.yaml @@ -32,9 +32,9 @@ rules: - apiGroups: ["csi.storage.k8s.io"] resources: ["csinodeinfos"] verbs: ["get", "list", "watch"] - {{ if .Values.attacher.enabled }} +{{ if .Values.provisioner.attacher.enabled }} - apiGroups: ["storage.k8s.io"] resources: ["volumeattachments"] verbs: ["get", "list", "watch", "update"] - {{ end }} +{{ end }} {{- end -}} diff --git a/deploy/cephfs/kubernetes/v1.14+/helm/templates/provisioner-serviceaccount.yaml b/deploy/cephfs/kubernetes/v1.14+/helm/templates/provisioner-serviceaccount.yaml index 2c1d9f74f..c4ba5c188 100644 --- a/deploy/cephfs/kubernetes/v1.14+/helm/templates/provisioner-serviceaccount.yaml +++ b/deploy/cephfs/kubernetes/v1.14+/helm/templates/provisioner-serviceaccount.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: {{ include "ceph-csi-cephfs.serviceAccountName.provisioner" . }} + namespace: {{ .Release.Namespace }} labels: app: {{ include "ceph-csi-cephfs.name" . }} chart: {{ include "ceph-csi-cephfs.chart" . }} diff --git a/deploy/cephfs/kubernetes/v1.14+/helm/values.yaml b/deploy/cephfs/kubernetes/v1.14+/helm/values.yaml index af81e11b0..0224284a4 100644 --- a/deploy/cephfs/kubernetes/v1.14+/helm/values.yaml +++ b/deploy/cephfs/kubernetes/v1.14+/helm/values.yaml @@ -19,21 +19,6 @@ registrationDir: /var/lib/kubelet/plugins_registry pluginDir: /var/lib/kubelet/plugins driverName: cephfs.csi.ceph.com configMapName: ceph-csi-config -attacher: - name: attacher - enabled: true - image: - repository: quay.io/k8scsi/csi-attacher - tag: v1.2.0 - pullPolicy: IfNotPresent - - resources: {} - - nodeSelector: {} - - tolerations: [] - - affinity: {} nodeplugin: name: nodeplugin @@ -43,7 +28,6 @@ nodeplugin: repository: quay.io/k8scsi/csi-node-driver-registrar tag: v1.1.0 pullPolicy: IfNotPresent - resources: {} plugin: @@ -52,7 +36,6 @@ nodeplugin: # for stable functionality replace canary with latest release version tag: canary pullPolicy: IfNotPresent - resources: {} nodeSelector: {} @@ -63,15 +46,23 @@ nodeplugin: provisioner: name: provisioner - replicaCount: 3 - image: - repository: quay.io/k8scsi/csi-provisioner - tag: v1.3.0 - pullPolicy: IfNotPresent + provisioner: + image: + repository: quay.io/k8scsi/csi-provisioner + tag: v1.3.0 + pullPolicy: IfNotPresent + resources: {} - resources: {} + attacher: + name: attacher + enabled: true + image: + repository: quay.io/k8scsi/csi-attacher + tag: v1.2.0 + pullPolicy: IfNotPresent + resources: {} nodeSelector: {} diff --git a/deploy/rbd/kubernetes/v1.13/helm/Chart.yaml b/deploy/rbd/kubernetes/v1.13/helm/Chart.yaml index a8a1595d0..3b03745fc 100644 --- a/deploy/rbd/kubernetes/v1.13/helm/Chart.yaml +++ b/deploy/rbd/kubernetes/v1.13/helm/Chart.yaml @@ -1,10 +1,10 @@ --- apiVersion: v1 -appVersion: "1.0.0" +appVersion: "1.3.0" description: "Container Storage Interface (CSI) driver, provisioner, snapshotter, and attacher for Ceph RBD" name: ceph-csi-rbd -version: 0.8.0 +version: 0.9.0 keywords: - ceph - rbd diff --git a/deploy/rbd/kubernetes/v1.13/helm/templates/csiplugin-configmap.yaml b/deploy/rbd/kubernetes/v1.13/helm/templates/csiplugin-configmap.yaml index f7c7de5f5..80ec5057b 100644 --- a/deploy/rbd/kubernetes/v1.13/helm/templates/csiplugin-configmap.yaml +++ b/deploy/rbd/kubernetes/v1.13/helm/templates/csiplugin-configmap.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: {{ .Values.configMapName | quote }} + namespace: {{ .Release.Namespace }} labels: app: {{ include "ceph-csi-rbd.name" . }} chart: {{ include "ceph-csi-rbd.chart" . }} diff --git a/deploy/rbd/kubernetes/v1.13/helm/templates/nodeplugin-clusterrolebinding.yaml b/deploy/rbd/kubernetes/v1.13/helm/templates/nodeplugin-clusterrolebinding.yaml index 86abf2054..bf52865e1 100644 --- a/deploy/rbd/kubernetes/v1.13/helm/templates/nodeplugin-clusterrolebinding.yaml +++ b/deploy/rbd/kubernetes/v1.13/helm/templates/nodeplugin-clusterrolebinding.yaml @@ -16,5 +16,5 @@ subjects: roleRef: kind: ClusterRole name: {{ include "ceph-csi-rbd.nodeplugin.fullname" . }} - apiGroup: rbac.authorization.k8s.io + apiGroup: rbac.authorization.k8s.io {{- end -}} diff --git a/deploy/rbd/kubernetes/v1.13/helm/templates/nodeplugin-daemonset.yaml b/deploy/rbd/kubernetes/v1.13/helm/templates/nodeplugin-daemonset.yaml index 38d7e969e..ff6f9b7ec 100644 --- a/deploy/rbd/kubernetes/v1.13/helm/templates/nodeplugin-daemonset.yaml +++ b/deploy/rbd/kubernetes/v1.13/helm/templates/nodeplugin-daemonset.yaml @@ -2,6 +2,7 @@ kind: DaemonSet apiVersion: apps/v1 metadata: name: {{ include "ceph-csi-rbd.nodeplugin.fullname" . }} + namespace: {{ .Release.Namespace }} labels: app: {{ include "ceph-csi-rbd.name" . }} chart: {{ include "ceph-csi-rbd.chart" . }} @@ -43,7 +44,7 @@ spec: exec: command: [ "/bin/sh", "-c", - 'rm -rf /registration/{{ .Values.driverName }} + 'rm -rf /registration/{{ .Values.driverName }} /registration/{{ .Values.driverName }}-reg.sock' ] env: @@ -89,7 +90,7 @@ spec: - name: plugin-dir mountPath: {{ .Values.pluginDir }} mountPropagation: "Bidirectional" - - name: mointpoint-dir + - name: mountpoint-dir mountPath: /var/lib/kubelet/pods mountPropagation: "Bidirectional" - mountPath: /dev @@ -143,15 +144,15 @@ spec: emptyDir: { medium: "Memory" } - {{- if .Values.nodeplugin.affinity -}} +{{- if .Values.nodeplugin.affinity }} affinity: -{{ toYaml .Values.nodeplugin.affinity . | indent 8 }} - {{- end -}} - {{- if .Values.nodeplugin.nodeSelector -}} +{{ toYaml .Values.nodeplugin.affinity . | indent 8 -}} +{{- end -}} +{{- if .Values.nodeplugin.nodeSelector }} nodeSelector: -{{ toYaml .Values.nodeplugin.nodeSelector | indent 8 }} - {{- end -}} - {{- if .Values.nodeplugin.tolerations -}} +{{ toYaml .Values.nodeplugin.nodeSelector | indent 8 -}} +{{- end -}} +{{- if .Values.nodeplugin.tolerations }} tolerations: -{{ toYaml .Values.nodeplugin.tolerations | indent 8 }} - {{- end -}} +{{ toYaml .Values.nodeplugin.tolerations | indent 8 -}} +{{- end -}} diff --git a/deploy/rbd/kubernetes/v1.13/helm/templates/nodeplugin-serviceaccount.yaml b/deploy/rbd/kubernetes/v1.13/helm/templates/nodeplugin-serviceaccount.yaml index 9dd41e4f6..36e1ee745 100644 --- a/deploy/rbd/kubernetes/v1.13/helm/templates/nodeplugin-serviceaccount.yaml +++ b/deploy/rbd/kubernetes/v1.13/helm/templates/nodeplugin-serviceaccount.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: {{ include "ceph-csi-rbd.serviceAccountName.nodeplugin" . }} + namespace: {{ .Release.Namespace }} labels: app: {{ include "ceph-csi-rbd.name" . }} chart: {{ include "ceph-csi-rbd.chart" . }} diff --git a/deploy/rbd/kubernetes/v1.13/helm/templates/provisioner-role.yaml b/deploy/rbd/kubernetes/v1.13/helm/templates/provisioner-role.yaml index 798174985..ba22b26f8 100644 --- a/deploy/rbd/kubernetes/v1.13/helm/templates/provisioner-role.yaml +++ b/deploy/rbd/kubernetes/v1.13/helm/templates/provisioner-role.yaml @@ -1,8 +1,9 @@ -{{- if .Values.rbac.create -}} +{{- if .Values.rbac.create -}} kind: Role apiVersion: rbac.authorization.k8s.io/v1 metadata: name: {{ include "ceph-csi-rbd.provisioner.fullname" . }} + namespace: {{ .Release.Namespace }} labels: app: {{ include "ceph-csi-rbd.name" . }} chart: {{ include "ceph-csi-rbd.chart" . }} diff --git a/deploy/rbd/kubernetes/v1.13/helm/templates/provisioner-rolebinding.yaml b/deploy/rbd/kubernetes/v1.13/helm/templates/provisioner-rolebinding.yaml index 34f8356bb..23fa39fed 100644 --- a/deploy/rbd/kubernetes/v1.13/helm/templates/provisioner-rolebinding.yaml +++ b/deploy/rbd/kubernetes/v1.13/helm/templates/provisioner-rolebinding.yaml @@ -3,6 +3,7 @@ kind: RoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: name: {{ include "ceph-csi-rbd.provisioner.fullname" . }} + namespace: {{ .Release.Namespace }} labels: app: {{ include "ceph-csi-rbd.name" . }} chart: {{ include "ceph-csi-rbd.chart" . }} @@ -17,5 +18,4 @@ roleRef: kind: Role name: {{ include "ceph-csi-rbd.provisioner.fullname" . }} apiGroup: rbac.authorization.k8s.io - namespace: {{ .Release.Namespace }} {{- end -}} diff --git a/deploy/rbd/kubernetes/v1.13/helm/templates/provisioner-rules-clusterrole.yaml b/deploy/rbd/kubernetes/v1.13/helm/templates/provisioner-rules-clusterrole.yaml index 545b6671d..2a32b0666 100644 --- a/deploy/rbd/kubernetes/v1.13/helm/templates/provisioner-rules-clusterrole.yaml +++ b/deploy/rbd/kubernetes/v1.13/helm/templates/provisioner-rules-clusterrole.yaml @@ -35,11 +35,11 @@ rules: - apiGroups: ["snapshot.storage.k8s.io"] resources: ["volumesnapshots"] verbs: ["get", "list", "watch", "update"] - {{ if .Values.attacher.enabled }} +{{ if .Values.provisioner.attacher.enabled }} - apiGroups: ["storage.k8s.io"] resources: ["volumeattachments"] verbs: ["get", "list", "watch", "update"] - {{ end }} +{{ end }} - apiGroups: ["snapshot.storage.k8s.io"] resources: ["volumesnapshotcontents"] verbs: ["create", "get", "list", "watch", "update", "delete"] diff --git a/deploy/rbd/kubernetes/v1.13/helm/templates/provisioner-service.yaml b/deploy/rbd/kubernetes/v1.13/helm/templates/provisioner-service.yaml index 9bbcfcf1f..b0a6cf477 100644 --- a/deploy/rbd/kubernetes/v1.13/helm/templates/provisioner-service.yaml +++ b/deploy/rbd/kubernetes/v1.13/helm/templates/provisioner-service.yaml @@ -2,6 +2,7 @@ kind: Service apiVersion: v1 metadata: name: {{ include "ceph-csi-rbd.provisioner.fullname" . }} + namespace: {{ .Release.Namespace }} labels: app: {{ include "ceph-csi-rbd.name" . }} chart: {{ include "ceph-csi-rbd.chart" . }} diff --git a/deploy/rbd/kubernetes/v1.13/helm/templates/provisioner-serviceaccount.yaml b/deploy/rbd/kubernetes/v1.13/helm/templates/provisioner-serviceaccount.yaml index 4c0f76297..893b43a9c 100644 --- a/deploy/rbd/kubernetes/v1.13/helm/templates/provisioner-serviceaccount.yaml +++ b/deploy/rbd/kubernetes/v1.13/helm/templates/provisioner-serviceaccount.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: {{ include "ceph-csi-rbd.serviceAccountName.provisioner" . }} + namespace: {{ .Release.Namespace }} labels: app: {{ include "ceph-csi-rbd.name" . }} chart: {{ include "ceph-csi-rbd.chart" . }} diff --git a/deploy/rbd/kubernetes/v1.13/helm/templates/provisioner-statefulset.yaml b/deploy/rbd/kubernetes/v1.13/helm/templates/provisioner-statefulset.yaml index b195f9667..5ab218318 100644 --- a/deploy/rbd/kubernetes/v1.13/helm/templates/provisioner-statefulset.yaml +++ b/deploy/rbd/kubernetes/v1.13/helm/templates/provisioner-statefulset.yaml @@ -2,6 +2,7 @@ kind: StatefulSet apiVersion: apps/v1 metadata: name: {{ include "ceph-csi-rbd.provisioner.fullname" . }} + namespace: {{ .Release.Namespace }} labels: app: {{ include "ceph-csi-rbd.name" . }} chart: {{ include "ceph-csi-rbd.chart" . }} @@ -10,7 +11,7 @@ metadata: heritage: {{ .Release.Service }} spec: serviceName: {{ include "ceph-csi-rbd.provisioner.fullname" . }} - replicas: {{ .Values.provisioner.replicas }} + replicas: {{ .Values.provisioner.replicaCount }} selector: matchLabels: app: {{ include "ceph-csi-rbd.name" . }} @@ -28,7 +29,8 @@ spec: serviceAccountName: {{ include "ceph-csi-rbd.serviceAccountName.provisioner" . }} containers: - name: csi-provisioner - image: "{{ .Values.provisioner.image.repository }}:{{ .Values.provisioner.image.tag }}" + image: "{{ .Values.provisioner.provisioner.image.repository }}:{{ .Values.provisioner.provisioner.image.tag }}" + imagePullPolicy: {{ .Values.provisioner.provisioner.image.pullPolicy }} args: - "--csi-address=$(ADDRESS)" - "--v=5" @@ -37,15 +39,14 @@ spec: env: - name: ADDRESS value: "{{ .Values.socketDir }}/{{ .Values.socketFile }}" - imagePullPolicy: {{ .Values.provisioner.image.pullPolicy }} volumeMounts: - name: socket-dir mountPath: {{ .Values.socketDir }} resources: -{{ toYaml .Values.provisioner.resources | indent 12 }} +{{ toYaml .Values.provisioner.provisioner.resources | indent 12 }} - name: csi-snapshotter - image: {{ .Values.snapshotter.image.repository }}:{{ .Values.snapshotter.image.tag }} - imagePullPolicy: {{ .Values.nodeplugin.plugin.image.pullPolicy }} + image: {{ .Values.provisioner.snapshotter.image.repository }}:{{ .Values.provisioner.snapshotter.image.tag }} + imagePullPolicy: {{ .Values.provisioner.snapshotter.image.pullPolicy }} args: - "--csi-address=$(ADDRESS)" - "--v=5" @@ -59,21 +60,23 @@ spec: - name: socket-dir mountPath: {{ .Values.socketDir }} resources: -{{ toYaml .Values.snapshotter.resources | indent 12 }} - {{ if .Values.attacher.enabled }} +{{ toYaml .Values.provisioner.snapshotter.resources | indent 12 }} +{{- if .Values.provisioner.attacher.enabled }} - name: csi-attacher - image: "{{ .Values.attacher.image.repository }}:{{ .Values.attacher.image.tag }}" + image: "{{ .Values.provisioner.attacher.image.repository }}:{{ .Values.provisioner.attacher.image.tag }}" + imagePullPolicy: {{ .Values.provisioner.attacher.image.pullPolicy }} args: - "--v=5" - "--csi-address=$(ADDRESS)" env: - name: ADDRESS value: "{{ .Values.socketDir }}/{{ .Values.socketFile }}" - imagePullPolicy: {{ .Values.attacher.image.pullPolicy }} volumeMounts: - name: socket-dir mountPath: {{ .Values.socketDir }} - {{ end }} + resources: +{{ toYaml .Values.provisioner.attacher.resources | indent 12 }} +{{- end }} - name: csi-rbdplugin securityContext: privileged: true @@ -81,6 +84,7 @@ spec: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true image: "{{ .Values.nodeplugin.plugin.image.repository }}:{{ .Values.nodeplugin.plugin.image.tag }}" + imagePullPolicy: {{ .Values.nodeplugin.plugin.image.pullPolicy }} args : - "--nodeid=$(NODE_ID)" - "--type=rbd" @@ -98,7 +102,6 @@ spec: fieldPath: spec.nodeName - name: CSI_ENDPOINT value: "unix:/{{ .Values.socketDir }}/{{ .Values.socketFile }}" - imagePullPolicy: {{ .Values.nodeplugin.plugin.image.pullPolicy }} volumeMounts: - name: socket-dir mountPath: {{ .Values.socketDir }} @@ -124,15 +127,15 @@ spec: emptyDir: { medium: "Memory" } - {{- if .Values.provisioner.affinity -}} +{{- if .Values.provisioner.affinity }} affinity: -{{ toYaml .Values.provisioner.affinity . | indent 8 }} - {{- end -}} - {{- if .Values.provisioner.nodeSelector -}} +{{ toYaml .Values.provisioner.affinity | indent 8 -}} +{{- end -}} +{{- if .Values.provisioner.nodeSelector }} nodeSelector: -{{ toYaml .Values.provisioner.nodeSelector | indent 8 }} - {{- end -}} - {{- if .Values.provisioner.tolerations -}} +{{ toYaml .Values.provisioner.nodeSelector | indent 8 -}} +{{- end -}} +{{- if .Values.provisioner.tolerations }} tolerations: -{{ toYaml .Values.provisioner.tolerations | indent 8 }} - {{- end -}} +{{ toYaml .Values.provisioner.tolerations | indent 8 -}} +{{- end -}} diff --git a/deploy/rbd/kubernetes/v1.13/helm/values.yaml b/deploy/rbd/kubernetes/v1.13/helm/values.yaml index 6db42cb17..6ef6a9b1c 100644 --- a/deploy/rbd/kubernetes/v1.13/helm/values.yaml +++ b/deploy/rbd/kubernetes/v1.13/helm/values.yaml @@ -20,24 +20,6 @@ pluginDir: /var/lib/kubelet/plugins driverName: rbd.csi.ceph.com configMapName: ceph-csi-config -attacher: - name: attacher - enabled: true - replicaCount: 1 - - image: - repository: quay.io/k8scsi/csi-attacher - tag: v1.2.0 - pullPolicy: IfNotPresent - - resources: {} - - nodeSelector: {} - - tolerations: [] - - affinity: {} - nodeplugin: name: nodeplugin @@ -46,7 +28,6 @@ nodeplugin: repository: quay.io/k8scsi/csi-node-driver-registrar tag: v1.1.0 pullPolicy: IfNotPresent - resources: {} plugin: @@ -55,7 +36,6 @@ nodeplugin: # for stable functionality replace canary with latest release version tag: canary pullPolicy: IfNotPresent - resources: {} nodeSelector: {} @@ -66,26 +46,32 @@ nodeplugin: provisioner: name: provisioner - replicaCount: 1 - image: - repository: quay.io/k8scsi/csi-provisioner - tag: v1.3.0 - pullPolicy: IfNotPresent + provisioner: + image: + repository: quay.io/k8scsi/csi-provisioner + tag: v1.3.0 + pullPolicy: IfNotPresent + resources: {} - resources: {} + snapshotter: + image: + repository: quay.io/k8scsi/csi-snapshotter + tag: v1.1.0 + pullPolicy: IfNotPresent + resources: {} + + attacher: + enabled: true + image: + repository: quay.io/k8scsi/csi-attacher + tag: v1.2.0 + pullPolicy: IfNotPresent + resources: {} nodeSelector: {} tolerations: [] affinity: {} - -snapshotter: - image: - repository: quay.io/k8scsi/csi-snapshotter - tag: v1.1.0 - pullPolicy: IfNotPresent - - resources: {} diff --git a/deploy/rbd/kubernetes/v1.14+/helm/templates/csidriver-crd.yaml b/deploy/rbd/kubernetes/v1.14+/helm/templates/csidriver-crd.yaml index 4c5021a72..8bdb83c4a 100644 --- a/deploy/rbd/kubernetes/v1.14+/helm/templates/csidriver-crd.yaml +++ b/deploy/rbd/kubernetes/v1.14+/helm/templates/csidriver-crd.yaml @@ -1,9 +1,10 @@ --- -{{ if not .Values.attacher.enabled }} +{{ if not .Values.provisioner.attacher.enabled }} apiVersion: storage.k8s.io/v1beta1 kind: CSIDriver metadata: name: {{ .Values.driverName }} + namespace: {{ .Release.Namespace }} spec: attachRequired: false podInfoOnMount: false diff --git a/deploy/rbd/kubernetes/v1.14+/helm/templates/csiplugin-configmap.yaml b/deploy/rbd/kubernetes/v1.14+/helm/templates/csiplugin-configmap.yaml index f7c7de5f5..80ec5057b 100644 --- a/deploy/rbd/kubernetes/v1.14+/helm/templates/csiplugin-configmap.yaml +++ b/deploy/rbd/kubernetes/v1.14+/helm/templates/csiplugin-configmap.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: {{ .Values.configMapName | quote }} + namespace: {{ .Release.Namespace }} labels: app: {{ include "ceph-csi-rbd.name" . }} chart: {{ include "ceph-csi-rbd.chart" . }} diff --git a/deploy/rbd/kubernetes/v1.14+/helm/templates/nodeplugin-clusterrolebinding.yaml b/deploy/rbd/kubernetes/v1.14+/helm/templates/nodeplugin-clusterrolebinding.yaml index 86abf2054..bf52865e1 100644 --- a/deploy/rbd/kubernetes/v1.14+/helm/templates/nodeplugin-clusterrolebinding.yaml +++ b/deploy/rbd/kubernetes/v1.14+/helm/templates/nodeplugin-clusterrolebinding.yaml @@ -16,5 +16,5 @@ subjects: roleRef: kind: ClusterRole name: {{ include "ceph-csi-rbd.nodeplugin.fullname" . }} - apiGroup: rbac.authorization.k8s.io + apiGroup: rbac.authorization.k8s.io {{- end -}} diff --git a/deploy/rbd/kubernetes/v1.14+/helm/templates/nodeplugin-daemonset.yaml b/deploy/rbd/kubernetes/v1.14+/helm/templates/nodeplugin-daemonset.yaml index 38d7e969e..06b1f75c5 100644 --- a/deploy/rbd/kubernetes/v1.14+/helm/templates/nodeplugin-daemonset.yaml +++ b/deploy/rbd/kubernetes/v1.14+/helm/templates/nodeplugin-daemonset.yaml @@ -2,6 +2,7 @@ kind: DaemonSet apiVersion: apps/v1 metadata: name: {{ include "ceph-csi-rbd.nodeplugin.fullname" . }} + namespace: {{ .Release.Namespace }} labels: app: {{ include "ceph-csi-rbd.name" . }} chart: {{ include "ceph-csi-rbd.chart" . }} @@ -43,8 +44,8 @@ spec: exec: command: [ "/bin/sh", "-c", - 'rm -rf /registration/{{ .Values.driverName }} - /registration/{{ .Values.driverName }}-reg.sock' + 'rm -rf /registration/{{ .Values.driverName }} + /registration/{{ .Values.driverName }}-reg.sock' ] env: - name: KUBE_NODE_NAME @@ -89,7 +90,7 @@ spec: - name: plugin-dir mountPath: {{ .Values.pluginDir }} mountPropagation: "Bidirectional" - - name: mointpoint-dir + - name: mountpoint-dir mountPath: /var/lib/kubelet/pods mountPropagation: "Bidirectional" - mountPath: /dev @@ -143,15 +144,15 @@ spec: emptyDir: { medium: "Memory" } - {{- if .Values.nodeplugin.affinity -}} +{{- if .Values.nodeplugin.affinity }} affinity: -{{ toYaml .Values.nodeplugin.affinity . | indent 8 }} - {{- end -}} - {{- if .Values.nodeplugin.nodeSelector -}} +{{ toYaml .Values.nodeplugin.affinity . | indent 8 -}} +{{- end -}} +{{- if .Values.nodeplugin.nodeSelector }} nodeSelector: -{{ toYaml .Values.nodeplugin.nodeSelector | indent 8 }} - {{- end -}} - {{- if .Values.nodeplugin.tolerations -}} +{{ toYaml .Values.nodeplugin.nodeSelector | indent 8 -}} +{{- end -}} +{{- if .Values.nodeplugin.tolerations }} tolerations: -{{ toYaml .Values.nodeplugin.tolerations | indent 8 }} - {{- end -}} +{{ toYaml .Values.nodeplugin.tolerations | indent 8 -}} +{{- end -}} diff --git a/deploy/rbd/kubernetes/v1.14+/helm/templates/nodeplugin-serviceaccount.yaml b/deploy/rbd/kubernetes/v1.14+/helm/templates/nodeplugin-serviceaccount.yaml index 9dd41e4f6..36e1ee745 100644 --- a/deploy/rbd/kubernetes/v1.14+/helm/templates/nodeplugin-serviceaccount.yaml +++ b/deploy/rbd/kubernetes/v1.14+/helm/templates/nodeplugin-serviceaccount.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: {{ include "ceph-csi-rbd.serviceAccountName.nodeplugin" . }} + namespace: {{ .Release.Namespace }} labels: app: {{ include "ceph-csi-rbd.name" . }} chart: {{ include "ceph-csi-rbd.chart" . }} diff --git a/deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-deployment.yaml b/deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-deployment.yaml index bacd694c4..d57d36802 100644 --- a/deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-deployment.yaml +++ b/deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-deployment.yaml @@ -2,6 +2,7 @@ kind: Deployment apiVersion: apps/v1 metadata: name: {{ include "ceph-csi-rbd.provisioner.fullname" . }} + namespace: {{ .Release.Namespace }} labels: app: {{ include "ceph-csi-rbd.name" . }} chart: {{ include "ceph-csi-rbd.chart" . }} @@ -9,7 +10,7 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} spec: - replicas: {{ .Values.provisioner.replicas }} + replicas: {{ .Values.provisioner.replicaCount }} selector: matchLabels: app: {{ include "ceph-csi-rbd.name" . }} @@ -27,7 +28,8 @@ spec: serviceAccountName: {{ include "ceph-csi-rbd.serviceAccountName.provisioner" . }} containers: - name: csi-provisioner - image: "{{ .Values.provisioner.image.repository }}:{{ .Values.provisioner.image.tag }}" + image: "{{ .Values.provisioner.provisioner.image.repository }}:{{ .Values.provisioner.provisioner.image.tag }}" + imagePullPolicy: {{ .Values.provisioner.provisioner.image.pullPolicy }} args: - "--csi-address=$(ADDRESS)" - "--v=5" @@ -38,15 +40,14 @@ spec: env: - name: ADDRESS value: "{{ .Values.socketDir }}/{{ .Values.socketFile }}" - imagePullPolicy: {{ .Values.provisioner.image.pullPolicy }} volumeMounts: - name: socket-dir mountPath: {{ .Values.socketDir }} resources: -{{ toYaml .Values.provisioner.resources | indent 12 }} +{{ toYaml .Values.provisioner.provisioner.resources | indent 12 }} - name: csi-snapshotter - image: {{ .Values.snapshotter.image.repository }}:{{ .Values.snapshotter.image.tag }} - imagePullPolicy: {{ .Values.nodeplugin.plugin.image.pullPolicy }} + image: {{ .Values.provisioner.snapshotter.image.repository }}:{{ .Values.provisioner.snapshotter.image.tag }} + imagePullPolicy: {{ .Values.provisioner.snapshotter.image.pullPolicy }} args: - "--csi-address=$(ADDRESS)" - "--v=5" @@ -61,10 +62,11 @@ spec: - name: socket-dir mountPath: {{ .Values.socketDir }} resources: -{{ toYaml .Values.snapshotter.resources | indent 12 }} - {{ if .Values.attacher.enabled }} +{{ toYaml .Values.provisioner.snapshotter.resources | indent 12 }} +{{- if .Values.provisioner.attacher.enabled }} - name: csi-attacher - image: "{{ .Values.attacher.image.repository }}:{{ .Values.attacher.image.tag }}" + image: "{{ .Values.provisioner.attacher.image.repository }}:{{ .Values.provisioner.attacher.image.tag }}" + imagePullPolicy: {{ .Values.provisioner.attacher.image.pullPolicy }} args: - "--v=5" - "--csi-address=$(ADDRESS)" @@ -73,11 +75,12 @@ spec: env: - name: ADDRESS value: "{{ .Values.socketDir }}/{{ .Values.socketFile }}" - imagePullPolicy: {{ .Values.attacher.image.pullPolicy }} volumeMounts: - name: socket-dir mountPath: {{ .Values.socketDir }} - {{ end }} + resources: +{{ toYaml .Values.provisioner.attacher.resources | indent 12 }} +{{- end }} - name: csi-rbdplugin securityContext: privileged: true @@ -85,6 +88,7 @@ spec: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true image: "{{ .Values.nodeplugin.plugin.image.repository }}:{{ .Values.nodeplugin.plugin.image.tag }}" + imagePullPolicy: {{ .Values.nodeplugin.plugin.image.pullPolicy }} args : - "--nodeid=$(NODE_ID)" - "--type=rbd" @@ -102,7 +106,6 @@ spec: fieldPath: spec.nodeName - name: CSI_ENDPOINT value: "unix:/{{ .Values.socketDir }}/{{ .Values.socketFile }}" - imagePullPolicy: {{ .Values.nodeplugin.plugin.image.pullPolicy }} volumeMounts: - name: socket-dir mountPath: {{ .Values.socketDir }} @@ -128,15 +131,15 @@ spec: emptyDir: { medium: "Memory" } - {{- if .Values.provisioner.affinity -}} +{{- if .Values.provisioner.affinity }} affinity: -{{ toYaml .Values.provisioner.affinity . | indent 8 }} - {{- end -}} - {{- if .Values.provisioner.nodeSelector -}} +{{ toYaml .Values.provisioner.affinity . | indent 8 -}} +{{- end -}} +{{- if .Values.provisioner.nodeSelector }} nodeSelector: -{{ toYaml .Values.provisioner.nodeSelector | indent 8 }} - {{- end -}} - {{- if .Values.provisioner.tolerations -}} +{{ toYaml .Values.provisioner.nodeSelector | indent 8 -}} +{{- end -}} +{{- if .Values.provisioner.tolerations }} tolerations: -{{ toYaml .Values.provisioner.tolerations | indent 8 }} - {{- end -}} +{{ toYaml .Values.provisioner.tolerations | indent 8 -}} +{{- end -}} diff --git a/deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-role.yaml b/deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-role.yaml index 6294b4a27..15b76cfcb 100644 --- a/deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-role.yaml +++ b/deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-role.yaml @@ -3,6 +3,7 @@ kind: Role apiVersion: rbac.authorization.k8s.io/v1 metadata: name: {{ include "ceph-csi-rbd.provisioner.fullname" . }} + namespace: {{ .Release.Namespace }} labels: app: {{ include "ceph-csi-rbd.name" . }} chart: {{ include "ceph-csi-rbd.chart" . }} diff --git a/deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-rolebinding.yaml b/deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-rolebinding.yaml index 34f8356bb..23fa39fed 100644 --- a/deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-rolebinding.yaml +++ b/deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-rolebinding.yaml @@ -3,6 +3,7 @@ kind: RoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: name: {{ include "ceph-csi-rbd.provisioner.fullname" . }} + namespace: {{ .Release.Namespace }} labels: app: {{ include "ceph-csi-rbd.name" . }} chart: {{ include "ceph-csi-rbd.chart" . }} @@ -17,5 +18,4 @@ roleRef: kind: Role name: {{ include "ceph-csi-rbd.provisioner.fullname" . }} apiGroup: rbac.authorization.k8s.io - namespace: {{ .Release.Namespace }} {{- end -}} diff --git a/deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-rules-clusterrole.yaml b/deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-rules-clusterrole.yaml index 9f2885c66..a5a55a3b8 100644 --- a/deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-rules-clusterrole.yaml +++ b/deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-rules-clusterrole.yaml @@ -35,11 +35,11 @@ rules: - apiGroups: ["snapshot.storage.k8s.io"] resources: ["volumesnapshots"] verbs: ["get", "list", "watch", "update"] - {{ if .Values.attacher.enabled }} +{{ if .Values.provisioner.attacher.enabled }} - apiGroups: ["storage.k8s.io"] resources: ["volumeattachments"] verbs: ["get", "list", "watch", "update"] - {{ end }} +{{ end }} - apiGroups: ["snapshot.storage.k8s.io"] resources: ["volumesnapshotcontents"] verbs: ["create", "get", "list", "watch", "update", "delete"] diff --git a/deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-serviceaccount.yaml b/deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-serviceaccount.yaml index 4c0f76297..893b43a9c 100644 --- a/deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-serviceaccount.yaml +++ b/deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-serviceaccount.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: {{ include "ceph-csi-rbd.serviceAccountName.provisioner" . }} + namespace: {{ .Release.Namespace }} labels: app: {{ include "ceph-csi-rbd.name" . }} chart: {{ include "ceph-csi-rbd.chart" . }} diff --git a/deploy/rbd/kubernetes/v1.14+/helm/values.yaml b/deploy/rbd/kubernetes/v1.14+/helm/values.yaml index b5c81a4e3..b7ed6beec 100644 --- a/deploy/rbd/kubernetes/v1.14+/helm/values.yaml +++ b/deploy/rbd/kubernetes/v1.14+/helm/values.yaml @@ -20,22 +20,6 @@ pluginDir: /var/lib/kubelet/plugins driverName: rbd.csi.ceph.com configMapName: ceph-csi-config -attacher: - name: attacher - enabled: true - image: - repository: quay.io/k8scsi/csi-attacher - tag: v1.2.0 - pullPolicy: IfNotPresent - - resources: {} - - nodeSelector: {} - - tolerations: [] - - affinity: {} - nodeplugin: name: nodeplugin @@ -44,7 +28,6 @@ nodeplugin: repository: quay.io/k8scsi/csi-node-driver-registrar tag: v1.1.0 pullPolicy: IfNotPresent - resources: {} plugin: @@ -53,7 +36,6 @@ nodeplugin: # for stable functionality replace canary with latest release version tag: canary pullPolicy: IfNotPresent - resources: {} nodeSelector: {} @@ -64,26 +46,33 @@ nodeplugin: provisioner: name: provisioner - replicaCount: 3 - image: - repository: quay.io/k8scsi/csi-provisioner - tag: v1.3.0 - pullPolicy: IfNotPresent + provisioner: + image: + repository: quay.io/k8scsi/csi-provisioner + tag: v1.3.0 + pullPolicy: IfNotPresent + resources: {} - resources: {} + attacher: + name: attacher + enabled: true + image: + repository: quay.io/k8scsi/csi-attacher + tag: v1.2.0 + pullPolicy: IfNotPresent + resources: {} + + snapshotter: + image: + repository: quay.io/k8scsi/csi-snapshotter + tag: v1.2.0 + pullPolicy: IfNotPresent + resources: {} nodeSelector: {} tolerations: [] affinity: {} - -snapshotter: - image: - repository: quay.io/k8scsi/csi-snapshotter - tag: v1.2.0 - pullPolicy: IfNotPresent - - resources: {}