fix aws registry env vars (#515)

eemcmullan · web-flow · commit d01d9be8f05b · 2021-12-16T10:32:29.000-05:00
diff --git a/controllers/registry.go b/controllers/registry.go
@@ -444,13 +444,14 @@ func (r *DPAReconciler) getAWSRegistryEnvVars(bsl *velerov1.BackupStorageLocatio
 			awsEnvVars[i].Value = AWSSecretKey
 		}
 
-		if awsEnvVars[i].Name == RegistryStorageS3RegionendpointEnvVarKey && bsl.Spec.Config[S3URL] != "" {
+		if awsEnvVars[i].Name == RegistryStorageS3RegionendpointEnvVarKey {
 			awsEnvVars[i].Value = bsl.Spec.Config[S3URL]
 		}
 
-		if awsEnvVars[i].Name == RegistryStorageS3SkipverifyEnvVarKey && bsl.Spec.Config[InsecureSkipTLSVerify] != "" {
+		if awsEnvVars[i].Name == RegistryStorageS3SkipverifyEnvVarKey {
 			awsEnvVars[i].Value = bsl.Spec.Config[InsecureSkipTLSVerify]
 		}
+
 	}
 	return awsEnvVars, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -444,13 +444,14 @@ func (r DPAReconciler) getAWSRegistryEnvVars(bsl velerov1.BackupStorageLocatio`
`444`	`444`	`awsEnvVars[i].Value = AWSSecretKey`
`445`	`445`	`}`
`446`	`446`
`447`		`- if awsEnvVars[i].Name == RegistryStorageS3RegionendpointEnvVarKey && bsl.Spec.Config[S3URL] != "" {`
	`447`	`+ if awsEnvVars[i].Name == RegistryStorageS3RegionendpointEnvVarKey {`
`448`	`448`	`awsEnvVars[i].Value = bsl.Spec.Config[S3URL]`
`449`	`449`	`}`
`450`	`450`
`451`		`- if awsEnvVars[i].Name == RegistryStorageS3SkipverifyEnvVarKey && bsl.Spec.Config[InsecureSkipTLSVerify] != "" {`
	`451`	`+ if awsEnvVars[i].Name == RegistryStorageS3SkipverifyEnvVarKey {`
`452`	`452`	`awsEnvVars[i].Value = bsl.Spec.Config[InsecureSkipTLSVerify]`
`453`	`453`	`}`
	`454`	`+`
`454`	`455`	`}`
`455`	`456`	`return awsEnvVars, nil`
`456`	`457`	`}`