Merge pull request 'ozg-3879-mongodb-helmchart' (#256) from ozg-3879-mongodb-helmchart into master

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


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

goofy-client/apps/goofy-e2e/Jenkinsfile

@@ -213,7 +213,7 @@ pipeline {
                                 def bezeichner = env.EA_BEZEICHNER
                                 def dbPort = 27018
 
-                                forwardServices(generateNamespace(bezeichner), dbPort)
+                                forwardServices(generateNamespace(bezeichner), dbPort, bezeichner)
 
                                 runTests(bezeichner, 'einheitlicher-ansprechpartner', dbPort, env.STAGE_NAME)
                             }
@@ -240,7 +240,7 @@ pipeline {
                                 def bezeichner = env.MAIN_BEZEICHNER
                                 def dbPort = 27019
 
-                                forwardServices(generateNamespace(bezeichner), dbPort)
+                                forwardServices(generateNamespace(bezeichner), dbPort, bezeichner)
 
                                 runTests(bezeichner, 'main-tests', dbPort, env.STAGE_NAME)
                             }
@@ -663,12 +663,12 @@ String generateCypressConfig(String bezeichner, String testFolder, Integer dbPor
     dir('goofy-client/apps/goofy-e2e/'){
         def config = readJSON file: 'cypress-ci.json'
 
-		def plutoDatabaseSecret = getPlutoDatabaseSecret(namespace);
+		def plutoDatabaseSecret = getPlutoDatabaseSecret(namespace, bezeichner);
 		def decodedPassword = decodeString(plutoDatabaseSecret.password);
 		def parsablePassword = makePasswordUrlConform(decodedPassword);
 
         config.baseUrl = "https://${bezeichner}.${env.CLUSTER_BASE_URL}" as String
-        config.env.dbUrl = "mongodb://pluto-database-user:${parsablePassword}@localhost:${dbPort}/admin?ssl=false&directConnection=true" as String
+        config.env.dbUrl = "mongodb://${decodeString(plutoDatabaseSecret.username)}:${parsablePassword}@localhost:${dbPort}/admin?ssl=false&directConnection=true" as String
         config.env.keycloakUrl = "https://${env.SSO_URL}/" as String
         config.env.keycloakRealm = namespace as String
         config.env.keycloakClient = "alfa" as String
@@ -679,7 +679,7 @@ String generateCypressConfig(String bezeichner, String testFolder, Integer dbPor
         config.reporterOptions.reportDir = "./reports/${testFolder}/mochawesome-report" as String
 
         config.env.put("search", getElasticsearchEnv(namespace))
-        config.env.put("userManager", getUserManagerEnv(namespace, dbPort))
+        config.env.put("userManager", getUserManagerEnv(namespace, dbPort, bezeichner))
 
         writeJSON file: configName, json: config
 
@@ -693,20 +693,20 @@ String makePasswordUrlConform(String password) {
     return sh (script: "printf %s ${password} | jq -sRr @uri", returnStdout: true);
 }
 
-Map getPlutoDatabaseSecret(String namespace) {
-    return readJSON ( text: sh (script: "kubectl get secret pluto-database-admin-pluto-database-user -n ${namespace} -o jsonpath={.data}", returnStdout: true))
+Map getPlutoDatabaseSecret(String namespace, String bezeichner) {
+    return readJSON ( text: sh (script: "kubectl get secret ${bezeichner}-database-admin-pluto-user -n ${namespace} -o jsonpath={.data}", returnStdout: true))
 }
 
-Map getUserManagerEnv(String namespace, dbPort){
-	def plutoDatabaseUserManagerSecret = getPlutoDatabaseUserManagerSecret(namespace);
+Map getUserManagerEnv(String namespace, dbPort, String bezeichner){
+	def userManagerDatabaseSecret = getUserManagerDatabaseSecret(namespace, bezeichner);
     return [
-        "dbUrl": "mongodb://user-manager-database-user:${decodeString(plutoDatabaseUserManagerSecret.password)}@localhost:${dbPort}/admin?ssl=false&directConnection=true" as String,
+        "dbUrl": "mongodb://${decodeString(userManagerDatabaseSecret.username)}:${decodeString(userManagerDatabaseSecret.password)}@localhost:${dbPort}/admin?ssl=false&directConnection=true" as String,
         "database": "user-manager-database"
         ]
 }
 
-Map getPlutoDatabaseUserManagerSecret(String namespace) {
-    return readJSON ( text: sh (script: "kubectl get secret pluto-database-admin-user-manager-database-user -n ${namespace} -o jsonpath={.data}", returnStdout: true))
+Map getUserManagerDatabaseSecret(String namespace, String bezeichner) {
+    return readJSON ( text: sh (script: "kubectl get secret ${bezeichner}-database-admin-user-manager-user -n ${namespace} -o jsonpath={.data}", returnStdout: true))
 }
 
 String getKeycloakUuid(realm, userName) {
@@ -781,9 +781,9 @@ Map getElasticsearchEnv(String namespace) {
         ]
 }
 
-Void forwardServices(String namespace, Integer dbPort) {
+Void forwardServices(String namespace, Integer dbPort, String bezeichner) {
     try {
-        forwardDatenbank(namespace, dbPort)
+        forwardDatenbank(namespace, dbPort, bezeichner)
         forwardElasticSearch()
     }
     catch (Exception e) {
@@ -802,8 +802,8 @@ Boolean isElasticSearchForwarded() {
     return sh (script: "lsof -i -P -n | grep LISTEN | grep :9200", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer
 }
 
-Void forwardDatenbank(String namespace, port) {
-    sh "kubectl port-forward pluto-database-0 ${port}:27017 -n ${namespace} &"
+Void forwardDatenbank(String namespace, port, String bezeichner) {
+    sh "kubectl port-forward ${bezeichner}-database-0 ${port}:27017 -n ${namespace} &"
 }
 
 String generateNamespace(String bezeichner) {

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

@@ -22,13 +22,7 @@ pluto:
   elasticsearch:
     enabled: true
     password: "Test3456!"
-  database:
-    password: XnHhfznNWg65NNd
-    usermanagerPassword: 5M3N2sVEq5c8
-  storage:
-    class: ssd-delete
   replicaCount: 1
-  replicaCountDatabase: 1
   
 user_manager:
   kop:

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

@@ -18,13 +18,7 @@ pluto:
   elasticsearch:
     enabled: true
     password: "Test3456!"
-  database:
-    password: XnHhfznNWg65NNd
-    usermanagerPassword: 5M3N2sVEq5c8
-  storage:
-    class: ssd-delete
   replicaCount: 1
-  replicaCountDatabase: 1
 
 user_manager:
   kop: