From fdd91fefd13f659675adf5af047ee4acb276c5d4 Mon Sep 17 00:00:00 2001 From: OMPRAKASH MISHRA Date: Fri, 23 Feb 2024 11:44:20 -0800 Subject: [PATCH 1/2] fix(CD): merge fail --- .github/workflows/merge.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 09f9484c..47d53dbc 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -38,11 +38,7 @@ jobs: environment: test tag: ${{ needs.vars.outputs.pr }} release: test - params: | - --set backend.deploymentStrategy=RollingUpdate \ - --set frontend.deploymentStrategy=RollingUpdate \ - --set backend.pdb.enabled=true \ - --set frontend.pdb.enabled=true \ + params: --set backend.deploymentStrategy=RollingUpdate --set frontend.deploymentStrategy=RollingUpdate --set backend.pdb.enabled=true --set frontend.pdb.enabled=true deploy-prod: @@ -54,11 +50,7 @@ jobs: environment: prod tag: ${{ needs.vars.outputs.pr }} release: prod - params: | - --set backend.deploymentStrategy=RollingUpdate \ - --set frontend.deploymentStrategy=RollingUpdate \ - --set backend.pdb.enabled=true \ - --set frontend.pdb.enabled=true \ + params: --set backend.deploymentStrategy=RollingUpdate --set frontend.deploymentStrategy=RollingUpdate --set backend.pdb.enabled=true --set frontend.pdb.enabled=true promote: name: Promote Images From 4cb78cc2b86f63548eefa1f0e2f871407eafb96a Mon Sep 17 00:00:00 2001 From: OMPRAKASH MISHRA Date: Fri, 23 Feb 2024 11:58:54 -0800 Subject: [PATCH 2/2] fix(HELM): PDB template --- .../nr-omrr-transparency/templates/frontend/templates/pdb.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/nr-omrr-transparency/templates/frontend/templates/pdb.yaml b/charts/nr-omrr-transparency/templates/frontend/templates/pdb.yaml index cfdf9784..3496e25b 100644 --- a/charts/nr-omrr-transparency/templates/frontend/templates/pdb.yaml +++ b/charts/nr-omrr-transparency/templates/frontend/templates/pdb.yaml @@ -1,6 +1,7 @@ {{- if and .Values.frontend.pdb .Values.frontend.pdb.enabled }} --- apiVersion: policy/v1 +kind: PodDisruptionBudget metadata: name: {{ include "frontend.fullname" . }} labels: