OADP-1927: Fix VSL secret validation (#1018)

Signed-off-by: Prasad Joshi <prajoshi@redhat.com>
openshift · May 18, 2023 · 410c2cc · 410c2cc
1 parent a62abe2
commit 410c2cc
Showing 1 changed file with 36 additions and 12 deletions.
diff --git a/controllers/vsl.go b/controllers/vsl.go
@@ -57,22 +57,46 @@ func (r *DPAReconciler) LabelVSLSecrets(log logr.Logger) (bool, error) {
 		provider := strings.TrimPrefix(vsl.Velero.Provider, veleroIOPrefix)
 		switch provider {
 		case "aws":
-			secretName := credentials.PluginSpecificFields[oadpv1alpha1.DefaultPluginAWS].SecretName
-			_, err := r.UpdateCredentialsSecretLabels(secretName, dpa.Namespace, dpa.Name)
-			if err != nil {
-				return false, err
+			if vsl.Velero.Credential != nil {
+				secretName := vsl.Velero.Credential.Name
+				_, err := r.UpdateCredentialsSecretLabels(secretName, dpa.Namespace, dpa.Name)
+				if err != nil {
+					return false, err
+				}
+			} else {
+				secretName := credentials.PluginSpecificFields[oadpv1alpha1.DefaultPluginAWS].SecretName
+				_, err := r.UpdateCredentialsSecretLabels(secretName, dpa.Namespace, dpa.Name)
+				if err != nil {
+					return false, err
+				}
 			}
 		case "gcp":
-			secretName := credentials.PluginSpecificFields[oadpv1alpha1.DefaultPluginGCP].SecretName
-			_, err := r.UpdateCredentialsSecretLabels(secretName, dpa.Namespace, dpa.Name)
-			if err != nil {
-				return false, err
+			if vsl.Velero.Credential != nil {
+				secretName := vsl.Velero.Credential.Name
+				_, err := r.UpdateCredentialsSecretLabels(secretName, dpa.Namespace, dpa.Name)
+				if err != nil {
+					return false, err
+				}
+			} else {
+				secretName := credentials.PluginSpecificFields[oadpv1alpha1.DefaultPluginGCP].SecretName
+				_, err := r.UpdateCredentialsSecretLabels(secretName, dpa.Namespace, dpa.Name)
+				if err != nil {
+					return false, err
+				}
 			}
 		case "azure":
-			secretName := credentials.PluginSpecificFields[oadpv1alpha1.DefaultPluginMicrosoftAzure].SecretName
-			_, err := r.UpdateCredentialsSecretLabels(secretName, dpa.Namespace, dpa.Name)
-			if err != nil {
-				return false, err
+			if vsl.Velero.Credential != nil {
+				secretName := vsl.Velero.Credential.Name
+				_, err := r.UpdateCredentialsSecretLabels(secretName, dpa.Namespace, dpa.Name)
+				if err != nil {
+					return false, err
+				}
+			} else {
+				secretName := credentials.PluginSpecificFields[oadpv1alpha1.DefaultPluginMicrosoftAzure].SecretName
+				_, err := r.UpdateCredentialsSecretLabels(secretName, dpa.Namespace, dpa.Name)
+				if err != nil {
+					return false, err
+				}
 			}
 		}