Merge pull request #913 from pohly/external-provisioner-2.1.1

deploy: use external-provisioner v2.1.1
intel · Mar 12, 2021 · 5ac8462 · 5ac8462
2 parents 3fbe2c8 + e459580
commit 5ac8462
Show file tree

Hide file tree

Showing 44 changed files with 65 additions and 67 deletions.
diff --git a/deploy/bindata_generated.go b/deploy/bindata_generated.go
diff --git a/deploy/kubernetes-1.17/direct/pmem-csi.yaml b/deploy/kubernetes-1.17/direct/pmem-csi.yaml
@@ -496,7 +496,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: spec.nodeName
-        image: gcr.io/k8s-staging-sig-storage/csi-provisioner:canary
+        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
         imagePullPolicy: IfNotPresent
         name: external-provisioner
         ports:

diff --git a/deploy/kubernetes-1.17/direct/testing/pmem-csi.yaml b/deploy/kubernetes-1.17/direct/testing/pmem-csi.yaml
@@ -540,7 +540,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: spec.nodeName
-        image: gcr.io/k8s-staging-sig-storage/csi-provisioner:canary
+        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
         imagePullPolicy: IfNotPresent
         name: external-provisioner
         ports:

diff --git a/deploy/kubernetes-1.17/lvm/pmem-csi.yaml b/deploy/kubernetes-1.17/lvm/pmem-csi.yaml
@@ -496,7 +496,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: spec.nodeName
-        image: gcr.io/k8s-staging-sig-storage/csi-provisioner:canary
+        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
         imagePullPolicy: IfNotPresent
         name: external-provisioner
         ports:

diff --git a/deploy/kubernetes-1.17/lvm/testing/pmem-csi.yaml b/deploy/kubernetes-1.17/lvm/testing/pmem-csi.yaml
@@ -540,7 +540,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: spec.nodeName
-        image: gcr.io/k8s-staging-sig-storage/csi-provisioner:canary
+        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
         imagePullPolicy: IfNotPresent
         name: external-provisioner
         ports:

diff --git a/deploy/kubernetes-1.17/pmem-csi-direct-testing.yaml b/deploy/kubernetes-1.17/pmem-csi-direct-testing.yaml
@@ -540,7 +540,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: spec.nodeName
-        image: gcr.io/k8s-staging-sig-storage/csi-provisioner:canary
+        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
         imagePullPolicy: IfNotPresent
         name: external-provisioner
         ports:

diff --git a/deploy/kubernetes-1.17/pmem-csi-direct.yaml b/deploy/kubernetes-1.17/pmem-csi-direct.yaml
@@ -496,7 +496,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: spec.nodeName
-        image: gcr.io/k8s-staging-sig-storage/csi-provisioner:canary
+        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
         imagePullPolicy: IfNotPresent
         name: external-provisioner
         ports:

diff --git a/deploy/kubernetes-1.17/pmem-csi-lvm-testing.yaml b/deploy/kubernetes-1.17/pmem-csi-lvm-testing.yaml
@@ -540,7 +540,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: spec.nodeName
-        image: gcr.io/k8s-staging-sig-storage/csi-provisioner:canary
+        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
         imagePullPolicy: IfNotPresent
         name: external-provisioner
         ports:

diff --git a/deploy/kubernetes-1.17/pmem-csi-lvm.yaml b/deploy/kubernetes-1.17/pmem-csi-lvm.yaml
@@ -496,7 +496,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: spec.nodeName
-        image: gcr.io/k8s-staging-sig-storage/csi-provisioner:canary
+        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
         imagePullPolicy: IfNotPresent
         name: external-provisioner
         ports:

diff --git a/deploy/kubernetes-1.18/direct/pmem-csi.yaml b/deploy/kubernetes-1.18/direct/pmem-csi.yaml
@@ -496,7 +496,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: spec.nodeName
-        image: gcr.io/k8s-staging-sig-storage/csi-provisioner:canary
+        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
         imagePullPolicy: IfNotPresent
         name: external-provisioner
         ports:

diff --git a/deploy/kubernetes-1.18/direct/testing/pmem-csi.yaml b/deploy/kubernetes-1.18/direct/testing/pmem-csi.yaml
@@ -540,7 +540,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: spec.nodeName
-        image: gcr.io/k8s-staging-sig-storage/csi-provisioner:canary
+        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
         imagePullPolicy: IfNotPresent
         name: external-provisioner
         ports:

diff --git a/deploy/kubernetes-1.18/lvm/pmem-csi.yaml b/deploy/kubernetes-1.18/lvm/pmem-csi.yaml
@@ -496,7 +496,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: spec.nodeName
-        image: gcr.io/k8s-staging-sig-storage/csi-provisioner:canary
+        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
         imagePullPolicy: IfNotPresent
         name: external-provisioner
         ports:

diff --git a/deploy/kubernetes-1.18/lvm/testing/pmem-csi.yaml b/deploy/kubernetes-1.18/lvm/testing/pmem-csi.yaml
@@ -540,7 +540,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: spec.nodeName
-        image: gcr.io/k8s-staging-sig-storage/csi-provisioner:canary
+        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
         imagePullPolicy: IfNotPresent
         name: external-provisioner
         ports:

diff --git a/deploy/kubernetes-1.18/pmem-csi-direct-testing.yaml b/deploy/kubernetes-1.18/pmem-csi-direct-testing.yaml
@@ -540,7 +540,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: spec.nodeName
-        image: gcr.io/k8s-staging-sig-storage/csi-provisioner:canary
+        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
         imagePullPolicy: IfNotPresent
         name: external-provisioner
         ports:

diff --git a/deploy/kubernetes-1.18/pmem-csi-direct.yaml b/deploy/kubernetes-1.18/pmem-csi-direct.yaml
@@ -496,7 +496,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: spec.nodeName
-        image: gcr.io/k8s-staging-sig-storage/csi-provisioner:canary
+        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
         imagePullPolicy: IfNotPresent
         name: external-provisioner
         ports:

diff --git a/deploy/kubernetes-1.18/pmem-csi-lvm-testing.yaml b/deploy/kubernetes-1.18/pmem-csi-lvm-testing.yaml
@@ -540,7 +540,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: spec.nodeName
-        image: gcr.io/k8s-staging-sig-storage/csi-provisioner:canary
+        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
         imagePullPolicy: IfNotPresent
         name: external-provisioner
         ports:

diff --git a/deploy/kubernetes-1.18/pmem-csi-lvm.yaml b/deploy/kubernetes-1.18/pmem-csi-lvm.yaml
@@ -496,7 +496,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: spec.nodeName
-        image: gcr.io/k8s-staging-sig-storage/csi-provisioner:canary
+        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
         imagePullPolicy: IfNotPresent
         name: external-provisioner
         ports:

diff --git a/deploy/kubernetes-1.19-alpha/direct/pmem-csi.yaml b/deploy/kubernetes-1.19-alpha/direct/pmem-csi.yaml
@@ -506,7 +506,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
-        image: gcr.io/k8s-staging-sig-storage/csi-provisioner:canary
+        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
         imagePullPolicy: IfNotPresent
         name: external-provisioner
         ports:

diff --git a/deploy/kubernetes-1.19-alpha/direct/testing/pmem-csi.yaml b/deploy/kubernetes-1.19-alpha/direct/testing/pmem-csi.yaml
@@ -550,7 +550,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
-        image: gcr.io/k8s-staging-sig-storage/csi-provisioner:canary
+        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
         imagePullPolicy: IfNotPresent
         name: external-provisioner
         ports:

diff --git a/deploy/kubernetes-1.19-alpha/lvm/pmem-csi.yaml b/deploy/kubernetes-1.19-alpha/lvm/pmem-csi.yaml
@@ -506,7 +506,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
-        image: gcr.io/k8s-staging-sig-storage/csi-provisioner:canary
+        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
         imagePullPolicy: IfNotPresent
         name: external-provisioner
         ports:

diff --git a/deploy/kubernetes-1.19-alpha/lvm/testing/pmem-csi.yaml b/deploy/kubernetes-1.19-alpha/lvm/testing/pmem-csi.yaml
@@ -550,7 +550,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
-        image: gcr.io/k8s-staging-sig-storage/csi-provisioner:canary
+        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
         imagePullPolicy: IfNotPresent
         name: external-provisioner
         ports:

diff --git a/deploy/kubernetes-1.19-alpha/pmem-csi-direct-testing.yaml b/deploy/kubernetes-1.19-alpha/pmem-csi-direct-testing.yaml
@@ -550,7 +550,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
-        image: gcr.io/k8s-staging-sig-storage/csi-provisioner:canary
+        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
         imagePullPolicy: IfNotPresent
         name: external-provisioner
         ports:

diff --git a/deploy/kubernetes-1.19-alpha/pmem-csi-direct.yaml b/deploy/kubernetes-1.19-alpha/pmem-csi-direct.yaml
@@ -506,7 +506,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
-        image: gcr.io/k8s-staging-sig-storage/csi-provisioner:canary
+        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
         imagePullPolicy: IfNotPresent
         name: external-provisioner
         ports:

diff --git a/deploy/kubernetes-1.19-alpha/pmem-csi-lvm-testing.yaml b/deploy/kubernetes-1.19-alpha/pmem-csi-lvm-testing.yaml
@@ -550,7 +550,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
-        image: gcr.io/k8s-staging-sig-storage/csi-provisioner:canary
+        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
         imagePullPolicy: IfNotPresent
         name: external-provisioner
         ports:

diff --git a/deploy/kubernetes-1.19-alpha/pmem-csi-lvm.yaml b/deploy/kubernetes-1.19-alpha/pmem-csi-lvm.yaml
@@ -506,7 +506,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
-        image: gcr.io/k8s-staging-sig-storage/csi-provisioner:canary
+        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
         imagePullPolicy: IfNotPresent
         name: external-provisioner
         ports:

diff --git a/deploy/kubernetes-1.19/direct/pmem-csi.yaml b/deploy/kubernetes-1.19/direct/pmem-csi.yaml
@@ -496,7 +496,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: spec.nodeName
-        image: gcr.io/k8s-staging-sig-storage/csi-provisioner:canary
+        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
         imagePullPolicy: IfNotPresent
         name: external-provisioner
         ports:

diff --git a/deploy/kubernetes-1.19/direct/testing/pmem-csi.yaml b/deploy/kubernetes-1.19/direct/testing/pmem-csi.yaml
@@ -540,7 +540,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: spec.nodeName
-        image: gcr.io/k8s-staging-sig-storage/csi-provisioner:canary
+        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
         imagePullPolicy: IfNotPresent
         name: external-provisioner
         ports:

diff --git a/deploy/kubernetes-1.19/lvm/pmem-csi.yaml b/deploy/kubernetes-1.19/lvm/pmem-csi.yaml
@@ -496,7 +496,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: spec.nodeName
-        image: gcr.io/k8s-staging-sig-storage/csi-provisioner:canary
+        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
         imagePullPolicy: IfNotPresent
         name: external-provisioner
         ports:

diff --git a/deploy/kubernetes-1.19/lvm/testing/pmem-csi.yaml b/deploy/kubernetes-1.19/lvm/testing/pmem-csi.yaml
@@ -540,7 +540,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: spec.nodeName
-        image: gcr.io/k8s-staging-sig-storage/csi-provisioner:canary
+        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
         imagePullPolicy: IfNotPresent
         name: external-provisioner
         ports:

diff --git a/deploy/kubernetes-1.19/pmem-csi-direct-testing.yaml b/deploy/kubernetes-1.19/pmem-csi-direct-testing.yaml
@@ -540,7 +540,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: spec.nodeName
-        image: gcr.io/k8s-staging-sig-storage/csi-provisioner:canary
+        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
         imagePullPolicy: IfNotPresent
         name: external-provisioner
         ports:

diff --git a/deploy/kubernetes-1.19/pmem-csi-direct.yaml b/deploy/kubernetes-1.19/pmem-csi-direct.yaml
@@ -496,7 +496,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: spec.nodeName
-        image: gcr.io/k8s-staging-sig-storage/csi-provisioner:canary
+        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
         imagePullPolicy: IfNotPresent
         name: external-provisioner
         ports:

diff --git a/deploy/kubernetes-1.19/pmem-csi-lvm-testing.yaml b/deploy/kubernetes-1.19/pmem-csi-lvm-testing.yaml
@@ -540,7 +540,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: spec.nodeName
-        image: gcr.io/k8s-staging-sig-storage/csi-provisioner:canary
+        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
         imagePullPolicy: IfNotPresent
         name: external-provisioner
         ports:

diff --git a/deploy/kubernetes-1.19/pmem-csi-lvm.yaml b/deploy/kubernetes-1.19/pmem-csi-lvm.yaml
@@ -496,7 +496,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: spec.nodeName
-        image: gcr.io/k8s-staging-sig-storage/csi-provisioner:canary
+        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
         imagePullPolicy: IfNotPresent
         name: external-provisioner
         ports:

diff --git a/deploy/kubernetes-1.20/direct/pmem-csi.yaml b/deploy/kubernetes-1.20/direct/pmem-csi.yaml
@@ -496,7 +496,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: spec.nodeName
-        image: gcr.io/k8s-staging-sig-storage/csi-provisioner:canary
+        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
         imagePullPolicy: IfNotPresent
         name: external-provisioner
         ports:

diff --git a/deploy/kubernetes-1.20/direct/testing/pmem-csi.yaml b/deploy/kubernetes-1.20/direct/testing/pmem-csi.yaml
@@ -540,7 +540,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: spec.nodeName
-        image: gcr.io/k8s-staging-sig-storage/csi-provisioner:canary
+        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
         imagePullPolicy: IfNotPresent
         name: external-provisioner
         ports:

diff --git a/deploy/kubernetes-1.20/lvm/pmem-csi.yaml b/deploy/kubernetes-1.20/lvm/pmem-csi.yaml
@@ -496,7 +496,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: spec.nodeName
-        image: gcr.io/k8s-staging-sig-storage/csi-provisioner:canary
+        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
         imagePullPolicy: IfNotPresent
         name: external-provisioner
         ports:

diff --git a/deploy/kubernetes-1.20/lvm/testing/pmem-csi.yaml b/deploy/kubernetes-1.20/lvm/testing/pmem-csi.yaml
@@ -540,7 +540,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: spec.nodeName
-        image: gcr.io/k8s-staging-sig-storage/csi-provisioner:canary
+        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
         imagePullPolicy: IfNotPresent
         name: external-provisioner
         ports:

diff --git a/deploy/kubernetes-1.20/pmem-csi-direct-testing.yaml b/deploy/kubernetes-1.20/pmem-csi-direct-testing.yaml
@@ -540,7 +540,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: spec.nodeName
-        image: gcr.io/k8s-staging-sig-storage/csi-provisioner:canary
+        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
         imagePullPolicy: IfNotPresent
         name: external-provisioner
         ports:

diff --git a/deploy/kubernetes-1.20/pmem-csi-direct.yaml b/deploy/kubernetes-1.20/pmem-csi-direct.yaml
@@ -496,7 +496,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: spec.nodeName
-        image: gcr.io/k8s-staging-sig-storage/csi-provisioner:canary
+        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
         imagePullPolicy: IfNotPresent
         name: external-provisioner
         ports:

diff --git a/deploy/kubernetes-1.20/pmem-csi-lvm-testing.yaml b/deploy/kubernetes-1.20/pmem-csi-lvm-testing.yaml
@@ -540,7 +540,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: spec.nodeName
-        image: gcr.io/k8s-staging-sig-storage/csi-provisioner:canary
+        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
         imagePullPolicy: IfNotPresent
         name: external-provisioner
         ports:

diff --git a/deploy/kubernetes-1.20/pmem-csi-lvm.yaml b/deploy/kubernetes-1.20/pmem-csi-lvm.yaml
@@ -496,7 +496,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: spec.nodeName
-        image: gcr.io/k8s-staging-sig-storage/csi-provisioner:canary
+        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1
         imagePullPolicy: IfNotPresent
         name: external-provisioner
         ports:

diff --git a/deploy/kustomize/driver/pmem-csi.yaml b/deploy/kustomize/driver/pmem-csi.yaml
@@ -317,7 +317,7 @@ spec:
         - name: PMEM_CSI_DRIVER_NAME
           value: pmem-csi.intel.com
       - name: external-provisioner
-        image: gcr.io/k8s-staging-sig-storage/csi-provisioner:canary
+        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.X
         imagePullPolicy: IfNotPresent
         args:
         - -v=3

diff --git a/deploy/kustomize/kubernetes-no-metrics/kustomization.yaml b/deploy/kustomize/kubernetes-no-metrics/kustomization.yaml
@@ -10,7 +10,7 @@ resources:
 # operator defaults in pkg/apis/pmemcsi/v1alpha1/deployment_types.go!
 images:
 - name: k8s.gcr.io/sig-storage/csi-provisioner
-  newTag: v2.0.2
+  newTag: v2.1.1
 - name: k8s.gcr.io/sig-storage/csi-node-driver-registrar
   newTag: v1.2.0
 

diff --git a/pkg/apis/pmemcsi/v1beta1/deployment_types.go b/pkg/apis/pmemcsi/v1beta1/deployment_types.go
@@ -262,10 +262,8 @@ const (
 
 	// The sidecar versions must be kept in sync with the
 	// deploy/kustomize YAML files!
-
-	// TODO: use released image
-	defaultProvisionerImageName = "gcr.io/k8s-staging-sig-storage/csi-provisioner"
-	defaultProvisionerImageTag  = "canary"
+	defaultProvisionerImageName = "k8s.gcr.io/sig-storage/csi-provisioner"
+	defaultProvisionerImageTag  = "v2.1.1"
 	// DefaultProvisionerImage default external provisioner image to use
 	DefaultProvisionerImage = defaultProvisionerImageName + ":" + defaultProvisionerImageTag