K8SPSMDB-1053: add cluster prefix to pbm-config secret (#1503)

Author: pooknull

e2e-tests/demand-backup-physical-sharded/compare/statefulset_some-name-rs0_restore_sharded-oc.yml

@@ -237,7 +237,7 @@ spec:
         - name: pbm-config
           secret:
             defaultMode: 420
-            secretName: pbm-config
+            secretName: some-name-pbm-config
   updateStrategy:
     rollingUpdate:
       partition: 0

e2e-tests/demand-backup-physical-sharded/compare/statefulset_some-name-rs0_restore_sharded.yml

@@ -239,7 +239,7 @@ spec:
         - name: pbm-config
           secret:
             defaultMode: 420
-            secretName: pbm-config
+            secretName: some-name-pbm-config
   updateStrategy:
     rollingUpdate:
       partition: 0

e2e-tests/demand-backup-physical/compare/statefulset_some-name-rs0_restore-arbiter-nv-oc.yml

@@ -236,7 +236,7 @@ spec:
         - name: pbm-config
           secret:
             defaultMode: 420
-            secretName: pbm-config
+            secretName: some-name-pbm-config
   updateStrategy:
     rollingUpdate:
       partition: 0

e2e-tests/demand-backup-physical/compare/statefulset_some-name-rs0_restore-arbiter-nv.yml

@@ -238,7 +238,7 @@ spec:
         - name: pbm-config
           secret:
             defaultMode: 420
-            secretName: pbm-config
+            secretName: some-name-pbm-config
   updateStrategy:
     rollingUpdate:
       partition: 0

e2e-tests/demand-backup-physical/compare/statefulset_some-name-rs0_restore-oc.yml

@@ -236,7 +236,7 @@ spec:
         - name: pbm-config
           secret:
             defaultMode: 420
-            secretName: pbm-config
+            secretName: some-name-pbm-config
   updateStrategy:
     rollingUpdate:
       partition: 0

e2e-tests/demand-backup-physical/compare/statefulset_some-name-rs0_restore.yml

@@ -238,7 +238,7 @@ spec:
         - name: pbm-config
           secret:
             defaultMode: 420
-            secretName: pbm-config
+            secretName: some-name-pbm-config
   updateStrategy:
     rollingUpdate:
       partition: 0

pkg/controller/perconaservermongodbrestore/physical.go

@@ -61,7 +61,7 @@ func (r *ReconcilePerconaServerMongoDBRestore) reconcilePhysicalRestore(ctx cont
 	if cr.Status.State == psmdbv1.RestoreStateNew {
 		pbmConf := corev1.Secret{
 			ObjectMeta: metav1.ObjectMeta{
-				Name:      "pbm-config",
+				Name:      r.pbmConfigName(cluster),
 				Namespace: cluster.Namespace,
 			},
 		}
@@ -464,7 +464,7 @@ func (r *ReconcilePerconaServerMongoDBRestore) updateStatefulSetForPhysicalResto
 		Name: "pbm-config",
 		VolumeSource: corev1.VolumeSource{
 			Secret: &corev1.SecretVolumeSource{
-				SecretName: "pbm-config",
+				SecretName: r.pbmConfigName(cluster),
 			},
 		},
 	})
@@ -743,7 +743,7 @@ func (r *ReconcilePerconaServerMongoDBRestore) createPBMConfigSecret(ctx context
 	log := logf.FromContext(ctx)
 
 	secret := corev1.Secret{}
-	err := r.client.Get(ctx, types.NamespacedName{Name: "pbm-config", Namespace: cluster.Namespace}, &secret)
+	err := r.client.Get(ctx, types.NamespacedName{Name: r.pbmConfigName(cluster), Namespace: cluster.Namespace}, &secret)
 	if err == nil {
 		return nil
 	} else if !k8serrors.IsNotFound(err) {
@@ -771,7 +771,7 @@ func (r *ReconcilePerconaServerMongoDBRestore) createPBMConfigSecret(ctx context
 
 	secret = corev1.Secret{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      "pbm-config",
+			Name:      r.pbmConfigName(cluster),
 			Namespace: cluster.Namespace,
 		},
 		Data: map[string][]byte{
@@ -908,3 +908,10 @@ func (r *ReconcilePerconaServerMongoDBRestore) disablePITR(ctx context.Context,
 
 	return nil
 }
+
+func (r *ReconcilePerconaServerMongoDBRestore) pbmConfigName(cluster *psmdbv1.PerconaServerMongoDB) string {
+	if cluster.CompareVersion("1.16.0") < 0 {
+		return "pbm-config"
+	}
+	return cluster.Name + "-pbm-config"
+}