Take backup credentails from operated secret

Author: AMecea

pkg/controller/mysqlbackup/internal/syncer/job.go

@@ -135,24 +135,24 @@ func (s *jobSyncer) ensurePodSpec(in core.PodSpec) core.PodSpec {
 
 	boolTrue := true
 	in.Containers[0].Env = []core.EnvVar{
-		core.EnvVar{
-			Name: "MYSQL_BACKUP_USER",
+		{
+			Name: "BACKUP_USER",
 			ValueFrom: &core.EnvVarSource{
 				SecretKeyRef: &core.SecretKeySelector{
 					LocalObjectReference: core.LocalObjectReference{
-						Name: s.cluster.Spec.SecretName,
+						Name: s.cluster.GetNameForResource(mysqlcluster.Secret),
 					},
 					Key:      "BACKUP_USER",
 					Optional: &boolTrue,
 				},
 			},
 		},
-		core.EnvVar{
-			Name: "MYSQL_BACKUP_PASSWORD",
+		{
+			Name: "BACKUP_PASSWORD",
 			ValueFrom: &core.EnvVarSource{
 				SecretKeyRef: &core.SecretKeySelector{
 					LocalObjectReference: core.LocalObjectReference{
-						Name: s.cluster.Spec.SecretName,
+						Name: s.cluster.GetNameForResource(mysqlcluster.Secret),
 					},
 					Key:      "BACKUP_PASSWORD",
 					Optional: &boolTrue,

test/e2e/framework/backup_util.go

@@ -18,6 +18,7 @@ package framework
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"os"
 
@@ -46,13 +47,18 @@ func (f *Framework) NewGCSBackupSecret() *corev1.Secret {
 		Logf("GOOGLE_CREDENTIALS is not set! Backups tests will not work")
 	}
 
+	jk := make(map[string]string)
+	if err := json.Unmarshal([]byte(json_key), &jk); err != nil {
+		panic("Failed to unmarshal GOOGLE_CREDENTIALS env value")
+	}
 	return &corev1.Secret{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      fmt.Sprintf("backup-secret-%s", f.BaseName),
 			Namespace: f.Namespace.Name,
 		},
 		StringData: map[string]string{
 			"GCS_SERVICE_ACCOUNT_JSON_KEY": json_key,
+			"GCS_PROJECT_ID":               jk["project_id"],
 		},
 	}
 }
@@ -83,7 +89,7 @@ func (f *Framework) RefreshBackupFn(backup *api.MysqlBackup) func() *api.MysqlBa
 	}
 }
 
-// BackupCompleted a matcher to check cluster complition
+// BackupCompleted a matcher to check cluster completion
 func BackupCompleted() gomegatypes.GomegaMatcher {
 	return PointTo(MatchFields(IgnoreExtras, Fields{
 		"Status": MatchFields(IgnoreExtras, Fields{