From 6403d2d877d43f12d3695c3b9508e5a2ade6966e Mon Sep 17 00:00:00 2001
From: aimee-889 <aimee.weiss@capgemini.com>
Date: Tue, 9 Jul 2024 11:37:56 +0000
Subject: [PATCH] fix pipeline

---
 .github/workflows/deploy-to-dev-manual.yml |  6 ++++++
 .github/workflows/deploy.yml               | 21 +++++++++++----------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/deploy-to-dev-manual.yml b/.github/workflows/deploy-to-dev-manual.yml
index cc95727..1616455 100644
--- a/.github/workflows/deploy-to-dev-manual.yml
+++ b/.github/workflows/deploy-to-dev-manual.yml
@@ -23,6 +23,11 @@ on:
         description: "dbildungs_iam_keycloak Branch. Has to be main or in format <project>-<ticketnumber>, e.g. spsh-130"
         default: main
         type: string
+      dbildungs_iam_ldap_branch:
+        required: true
+        description: "dbildungs_iam_ldap Branch. Has to be main or in format <project>-<ticketnumber>, e.g. spsh-130"
+        default: main
+        type: string
       dbseeding:
         required: true
         description: "DB-Seeding (Default: chart_value)"
@@ -61,6 +66,7 @@ jobs:
       dbildungs_iam_server_branch: ${{ github.event.inputs.dbildungs_iam_server_branch }}
       schulportal_client_branch: ${{ github.event.inputs.dbildungs_iam_client_branch }}
       dbildungs_iam_keycloak_branch: ${{ github.event.inputs.dbildungs_iam_keycloak_branch }}
+      dbildungs_iam_ldap_branch: ${{ github.event.inputs.dbildungs_iam_ldap_branch }}
       dbseeding: ${{ github.event.inputs.dbseeding }}
       namespace: ${{ needs.create_branch_identifier.outputs.namespace_from_branch }}
       user_name: spsh-bot
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index c54181a..6df082c 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -228,16 +228,6 @@ jobs:
             --set auth.existingSecret="psql-config-secret" \
             --set database.name=${{ needs.create_dbildungs_iam_keycloak_db_name.outputs.keycloak_db_name }}
 
-      # even though the initTLSSecret.secret value is set it has no effect if the initTLSSecret in not enabled (default: false) - only necessary for External IP
-      - name: Deploy dbildungs_iam_ldap Helm chart
-        run: |
-          helm upgrade --install \
-            dbildungs-iam-ldap \
-            dbildungs-iam-ldap \
-            --namespace ${{ inputs.namespace }} \
-            --set global.existingSecret="dbildungs-iam-ldap" \
-            --set initTLSSecret.secret="dbildungs-iam-ldap-tls" \
-            --wait
 
       - name: Create Database for dbildungs-iam-server
         run: |
@@ -269,6 +259,17 @@ jobs:
             --set database.username=spshdeveloper \
             --wait
       
+      # even though the initTLSSecret.secret value is set it has no effect if the initTLSSecret in not enabled (default: false) - only necessary for External IP
+      - name: Deploy dbildungs_iam_ldap Helm chart
+        run: |
+          helm upgrade --install \
+            dbildungs-iam-ldap \
+            dbildungs-iam-ldap \
+            --namespace ${{ inputs.namespace }} \
+            --set global.existingSecret="dbildungs-iam-ldap" \
+            --set initTLSSecret.secret="dbildungs-iam-ldap-tls" \
+            --wait
+
       - name: Deploy schulportal_client Helm chart
         run: |
           helm upgrade --install \