From 8dcca3ebc568f2b8b09214a45728d22f5ddd67f5 Mon Sep 17 00:00:00 2001 From: Miao Zhou Date: Fri, 4 Jan 2019 11:43:28 +0800 Subject: [PATCH 1/3] bump image version csi-attacher and csi-provisioner change from v1.0.0 to v1.0.1, as i the v1.0.0 is a Pre-release driver-registrar:v1.0.0 change to csi-node-driver-registrar:v1.0.2, as in CSI Spec v1.0.0, image name has changed, see [https://github.com/kubernetes-csi/node-driver-registrar#compatibility](https://github.com/kubernetes-csi/node-driver-registrar#compatibility) --- deploy/cephfs/kubernetes/csi-cephfsplugin-attacher.yaml | 2 +- deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml | 2 +- deploy/cephfs/kubernetes/csi-cephfsplugin.yaml | 2 +- deploy/rbd/kubernetes/csi-rbdplugin-attacher.yaml | 2 +- deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml | 2 +- deploy/rbd/kubernetes/csi-rbdplugin.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin-attacher.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin-attacher.yaml index b663067a8..066e14ad3 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin-attacher.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin-attacher.yaml @@ -27,7 +27,7 @@ spec: serviceAccount: csi-attacher containers: - name: csi-cephfsplugin-attacher - image: quay.io/k8scsi/csi-attacher:v1.0.0 + image: quay.io/k8scsi/csi-attacher:v1.0.1 args: - "--v=5" - "--csi-address=$(ADDRESS)" diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml index 8206680b3..1b37c7165 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml @@ -27,7 +27,7 @@ spec: serviceAccount: csi-provisioner containers: - name: csi-provisioner - image: quay.io/k8scsi/csi-provisioner:v1.0.0 + image: quay.io/k8scsi/csi-provisioner:v1.0.1 args: - "--provisioner=csi-cephfsplugin" - "--csi-address=$(ADDRESS)" diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml index e8f49f2af..36bdfecb3 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml @@ -18,7 +18,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet containers: - name: driver-registrar - image: quay.io/k8scsi/driver-registrar:v1.0.0 + image: quay.io/k8scsi/csi-node-driver-registrar:v1.0.2 args: - "--v=5" - "--csi-address=$(ADDRESS)" diff --git a/deploy/rbd/kubernetes/csi-rbdplugin-attacher.yaml b/deploy/rbd/kubernetes/csi-rbdplugin-attacher.yaml index f7a3d488a..39f9826ee 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin-attacher.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin-attacher.yaml @@ -27,7 +27,7 @@ spec: serviceAccount: csi-attacher containers: - name: csi-rbdplugin-attacher - image: quay.io/k8scsi/csi-attacher:v1.0.0 + image: quay.io/k8scsi/csi-attacher:v1.0.1 args: - "--v=5" - "--csi-address=$(ADDRESS)" diff --git a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml index 966b49260..abd2739c0 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml @@ -27,7 +27,7 @@ spec: serviceAccount: csi-provisioner containers: - name: csi-provisioner - image: quay.io/k8scsi/csi-provisioner:v1.0.0 + image: quay.io/k8scsi/csi-provisioner:v1.0.1 args: - "--provisioner=csi-rbdplugin" - "--csi-address=$(ADDRESS)" diff --git a/deploy/rbd/kubernetes/csi-rbdplugin.yaml b/deploy/rbd/kubernetes/csi-rbdplugin.yaml index 12e1ffdfc..de91bf838 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin.yaml @@ -19,7 +19,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet containers: - name: driver-registrar - image: quay.io/k8scsi/driver-registrar:v1.0.0 + image: quay.io/k8scsi/csi-node-driver-registrar:v1.0.2 args: - "--v=5" - "--csi-address=$(ADDRESS)" From a01c01b01b962e5a529e77c7612e7bac0d91c7e2 Mon Sep 17 00:00:00 2001 From: Zhou Miao Date: Thu, 25 Apr 2019 12:03:44 +0800 Subject: [PATCH 2/3] fix helm value pullPolicy mismatch bug --- deploy/cephfs/helm/templates/nodeplugin-daemonset.yaml | 4 ++-- deploy/cephfs/helm/templates/provisioner-statefulset.yaml | 2 +- deploy/rbd/helm/templates/nodeplugin-daemonset.yaml | 4 ++-- deploy/rbd/helm/templates/provisioner-statefulset.yaml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/deploy/cephfs/helm/templates/nodeplugin-daemonset.yaml b/deploy/cephfs/helm/templates/nodeplugin-daemonset.yaml index c56e70bb4..24ffc8420 100644 --- a/deploy/cephfs/helm/templates/nodeplugin-daemonset.yaml +++ b/deploy/cephfs/helm/templates/nodeplugin-daemonset.yaml @@ -49,7 +49,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - imagePullPolicy: {{ .Values.nodeplugin.registrar.image.imagePullPolicy }} + imagePullPolicy: {{ .Values.nodeplugin.registrar.image.pullPolicy }} volumeMounts: - name: plugin-dir mountPath: /csi @@ -82,7 +82,7 @@ spec: fieldPath: spec.nodeName - name: CSI_ENDPOINT value: "unix:/{{ .Values.socketDir }}/{{ .Values.socketFile }}" - imagePullPolicy: {{ .Values.nodeplugin.plugin.image.imagePullPolicy }} + imagePullPolicy: {{ .Values.nodeplugin.plugin.image.pullPolicy }} volumeMounts: - name: mount-cache-dir mountPath: /mount-cache-dir diff --git a/deploy/cephfs/helm/templates/provisioner-statefulset.yaml b/deploy/cephfs/helm/templates/provisioner-statefulset.yaml index fe4fc6428..84c698fbc 100644 --- a/deploy/cephfs/helm/templates/provisioner-statefulset.yaml +++ b/deploy/cephfs/helm/templates/provisioner-statefulset.yaml @@ -65,7 +65,7 @@ spec: fieldPath: spec.nodeName - name: CSI_ENDPOINT value: "unix:/{{ .Values.socketDir }}/{{ .Values.socketFile }}" - imagePullPolicy: {{ .Values.nodeplugin.plugin.image.imagePullPolicy }} + imagePullPolicy: {{ .Values.nodeplugin.plugin.image.pullPolicy }} volumeMounts: - name: socket-dir mountPath: {{ .Values.socketDir }} diff --git a/deploy/rbd/helm/templates/nodeplugin-daemonset.yaml b/deploy/rbd/helm/templates/nodeplugin-daemonset.yaml index 355983b49..6290dd978 100644 --- a/deploy/rbd/helm/templates/nodeplugin-daemonset.yaml +++ b/deploy/rbd/helm/templates/nodeplugin-daemonset.yaml @@ -49,7 +49,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - imagePullPolicy: {{ .Values.nodeplugin.registrar.image.imagePullPolicy }} + imagePullPolicy: {{ .Values.nodeplugin.registrar.image.pullPolicy }} volumeMounts: - name: plugin-dir mountPath: /csi @@ -82,7 +82,7 @@ spec: fieldPath: spec.nodeName - name: CSI_ENDPOINT value: "unix:/{{ .Values.socketDir }}/{{ .Values.socketFile }}" - imagePullPolicy: {{ .Values.nodeplugin.plugin.image.imagePullPolicy }} + imagePullPolicy: {{ .Values.nodeplugin.plugin.image.pullPolicy }} volumeMounts: - name: plugin-dir mountPath: {{ .Values.socketDir }} diff --git a/deploy/rbd/helm/templates/provisioner-statefulset.yaml b/deploy/rbd/helm/templates/provisioner-statefulset.yaml index 269cb0a44..23265d116 100644 --- a/deploy/rbd/helm/templates/provisioner-statefulset.yaml +++ b/deploy/rbd/helm/templates/provisioner-statefulset.yaml @@ -43,7 +43,7 @@ spec: {{ toYaml .Values.provisioner.resources | indent 12 }} - name: csi-snapshotter image: {{ .Values.snapshotter.image.repository }}:{{ .Values.snapshotter.image.tag }} - imagePullPolicy: {{ .Values.nodeplugin.plugin.image.imagePullPolicy }} + imagePullPolicy: {{ .Values.nodeplugin.plugin.image.pullPolicy }} args: - "--csi-address=$(ADDRESS)" - "--connection-timeout=15s" @@ -83,7 +83,7 @@ spec: fieldPath: spec.nodeName - name: CSI_ENDPOINT value: "unix:/{{ .Values.socketDir }}/{{ .Values.socketFile }}" - imagePullPolicy: {{ .Values.nodeplugin.plugin.image.imagePullPolicy }} + imagePullPolicy: {{ .Values.nodeplugin.plugin.image.pullPolicy }} volumeMounts: - name: socket-dir mountPath: {{ .Values.socketDir }} From 00e7e29996726c0b712f36905528c273841bf5b2 Mon Sep 17 00:00:00 2001 From: Miao Zhou Date: Mon, 6 May 2019 15:52:45 +0800 Subject: [PATCH 3/3] bump up the chart version --- deploy/cephfs/helm/Chart.yaml | 2 +- deploy/rbd/helm/Chart.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/cephfs/helm/Chart.yaml b/deploy/cephfs/helm/Chart.yaml index f324e7f57..dc94bb2af 100644 --- a/deploy/cephfs/helm/Chart.yaml +++ b/deploy/cephfs/helm/Chart.yaml @@ -4,7 +4,7 @@ appVersion: "1.0.0" description: "Container Storage Interface (CSI) driver, provisioner, and attacher for Ceph cephfs" name: ceph-csi-cephfs -version: 0.5.1 +version: 0.6.0 keywords: - ceph - cephfs diff --git a/deploy/rbd/helm/Chart.yaml b/deploy/rbd/helm/Chart.yaml index 30585b9d8..a36450e34 100644 --- a/deploy/rbd/helm/Chart.yaml +++ b/deploy/rbd/helm/Chart.yaml @@ -4,7 +4,7 @@ appVersion: "1.0.0" description: "Container Storage Interface (CSI) driver, provisioner, snapshotter, and attacher for Ceph RBD" name: ceph-csi-rbd -version: 0.5.1 +version: 0.6.0 keywords: - ceph - rbd