keep WALG_S3_PREFIX, take the rest from ConfigMap and Secret (#596)

Author: eberlep

controllers/postgres_controller.go

@@ -2106,53 +2106,25 @@ func (r *PostgresReconciler) createOrUpdateWalGExporterDeployment(log logr.Logge
 									},
 								},
 								{
-									Name: "AWS_ACCESS_KEY_ID",
-									ValueFrom: &corev1.EnvVarSource{
-										SecretKeyRef: &corev1.SecretKeySelector{
-											Key: "AWS_ACCESS_KEY_ID",
-											LocalObjectReference: corev1.LocalObjectReference{
-												Name: operatormanager.PodEnvSecretName,
-											},
-										},
-									},
-								},
-								{
-									Name: "AWS_SECRET_ACCESS_KEY",
-									ValueFrom: &corev1.EnvVarSource{
-										SecretKeyRef: &corev1.SecretKeySelector{
-											Key: "AWS_SECRET_ACCESS_KEY",
-											LocalObjectReference: corev1.LocalObjectReference{
-												Name: operatormanager.PodEnvSecretName,
-											},
-										},
-									},
+									Name:  "WALG_S3_PREFIX",
+									Value: "s3://" + b.S3BucketName + "/" + instance.ToPeripheralResourceName(),
 								},
+							},
+							EnvFrom: []corev1.EnvFromSource{
 								{
-									Name: "AWS_ENDPOINT",
-									ValueFrom: &corev1.EnvVarSource{
-										ConfigMapKeyRef: &corev1.ConfigMapKeySelector{
-											Key: "AWS_ENDPOINT",
-											LocalObjectReference: corev1.LocalObjectReference{
-												Name: operatormanager.PodEnvCMName,
-											},
+									ConfigMapRef: &corev1.ConfigMapEnvSource{
+										LocalObjectReference: corev1.LocalObjectReference{
+											Name: operatormanager.PodEnvCMName,
 										},
 									},
 								},
 								{
-									Name: "AWS_S3_FORCE_PATH_STYLE",
-									ValueFrom: &corev1.EnvVarSource{
-										ConfigMapKeyRef: &corev1.ConfigMapKeySelector{
-											Key: "AWS_S3_FORCE_PATH_STYLE",
-											LocalObjectReference: corev1.LocalObjectReference{
-												Name: operatormanager.PodEnvCMName,
-											},
+									SecretRef: &corev1.SecretEnvSource{
+										LocalObjectReference: corev1.LocalObjectReference{
+											Name: operatormanager.PodEnvSecretName,
 										},
 									},
 								},
-								{
-									Name:  "WALG_S3_PREFIX",
-									Value: "s3://" + b.S3BucketName + "/" + instance.ToPeripheralResourceName(),
-								},
 							},
 							Image: r.WalGExporterImage,
 							Name:  walGExporterName,