Merge pull request #95 from andyzhangx/use-mcr-repo

chore: swtich to use mcr repo

Author: andyzhangx

charts/latest/blobfuse-csi-driver/values.yaml

@@ -4,23 +4,23 @@ image:
     tag: latest
     pullPolicy: Always
   csiProvisioner:
-    repository: quay.io/k8scsi/csi-provisioner
+    repository: mcr.microsoft.com/oss/kubernetes-csi/csi-provisioner
     tag: v1.4.0
     pullPolicy: Always
   csiAttacher:
-    repository: quay.io/k8scsi/csi-attacher
+    repository: mcr.microsoft.com/oss/kubernetes-csi/csi-attacher
     tag: v1.2.0
     pullPolicy: Always
   clusterDriverRegistrar:
-    repository: quay.io/k8scsi/csi-cluster-driver-registrar
+    repository: mcr.microsoft.com/oss/kubernetes-csi/csi-cluster-driver-registrar
     tag: v1.0.1
     pullPolicy: Always
   livenessProbe:
-    repository: quay.io/k8scsi/livenessprobe
+    repository: mcr.microsoft.com/oss/kubernetes-csi/livenessprobe
     tag: v1.1.0
     pullPolicy: Always
   nodeDriverRegistrar:
-    repository: quay.io/k8scsi/csi-node-driver-registrar
+    repository: mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar
     tag: v1.1.0
     pullPolicy: Always
 

deploy/csi-blobfuse-controller.yaml

@@ -20,7 +20,7 @@ spec:
       priorityClassName: system-cluster-critical
       containers:
         - name: csi-provisioner
-          image: quay.io/k8scsi/csi-provisioner:v1.4.0
+          image: mcr.microsoft.com/oss/kubernetes-csi/csi-provisioner:v1.4.0
           args:
             - "--provisioner=blobfuse.csi.azure.com"
             - "--csi-address=$(ADDRESS)"
@@ -35,7 +35,7 @@ spec:
             - mountPath: /csi
               name: socket-dir
         - name: csi-attacher
-          image: quay.io/k8scsi/csi-attacher:v1.2.0
+          image: mcr.microsoft.com/oss/kubernetes-csi/csi-attacher:v1.2.0
           args:
             - "-v=5"
             - "-csi-address=$(ADDRESS)"
@@ -50,7 +50,7 @@ spec:
           - mountPath: /csi
             name: socket-dir
         - name: cluster-driver-registrar
-          image: quay.io/k8scsi/csi-cluster-driver-registrar:v1.0.1
+          image: mcr.microsoft.com/oss/kubernetes-csi/csi-cluster-driver-registrar:v1.0.1
           args:
             - --csi-address=$(ADDRESS)
             - --driver-requires-attachment=true
@@ -62,7 +62,7 @@ spec:
             - name: socket-dir
               mountPath: /csi
         - name: liveness-probe
-          image: quay.io/k8scsi/livenessprobe:v1.1.0
+          image: mcr.microsoft.com/oss/kubernetes-csi/livenessprobe:v1.1.0
           args:
             - --csi-address=/csi/csi.sock
             - --connection-timeout=3s

deploy/csi-blobfuse-node.yaml

@@ -22,13 +22,13 @@ spec:
           volumeMounts:
             - mountPath: /csi
               name: socket-dir
-          image: quay.io/k8scsi/livenessprobe:v1.1.0
+          image: mcr.microsoft.com/oss/kubernetes-csi/livenessprobe:v1.1.0
           args:
             - --csi-address=/csi/csi.sock
             - --connection-timeout=3s
             - --health-port=9802
         - name: node-driver-registrar
-          image: quay.io/k8scsi/csi-node-driver-registrar:v1.1.0
+          image: mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar:v1.1.0
           args:
             - --csi-address=$(ADDRESS)
             - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)

pkg/blobfuse/nodeserver.go

@@ -161,13 +161,12 @@ func (d *Driver) NodeStageVolume(ctx context.Context, req *csi.NodeStageVolumeRe
 	options := []string{"--use-https=true"}
 	mountOptions := util.JoinMountOptions(mountFlags, options)
 
-	klog.V(2).Infof("target %v\nfstype %v\n\nvolumeId %v\ncontext %v\nmountflags %v\nmountOptions %v\n",
-		targetPath, fsType, volumeID, attrib, mountFlags, mountOptions)
-
 	args := targetPath + " " + "--tmp-path=/mnt/" + volumeID + " " + "--container-name=" + containerName
 	for _, opt := range mountOptions {
 		args = args + " " + opt
 	}
+	klog.V(2).Infof("target %v\nfstype %v\n\nvolumeId %v\ncontext %v\nmountflags %v\nmountOptions %v\nargs %v\n",
+		targetPath, fsType, volumeID, attrib, mountFlags, mountOptions, args)
 	cmd := exec.Command("blobfuse", strings.Split(args, " ")...)
 	cmd.Env = append(os.Environ(), "AZURE_STORAGE_ACCOUNT="+accountName)