Merge branch 'main' into OZG-7591-user-roles-fields-validation

alfa-client/Jenkinsfile.e2e

@@ -462,7 +462,7 @@ Void initEnvAdminDefaultVersions() {
   env.ADMINISTRATION_HELM_CHART_VERSION = getHelmChartVersion(values)
   env.ADMINISTRATION_HELM_REPO_URL = getHelmRepoUrl()
 
-  values = getApplicationValues('admin-client')
+  values = getApplicationValues('administration-client')
   env.ADMIN_CLIENT_IMAGE_TAG = getImageTag(values)
   env.ADMIN_CLIENT_HELM_CHART_VERSION = getHelmChartVersion(values)
   env.ADMIN_CLIENT_HELM_REPO_URL = getHelmRepoUrl()
@@ -565,8 +565,8 @@ Void generateAdminNamespaceYaml() {
     envValues.administration.put("helm", ['version': env.ADMINISTRATION_HELM_CHART_VERSION, 'repoUrl': env.ADMINISTRATION_HELM_REPO_URL])
     envValues.administration.put("ozgcloud", ['feature': ['organisationsEinheiten': "true"], 'organisationEinheit': ['zufiSearchUri': generateZufiSearchUri(bezeichner)]])
 
-    envValues.admin_client.put("image", ['tag': env.ADMIN_CLIENT_IMAGE_TAG])
-    envValues.admin_client.put("helm", ['version': env.ADMIN_CLIENT_HELM_CHART_VERSION, 'repoUrl': env.ADMIN_CLIENT_HELM_REPO_URL])
+    envValues.administration_client.put("image", ['tag': env.ADMIN_CLIENT_IMAGE_TAG])
+    envValues.administration_client.put("helm", ['version': env.ADMIN_CLIENT_HELM_CHART_VERSION, 'repoUrl': env.ADMIN_CLIENT_HELM_REPO_URL])
   }
   return writeYamlToGitOps(bezeichner, envValues);
 }
@@ -657,7 +657,7 @@ Void waitForAlfaRollout(ozgCloudBezeichner) {
 Void waitForAdminRollout(String bezeichner) {
   waitForAlfaRollout([bezeichner])
   waitForHealthyApplication(bezeichner, 'administration')
-  waitForHealthyApplication(bezeichner, 'admin-client')
+  waitForHealthyApplication(bezeichner, 'administration-client')
 }
 
 Void waitForAlfaRollout(String bezeichner) {

alfa-client/apps/admin-e2e/src/fixtures/argocd/by-admin-dev.yaml

@@ -87,7 +87,7 @@ alfa_client:
   ingress:
     use_staging_cert: true
 
-admin_client:
+administration_client:
   enabled: true
   ingress:
     use_staging_cert: true