From bcbd32a5ec9af75ba3d45dea1f8d8fa99b6deed2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=A9o=20M=C3=A9vollon?= Date: Tue, 1 Oct 2024 10:42:32 +0200 Subject: [PATCH 1/2] Revert "fix: more memory for degit init-container (#511)" This reverts commit 8f60b955eb42be644f42e83f18e45a73e6d267b8. --- .../tests/__snapshots__/job-builds.dev.yaml | 16 +++------ .../__snapshots__/job-no-affinity.dev.yaml | 8 ++--- plugins/contrib/charts/job/values.yaml | 33 +++++++++---------- 3 files changed, 22 insertions(+), 35 deletions(-) diff --git a/packages/kontinuous/tests/__snapshots__/job-builds.dev.yaml b/packages/kontinuous/tests/__snapshots__/job-builds.dev.yaml index 08f9c5480..c903b6a35 100644 --- a/packages/kontinuous/tests/__snapshots__/job-builds.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/job-builds.dev.yaml @@ -149,12 +149,8 @@ spec: - name: workspace mountPath: /workspace resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 1 - memory: 1Gi + limits: {} + requests: {} containers: - name: job image: moby/buildkit:v0.13.0-rootless @@ -421,12 +417,8 @@ spec: - name: workspace mountPath: /workspace resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 1 - memory: 1Gi + limits: {} + requests: {} containers: - name: job image: moby/buildkit:v0.13.0-rootless diff --git a/packages/kontinuous/tests/__snapshots__/job-no-affinity.dev.yaml b/packages/kontinuous/tests/__snapshots__/job-no-affinity.dev.yaml index 4a9ae4992..64c2242d5 100644 --- a/packages/kontinuous/tests/__snapshots__/job-no-affinity.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/job-no-affinity.dev.yaml @@ -149,12 +149,8 @@ spec: - name: workspace mountPath: /workspace resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 1 - memory: 1Gi + limits: {} + requests: {} containers: - name: job image: moby/buildkit:v0.13.0-rootless diff --git a/plugins/contrib/charts/job/values.yaml b/plugins/contrib/charts/job/values.yaml index 46dc10c26..5c17cbe53 100644 --- a/plugins/contrib/charts/job/values.yaml +++ b/plugins/contrib/charts/job/values.yaml @@ -1,8 +1,8 @@ enabled: output: false -namespace: -repository: -gitBranch: +namespace: +repository: +gitBranch: runs: {} defaults: image: "debian:stable" @@ -15,27 +15,27 @@ defaults: serviceAccountName: "" resources: limits: - cpu: - memory: + cpu: + memory: requests: - cpu: - memory: + cpu: + memory: degitRepository: resources: limits: - cpu: "1" - memory: 1Gi + cpu: + memory: requests: - cpu: "1" - memory: 1Gi + cpu: + memory: degitAction: resources: limits: - cpu: - memory: + cpu: + memory: requests: - cpu: - memory: + cpu: + memory: deployKey: enabled: false secretRefName: deploy-key @@ -44,5 +44,4 @@ defaults: secretRefName: kubeconfig secretRefKey: KUBECONFIG mountDeployKey: false -_pluginValuesCompilerContribJob: true - +_pluginValuesCompilerContribJob: true \ No newline at end of file From 2b31c8de4ee6ac2e20d7627c6e4ea96b8721e436 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=A9o=20M=C3=A9vollon?= Date: Tue, 1 Oct 2024 10:53:10 +0200 Subject: [PATCH 2/2] fix: more memory for degit init-container --- .../__snapshots__/app-simple-options.dev.yaml | 16 ++++---- .../tests/__snapshots__/include-file.dev.yaml | 8 ++-- .../__snapshots__/jobs-build-options.dev.yaml | 8 ++-- .../__snapshots__/jobs-build-stage.dev.yaml | 16 ++++---- .../tests/__snapshots__/jobs-build.dev.yaml | 16 ++++---- .../tests/__snapshots__/meta-log.dev.yaml | 16 ++++---- .../tests/__snapshots__/output.dev.yaml | 16 ++++---- .../tests/__snapshots__/repo.domifa.dev.yaml | 40 +++++++++---------- .../__snapshots__/repo.domifa.preprod.yaml | 32 +++++++-------- .../tests/__snapshots__/repo.domifa.prod.yaml | 32 +++++++-------- .../socialgouv-autodevops-override.dev.yaml | 8 ++-- .../socialgouv-autodevops.dev.yaml | 8 ++-- .../__snapshots__/values-extends.dev.yaml | 8 ++-- .../__snapshots__/values-extends.preprod.yaml | 8 ++-- plugins/contrib/charts/jobs/values.yaml | 17 ++++---- 15 files changed, 125 insertions(+), 124 deletions(-) diff --git a/packages/kontinuous/tests/__snapshots__/app-simple-options.dev.yaml b/packages/kontinuous/tests/__snapshots__/app-simple-options.dev.yaml index 80e29d333..e77dfe5a5 100644 --- a/packages/kontinuous/tests/__snapshots__/app-simple-options.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/app-simple-options.dev.yaml @@ -474,11 +474,11 @@ spec: mountPath: /workspace resources: limits: - cpu: 200m - memory: 100Mi + cpu: 500m + memory: 1Gi requests: - cpu: 64m - memory: 32Mi + cpu: 500m + memory: 1Gi containers: - name: job image: harbor.fabrique.social.gouv.fr/test-app-simple-options/app:sha-ffac537e6cbbf934b08745a378932722df287a53 @@ -612,11 +612,11 @@ spec: mountPath: /workspace resources: limits: - cpu: 200m - memory: 100Mi + cpu: 500m + memory: 1Gi requests: - cpu: 64m - memory: 32Mi + cpu: 500m + memory: 1Gi - name: degit-action image: ghcr.io/socialgouv/kontinuous/degit:v1.181.4 command: diff --git a/packages/kontinuous/tests/__snapshots__/include-file.dev.yaml b/packages/kontinuous/tests/__snapshots__/include-file.dev.yaml index a280b94c1..b6e0d0881 100644 --- a/packages/kontinuous/tests/__snapshots__/include-file.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/include-file.dev.yaml @@ -149,11 +149,11 @@ spec: mountPath: /workspace resources: limits: - cpu: 200m - memory: 100Mi + cpu: 500m + memory: 1Gi requests: - cpu: 64m - memory: 32Mi + cpu: 500m + memory: 1Gi containers: - name: job image: debian:stable diff --git a/packages/kontinuous/tests/__snapshots__/jobs-build-options.dev.yaml b/packages/kontinuous/tests/__snapshots__/jobs-build-options.dev.yaml index 1aa7f01bf..4b66f32cc 100644 --- a/packages/kontinuous/tests/__snapshots__/jobs-build-options.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/jobs-build-options.dev.yaml @@ -151,11 +151,11 @@ spec: mountPath: /workspace resources: limits: - cpu: 200m - memory: 100Mi + cpu: 500m + memory: 1Gi requests: - cpu: 64m - memory: 32Mi + cpu: 500m + memory: 1Gi containers: - name: job image: moby/buildkit:v0.13.0-rootless diff --git a/packages/kontinuous/tests/__snapshots__/jobs-build-stage.dev.yaml b/packages/kontinuous/tests/__snapshots__/jobs-build-stage.dev.yaml index 7f08a3f1e..f97f5e424 100644 --- a/packages/kontinuous/tests/__snapshots__/jobs-build-stage.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/jobs-build-stage.dev.yaml @@ -475,11 +475,11 @@ spec: mountPath: /workspace resources: limits: - cpu: 200m - memory: 100Mi + cpu: 500m + memory: 1Gi requests: - cpu: 64m - memory: 32Mi + cpu: 500m + memory: 1Gi containers: - name: job image: moby/buildkit:v0.13.0-rootless @@ -747,11 +747,11 @@ spec: mountPath: /workspace resources: limits: - cpu: 200m - memory: 100Mi + cpu: 500m + memory: 1Gi requests: - cpu: 64m - memory: 32Mi + cpu: 500m + memory: 1Gi containers: - name: job image: moby/buildkit:v0.13.0-rootless diff --git a/packages/kontinuous/tests/__snapshots__/jobs-build.dev.yaml b/packages/kontinuous/tests/__snapshots__/jobs-build.dev.yaml index 8700aea21..ebc89f0a8 100644 --- a/packages/kontinuous/tests/__snapshots__/jobs-build.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/jobs-build.dev.yaml @@ -474,11 +474,11 @@ spec: mountPath: /workspace resources: limits: - cpu: 200m - memory: 100Mi + cpu: 500m + memory: 1Gi requests: - cpu: 64m - memory: 32Mi + cpu: 500m + memory: 1Gi containers: - name: job image: moby/buildkit:v0.13.0-rootless @@ -745,11 +745,11 @@ spec: mountPath: /workspace resources: limits: - cpu: 200m - memory: 100Mi + cpu: 500m + memory: 1Gi requests: - cpu: 64m - memory: 32Mi + cpu: 500m + memory: 1Gi containers: - name: job image: moby/buildkit:v0.13.0-rootless diff --git a/packages/kontinuous/tests/__snapshots__/meta-log.dev.yaml b/packages/kontinuous/tests/__snapshots__/meta-log.dev.yaml index 02ad7f163..5571c8fb5 100644 --- a/packages/kontinuous/tests/__snapshots__/meta-log.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/meta-log.dev.yaml @@ -150,11 +150,11 @@ spec: mountPath: /workspace resources: limits: - cpu: 200m - memory: 100Mi + cpu: 500m + memory: 1Gi requests: - cpu: 64m - memory: 32Mi + cpu: 500m + memory: 1Gi containers: - name: job image: debian:stable @@ -279,11 +279,11 @@ spec: mountPath: /workspace resources: limits: - cpu: 200m - memory: 100Mi + cpu: 500m + memory: 1Gi requests: - cpu: 64m - memory: 32Mi + cpu: 500m + memory: 1Gi containers: - name: job image: debian:stable diff --git a/packages/kontinuous/tests/__snapshots__/output.dev.yaml b/packages/kontinuous/tests/__snapshots__/output.dev.yaml index 2804b4b36..2983742fa 100644 --- a/packages/kontinuous/tests/__snapshots__/output.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/output.dev.yaml @@ -174,11 +174,11 @@ spec: mountPath: /workspace resources: limits: - cpu: 200m - memory: 100Mi + cpu: 500m + memory: 1Gi requests: - cpu: 64m - memory: 32Mi + cpu: 500m + memory: 1Gi containers: - name: job image: debian:stable @@ -311,11 +311,11 @@ spec: mountPath: /workspace resources: limits: - cpu: 200m - memory: 100Mi + cpu: 500m + memory: 1Gi requests: - cpu: 64m - memory: 32Mi + cpu: 500m + memory: 1Gi containers: - name: job image: debian:stable diff --git a/packages/kontinuous/tests/__snapshots__/repo.domifa.dev.yaml b/packages/kontinuous/tests/__snapshots__/repo.domifa.dev.yaml index ac85ca7d7..62a94afad 100644 --- a/packages/kontinuous/tests/__snapshots__/repo.domifa.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/repo.domifa.dev.yaml @@ -187,11 +187,11 @@ spec: mountPath: /workspace resources: limits: - cpu: 200m - memory: 100Mi + cpu: 500m + memory: 1Gi requests: - cpu: 64m - memory: 32Mi + cpu: 500m + memory: 1Gi containers: - name: job image: moby/buildkit:v0.13.0-rootless @@ -463,11 +463,11 @@ spec: mountPath: /workspace resources: limits: - cpu: 200m - memory: 100Mi + cpu: 500m + memory: 1Gi requests: - cpu: 64m - memory: 32Mi + cpu: 500m + memory: 1Gi containers: - name: job image: moby/buildkit:v0.13.0-rootless @@ -740,11 +740,11 @@ spec: mountPath: /workspace resources: limits: - cpu: 200m - memory: 100Mi + cpu: 500m + memory: 1Gi requests: - cpu: 64m - memory: 32Mi + cpu: 500m + memory: 1Gi containers: - name: job image: moby/buildkit:v0.13.0-rootless @@ -1013,11 +1013,11 @@ spec: mountPath: /workspace resources: limits: - cpu: 200m - memory: 100Mi + cpu: 500m + memory: 1Gi requests: - cpu: 64m - memory: 32Mi + cpu: 500m + memory: 1Gi containers: - name: job image: moby/buildkit:v0.13.0-rootless @@ -1749,11 +1749,11 @@ spec: mountPath: /workspace resources: limits: - cpu: 200m - memory: 100Mi + cpu: 500m + memory: 1Gi requests: - cpu: 64m - memory: 32Mi + cpu: 500m + memory: 1Gi - name: degit-action image: ghcr.io/socialgouv/kontinuous/degit:v1.181.4 command: diff --git a/packages/kontinuous/tests/__snapshots__/repo.domifa.preprod.yaml b/packages/kontinuous/tests/__snapshots__/repo.domifa.preprod.yaml index a1717f294..55c54b660 100644 --- a/packages/kontinuous/tests/__snapshots__/repo.domifa.preprod.yaml +++ b/packages/kontinuous/tests/__snapshots__/repo.domifa.preprod.yaml @@ -186,11 +186,11 @@ spec: mountPath: /workspace resources: limits: - cpu: 200m - memory: 100Mi + cpu: 500m + memory: 1Gi requests: - cpu: 64m - memory: 32Mi + cpu: 500m + memory: 1Gi containers: - name: job image: moby/buildkit:v0.13.0-rootless @@ -458,11 +458,11 @@ spec: mountPath: /workspace resources: limits: - cpu: 200m - memory: 100Mi + cpu: 500m + memory: 1Gi requests: - cpu: 64m - memory: 32Mi + cpu: 500m + memory: 1Gi containers: - name: job image: moby/buildkit:v0.13.0-rootless @@ -735,11 +735,11 @@ spec: mountPath: /workspace resources: limits: - cpu: 200m - memory: 100Mi + cpu: 500m + memory: 1Gi requests: - cpu: 64m - memory: 32Mi + cpu: 500m + memory: 1Gi containers: - name: job image: moby/buildkit:v0.13.0-rootless @@ -1008,11 +1008,11 @@ spec: mountPath: /workspace resources: limits: - cpu: 200m - memory: 100Mi + cpu: 500m + memory: 1Gi requests: - cpu: 64m - memory: 32Mi + cpu: 500m + memory: 1Gi containers: - name: job image: moby/buildkit:v0.13.0-rootless diff --git a/packages/kontinuous/tests/__snapshots__/repo.domifa.prod.yaml b/packages/kontinuous/tests/__snapshots__/repo.domifa.prod.yaml index 6593cacc8..32d8f584f 100644 --- a/packages/kontinuous/tests/__snapshots__/repo.domifa.prod.yaml +++ b/packages/kontinuous/tests/__snapshots__/repo.domifa.prod.yaml @@ -184,11 +184,11 @@ spec: mountPath: /workspace resources: limits: - cpu: 200m - memory: 100Mi + cpu: 500m + memory: 1Gi requests: - cpu: 64m - memory: 32Mi + cpu: 500m + memory: 1Gi containers: - name: job image: moby/buildkit:v0.13.0-rootless @@ -459,11 +459,11 @@ spec: mountPath: /workspace resources: limits: - cpu: 200m - memory: 100Mi + cpu: 500m + memory: 1Gi requests: - cpu: 64m - memory: 32Mi + cpu: 500m + memory: 1Gi containers: - name: job image: moby/buildkit:v0.13.0-rootless @@ -736,11 +736,11 @@ spec: mountPath: /workspace resources: limits: - cpu: 200m - memory: 100Mi + cpu: 500m + memory: 1Gi requests: - cpu: 64m - memory: 32Mi + cpu: 500m + memory: 1Gi containers: - name: job image: moby/buildkit:v0.13.0-rootless @@ -1010,11 +1010,11 @@ spec: mountPath: /workspace resources: limits: - cpu: 200m - memory: 100Mi + cpu: 500m + memory: 1Gi requests: - cpu: 64m - memory: 32Mi + cpu: 500m + memory: 1Gi containers: - name: job image: moby/buildkit:v0.13.0-rootless diff --git a/packages/kontinuous/tests/__snapshots__/socialgouv-autodevops-override.dev.yaml b/packages/kontinuous/tests/__snapshots__/socialgouv-autodevops-override.dev.yaml index d09e57e67..8e16867f5 100644 --- a/packages/kontinuous/tests/__snapshots__/socialgouv-autodevops-override.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/socialgouv-autodevops-override.dev.yaml @@ -151,11 +151,11 @@ spec: mountPath: /workspace resources: limits: - cpu: 200m - memory: 100Mi + cpu: 500m + memory: 1Gi requests: - cpu: 64m - memory: 32Mi + cpu: 500m + memory: 1Gi containers: - name: job image: moby/buildkit:v0.13.0-rootless diff --git a/packages/kontinuous/tests/__snapshots__/socialgouv-autodevops.dev.yaml b/packages/kontinuous/tests/__snapshots__/socialgouv-autodevops.dev.yaml index 3491d0036..99c0cfad0 100644 --- a/packages/kontinuous/tests/__snapshots__/socialgouv-autodevops.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/socialgouv-autodevops.dev.yaml @@ -151,11 +151,11 @@ spec: mountPath: /workspace resources: limits: - cpu: 200m - memory: 100Mi + cpu: 500m + memory: 1Gi requests: - cpu: 64m - memory: 32Mi + cpu: 500m + memory: 1Gi containers: - name: job image: moby/buildkit:v0.13.0-rootless diff --git a/packages/kontinuous/tests/__snapshots__/values-extends.dev.yaml b/packages/kontinuous/tests/__snapshots__/values-extends.dev.yaml index d66cb30c0..bfd2acf2d 100644 --- a/packages/kontinuous/tests/__snapshots__/values-extends.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/values-extends.dev.yaml @@ -150,11 +150,11 @@ spec: mountPath: /workspace resources: limits: - cpu: 200m - memory: 100Mi + cpu: 500m + memory: 1Gi requests: - cpu: 64m - memory: 32Mi + cpu: 500m + memory: 1Gi containers: - name: job image: harbor.fabrique.social.gouv.fr/test-values-extends/app:sha-ffac537e6cbbf934b08745a378932722df287a53 diff --git a/packages/kontinuous/tests/__snapshots__/values-extends.preprod.yaml b/packages/kontinuous/tests/__snapshots__/values-extends.preprod.yaml index e0c72a9af..974878f1a 100644 --- a/packages/kontinuous/tests/__snapshots__/values-extends.preprod.yaml +++ b/packages/kontinuous/tests/__snapshots__/values-extends.preprod.yaml @@ -150,11 +150,11 @@ spec: mountPath: /workspace resources: limits: - cpu: 200m - memory: 100Mi + cpu: 500m + memory: 1Gi requests: - cpu: 64m - memory: 32Mi + cpu: 500m + memory: 1Gi containers: - name: job image: harbor.fabrique.social.gouv.fr/test-values-extends/app:preprod-ffac537e6cbbf934b08745a378932722df287a53 diff --git a/plugins/contrib/charts/jobs/values.yaml b/plugins/contrib/charts/jobs/values.yaml index b56b4b474..1b34afa6e 100644 --- a/plugins/contrib/charts/jobs/values.yaml +++ b/plugins/contrib/charts/jobs/values.yaml @@ -1,7 +1,7 @@ enabled: -namespace: -repository: -gitBranch: +namespace: +repository: +gitBranch: runs: {} image: "debian:stable" @@ -22,11 +22,11 @@ resources: degitRepository: resources: limits: - cpu: 200m - memory: 100Mi + cpu: 500m + memory: 1Gi requests: - cpu: 64m - memory: 32Mi + cpu: 500m + memory: 1Gi degitAction: resources: limits: @@ -43,4 +43,5 @@ kubeconfig: secretRefName: kubeconfig secretRefKey: KUBECONFIG mountDeployKey: false -_pluginValuesCompilerContribJobs: true \ No newline at end of file +_pluginValuesCompilerContribJobs: true +