fix conflicting changes

Author: Pearl1594

Makefile

@@ -1,6 +1,6 @@
 CMDS=cloudstack-csi-driver cloudstack-csi-sc-syncer
 
-PKG=github.com/shapeblue/cloudstack-csi-driver
+PKG=github.com/cloudstack/cloudstack-csi-driver
 # Revision that gets built into each binary via the main.version
 # string. Uses the `git describe` output based on the most recent
 # version tag with a short revision suffix or, if nothing has been

deploy/k8s/controller-deployment.yaml

@@ -61,7 +61,7 @@ spec:
 
       containers:
         - name: cloudstack-csi-controller
-          image: ghcr.io/shapeblue/cloudstack-csi-driver:main
+          image: ghcr.io/cloudstack/cloudstack-csi-driver:main
           imagePullPolicy: Always
           args:
             - "controller"

deploy/k8s/node-daemonset.yaml

@@ -36,7 +36,7 @@ spec:
 
       containers:
         - name: cloudstack-csi-node
-          image: ghcr.io/shapeblue/cloudstack-csi-driver:main
+          image: ghcr.io/cloudstack/cloudstack-csi-driver:main
           imagePullPolicy: IfNotPresent
           args:
             - "node"

pkg/cloud/fake/fake.go

@@ -141,7 +141,7 @@ func (f *fakeConnector) CreateVolumeFromSnapshot(ctx context.Context, zoneID, na
 	return nil, nil
 }
 
-func (f *fakeConnector) GetSnapshotByID(ctx context.Context, snapshotID ...string) (*cloud.Snapshot, error) {
+func (f *fakeConnector) GetSnapshotByID(ctx context.Context, snapshotID string) (*cloud.Snapshot, error) {
 	return f.snapshot, nil
 }