From 1e9fbbda983cef1c2d05533483f7dbe45ab4b082 Mon Sep 17 00:00:00 2001 From: xing-yang Date: Mon, 16 Nov 2020 15:08:17 +0000 Subject: [PATCH] WIP: Do Not Merge --- .../snapshot-controller/setup-snapshot-controller.yaml | 4 ++-- release-tools/prow.sh | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/deploy/kubernetes/snapshot-controller/setup-snapshot-controller.yaml b/deploy/kubernetes/snapshot-controller/setup-snapshot-controller.yaml index 6b12d276d..0b7c2612f 100644 --- a/deploy/kubernetes/snapshot-controller/setup-snapshot-controller.yaml +++ b/deploy/kubernetes/snapshot-controller/setup-snapshot-controller.yaml @@ -25,8 +25,8 @@ spec: serviceAccount: snapshot-controller containers: - name: snapshot-controller - image: k8s.gcr.io/sig-storage/snapshot-controller:v3.0.0 + image: snapshot-controller:csiprow # k8s.gcr.io/sig-storage/snapshot-controller:v3.0.0 args: - "--v=5" - "--leader-election=false" - imagePullPolicy: Always + imagePullPolicy: IfNotPresent #Always diff --git a/release-tools/prow.sh b/release-tools/prow.sh index 75eedbdbd..994e0632b 100755 --- a/release-tools/prow.sh +++ b/release-tools/prow.sh @@ -734,7 +734,9 @@ install_snapshot_controller() { done - kubectl apply -f "https://raw.githubusercontent.com/kubernetes-csi/external-snapshotter/${CSI_SNAPSHOTTER_VERSION}/deploy/kubernetes/snapshot-controller/setup-snapshot-controller.yaml" + echo "kubectl apply -f ${REPO_DIR}/deploy/kubernetes/snapshot-controller/setup-snapshot-controller.yaml" + kubectl apply -f "${REPO_DIR}/deploy/kubernetes/snapshot-controller/setup-snapshot-controller.yaml" + #kubectl apply -f "https://raw.githubusercontent.com/kubernetes-csi/external-snapshotter/${CSI_SNAPSHOTTER_VERSION}/deploy/kubernetes/snapshot-controller/setup-snapshot-controller.yaml" cnt=0 expected_running_pods=$(curl https://raw.githubusercontent.com/kubernetes-csi/external-snapshotter/"${CSI_SNAPSHOTTER_VERSION}"/deploy/kubernetes/snapshot-controller/setup-snapshot-controller.yaml | grep replicas | cut -d ':' -f 2-) while [ "$(kubectl get pods -l app=snapshot-controller | grep 'Running' -c)" -lt "$expected_running_pods" ]; do