Merge pull request #63 from openshift-cherrypick-robot/cherry-pick-61…

…-to-release-4.15

Bug 2259664: [release-4.15] csi: use static name for cephfs/rbd

controllers/clusterversion_controller.go

@@ -278,15 +278,15 @@ func (c *ClusterVersionReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 	// Need to handle deletion of the csiDriver object, we cannot set
 	// ownerReference on it as its cluster scoped resource
 	cephfsCSIDriver := templates.CephFSCSIDriver.DeepCopy()
-	cephfsCSIDriver.ObjectMeta.Name = csi.GetCephFSDriverName(c.OperatorNamespace)
+	cephfsCSIDriver.ObjectMeta.Name = csi.GetCephFSDriverName()
 	err = csi.CreateCSIDriver(c.ctx, c.Client, cephfsCSIDriver)
 	if err != nil {
 		c.log.Error(err, "unable to create cephfs CSIDriver")
 		return ctrl.Result{}, err
 	}
 
 	rbdCSIDriver := templates.RbdCSIDriver.DeepCopy()
-	rbdCSIDriver.ObjectMeta.Name = csi.GetRBDDriverName(c.OperatorNamespace)
+	rbdCSIDriver.ObjectMeta.Name = csi.GetRBDDriverName()
 	err = csi.CreateCSIDriver(c.ctx, c.Client, rbdCSIDriver)
 	if err != nil {
 		c.log.Error(err, "unable to create rbd CSIDriver")

controllers/storageclassclaim_controller.go

@@ -461,7 +461,7 @@ func (r *StorageClassClaimReconciler) getCephFSStorageClass(data map[string]stri
 		},
 		ReclaimPolicy:        &pvReclaimPolicy,
 		AllowVolumeExpansion: &allowVolumeExpansion,
-		Provisioner:          fmt.Sprintf("%s.cephfs.csi.ceph.com", r.OperatorNamespace),
+		Provisioner:          csi.GetCephFSDriverName(),
 		Parameters:           data,
 	}
 	return storageClass
@@ -479,7 +479,7 @@ func (r *StorageClassClaimReconciler) getCephRBDStorageClass(data map[string]str
 		},
 		ReclaimPolicy:        &pvReclaimPolicy,
 		AllowVolumeExpansion: &allowVolumeExpansion,
-		Provisioner:          fmt.Sprintf("%s.rbd.csi.ceph.com", r.OperatorNamespace),
+		Provisioner:          csi.GetRBDDriverName(),
 		Parameters:           data,
 	}
 	return storageClass
@@ -490,7 +490,7 @@ func (r *StorageClassClaimReconciler) getCephFSVolumeSnapshotClass(data map[stri
 		ObjectMeta: metav1.ObjectMeta{
 			Name: r.storageClassClaim.Name,
 		},
-		Driver:         fmt.Sprintf("%s.cephfs.csi.ceph.com", r.OperatorNamespace),
+		Driver:         csi.GetCephFSDriverName(),
 		DeletionPolicy: snapapi.VolumeSnapshotContentDelete,
 		Parameters:     data,
 	}
@@ -502,7 +502,7 @@ func (r *StorageClassClaimReconciler) getCephRBDVolumeSnapshotClass(data map[str
 		ObjectMeta: metav1.ObjectMeta{
 			Name: r.storageClassClaim.Name,
 		},
-		Driver:         fmt.Sprintf("%s.rbd.csi.ceph.com", r.OperatorNamespace),
+		Driver:         csi.GetRBDDriverName(),
 		DeletionPolicy: snapapi.VolumeSnapshotContentDelete,
 		Parameters:     data,
 	}

pkg/csi/cephfsdaemonset.go

@@ -49,7 +49,7 @@ func GetCephFSDaemonSet(namespace string) *appsv1.DaemonSet {
 		driverRegistrar.Args,
 		fmt.Sprintf("--kubelet-registration-path=%s/plugins/%s/csi.sock",
 			templates.DefaultKubeletDirPath,
-			GetCephFSDriverName(namespace)),
+			GetCephFSDriverName()),
 	)
 	return &appsv1.DaemonSet{
 		ObjectMeta: metav1.ObjectMeta{
@@ -93,7 +93,7 @@ func GetCephFSDaemonSet(namespace string) *appsv1.DaemonSet {
 								"--pidlimit=-1",
 								"--type=cephfs",
 								"--nodeserver=true",
-								fmt.Sprintf("--drivername=%s", GetCephFSDriverName(namespace)),
+								fmt.Sprintf("--drivername=%s", GetCephFSDriverName()),
 							},
 							Resources: templates.CephFSPluginResourceRequirements,
 							Env: []corev1.EnvVar{
@@ -230,7 +230,7 @@ func GetCephFSDaemonSet(namespace string) *appsv1.DaemonSet {
 							Name: "plugin-dir",
 							VolumeSource: corev1.VolumeSource{
 								HostPath: &corev1.HostPathVolumeSource{
-									Path: fmt.Sprintf("%s/plugins/%s", templates.DefaultKubeletDirPath, GetCephFSDriverName(namespace)),
+									Path: fmt.Sprintf("%s/plugins/%s", templates.DefaultKubeletDirPath, GetCephFSDriverName()),
 									Type: &hostPathDirectoryorCreate,
 								},
 							},

pkg/csi/cephfsdeployment.go

@@ -96,7 +96,7 @@ func GetCephFSDeployment(namespace string) *appsv1.Deployment {
 								"--pidlimit=-1",
 								"--type=cephfs",
 								"--controllerserver=true",
-								fmt.Sprintf("--drivername=%s", GetCephFSDriverName(namespace)),
+								fmt.Sprintf("--drivername=%s", GetCephFSDriverName()),
 							},
 							Resources: templates.CephFSPluginResourceRequirements,
 							Env: []corev1.EnvVar{

pkg/csi/csi.go

@@ -75,11 +75,11 @@ func InitializeSidecars(ver string) error {
 }
 
 // GetCephFSDriverName returns the cephfs driver name
-func GetCephFSDriverName(namespace string) string {
-	return fmt.Sprintf("%s.cephfs.csi.ceph.com", namespace)
+func GetCephFSDriverName() string {
+	return "openshift-storage.cephfs.csi.ceph.com"
 }
 
 // GetRBDDriverName returns the rbd driver name
-func GetRBDDriverName(namespace string) string {
-	return fmt.Sprintf("%s.rbd.csi.ceph.com", namespace)
+func GetRBDDriverName() string {
+	return "openshift-storage.rbd.csi.ceph.com"
 }

pkg/csi/rbddaemonset.go

@@ -61,7 +61,7 @@ func GetRBDDaemonSet(namespace string) *appsv1.DaemonSet {
 		driverRegistrar.Args,
 		fmt.Sprintf("--kubelet-registration-path=%s/plugins/%s/csi.sock",
 			templates.DefaultKubeletDirPath,
-			GetRBDDriverName(namespace)),
+			GetRBDDriverName()),
 	)
 	return &appsv1.DaemonSet{
 		ObjectMeta: metav1.ObjectMeta{
@@ -106,7 +106,7 @@ func GetRBDDaemonSet(namespace string) *appsv1.DaemonSet {
 								"--pidlimit=-1",
 								"--type=rbd",
 								"--nodeserver=true",
-								fmt.Sprintf("--drivername=%s", GetRBDDriverName(namespace)),
+								fmt.Sprintf("--drivername=%s", GetRBDDriverName()),
 								fmt.Sprintf("--stagingpath=%s/plugins/kubernetes.io/csi/", templates.DefaultKubeletDirPath),
 								"--csi-addons-endpoint=$(CSIADDONS_ENDPOINT)",
 							},
@@ -327,7 +327,7 @@ func GetRBDDaemonSet(namespace string) *appsv1.DaemonSet {
 							Name: "plugin-dir",
 							VolumeSource: corev1.VolumeSource{
 								HostPath: &corev1.HostPathVolumeSource{
-									Path: fmt.Sprintf("%s/plugins/%s", templates.DefaultKubeletDirPath, GetRBDDriverName(namespace)),
+									Path: fmt.Sprintf("%s/plugins/%s", templates.DefaultKubeletDirPath, GetRBDDriverName()),
 									Type: &hostPathDirectoryorCreate,
 								},
 							},

pkg/csi/rbddeployment.go

@@ -95,7 +95,7 @@ func GetRBDDeployment(namespace string) *appsv1.Deployment {
 								"--pidlimit=-1",
 								"--type=rbd",
 								"--controllerserver=true",
-								fmt.Sprintf("--drivername=%s", GetRBDDriverName(namespace)),
+								fmt.Sprintf("--drivername=%s", GetRBDDriverName()),
 							},
 							Resources: templates.RBDPluginResourceRequirements,
 							Env: []corev1.EnvVar{