fix: reconcile admin secret

keycloak · Oct 2, 2019 · 43d7fc1 · 43d7fc1
1 parent 10e7431
commit 43d7fc1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/pkg/controller/keycloak/keycloak_reconciler.go b/pkg/controller/keycloak/keycloak_reconciler.go
@@ -66,7 +66,7 @@ func (i *KeycloakReconciler) GetKeycloakAdminSecretDesiredState(clusterState *co
 		}
 	}
 	return common.GenericUpdateAction{
-		Ref: keycloakAdminSecret,
+		Ref: model.KeycloakAdminSecretReconciled(cr, clusterState.KeycloakAdminSecret),
 		Msg: "Update Keycloak admin secret",
 	}
 }

diff --git a/pkg/model/keycloak_admin_secret.go b/pkg/model/keycloak_admin_secret.go
@@ -18,8 +18,8 @@ func KeycloakAdminSecret(cr *v1alpha1.Keycloak) *v1.Secret {
 			},
 		},
 		Data: map[string][]byte{
-			"ADMIN_USERNAME": []byte("admin"),
-			"ADMIN_PASSWORD": []byte(randStringRunes(10)),
+			AdminUsernameProperty: []byte("admin"),
+			AdminPasswordProperty: []byte(randStringRunes(10)),
 		},
 		Type: "Opaque",
 	}
@@ -31,3 +31,15 @@ func KeycloakAdminSecretSelector(cr *v1alpha1.Keycloak) client.ObjectKey {
 		Namespace: cr.Namespace,
 	}
 }
+
+func KeycloakAdminSecretReconciled(cr *v1alpha1.Keycloak, currentState *v1.Secret) *v1.Secret {
+	reconciled := currentState.DeepCopy()
+	// K8s automatically converts StringData to Data when getting the resource
+	if _, ok := reconciled.Data[AdminUsernameProperty]; !ok {
+		reconciled.Data[AdminUsernameProperty] = []byte("admin")
+	}
+	if _, ok := reconciled.Data[AdminPasswordProperty]; !ok {
+		reconciled.Data[AdminPasswordProperty] = []byte(randStringRunes(10))
+	}
+	return reconciled
+}