Merge pull request #37 from philbrookes/INTLY-1180

specify namespace for component secret
integr8ly · Mar 11, 2019 · 0079148 · 0079148
2 parents ad2d5dc + 4384952
commit 0079148
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 28 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,6 @@
 ORG=integreatly
 NAMESPACE=rhsso
+CONSUMER_NAMESPACES=${NAMESPACE}
 PROJECT=keycloak-operator
 REG=quay.io
 SHELL=/bin/bash
@@ -22,6 +23,7 @@ setup/travis:
 
 .PHONY: code/run
 code/run:
+	export CONSUMER_NAMESPACES=${CONSUMER_NAMESPACES}
 	@operator-sdk up local --namespace=${NAMESPACE} --operator-flags="--resync=10"
 
 .PHONY: code/compile

diff --git a/deploy/examples/keycloak_backed_up.json b/deploy/examples/keycloak_backed_up.json
@@ -10,10 +10,10 @@
     "backups": [
       {
         "name": "daily-at-midnight",
-        "schedule": "* 0 * * *",
+        "schedule": "0 0 * * *",
         "encryption_key_secret_name": "example-encryption-key",
         "aws_credentials_secret_name": "example-aws-key",
-        "image": "quay.io/philbrookes/backup-container-image",
+        "image": "quay.io/integreatly/backup-container",
         "image_tag": "latest"
       }
     ]

diff --git a/pkg/keycloak/phaseHandler.go b/pkg/keycloak/phaseHandler.go
@@ -227,25 +227,28 @@ func (ph *phaseHandler) reconcileBackup(sso *v1alpha1.Keycloak, backup v1alpha1.
 				Spec: batchv1.JobSpec{
 					Template: v1.PodTemplateSpec{
 						Spec: v1.PodSpec{
+							ServiceAccountName: "backupjob",
 							Containers: []v1.Container{
 								{
 									Name:    backup.Name + "-keycloak-backup",
 									Image:   backup.Image + ":" + backup.ImageTag,
-									Command: []string{"/opt/intly/tools/entrypoint.sh", "-c", "postgres", "-b", "s3", "-e", "gpg"},
-									EnvFrom: []v1.EnvFromSource{
+									Command: []string{"/opt/intly/tools/entrypoint.sh", "-c", "postgres", "-n", namespace, "-b", "s3", "-e", "gpg"},
+									Env: []v1.EnvVar{
 										{
-											SecretRef: &v1.SecretEnvSource{
-												LocalObjectReference: v1.LocalObjectReference{
-													Name: backup.AwsCredentialsSecretName,
-												},
-											},
+											Name:  "BACKEND_SECRET_NAME",
+											Value: backup.AwsCredentialsSecretName,
 										},
 										{
-											SecretRef: &v1.SecretEnvSource{
-												LocalObjectReference: v1.LocalObjectReference{
-													Name: "db-credentials-" + sso.Name,
-												},
-											},
+											Name:  "ENCRYPTION_SECRET_NAME",
+											Value: backup.EncryptionKeySecretName,
+										},
+										{
+											Name:  "COMPONENT_SECRET_NAME",
+											Value: "db-credentials-" + sso.Name,
+										},
+										{
+											Name:  "PRODUCT_NAME",
+											Value: "rhsso",
 										},
 									},
 								},
@@ -257,21 +260,7 @@ func (ph *phaseHandler) reconcileBackup(sso *v1alpha1.Keycloak, backup v1alpha1.
 			},
 		},
 	}
-	/*
 
-	 */
-	if backup.EncryptionKeySecretName != "" {
-		cron.Spec.JobTemplate.Spec.Template.Spec.Containers[0].EnvFrom = append(
-			cron.Spec.JobTemplate.Spec.Template.Spec.Containers[0].EnvFrom,
-			v1.EnvFromSource{
-				SecretRef: &v1.SecretEnvSource{
-					LocalObjectReference: v1.LocalObjectReference{
-						Name: backup.EncryptionKeySecretName,
-					},
-				},
-			},
-		)
-	}
 	_, err := ph.k8sClient.BatchV1beta1().CronJobs(namespace).Create(cron)
 	if err != nil && !errors2.IsAlreadyExists(err) {
 		return errors.Wrapf(err, "error creating cronjob %s/%s", cron.Namespace, cron.Name)