OADP-534 Ensure we are using custom secret names for GCP registry (#708)

dymurray · web-flow · commit 71ad6212a0a4 · 2022-05-25T12:04:26.000-04:00
diff --git a/controllers/registry.go b/controllers/registry.go
@@ -299,13 +299,13 @@ func (r *DPAReconciler) buildRegistryDeployment(registryDeployment *appsv1.Deplo
 			)
 		}
 	} else if bsl.Spec.Provider == GCPProvider {
-		cloudProviderMap := credentials.PluginSpecificFields[oadpv1alpha1.DefaultPluginGCP]
+		secretName, _ := r.getSecretNameAndKey(&bsl.Spec, oadpv1alpha1.DefaultPluginGCP)
 		registryDeployment.Spec.Template.Spec.Volumes = []corev1.Volume{
 			{
-				Name: cloudProviderMap.SecretName,
+				Name: secretName,
 				VolumeSource: corev1.VolumeSource{
 					Secret: &corev1.SecretVolumeSource{
-						SecretName: cloudProviderMap.SecretName,
+						SecretName: secretName,
 					},
 				},
 			},

Original file line number	Diff line number	Diff line change
`@@ -299,13 +299,13 @@ func (r DPAReconciler) buildRegistryDeployment(registryDeployment appsv1.Deplo`
`299`	`299`	`)`
`300`	`300`	`}`
`301`	`301`	`} else if bsl.Spec.Provider == GCPProvider {`
`302`		`- cloudProviderMap := credentials.PluginSpecificFields[oadpv1alpha1.DefaultPluginGCP]`
	`302`	`+ secretName, _ := r.getSecretNameAndKey(&bsl.Spec, oadpv1alpha1.DefaultPluginGCP)`
`303`	`303`	`registryDeployment.Spec.Template.Spec.Volumes = []corev1.Volume{`
`304`	`304`	`{`
`305`		`- Name: cloudProviderMap.SecretName,`
	`305`	`+ Name: secretName,`
`306`	`306`	`VolumeSource: corev1.VolumeSource{`
`307`	`307`	`Secret: &corev1.SecretVolumeSource{`
`308`		`- SecretName: cloudProviderMap.SecretName,`
	`308`	`+ SecretName: secretName,`
`309`	`309`	`},`
`310`	`310`	`},`
`311`	`311`	`},`