From 2115d6e983aeda2ff6f9d2e233d54c1eb2864269 Mon Sep 17 00:00:00 2001
From: aimee-889 <93951322+aimee-889@users.noreply.github.com>
Date: Mon, 4 Nov 2024 11:06:57 +0100
Subject: [PATCH 1/2] DBP-0000-improve-speed-of-pipeline (#8)

DBP-0000-improve-speed-of-pipeline (#8)
---
 ...publish-check-deploy-on-push-scheduled.yml | 31 ++++++++++++-------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/image-and-helm-publish-check-deploy-on-push-scheduled.yml b/.github/workflows/image-and-helm-publish-check-deploy-on-push-scheduled.yml
index 48e7c00..02fe504 100644
--- a/.github/workflows/image-and-helm-publish-check-deploy-on-push-scheduled.yml
+++ b/.github/workflows/image-and-helm-publish-check-deploy-on-push-scheduled.yml
@@ -22,8 +22,6 @@ jobs:
 
   select_helm_version_generation_and_image_tag_generation:
     if: ${{ github.event_name == 'push' && !startsWith(github.ref_name,'dependabot/') }}
-    needs: 
-      - scan_helm
     runs-on: ubuntu-latest
     outputs: 
       SELECT_HELM_VERION_GENERATION: ${{ steps.select_generation.outputs.SELECT_HELM_VERION_GENERATION }}
@@ -39,6 +37,7 @@ jobs:
             echo "SELECT_HELM_VERION_GENERATION=ticket_from_branch_timestamp" >> "$GITHUB_OUTPUT"
             echo "SELECT_IMAGE_TAG_GENERATION=ticket_from_branch" >> "$GITHUB_OUTPUT"
           fi
+
   release_helm:
     if: ${{ github.event_name == 'push' && !startsWith(github.ref_name,'dependabot/') }}
     needs: 
@@ -50,6 +49,15 @@ jobs:
       helm_chart_version_generation: ${{ needs. select_helm_version_generation_and_image_tag_generation.outputs.SELECT_HELM_VERION_GENERATION  }}
       image_tag_generation: ${{ needs. select_helm_version_generation_and_image_tag_generation.outputs.SELECT_IMAGE_TAG_GENERATION  }}
 
+  wait_for_helm_chart_to_get_published:
+    needs:
+      - release_helm
+    runs-on: ubuntu-latest
+    steps:
+      - shell: bash
+        run: |
+          sleep 1m 
+
   branch_meta:
     if: ${{ github.event_name == 'push' && !startsWith(github.ref_name,'dependabot/') }}
     uses: dBildungsplattform/spsh-app-deploy/.github/workflows/get-branch-meta.yml@3
@@ -62,15 +70,6 @@ jobs:
     with:
       branch: ${{ needs.branch_meta.outputs.branch }}
 
-  wait_for_helm_chart_to_get_published:
-    needs:
-      - release_helm
-    runs-on: ubuntu-latest
-    steps:
-      - shell: bash
-        run: |
-          sleep 1m 
-
   deploy:
     if: ${{ github.event_name == 'push' && !startsWith(github.ref_name,'dependabot/') }}
     needs:
@@ -86,6 +85,16 @@ jobs:
       namespace: ${{ needs.create_branch_identifier.outputs.namespace_from_branch }}
     secrets: inherit
 
+  all_tests_successfull:
+    needs:
+      - scan_helm
+      - deploy
+    runs-on: ubuntu-latest
+    steps:
+      - shell: bash
+        run: echo "All necessary Tests have been executed" 
+
+  # On Delete
   create_branch_identifier_for_deletion:
     if: ${{ github.event_name == 'delete' && github.event.ref_type == 'branch' }}
     uses: dBildungsplattform/spsh-app-deploy/.github/workflows/deploy-branch-to-namespace.yml@3

From 349e5a98d28e5042715b19c005cb7cc223cfa88d Mon Sep 17 00:00:00 2001
From: aimee-889 <93951322+aimee-889@users.noreply.github.com>
Date: Mon, 4 Nov 2024 12:13:16 +0100
Subject: [PATCH 2/2] DBP-1032-reduce-default-resources (#7)

DBP-1032-reduce-default-resources (#7)
---
 charts/dbildungs-iam-ldap/values.yaml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/charts/dbildungs-iam-ldap/values.yaml b/charts/dbildungs-iam-ldap/values.yaml
index db4be36..476b7f2 100644
--- a/charts/dbildungs-iam-ldap/values.yaml
+++ b/charts/dbildungs-iam-ldap/values.yaml
@@ -214,8 +214,8 @@ resources:
     cpu: 2
     memory: 4G
   requests:
-    cpu: 200m
-    memory: 200Mi
+    cpu: 100m
+    memory: 100Mi
 
 # enabling other features makes it so that ldap container fails with not enough permissions
 containerSecurityContext:
@@ -294,11 +294,11 @@ metrics:
       containerPort: 9330
   resources:
     limits:
-      cpu: 500m
-      memory: 1Gi
+      cpu: 300m
+      memory: 256Mi
     requests:
-      cpu: 200m
-      memory: 500Mi
+      cpu: 100m
+      memory: 64Mi
 
   service:
     type: ClusterIP
@@ -348,8 +348,8 @@ initTLSSecret:
       cpu: 500m
       memory: 500Mi
     requests:
-      cpu: 200m
-      memory: 200Mi
+      cpu: 100m
+      memory: 100Mi
 
 volumePermissions:
   enabled: true
@@ -361,11 +361,11 @@ volumePermissions:
     command: [ 'sh', '-c', 'chmod -R g+rwX /bitnami' ]
   resources:
     limits:
-      cpu: 500m
-      memory: 500Mi
-    requests:
       cpu: 200m
       memory: 200Mi
+    requests:
+      cpu: 100m
+      memory: 100Mi
 
 sidecars: {}