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 a7b5884..a84f792 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,9 +22,7 @@ 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 + runs-on: ubuntu-latest outputs: SELECT_HELM_VERION_GENERATION: ${{ steps.select_generation.outputs.SELECT_HELM_VERION_GENERATION }} SELECT_IMAGE_TAG_GENERATION: ${{ steps.select_generation.outputs.SELECT_IMAGE_TAG_GENERATION }} @@ -60,6 +58,15 @@ jobs: run: | sleep 1m + 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 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: {}