Merge pull request #64 from cybozu-go/envfrom

use Env instead of EnvFrom for export data upload Job
cybozu-go · Nov 15, 2024 · a83bcdc · a83bcdc
2 parents a6f15d6 + 3b135c3
commit a83bcdc
Showing 1 changed file with 18 additions and 5 deletions.
diff --git a/internal/controller/mantlebackup_controller.go b/internal/controller/mantlebackup_controller.go
@@ -1287,12 +1287,25 @@ func (r *MantleBackupReconciler) createOrUpdateExportDataUploadJob(ctx context.C
 						Name:  "OBJECT_STORAGE_ENDPOINT",
 						Value: r.objectStorageSettings.Endpoint,
 					},
-				},
-				EnvFrom: []corev1.EnvFromSource{
 					{
-						SecretRef: &corev1.SecretEnvSource{
-							LocalObjectReference: corev1.LocalObjectReference{
-								Name: r.envSecret,
+						Name: "AWS_ACCESS_KEY_ID",
+						ValueFrom: &corev1.EnvVarSource{
+							SecretKeyRef: &corev1.SecretKeySelector{
+								LocalObjectReference: corev1.LocalObjectReference{
+									Name: r.envSecret,
+								},
+								Key: "AWS_ACCESS_KEY_ID",
+							},
+						},
+					},
+					{
+						Name: "AWS_SECRET_ACCESS_KEY",
+						ValueFrom: &corev1.EnvVarSource{
+							SecretKeyRef: &corev1.SecretKeySelector{
+								LocalObjectReference: corev1.LocalObjectReference{
+									Name: r.envSecret,
+								},
+								Key: "AWS_SECRET_ACCESS_KEY",
 							},
 						},
 					},