chang image repo

stoneshi-yunify · Jun 8, 2020 · fec61b4 · fec61b4
1 parent 8eef8f7
commit fec61b4
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 31 deletions.
diff --git a/Makefile b/Makefile
@@ -17,7 +17,8 @@
 .PHONY: all disk
 
 NEONSAN_IMAGE_NAME=csiplugin/csi-neonsan
-NEONSAN_VERSION=v1.2.0-rc1
+NEONSAN_IMAGE_VERSION=v1.2.0-rc2
+RELEASE_VERSION=v1.2.0
 ROOT_PATH=$(pwd)
 PACKAGE_LIST=./cmd/... ./pkg/...
 
@@ -28,13 +29,13 @@ neonsan-plugin-debug:
 	go build  -gcflags "all=-N -l" -mod=vendor  -o deploy/neonsan/plugin/neonsan-plugin-debug ./cmd/neonsan
 
 neonsan-container:
-	docker build -t ${NEONSAN_IMAGE_NAME}:${NEONSAN_VERSION} -f deploy/neonsan/docker/Dockerfile  .
+	docker build -t ${NEONSAN_IMAGE_NAME}:${NEONSAN_IMAGE_VERSION} -f deploy/neonsan/docker/Dockerfile  .
 
 yaml:
-	kustomize build deploy/neonsan/kubernetes/base > deploy/neonsan/kubernetes/release/csi-neonsan.yaml
+	kustomize build deploy/neonsan/kubernetes/base > deploy/neonsan/kubernetes/release/csi-neonsan-${RELEASE_VERSION}.yaml
 
 release:
-	cp deploy/neonsan/plugin/* deploy/neonsan/kubernetes/release && cd deploy/neonsan/kubernetes/ && tar -zcvf csi-neonsan-${NEONSAN_VERSION}.tar.gz release/*
+	cp deploy/neonsan/plugin/* deploy/neonsan/kubernetes/release && cd deploy/neonsan/kubernetes/ && tar -zcvf csi-neonsan-${RELEASE_VERSION}.tar.gz release/*
 
 mod:
 	go build ./...

diff --git a/README.md b/README.md
@@ -72,11 +72,11 @@ This guide will install CSI plugin in the *kube-system* namespace of Kubernetes
   - Kubectl
     - For kubernetes 1.16
       ```bash
-      kubectl apply -f deploy/neonsan/kubernetes/release/csi-neonsan-v1.2.0-rc1-k8s16.yaml
+      kubectl apply -f deploy/neonsan/kubernetes/release/csi-neonsan-v1.2.0-k8s16.yaml
       ```
     - For kubernetes 1.17
       ```bash
-      kubectl apply -f deploy/neonsan/kubernetes/release/csi-neonsan-v1.2.0-rc1.yaml
+      kubectl apply -f deploy/neonsan/kubernetes/release/csi-neonsan-v1.2.0.yaml
       ```
     - Check CSI plugin
       ```bash

diff --git a/deploy/neonsan/kubernetes/base/controller-deploy.yaml b/deploy/neonsan/kubernetes/base/controller-deploy.yaml
@@ -30,7 +30,7 @@ spec:
       serviceAccount: csi-neonsan-controller
       containers:
         - name: csi-provisioner
-          image: quay.azk8s.cn/k8scsi/csi-provisioner:v1.5.0
+          image: csiplugin/csi-provisioner:v1.5.0
           resources:
             limits:
               memory: "20Mi"
@@ -57,7 +57,7 @@ spec:
             - name: socket-dir
               mountPath: /csi
         - name: csi-attacher
-          image: quay.azk8s.cn/k8scsi/csi-attacher:v2.1.1
+          image: csiplugin/csi-attacher:v2.1.1
           resources:
             limits:
               memory: "20Mi"
@@ -85,7 +85,7 @@ spec:
             - name: socket-dir
               mountPath: /csi
         - name: csi-snapshotter
-          image: quay.azk8s.cn/k8scsi/csi-snapshotter:v2.0.1
+          image: csiplugin/csi-snapshotter:v2.0.1
           resources:
             limits:
               memory: "20Mi"
@@ -105,7 +105,7 @@ spec:
             - name: socket-dir
               mountPath: /csi
         - name: csi-resizer
-          image: quay.azk8s.cn/k8scsi/csi-resizer:v0.4.0
+          image: csiplugin/csi-resizer:v0.4.0
           resources:
             limits:
               memory: "20Mi"
@@ -125,7 +125,7 @@ spec:
             - name: socket-dir
               mountPath: /csi
         - name: csi-neonsan
-          image: csiplugin/csi-neonsan:v1.2.0-rc1
+          image: csiplugin/csi-neonsan:v1.2.0-rc2
           resources:
             limits:
               memory: "50Mi"

diff --git a/deploy/neonsan/kubernetes/base/node-ds.yaml b/deploy/neonsan/kubernetes/base/node-ds.yaml
@@ -42,7 +42,7 @@ spec:
       hostNetwork: true
       containers:
         - name: node-registrar
-          image: quay.azk8s.cn/k8scsi/csi-node-driver-registrar:v1.2.0
+          image: csiplugin/csi-node-driver-registrar:v1.2.0
           resources:
             limits:
               memory: "20Mi"

diff --git a/...release/csi-neonsan-v1.2.0-rc1-k8s16.yaml → ...tes/release/csi-neonsan-v1.2.0-k8s16.yaml b/...release/csi-neonsan-v1.2.0-rc1-k8s16.yaml → ...tes/release/csi-neonsan-v1.2.0-k8s16.yaml
@@ -422,7 +422,7 @@ spec:
         env:
         - name: ADDRESS
           value: /csi/csi.sock
-        image: quay.azk8s.cn/k8scsi/csi-provisioner:v1.5.0
+        image: csiplugin/csi-provisioner:v1.5.0
         imagePullPolicy: IfNotPresent
         name: csi-provisioner
         resources:
@@ -450,7 +450,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
-        image: quay.azk8s.cn/k8scsi/csi-attacher:v2.1.1
+        image: csiplugin/csi-attacher:v2.1.1
         imagePullPolicy: IfNotPresent
         name: csi-attacher
         resources:
@@ -470,7 +470,7 @@ spec:
         env:
         - name: ADDRESS
           value: /csi/csi.sock
-        image: quay.azk8s.cn/k8scsi/csi-resizer:v0.4.0
+        image: csiplugin/csi-resizer:v0.4.0
         imagePullPolicy: IfNotPresent
         name: csi-resizer
         resources:
@@ -497,7 +497,7 @@ spec:
               fieldPath: spec.nodeName
         - name: CSI_ENDPOINT
           value: unix://csi/csi.sock
-        image: csiplugin/csi-neonsan:v1.2.0-rc1
+        image: csiplugin/csi-neonsan:v1.2.0-rc2
         imagePullPolicy: IfNotPresent
         name: csi-neonsan
         resources:
@@ -553,7 +553,7 @@ spec:
         env:
         - name: ADDRESS
           value: /csi/csi.sock
-        image: quay.azk8s.cn/k8scsi/csi-node-driver-registrar:v1.2.0
+        image: csiplugin/csi-node-driver-registrar:v1.2.0
         lifecycle:
           preStop:
             exec:

diff --git a/...netes/release/csi-neonsan-v1.2.0-rc1.yaml → ...ubernetes/release/csi-neonsan-v1.2.0.yaml b/...netes/release/csi-neonsan-v1.2.0-rc1.yaml → ...ubernetes/release/csi-neonsan-v1.2.0.yaml
@@ -524,7 +524,7 @@ spec:
         env:
         - name: ADDRESS
           value: /csi/csi.sock
-        image: quay.azk8s.cn/k8scsi/csi-provisioner:v1.5.0
+        image: csiplugin/csi-provisioner:v1.5.0
         imagePullPolicy: IfNotPresent
         name: csi-provisioner
         resources:
@@ -552,7 +552,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
-        image: quay.azk8s.cn/k8scsi/csi-attacher:v2.1.1
+        image: csiplugin/csi-attacher:v2.1.1
         imagePullPolicy: IfNotPresent
         name: csi-attacher
         resources:
@@ -572,7 +572,7 @@ spec:
         env:
         - name: ADDRESS
           value: /csi/csi.sock
-        image: quay.azk8s.cn/k8scsi/csi-snapshotter:v2.0.1
+        image: csiplugin/csi-snapshotter:v2.0.1
         imagePullPolicy: IfNotPresent
         name: csi-snapshotter
         resources:
@@ -592,7 +592,7 @@ spec:
         env:
         - name: ADDRESS
           value: /csi/csi.sock
-        image: quay.azk8s.cn/k8scsi/csi-resizer:v0.4.0
+        image: csiplugin/csi-resizer:v0.4.0
         imagePullPolicy: IfNotPresent
         name: csi-resizer
         resources:
@@ -619,7 +619,7 @@ spec:
               fieldPath: spec.nodeName
         - name: CSI_ENDPOINT
           value: unix://csi/csi.sock
-        image: csiplugin/csi-neonsan:v1.2.0-rc1
+        image: csiplugin/csi-neonsan:v1.2.0-rc2
         imagePullPolicy: IfNotPresent
         name: csi-neonsan
         resources:
@@ -675,7 +675,7 @@ spec:
         env:
         - name: ADDRESS
           value: /csi/csi.sock
-        image: quay.azk8s.cn/k8scsi/csi-node-driver-registrar:v1.2.0
+        image: csiplugin/csi-node-driver-registrar:v1.2.0
         lifecycle:
           preStop:
             exec:

diff --git a/deploy/neonsan/kubernetes/snapshot/snapshot-controller.yaml b/deploy/neonsan/kubernetes/snapshot/snapshot-controller.yaml
@@ -99,7 +99,7 @@ spec:
       serviceAccount: snapshot-controller
       containers:
         - name: snapshot-controller
-          image: quay.azk8s.cn/k8scsi/snapshot-controller:v2.0.1
+          image: csiplugin/snapshot-controller:v2.0.1
           args:
             - "--v=5"
             - "--leader-election=false"

diff --git a/helm/csi-neonsan/values.yaml b/helm/csi-neonsan/values.yaml
@@ -15,27 +15,27 @@
 driver:
   name: neonsan.csi.qingstor.com
   repository: csiplugin/csi-neonsan
-  tag: v1.2.0-rc1
+  tag: v1.2.0-rc2
   pullPolicy: IfNotPresent
   config:
     path: /etc/neonsan
     file: qbd.conf
 provisioner:
-  repository: quay.azk8s.cn/k8scsi/csi-provisioner
+  repository: csiplugin/csi-provisioner
   tag: v1.5.0
   volumeNamePrefix: pvc
 attacher:
-  repository: quay.azk8s.cn/k8scsi/csi-attacher
+  repository: csiplugin/csi-attacher
   tag: v2.1.1
 resizer:
-  repository: quay.azk8s.cn/k8scsi/csi-resizer
+  repository: csiplugin/csi-resizer
   tag: v0.4.0
 snapshotter:
-  repository: quay.azk8s.cn/k8scsi/csi-snapshotter
+  repository: csiplugin/csi-snapshotter
   tag: v2.0.1
 registrar:
-  repository: quay.azk8s.cn/k8scsi/csi-node-driver-registrar
+  repository: csiplugin/csi-node-driver-registrar
   tag: v1.2.0
 snapshotController:
-  repository: quay.azk8s.cn/k8scsi/snapshot-controller
+  repository: csiplugin/snapshot-controller
   tag: v2.0.1