From 5e3a6801652fe52c84bc5b1599812b42a549494f Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Tue, 17 Nov 2020 02:47:50 +0000 Subject: [PATCH] doc: use quay images --- deploy/csi-nfs-controller.yaml | 9 ++++----- deploy/csi-nfs-node.yaml | 4 ++-- deploy/install-driver.sh | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/deploy/csi-nfs-controller.yaml b/deploy/csi-nfs-controller.yaml index f4b7566a..2eb5b8f7 100644 --- a/deploy/csi-nfs-controller.yaml +++ b/deploy/csi-nfs-controller.yaml @@ -25,12 +25,11 @@ spec: effect: "NoSchedule" containers: - name: csi-provisioner - image: mcr.microsoft.com/oss/kubernetes-csi/csi-provisioner:v1.4.0 + image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.4 args: - "-v=5" - "--csi-address=$(ADDRESS)" - - "--enable-leader-election" - - "--leader-election-type=leases" + - "--leader-election" env: - name: ADDRESS value: /csi/csi.sock @@ -45,7 +44,7 @@ spec: cpu: 10m memory: 20Mi - name: liveness-probe - image: mcr.microsoft.com/oss/kubernetes-csi/livenessprobe:v2.0.0 + image: k8s.gcr.io/sig-storage/livenessprobe:v2.1.0 args: - --csi-address=/csi/csi.sock - --probe-timeout=3s @@ -62,7 +61,7 @@ spec: cpu: 10m memory: 20Mi - name: nfs - image: quay.io/k8scsi/nfsplugin:v2.0.0 + image: gcr.io/k8s-staging-sig-storage/nfsplugin:amd64-linux-canary securityContext: privileged: true capabilities: diff --git a/deploy/csi-nfs-node.yaml b/deploy/csi-nfs-node.yaml index dfbbd1e9..b6307b33 100644 --- a/deploy/csi-nfs-node.yaml +++ b/deploy/csi-nfs-node.yaml @@ -18,7 +18,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet containers: - name: node-driver-registrar - image: quay.io/k8scsi/csi-node-driver-registrar:v1.0.2 + image: quay.io/k8scsi/csi-node-driver-registrar:v2.0.1 lifecycle: preStop: exec: @@ -43,7 +43,7 @@ spec: capabilities: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true - image: quay.io/k8scsi/nfsplugin:v2.0.0 + image: gcr.io/k8s-staging-sig-storage/nfsplugin:amd64-linux-canary args : - "-v=5" - "--nodeid=$(NODE_ID)" diff --git a/deploy/install-driver.sh b/deploy/install-driver.sh index eec69e1d..6e0a3ab4 100755 --- a/deploy/install-driver.sh +++ b/deploy/install-driver.sh @@ -21,11 +21,11 @@ if [[ "$#" -gt 0 ]]; then ver="$1" fi -repo="https://raw.githubusercontent.com/kubernetes-csi/csi-driver-nfs/$ver/deploy/kubernetes" +repo="https://raw.githubusercontent.com/kubernetes-csi/csi-driver-nfs/$ver/deploy" if [[ "$#" -gt 1 ]]; then if [[ "$2" == *"local"* ]]; then echo "use local deploy" - repo="./deploy/kubernetes" + repo="./deploy" fi fi