fixup! fix: read ephemeral-storage in code

Signed-off-by: Mateus Oliveira <[email protected]>
openshift · Aug 13, 2024 · 559a154 · 559a154
1 parent 2b44549
commit 559a154
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/controllers/nodeagent_test.go b/controllers/nodeagent_test.go
@@ -944,7 +944,7 @@ func TestDPAReconciler_buildNodeAgentDaemonset(t *testing.T) {
 			}),
 		},
 		{
-			name: "invalid DPA CR with aws plugin from CloudStorage, error is returned",
+			name: "valid DPA CR with aws plugin from CloudStorage, NodeAgent DaemonSet is built",
 			dpa: createTestDpaWith(
 				nil,
 				oadpv1alpha1.DataProtectionApplicationSpec{
@@ -990,8 +990,8 @@ func TestDPAReconciler_buildNodeAgentDaemonset(t *testing.T) {
 					},
 				},
 			},
-			nodeAgentDaemonSet: testNodeAgentDaemonSet.DeepCopy(),
-			errorMessage:       "spec.backupLocations.velero must be provided in DPA",
+			nodeAgentDaemonSet:     testNodeAgentDaemonSet.DeepCopy(),
+			wantNodeAgentDaemonSet: createTestBuiltNodeAgentDaemonSet(TestBuiltNodeAgentDaemonSetOptions{}),
 		},
 		{
 			name: "valid DPA CR with aws plugin and BSL, NodeAgent DaemonSet is built",

diff --git a/pkg/credentials/credentials.go b/pkg/credentials/credentials.go
@@ -179,6 +179,7 @@ func AppendCloudProviderVolumes(dpa *oadpv1alpha1.DataProtectionApplication, ds
 				dpa.Spec.UnsupportedOverrides[oadpv1alpha1.OperatorTypeKey] == oadpv1alpha1.OperatorTypeMTC) { // OADP is installed via MTC
 
 			pluginNeedsCheck, foundProviderPlugin := providerNeedsDefaultCreds[string(plugin)]
+			// duplication with controllers/validator.go
 			if !foundProviderPlugin && !hasCloudStorage {
 				pluginNeedsCheck = true
 			}
@@ -221,24 +222,24 @@ func AppendCloudProviderVolumes(dpa *oadpv1alpha1.DataProtectionApplication, ds
 		}
 	}
 	for _, bslSpec := range dpa.Spec.BackupLocations {
-		if bslSpec.Velero == nil {
-			return errors.New("spec.backupLocations.velero must be provided in DPA")
-		}
-		if _, ok := bslSpec.Velero.Config["credentialsFile"]; ok {
-			if secretName, err := GetSecretNameFromCredentialsFileConfigString(bslSpec.Velero.Config["credentialsFile"]); err == nil {
-				ds.Spec.Template.Spec.Volumes = append(
-					ds.Spec.Template.Spec.Volumes,
-					corev1.Volume{
-						Name: secretName,
-						VolumeSource: corev1.VolumeSource{
-							Secret: &corev1.SecretVolumeSource{
-								SecretName: secretName,
+		if bslSpec.Velero != nil {
+			if _, ok := bslSpec.Velero.Config["credentialsFile"]; ok {
+				if secretName, err := GetSecretNameFromCredentialsFileConfigString(bslSpec.Velero.Config["credentialsFile"]); err == nil {
+					ds.Spec.Template.Spec.Volumes = append(
+						ds.Spec.Template.Spec.Volumes,
+						corev1.Volume{
+							Name: secretName,
+							VolumeSource: corev1.VolumeSource{
+								Secret: &corev1.SecretVolumeSource{
+									SecretName: secretName,
+								},
 							},
 						},
-					},
-				)
+					)
+				}
 			}
 		}
+
 	}
 	return nil
 }