K8SPSMDB-297 remove PSMDBCluster from PerconaServerMongoDBBackupSpec (#1941)

* K8SPSMDB-297 remove PSMDBCluster from PerconaServerMongoDBBackupSpec

* run generate manifest

* fix e2e tests that used psmdb cluster name

Author: gkech

config/crd/bases/psmdb.percona.com_perconaservermongodbbackups.yaml

@@ -67,8 +67,6 @@ spec:
                 type: integer
               compressionType:
                 type: string
-              psmdbCluster:
-                type: string
               storageName:
                 type: string
               type:

deploy/bundle.yaml

@@ -71,8 +71,6 @@ spec:
                 type: integer
               compressionType:
                 type: string
-              psmdbCluster:
-                type: string
               storageName:
                 type: string
               type:

deploy/crd.yaml

@@ -71,8 +71,6 @@ spec:
                 type: integer
               compressionType:
                 type: string
-              psmdbCluster:
-                type: string
               storageName:
                 type: string
               type:

deploy/cw-bundle.yaml

@@ -71,8 +71,6 @@ spec:
                 type: integer
               compressionType:
                 type: string
-              psmdbCluster:
-                type: string
               storageName:
                 type: string
               type:

e2e-tests/custom-replset-name/conf/backup-minio.yml

@@ -3,5 +3,5 @@ kind: PerconaServerMongoDBBackup
 metadata:
   name: backup-minio
 spec:
-  psmdbCluster: some-name
+  clusterName: some-name
   storageName: minio

e2e-tests/upgrade-sharded/conf/backup-minio.yml

@@ -4,5 +4,4 @@ metadata:
   name: backup-minio
 spec:
   clusterName: upgrade-sharded
-  psmdbCluster: upgrade-sharded # TODO: remove after 1.12 release
   storageName: minio

e2e-tests/upgrade/conf/backup-minio.yml

@@ -4,5 +4,4 @@ metadata:
   name: backup-minio
 spec:
   clusterName: upgrade
-  psmdbCluster: upgrade # TODO: remove after 1.12 release
   storageName: minio

e2e-tests/version-service/conf/crd.yaml

@@ -71,8 +71,6 @@ spec:
                 type: integer
               compressionType:
                 type: string
-              psmdbCluster:
-                type: string
               storageName:
                 type: string
               type:

pkg/apis/psmdb/v1/perconaservermongodbbackup_types.go

@@ -11,8 +11,6 @@ import (
 
 // PerconaServerMongoDBBackupSpec defines the desired state of PerconaServerMongoDBBackup
 type PerconaServerMongoDBBackupSpec struct {
-	// Deprecated: Use ClusterName instead
-	PSMDBCluster     string                   `json:"psmdbCluster,omitempty"` // TODO: Remove after v1.15
 	ClusterName      string                   `json:"clusterName,omitempty"`
 	StorageName      string                   `json:"storageName,omitempty"`
 	Compression      compress.CompressionType `json:"compressionType,omitempty"`
@@ -94,7 +92,7 @@ func (p *PerconaServerMongoDBBackup) CheckFields() error {
 		return fmt.Errorf("spec storageName field is empty")
 	}
 	if len(p.Spec.GetClusterName()) == 0 {
-		return fmt.Errorf("spec clusterName and deprecated psmdbCluster fields are empty")
+		return fmt.Errorf("spec clusterName is empty")
 	}
 	if string(p.Spec.Type) == "" {
 		p.Spec.Type = defs.LogicalBackup
@@ -120,11 +118,7 @@ func (p *PerconaServerMongoDBBackup) IsBackupTypeIncrementalBase() bool {
 	return p.Spec.Type == BackupTypeIncrementalBase
 }
 
-// GetClusterName returns ClusterName if it's not empty. Otherwise, it will return PSMDBCluster.
-// TODO: Remove after v1.15
+// GetClusterName returns ClusterName.
 func (p *PerconaServerMongoDBBackupSpec) GetClusterName() string {
-	if len(p.ClusterName) > 0 {
-		return p.ClusterName
-	}
-	return p.PSMDBCluster
+	return p.ClusterName
 }