WIP: Do Not Merge

kubernetes-csi · Nov 16, 2020 · 1e9fbbd · 1e9fbbd
1 parent 1e5a7ef
commit 1e9fbbd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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