From abcef766264e07df14bfca324500c47891359621 Mon Sep 17 00:00:00 2001 From: Deepak Raj D S Date: Thu, 10 Feb 2022 01:25:11 -0500 Subject: [PATCH] Fix helpers --- tests/e2e/dpa_helpers.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/e2e/dpa_helpers.go b/tests/e2e/dpa_helpers.go index 50c9e86834..71a1bf1d86 100755 --- a/tests/e2e/dpa_helpers.go +++ b/tests/e2e/dpa_helpers.go @@ -99,19 +99,19 @@ func (v *dpaCustomResource) Build(backupRestoreType BackupRestoreType) error { switch v.Provider { case "gcp": if v.OpenshiftCi { - dpa.Spec.BackupLocations[0].Velero.Config = map[string]string{ + dpaInstance.Spec.BackupLocations[0].Velero.Config = map[string]string{ "credentialsFile": "bsl-cloud-credentials-gcp/cloud", // / } } else { - dpa.Spec.BackupLocations[0].Velero.Credential = &corev1.SecretKeySelector{ + dpaInstance.Spec.BackupLocations[0].Velero.Credential = &corev1.SecretKeySelector{ LocalObjectReference: corev1.LocalObjectReference{ Name: v.CredSecretRef, }, Key: "cloud", } } - // dpa.Spec.Configuration.Velero.DefaultPlugins = append(dpa.Spec.Configuration.Velero.DefaultPlugins, oadpv1alpha1.DefaultPluginGCP) - // dpa.Spec.SnapshotLocations = []oadpv1alpha1.SnapshotLocation{ + // dpaInstance.Spec.Configuration.Velero.DefaultPlugins = append(dpaInstance.Spec.Configuration.Velero.DefaultPlugins, oadpv1alpha1.DefaultPluginGCP) + // dpaInstance.Spec.SnapshotLocations = []oadpv1alpha1.SnapshotLocation{ // { // Velero: &velero.VolumeSnapshotLocationSpec{ // Provider: v.Provider, @@ -122,24 +122,24 @@ func (v *dpaCustomResource) Build(backupRestoreType BackupRestoreType) error { // }, // } case "azure": - dpa.Spec.BackupLocations[0].Velero.Config = map[string]string{ + dpaInstance.Spec.BackupLocations[0].Velero.Config = map[string]string{ "subscriptionId": v.DpaAzureConfig.BslSubscriptionId, "storageAccount": v.DpaAzureConfig.BslStorageAccount, "resourceGroup": v.DpaAzureConfig.BslResourceGroup, "storageAccountKeyEnvVar": v.DpaAzureConfig.BslStorageAccountKeyEnvVar, } if v.OpenshiftCi { - dpa.Spec.BackupLocations[0].Velero.Config["credentialsFile"] = "bsl-cloud-credentials-azure/cloud" // / + dpaInstance.Spec.BackupLocations[0].Velero.Config["credentialsFile"] = "bsl-cloud-credentials-azure/cloud" // / } else { - dpa.Spec.BackupLocations[0].Velero.Credential = &corev1.SecretKeySelector{ + dpaInstance.Spec.BackupLocations[0].Velero.Credential = &corev1.SecretKeySelector{ LocalObjectReference: corev1.LocalObjectReference{ Name: v.CredSecretRef, }, Key: "cloud", } } - dpa.Spec.Configuration.Velero.DefaultPlugins = append(dpa.Spec.Configuration.Velero.DefaultPlugins, oadpv1alpha1.DefaultPluginMicrosoftAzure) - dpa.Spec.SnapshotLocations = []oadpv1alpha1.SnapshotLocation{ + dpaInstance.Spec.Configuration.Velero.DefaultPlugins = append(dpaInstance.Spec.Configuration.Velero.DefaultPlugins, oadpv1alpha1.DefaultPluginMicrosoftAzure) + dpaInstance.Spec.SnapshotLocations = []oadpv1alpha1.SnapshotLocation{ { Velero: &velero.VolumeSnapshotLocationSpec{ Provider: v.Provider,