From 7bab3932552c8b09961ccfc90a08861eaf7175a3 Mon Sep 17 00:00:00 2001 From: Simon Beck Date: Wed, 5 Jun 2024 13:24:38 +0200 Subject: [PATCH] Rename Keycloak's restore service account Previously it had the same name as MariaDB's restore account. --- component/class/defaults.yml | 2 +- .../vshn/appcat/appcat/20_role_vshn_keycloak_restore.yaml | 6 +++--- .../vshn/appcat/appcat/21_composition_vshn_keycloak.yaml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/component/class/defaults.yml b/component/class/defaults.yml index 44f65446b..cf3270456 100644 --- a/component/class/defaults.yml +++ b/component/class/defaults.yml @@ -710,7 +710,7 @@ parameters: mode: standalone offered: true enabled: false - restoreSA: mariadbrestoreserviceaccount + restoreSA: keycloakserviceaccount restoreRoleRules: ${appcat:defaultRestoreRoleRules} additionalInputs: registry_username: "?{vaultkv:__shared__/__shared__/appcat/inventage_registry_username}" diff --git a/component/tests/golden/vshn/appcat/appcat/20_role_vshn_keycloak_restore.yaml b/component/tests/golden/vshn/appcat/appcat/20_role_vshn_keycloak_restore.yaml index 0b83f6bb8..32d30be78 100644 --- a/component/tests/golden/vshn/appcat/appcat/20_role_vshn_keycloak_restore.yaml +++ b/component/tests/golden/vshn/appcat/appcat/20_role_vshn_keycloak_restore.yaml @@ -59,8 +59,8 @@ kind: ServiceAccount metadata: annotations: {} labels: - name: mariadbrestoreserviceaccount - name: mariadbrestoreserviceaccount + name: keycloakserviceaccount + name: keycloakserviceaccount namespace: syn-appcat-control --- apiVersion: rbac.authorization.k8s.io/v1 @@ -76,5 +76,5 @@ roleRef: name: crossplane:appcat:job:keycloak:restorejob subjects: - kind: ServiceAccount - name: mariadbrestoreserviceaccount + name: keycloakserviceaccount namespace: syn-appcat-control diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_keycloak.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_keycloak.yaml index 1350b11e4..0b77ceaf3 100644 --- a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_keycloak.yaml +++ b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_keycloak.yaml @@ -53,7 +53,7 @@ spec: quotasEnabled: 'false' registry_password: '' registry_username: '' - restoreSA: mariadbrestoreserviceaccount + restoreSA: keycloakserviceaccount serviceName: keycloak sliNamespace: appcat-slos kind: ConfigMap