update sc yamls

Signed-off-by: Ashima-Ashima1 <[email protected]>

Author: ashimagarg27

controllers/ibmobjectcsi_controller_test.go

@@ -382,9 +382,7 @@ var (
 			"client":             "awss3",
 			"cosEndpoint":        "https://s3.us-east-2.amazonaws.com",
 			"locationConstraint": "us-east-2",
-			"csi.storage.k8s.io/provisioner-secret-name":       "${pvc.name}",
-			"csi.storage.k8s.io/provisioner-secret-namespace":  "${pvc.namespace}",
-			"csi.storage.k8s.io/node-publish-secret-name":      "${pvc.name}",
+			"csi.storage.k8s.io/node-publish-secret-name":      "${pvc.annotations['cos.csi.driver/secret']}",
 			"csi.storage.k8s.io/node-publish-secret-namespace": "${pvc.namespace}",
 		},
 	}
@@ -412,9 +410,7 @@ var (
 			"client":             "awss3",
 			"cosEndpoint":        "https://s3.us-east-2.amazonaws.com",
 			"locationConstraint": "us-east-2",
-			"csi.storage.k8s.io/provisioner-secret-name":       "${pvc.name}",
-			"csi.storage.k8s.io/provisioner-secret-namespace":  "${pvc.namespace}",
-			"csi.storage.k8s.io/node-publish-secret-name":      "${pvc.name}",
+			"csi.storage.k8s.io/node-publish-secret-name":      "${pvc.annotations['cos.csi.driver/secret']}",
 			"csi.storage.k8s.io/node-publish-secret-namespace": "${pvc.namespace}",
 		},
 	}
@@ -439,9 +435,7 @@ var (
 			"client":             "awss3",
 			"cosEndpoint":        "https://s3.us-east-2.amazonaws.com",
 			"locationConstraint": "us-east-2",
-			"csi.storage.k8s.io/provisioner-secret-name":       "${pvc.name}",
-			"csi.storage.k8s.io/provisioner-secret-namespace":  "${pvc.namespace}",
-			"csi.storage.k8s.io/node-publish-secret-name":      "${pvc.name}",
+			"csi.storage.k8s.io/node-publish-secret-name":      "${pvc.annotations['cos.csi.driver/secret']}",
 			"csi.storage.k8s.io/node-publish-secret-namespace": "${pvc.namespace}",
 		},
 	}
@@ -466,9 +460,7 @@ var (
 			"client":             "awss3",
 			"cosEndpoint":        "https://s3.us-east-2.amazonaws.com",
 			"locationConstraint": "us-east-2",
-			"csi.storage.k8s.io/provisioner-secret-name":       "${pvc.name}",
-			"csi.storage.k8s.io/provisioner-secret-namespace":  "${pvc.namespace}",
-			"csi.storage.k8s.io/node-publish-secret-name":      "${pvc.name}",
+			"csi.storage.k8s.io/node-publish-secret-name":      "${pvc.annotations['cos.csi.driver/secret']}",
 			"csi.storage.k8s.io/node-publish-secret-namespace": "${pvc.namespace}",
 		},
 	}

controllers/internal/crutils/static_resource_generator.go

@@ -258,9 +258,7 @@ func (c *IBMObjectCSI) GenerateS3fsSC(reclaimPolicy corev1.PersistentVolumeRecla
 			"client":             "awss3",
 			"cosEndpoint":        cosEndpoint,
 			"locationConstraint": locationConstraint,
-			"csi.storage.k8s.io/provisioner-secret-name":       "${pvc.name}",
-			"csi.storage.k8s.io/provisioner-secret-namespace":  "${pvc.namespace}",
-			"csi.storage.k8s.io/node-publish-secret-name":      "${pvc.name}",
+			"csi.storage.k8s.io/node-publish-secret-name":      "${pvc.annotations['cos.csi.driver/secret']}",
 			"csi.storage.k8s.io/node-publish-secret-namespace": "${pvc.namespace}",
 		},
 	}
@@ -308,9 +306,7 @@ func (c *IBMObjectCSI) GenerateRcloneSC(reclaimPolicy corev1.PersistentVolumeRec
 			"client":             "awss3",
 			"cosEndpoint":        cosEndpoint,
 			"locationConstraint": locationConstraint,
-			"csi.storage.k8s.io/provisioner-secret-name":       "${pvc.name}",
-			"csi.storage.k8s.io/provisioner-secret-namespace":  "${pvc.namespace}",
-			"csi.storage.k8s.io/node-publish-secret-name":      "${pvc.name}",
+			"csi.storage.k8s.io/node-publish-secret-name":      "${pvc.annotations['cos.csi.driver/secret']}",
 			"csi.storage.k8s.io/node-publish-secret-namespace": "${pvc.namespace}",
 		},
 	}