Merge pull request 'e2e-okd-cluster' (#321) from e2e-okd-cluster into master

Reviewed-on: https://git.ozg-sh.de/mgm/goofy/pulls/321


Reviewed-by: OZGCloud <ozgcloud@mgm-tp.com>

goofy-client/apps/goofy-e2e/Jenkinsfile

@@ -151,7 +151,7 @@ pipeline {
                 script {
                     FAILED_STAGE = env.STAGE_NAME
 
-                    configFileProvider([configFile(fileId: 'kubeconfig-ovh-cluster', variable: 'KUBE_CONFIG')]) {
+                    configFileProvider([configFile(fileId: 'kubeconfig-dev-okd-cluster', variable: 'KUBE_CONFIG')]) {
                         sh 'mkdir ~/.kube'
                         sh 'cp ${KUBE_CONFIG} ~/.kube/config'
                     }
@@ -705,7 +705,7 @@ Map getUserManagerDatabaseSecret(String namespace) {
 
 String getKeycloakUuid(realm, userName) {
     def shScript = """curl -H 'Content-Type: application/json' \
-                        -H 'Authorization: bearer ${getKeycloakAccessToken()}' \
+                        -H 'Authorization: bearer ${getKeycloakAccessToken(realm)}' \
                         'https://${env.SSO_URL}/admin/realms/${realm}/users'
                     """
 
@@ -720,12 +720,21 @@ String getKeycloakUuid(realm, userName) {
 	}
 }
 
-String getKeycloakAccessToken() {
-	withCredentials([usernamePassword(credentialsId: 'keycloak-ovh-cluster', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) {
-		def token = readJSON text: sh (script: 'curl -d "client_id=admin-cli" -d "username=$USER" -d "password=$PASSWORD" -d "grant_type=password" https://$SSO_URL/realms/master/protocol/openid-connect/token', returnStdout: true)
+String getKeycloakAccessToken(String realm) {
+    userManagerApiUserCredentials = getUserManagerApiUserCredentials(realm)
+
+	def token = readJSON text: sh (script: "set +x && curl -d \"client_id=admin-cli\" -d \"username=${userManagerApiUserCredentials.user}\" -d \"password=${userManagerApiUserCredentials.password}\" -d \"grant_type=password\" https://$SSO_URL/realms/$realm/protocol/openid-connect/token", returnStdout: true)
 
 	return token.access_token
 }
+
+Map getUserManagerApiUserCredentials(String namespace) {
+    userManagerApiUserCredentials = readJSON ( text: sh (script: "kubectl get secret usermanagerapiuser-credentials -n ${namespace} -o jsonpath={.data}", returnStdout: true))
+
+    return [
+        "user": decodeString(userManagerApiUserCredentials.name),
+        "password": decodeString(userManagerApiUserCredentials.password)
+    ]
 }
 
 Void sendFailureMessage() {

goofy-client/apps/goofy-e2e/src/fixtures/argocd/by-ea-dev.yaml

 kop:
   bezeichner: mastere2eea
   environment: dev
-  
+e2eTest: true
+project:
+  destinations:
+    - namespace: '*'
+      server: https://kubernetes.default.svc
 goofy:
   env:
     overrideSpringProfiles: "oc,ea,e2e,dev"
@@ -14,6 +18,7 @@ goofy:
           - name: EINHEITLICHER_ANSPRECHPARTNER
   ingress:
     use_staging_cert: true
+    className: openshift-default
   baseUrl: dev.by.ozg-cloud.de
 
 pluto:
@@ -45,3 +50,7 @@ user_manager:
       - name: realm-management
         role: manage-users
   baseUrl: dev.by.ozg-cloud.de
+
+  ingress:
+    use_staging_cert: true
+    className: openshift-default
\ No newline at end of file

goofy-client/apps/goofy-e2e/src/fixtures/argocd/by-main-dev.yaml

 kop:
   bezeichner: mastere2emain
   environment: dev
-
+e2eTest: true
+project:
+  destinations:
+    - namespace: '*'
+      server: https://kubernetes.default.svc
 goofy:
   env:
     overrideSpringProfiles: "oc,e2e,dev"
@@ -10,6 +14,7 @@ goofy:
     apiPassword: "Test1234!"
   ingress:
     use_staging_cert: true
+    className: openshift-default
   baseUrl: dev.by.ozg-cloud.de
     
 pluto:
@@ -41,3 +46,7 @@ user_manager:
       - name: realm-management
         role: manage-users
   baseUrl: dev.by.ozg-cloud.de
+
+  ingress:
+    use_staging_cert: true
+    className: openshift-default
\ No newline at end of file