chore: replace mcr images with gcr

andyzhangx · andyzhangx · commit 4e92c7394033 · 2022-05-03T07:38:24.000Z
diff --git a/charts/v1.4.0/csi-driver-smb-v1.4.0.tgz b/charts/v1.4.0/csi-driver-smb-v1.4.0.tgz
diff --git a/charts/v1.4.0/csi-driver-smb/values.yaml b/charts/v1.4.0/csi-driver-smb/values.yaml
@@ -1,19 +1,19 @@
 image:
-  baseRepo: mcr.microsoft.com
+  baseRepo: registry.k8s.io/sig-storage
   smb:
-    repository: /k8s/csi/smb-csi
+    repository: smbplugin
     tag: v1.4.0
     pullPolicy: IfNotPresent
   csiProvisioner:
-    repository: /oss/kubernetes-csi/csi-provisioner
+    repository: csi-provisioner
     tag: v2.2.2
     pullPolicy: IfNotPresent
   livenessProbe:
-    repository: /oss/kubernetes-csi/livenessprobe
+    repository: livenessprobe
     tag: v2.5.0
     pullPolicy: IfNotPresent
   nodeDriverRegistrar:
-    repository: /oss/kubernetes-csi/csi-node-driver-registrar
+    repository: csi-node-driver-registrar
     tag: v2.4.0
     pullPolicy: IfNotPresent
 
diff --git a/charts/v1.5.0/csi-driver-smb-v1.5.0.tgz b/charts/v1.5.0/csi-driver-smb-v1.5.0.tgz
diff --git a/charts/v1.5.0/csi-driver-smb/values.yaml b/charts/v1.5.0/csi-driver-smb/values.yaml
@@ -1,19 +1,19 @@
 image:
   baseRepo: registry.k8s.io/sig-storage
   smb:
-    repository: mcr.microsoft.com/k8s/csi/smb-csi
+    repository: smbplugin
     tag: v1.5.0
     pullPolicy: IfNotPresent
   csiProvisioner:
-    repository: registry.k8s.io/sig-storage/csi-provisioner
+    repository: csi-provisioner
     tag: v2.2.2
     pullPolicy: IfNotPresent
   livenessProbe:
-    repository: registry.k8s.io/sig-storage/livenessprobe
+    repository: livenessprobe
     tag: v2.5.0
     pullPolicy: IfNotPresent
   nodeDriverRegistrar:
-    repository: registry.k8s.io/sig-storage/csi-node-driver-registrar
+    repository: csi-node-driver-registrar
     tag: v2.4.0
     pullPolicy: IfNotPresent
 
diff --git a/charts/v1.6.0/csi-driver-smb-v1.6.0.tgz b/charts/v1.6.0/csi-driver-smb-v1.6.0.tgz
diff --git a/charts/v1.6.0/csi-driver-smb/values.yaml b/charts/v1.6.0/csi-driver-smb/values.yaml
@@ -1,7 +1,7 @@
 image:
   baseRepo: registry.k8s.io/sig-storage
   smb:
-    repository: mcr.microsoft.com/k8s/csi/smb-csi
+    repository: registry.k8s.io/sig-storage/smbplugin
     tag: v1.6.0
     pullPolicy: IfNotPresent
   csiProvisioner:
diff --git a/deploy/v1.4.0/csi-smb-controller.yaml b/deploy/v1.4.0/csi-smb-controller.yaml
@@ -64,7 +64,7 @@ spec:
               cpu: 10m
               memory: 20Mi
         - name: smb
-          image: mcr.microsoft.com/k8s/csi/smb-csi:v1.4.0
+          image: registry.k8s.io/sig-storage/smbplugin:v1.4.0
           imagePullPolicy: IfNotPresent
           args:
             - "--v=5"
diff --git a/deploy/v1.4.0/csi-smb-node-windows.yaml b/deploy/v1.4.0/csi-smb-node-windows.yaml
@@ -83,7 +83,7 @@ spec:
               cpu: 10m
               memory: 20Mi
         - name: smb
-          image: mcr.microsoft.com/k8s/csi/smb-csi:v1.4.0
+          image: registry.k8s.io/sig-storage/smbplugin:v1.4.0
           imagePullPolicy: IfNotPresent
           args:
             - --v=5
diff --git a/deploy/v1.4.0/csi-smb-node.yaml b/deploy/v1.4.0/csi-smb-node.yaml
@@ -74,7 +74,7 @@ spec:
               cpu: 10m
               memory: 20Mi
         - name: smb
-          image: mcr.microsoft.com/k8s/csi/smb-csi:v1.4.0
+          image: registry.k8s.io/sig-storage/smbplugin:v1.4.0
           imagePullPolicy: IfNotPresent
           args:
             - "--v=5"
diff --git a/deploy/v1.5.0/csi-smb-controller.yaml b/deploy/v1.5.0/csi-smb-controller.yaml
@@ -64,7 +64,7 @@ spec:
               cpu: 10m
               memory: 20Mi
         - name: smb
-          image: mcr.microsoft.com/k8s/csi/smb-csi:v1.5.0
+          image: registry.k8s.io/sig-storage/smbplugin:v1.5.0
           imagePullPolicy: IfNotPresent
           args:
             - "--v=5"
diff --git a/deploy/v1.5.0/csi-smb-node-windows.yaml b/deploy/v1.5.0/csi-smb-node-windows.yaml
@@ -81,7 +81,7 @@ spec:
               cpu: 10m
               memory: 20Mi
         - name: smb
-          image: mcr.microsoft.com/k8s/csi/smb-csi:v1.5.0
+          image: registry.k8s.io/sig-storage/smbplugin:v1.5.0
           imagePullPolicy: IfNotPresent
           args:
             - --v=5
diff --git a/deploy/v1.5.0/csi-smb-node.yaml b/deploy/v1.5.0/csi-smb-node.yaml
@@ -72,7 +72,7 @@ spec:
               cpu: 10m
               memory: 20Mi
         - name: smb
-          image: mcr.microsoft.com/k8s/csi/smb-csi:v1.5.0
+          image: registry.k8s.io/sig-storage/smbplugin:v1.5.0
           imagePullPolicy: IfNotPresent
           args:
             - "--v=5"
diff --git a/deploy/v1.6.0/csi-smb-controller.yaml b/deploy/v1.6.0/csi-smb-controller.yaml
@@ -68,7 +68,7 @@ spec:
               cpu: 10m
               memory: 20Mi
         - name: smb
-          image: mcr.microsoft.com/k8s/csi/smb-csi:v1.6.0
+          image: registry.k8s.io/sig-storage/smbplugin:v1.6.0
           imagePullPolicy: IfNotPresent
           args:
             - "--v=5"
diff --git a/deploy/v1.6.0/csi-smb-node-windows.yaml b/deploy/v1.6.0/csi-smb-node-windows.yaml
@@ -81,7 +81,7 @@ spec:
               cpu: 10m
               memory: 40Mi
         - name: smb
-          image: mcr.microsoft.com/k8s/csi/smb-csi:v1.6.0
+          image: registry.k8s.io/sig-storage/smbplugin:v1.6.0
           imagePullPolicy: IfNotPresent
           args:
             - --v=5
diff --git a/deploy/v1.6.0/csi-smb-node.yaml b/deploy/v1.6.0/csi-smb-node.yaml
@@ -72,7 +72,7 @@ spec:
               cpu: 10m
               memory: 20Mi
         - name: smb
-          image: mcr.microsoft.com/k8s/csi/smb-csi:v1.6.0
+          image: registry.k8s.io/sig-storage/smbplugin:v1.6.0
           imagePullPolicy: IfNotPresent
           args:
             - "--v=5"
diff --git a/docs/csi-debug.md b/docs/csi-debug.md
@@ -50,7 +50,7 @@ kubectl edit ds csi-smb-node -n kube-system
 ```
 change below deployment config, e.g.
 ```console
-        image: mcr.microsoft.com/k8s/csi/smb-csi:v1.4.0
+        image: registry.k8s.io/sig-storage/smbplugin:v1.5.0
         imagePullPolicy: Always
 ```
 
diff --git a/docs/csi-dev.md b/docs/csi-dev.md
@@ -91,7 +91,7 @@ make container-all
 make push-manifest
 ```
 
- - Replace `mcr.microsoft.com/k8s/csi/smb-csi:latest` in [`csi-smb-controller.yaml`](https://github.com/kubernetes-csi/csi-driver-smb/blob/master/deploy/csi-smb-controller.yaml) and [`csi-smb-node.yaml`](https://github.com/kubernetes-csi/csi-driver-smb/blob/master/deploy/csi-smb-node.yaml) with above dockerhub image urls and then follow [install CSI driver master version](https://github.com/kubernetes-csi/csi-driver-smb/blob/master/docs/install-csi-driver-master.md)
+ - Replace `registry.k8s.io/sig-storage/smbplugin:canary` in [`csi-smb-controller.yaml`](https://github.com/kubernetes-csi/csi-driver-smb/blob/master/deploy/csi-smb-controller.yaml) and [`csi-smb-node.yaml`](https://github.com/kubernetes-csi/csi-driver-smb/blob/master/deploy/csi-smb-node.yaml) with above dockerhub image urls and then follow [install CSI driver master version](https://github.com/kubernetes-csi/csi-driver-smb/blob/master/docs/install-csi-driver-master.md)
  ```console
 wget -O csi-smb-node.yaml https://raw.githubusercontent.com/kubernetes-csi/csi-driver-smb/master/deploy/csi-smb-node.yaml
 # edit csi-smb-node.yaml
