diff --git a/packages/kontinuous/tests/__snapshots__/app-sidecar.dev.yaml b/packages/kontinuous/tests/__snapshots__/app-sidecar.dev.yaml index aad4b94b9e..6d8b6084fe 100644 --- a/packages/kontinuous/tests/__snapshots__/app-sidecar.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/app-sidecar.dev.yaml @@ -177,12 +177,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 41m - memory: 131Mi + limits: {} + requests: {} lifecycle: postStart: exec: @@ -208,10 +204,6 @@ spec: run-background-cronjob securityContext: runAsUser: 1000 - resources: - requests: - cpu: 41m - memory: 131Mi lifecycle: postStart: exec: diff --git a/packages/kontinuous/tests/__snapshots__/app-simple-options.dev.yaml b/packages/kontinuous/tests/__snapshots__/app-simple-options.dev.yaml index 874660245d..360884cbfe 100644 --- a/packages/kontinuous/tests/__snapshots__/app-simple-options.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/app-simple-options.dev.yaml @@ -147,12 +147,8 @@ spec: - name: action mountPath: /action resources: - limits: - cpu: 1000m - memory: 1024Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: ghcr.io/socialgouv/docker/psql:6.70.0 @@ -201,12 +197,8 @@ spec: set -e /action/ensure-db.sh resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} securityContext: runAsUser: 1000 runAsGroup: 1000 @@ -310,12 +302,8 @@ spec: - name: action mountPath: /action resources: - limits: - cpu: 1000m - memory: 1024Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: bitnami/kubectl:latest @@ -351,12 +339,8 @@ spec: set -e /action/create-secret.sh resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} securityContext: runAsUser: 1001 runAsGroup: 1001 @@ -473,12 +457,8 @@ spec: - name: workspace mountPath: /workspace resources: - limits: - cpu: 1000m - memory: 1024Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: harbor.fabrique.social.gouv.fr/test-app-simple-options/app:sha-ffac537e6cbbf934b08745a378932722df287a53 @@ -498,12 +478,8 @@ spec: set -e yarn seed resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} securityContext: runAsUser: 1000 runAsGroup: 1000 @@ -611,12 +587,8 @@ spec: - name: workspace mountPath: /workspace resources: - limits: - cpu: 1000m - memory: 1024Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} - name: degit-action image: ghcr.io/socialgouv/kontinuous/degit:v1.176.5 command: @@ -631,12 +603,8 @@ spec: - name: action mountPath: /action resources: - limits: - cpu: 1000m - memory: 1024Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: ghcr.io/socialgouv/docker/psql:7.0.0 @@ -658,12 +626,8 @@ spec: set -e /action/seed-db.sh resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} securityContext: runAsUser: 1000 runAsGroup: 1000 diff --git a/packages/kontinuous/tests/__snapshots__/app-simple.dev.yaml b/packages/kontinuous/tests/__snapshots__/app-simple.dev.yaml index 2e0e002f4f..62dbe4a397 100644 --- a/packages/kontinuous/tests/__snapshots__/app-simple.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/app-simple.dev.yaml @@ -177,12 +177,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} lifecycle: postStart: exec: diff --git a/packages/kontinuous/tests/__snapshots__/app-simple.prod.yaml b/packages/kontinuous/tests/__snapshots__/app-simple.prod.yaml index 0da8c2d57f..079ccf71c8 100644 --- a/packages/kontinuous/tests/__snapshots__/app-simple.prod.yaml +++ b/packages/kontinuous/tests/__snapshots__/app-simple.prod.yaml @@ -176,12 +176,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} lifecycle: postStart: exec: diff --git a/packages/kontinuous/tests/__snapshots__/chart-group.dev.yaml b/packages/kontinuous/tests/__snapshots__/chart-group.dev.yaml index d305d42887..f8343eaa09 100644 --- a/packages/kontinuous/tests/__snapshots__/chart-group.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/chart-group.dev.yaml @@ -100,12 +100,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} lifecycle: postStart: exec: @@ -225,12 +221,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} lifecycle: postStart: exec: diff --git a/packages/kontinuous/tests/__snapshots__/chart-groups.dev.yaml b/packages/kontinuous/tests/__snapshots__/chart-groups.dev.yaml index 56f8478ca2..2d14161024 100644 --- a/packages/kontinuous/tests/__snapshots__/chart-groups.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/chart-groups.dev.yaml @@ -100,12 +100,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} lifecycle: postStart: exec: @@ -225,12 +221,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} lifecycle: postStart: exec: diff --git a/packages/kontinuous/tests/__snapshots__/chart-not-in-values.dev.yaml b/packages/kontinuous/tests/__snapshots__/chart-not-in-values.dev.yaml index ed3721c60e..28153fe63b 100644 --- a/packages/kontinuous/tests/__snapshots__/chart-not-in-values.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/chart-not-in-values.dev.yaml @@ -99,12 +99,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} lifecycle: postStart: exec: diff --git a/packages/kontinuous/tests/__snapshots__/charts.dev.yaml b/packages/kontinuous/tests/__snapshots__/charts.dev.yaml index 03962dce64..b7790c4045 100644 --- a/packages/kontinuous/tests/__snapshots__/charts.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/charts.dev.yaml @@ -157,10 +157,6 @@ spec: set -e echo Hello World FOO=\\"barjo\\"\\" - resources: - requests: - cpu: 81m - memory: 262Mi affinity: nodeAffinity: preferredDuringSchedulingIgnoredDuringExecution: diff --git a/packages/kontinuous/tests/__snapshots__/daemon.dev.yaml b/packages/kontinuous/tests/__snapshots__/daemon.dev.yaml index b125ba0314..44031176b9 100644 --- a/packages/kontinuous/tests/__snapshots__/daemon.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/daemon.dev.yaml @@ -152,12 +152,8 @@ spec: - image: harbor.fabrique.social.gouv.fr/test-daemon/daemon:sha-ffac537e6cbbf934b08745a378932722df287a53 name: app resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} lifecycle: postStart: exec: diff --git a/packages/kontinuous/tests/__snapshots__/deactivate.dev.yaml b/packages/kontinuous/tests/__snapshots__/deactivate.dev.yaml index ace8f4fb35..4c5c30e163 100644 --- a/packages/kontinuous/tests/__snapshots__/deactivate.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/deactivate.dev.yaml @@ -68,12 +68,8 @@ spec: - name: action mountPath: /action resources: - limits: - cpu: 1000m - memory: 1024Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: bitnami/kubectl:latest @@ -96,12 +92,8 @@ spec: kubectl delete namespace \\"$NAMESPACE\\" --now=true --wait=false fi resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} securityContext: runAsUser: 1001 runAsGroup: 1001 diff --git a/packages/kontinuous/tests/__snapshots__/extends-ovh.dev.yaml b/packages/kontinuous/tests/__snapshots__/extends-ovh.dev.yaml index c9d97ffcb4..583836cae5 100644 --- a/packages/kontinuous/tests/__snapshots__/extends-ovh.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/extends-ovh.dev.yaml @@ -147,12 +147,8 @@ spec: - name: action mountPath: /action resources: - limits: - cpu: 1000m - memory: 1024Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: bitnami/kubectl:latest @@ -191,12 +187,8 @@ spec: set -e /action/create-secrets.sh resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} securityContext: runAsUser: 1001 runAsGroup: 1001 @@ -310,12 +302,8 @@ spec: - name: action mountPath: /action resources: - limits: - cpu: 1000m - memory: 1024Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: bitnami/kubectl:latest @@ -354,12 +342,8 @@ spec: set -e /action/create-secrets.sh resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} securityContext: runAsUser: 1001 runAsGroup: 1001 @@ -503,12 +487,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} lifecycle: postStart: exec: diff --git a/packages/kontinuous/tests/__snapshots__/extends-ovh.prod.yaml b/packages/kontinuous/tests/__snapshots__/extends-ovh.prod.yaml index 16da9eb0bc..8b52e9a2e6 100644 --- a/packages/kontinuous/tests/__snapshots__/extends-ovh.prod.yaml +++ b/packages/kontinuous/tests/__snapshots__/extends-ovh.prod.yaml @@ -308,12 +308,8 @@ spec: - name: action mountPath: /action resources: - limits: - cpu: 1000m - memory: 1024Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: bitnami/kubectl:latest @@ -352,12 +348,8 @@ spec: set -e /action/create-secrets.sh resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} securityContext: runAsUser: 1001 runAsGroup: 1001 @@ -471,12 +463,8 @@ spec: - name: action mountPath: /action resources: - limits: - cpu: 1000m - memory: 1024Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: bitnami/kubectl:latest @@ -515,12 +503,8 @@ spec: set -e /action/create-secrets.sh resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} securityContext: runAsUser: 1001 runAsGroup: 1001 @@ -664,12 +648,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} lifecycle: postStart: exec: diff --git a/packages/kontinuous/tests/__snapshots__/hasura-no-ing.prod.yaml b/packages/kontinuous/tests/__snapshots__/hasura-no-ing.prod.yaml index 5e497e1404..b808074a04 100644 --- a/packages/kontinuous/tests/__snapshots__/hasura-no-ing.prod.yaml +++ b/packages/kontinuous/tests/__snapshots__/hasura-no-ing.prod.yaml @@ -151,12 +151,8 @@ spec: initialDelaySeconds: 5 periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} startupProbe: failureThreshold: 30 httpGet: diff --git a/packages/kontinuous/tests/__snapshots__/if-env.dev.yaml b/packages/kontinuous/tests/__snapshots__/if-env.dev.yaml index 6bc8d3eb4d..e3debe2c0b 100644 --- a/packages/kontinuous/tests/__snapshots__/if-env.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/if-env.dev.yaml @@ -177,12 +177,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} lifecycle: postStart: exec: diff --git a/packages/kontinuous/tests/__snapshots__/if-env.local.yaml b/packages/kontinuous/tests/__snapshots__/if-env.local.yaml index ab7ea854be..5319c4c8e7 100644 --- a/packages/kontinuous/tests/__snapshots__/if-env.local.yaml +++ b/packages/kontinuous/tests/__snapshots__/if-env.local.yaml @@ -174,12 +174,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} lifecycle: postStart: exec: diff --git a/packages/kontinuous/tests/__snapshots__/include-file.dev.yaml b/packages/kontinuous/tests/__snapshots__/include-file.dev.yaml index 2b84647293..d9b71b45cb 100644 --- a/packages/kontinuous/tests/__snapshots__/include-file.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/include-file.dev.yaml @@ -148,12 +148,8 @@ spec: - name: workspace mountPath: /workspace resources: - limits: - cpu: 1000m - memory: 1024Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: debian:stable @@ -171,12 +167,8 @@ spec: set -e Hello World ! resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} securityContext: runAsUser: 1000 runAsGroup: 1000 diff --git a/packages/kontinuous/tests/__snapshots__/inline-values.dev.yaml b/packages/kontinuous/tests/__snapshots__/inline-values.dev.yaml index 4be2c805de..d7b91911e8 100644 --- a/packages/kontinuous/tests/__snapshots__/inline-values.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/inline-values.dev.yaml @@ -177,12 +177,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} lifecycle: postStart: exec: diff --git a/packages/kontinuous/tests/__snapshots__/job-builds.dev.yaml b/packages/kontinuous/tests/__snapshots__/job-builds.dev.yaml index 9ae5f9d0eb..3b2d74f93a 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: 2000m - memory: 8192Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: moby/buildkit:v0.13.0-rootless @@ -432,12 +428,8 @@ spec: - name: workspace mountPath: /workspace resources: - limits: - cpu: 2000m - memory: 4096Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + 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 e18a6ba3c9..5d8a4807ef 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: 2000m - memory: 4096Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: moby/buildkit:v0.13.0-rootless diff --git a/packages/kontinuous/tests/__snapshots__/jobs-build-options.dev.yaml b/packages/kontinuous/tests/__snapshots__/jobs-build-options.dev.yaml index 6955f1cb4a..bbf12f3be3 100644 --- a/packages/kontinuous/tests/__snapshots__/jobs-build-options.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/jobs-build-options.dev.yaml @@ -150,12 +150,8 @@ spec: - name: workspace mountPath: /workspace resources: - limits: - cpu: 2000m - memory: 4096Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: moby/buildkit:v0.13.0-rootless @@ -462,12 +458,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} envFrom: - secretRef: name: pg-user diff --git a/packages/kontinuous/tests/__snapshots__/jobs-build-stage.dev.yaml b/packages/kontinuous/tests/__snapshots__/jobs-build-stage.dev.yaml index 88e6526d7f..83891f9805 100644 --- a/packages/kontinuous/tests/__snapshots__/jobs-build-stage.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/jobs-build-stage.dev.yaml @@ -147,12 +147,8 @@ spec: - name: action mountPath: /action resources: - limits: - cpu: 1000m - memory: 1024Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: ghcr.io/socialgouv/docker/psql:6.70.0 @@ -201,12 +197,8 @@ spec: set -e /action/ensure-db.sh resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} securityContext: runAsUser: 1000 runAsGroup: 1000 @@ -310,12 +302,8 @@ spec: - name: action mountPath: /action resources: - limits: - cpu: 1000m - memory: 1024Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: bitnami/kubectl:latest @@ -351,12 +339,8 @@ spec: set -e /action/create-secret.sh resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} securityContext: runAsUser: 1001 runAsGroup: 1001 @@ -474,12 +458,8 @@ spec: - name: workspace mountPath: /workspace resources: - limits: - cpu: 2000m - memory: 4096Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: moby/buildkit:v0.13.0-rootless @@ -757,12 +737,8 @@ spec: - name: workspace mountPath: /workspace resources: - limits: - cpu: 2000m - memory: 4096Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: moby/buildkit:v0.13.0-rootless @@ -1067,12 +1043,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} envFrom: - secretRef: name: pg-user @@ -1174,12 +1146,8 @@ spec: initialDelaySeconds: 5 periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} startupProbe: failureThreshold: 30 httpGet: diff --git a/packages/kontinuous/tests/__snapshots__/jobs-build.dev.yaml b/packages/kontinuous/tests/__snapshots__/jobs-build.dev.yaml index 6b7c5698cb..10c4b640aa 100644 --- a/packages/kontinuous/tests/__snapshots__/jobs-build.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/jobs-build.dev.yaml @@ -147,12 +147,8 @@ spec: - name: action mountPath: /action resources: - limits: - cpu: 1000m - memory: 1024Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: ghcr.io/socialgouv/docker/psql:6.70.0 @@ -201,12 +197,8 @@ spec: set -e /action/ensure-db.sh resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} securityContext: runAsUser: 1000 runAsGroup: 1000 @@ -310,12 +302,8 @@ spec: - name: action mountPath: /action resources: - limits: - cpu: 1000m - memory: 1024Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: bitnami/kubectl:latest @@ -351,12 +339,8 @@ spec: set -e /action/create-secret.sh resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} securityContext: runAsUser: 1001 runAsGroup: 1001 @@ -473,12 +457,8 @@ spec: - name: workspace mountPath: /workspace resources: - limits: - cpu: 2000m - memory: 4096Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: moby/buildkit:v0.13.0-rootless @@ -755,12 +735,8 @@ spec: - name: workspace mountPath: /workspace resources: - limits: - cpu: 2000m - memory: 4096Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: moby/buildkit:v0.13.0-rootless @@ -1065,12 +1041,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} envFrom: - secretRef: name: pg-user @@ -1172,12 +1144,8 @@ spec: initialDelaySeconds: 5 periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} startupProbe: failureThreshold: 30 httpGet: diff --git a/packages/kontinuous/tests/__snapshots__/jobs-runs-map.dev.yaml b/packages/kontinuous/tests/__snapshots__/jobs-runs-map.dev.yaml index ead98a8e52..b92a72ccdf 100644 --- a/packages/kontinuous/tests/__snapshots__/jobs-runs-map.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/jobs-runs-map.dev.yaml @@ -146,12 +146,8 @@ spec: - name: action mountPath: /action resources: - limits: - cpu: 1000m - memory: 1024Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: ghcr.io/socialgouv/docker/psql:6.70.0 @@ -200,12 +196,8 @@ spec: set -e /action/ensure-db.sh resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} securityContext: runAsUser: 1000 runAsGroup: 1000 @@ -309,12 +301,8 @@ spec: - name: action mountPath: /action resources: - limits: - cpu: 1000m - memory: 1024Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: bitnami/kubectl:latest @@ -350,12 +338,8 @@ spec: set -e /action/create-secret.sh resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} securityContext: runAsUser: 1001 runAsGroup: 1001 diff --git a/packages/kontinuous/tests/__snapshots__/jobs-uses-relative.dev.yaml b/packages/kontinuous/tests/__snapshots__/jobs-uses-relative.dev.yaml index b809a189a6..893b84c583 100644 --- a/packages/kontinuous/tests/__snapshots__/jobs-uses-relative.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/jobs-uses-relative.dev.yaml @@ -146,12 +146,8 @@ spec: - name: action mountPath: /action resources: - limits: - cpu: 1000m - memory: 1024Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: ghcr.io/socialgouv/docker/psql:6.70.0 @@ -200,12 +196,8 @@ spec: set -e /action/ensure-db.sh resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} securityContext: runAsUser: 1000 runAsGroup: 1000 @@ -309,12 +301,8 @@ spec: - name: action mountPath: /action resources: - limits: - cpu: 1000m - memory: 1024Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: bitnami/kubectl:latest @@ -350,12 +338,8 @@ spec: set -e /action/create-secret.sh resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} securityContext: runAsUser: 1001 runAsGroup: 1001 diff --git a/packages/kontinuous/tests/__snapshots__/jobs-uses-self-ref.dev.yaml b/packages/kontinuous/tests/__snapshots__/jobs-uses-self-ref.dev.yaml index 2770790fbf..012e519b03 100644 --- a/packages/kontinuous/tests/__snapshots__/jobs-uses-self-ref.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/jobs-uses-self-ref.dev.yaml @@ -146,12 +146,8 @@ spec: - name: action mountPath: /action resources: - limits: - cpu: 1000m - memory: 1024Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: ghcr.io/socialgouv/docker/psql:6.70.0 @@ -200,12 +196,8 @@ spec: set -e /action/ensure-db.sh resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} securityContext: runAsUser: 1000 runAsGroup: 1000 @@ -309,12 +301,8 @@ spec: - name: action mountPath: /action resources: - limits: - cpu: 1000m - memory: 1024Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: bitnami/kubectl:latest @@ -350,12 +338,8 @@ spec: set -e /action/create-secret.sh resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} securityContext: runAsUser: 1001 runAsGroup: 1001 diff --git a/packages/kontinuous/tests/__snapshots__/long-branch-host-patch.dev.yaml b/packages/kontinuous/tests/__snapshots__/long-branch-host-patch.dev.yaml index 1891fbc9c4..e93f09afb4 100644 --- a/packages/kontinuous/tests/__snapshots__/long-branch-host-patch.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/long-branch-host-patch.dev.yaml @@ -177,12 +177,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} lifecycle: postStart: exec: diff --git a/packages/kontinuous/tests/__snapshots__/long-branch-host.dev.yaml b/packages/kontinuous/tests/__snapshots__/long-branch-host.dev.yaml index f5a36b679e..75878b3d83 100644 --- a/packages/kontinuous/tests/__snapshots__/long-branch-host.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/long-branch-host.dev.yaml @@ -177,12 +177,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} lifecycle: postStart: exec: diff --git a/packages/kontinuous/tests/__snapshots__/maildev.dev.yaml b/packages/kontinuous/tests/__snapshots__/maildev.dev.yaml index 8e08e71f1c..236c8b1ce6 100644 --- a/packages/kontinuous/tests/__snapshots__/maildev.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/maildev.dev.yaml @@ -162,10 +162,7 @@ spec: securityContext: runAsUser: 1000 runAsGroup: 1000 - resources: - requests: - cpu: 81m - memory: 262Mi + resources: {} lifecycle: postStart: exec: diff --git a/packages/kontinuous/tests/__snapshots__/maildev.prod.yaml b/packages/kontinuous/tests/__snapshots__/maildev.prod.yaml index 5416cde636..a77bf1aa4a 100644 --- a/packages/kontinuous/tests/__snapshots__/maildev.prod.yaml +++ b/packages/kontinuous/tests/__snapshots__/maildev.prod.yaml @@ -161,10 +161,7 @@ spec: securityContext: runAsUser: 1000 runAsGroup: 1000 - resources: - requests: - cpu: 81m - memory: 262Mi + resources: {} lifecycle: postStart: exec: diff --git a/packages/kontinuous/tests/__snapshots__/meta-log.dev.yaml b/packages/kontinuous/tests/__snapshots__/meta-log.dev.yaml index b2fbb8eeb6..66a896e830 100644 --- a/packages/kontinuous/tests/__snapshots__/meta-log.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/meta-log.dev.yaml @@ -149,12 +149,8 @@ spec: - name: workspace mountPath: /workspace resources: - limits: - cpu: 1000m - memory: 1024Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: debian:stable @@ -166,12 +162,8 @@ spec: - name: KONTINUOUS_INPUT value: /kontinuous-input resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} securityContext: runAsUser: 1000 runAsGroup: 1000 @@ -278,12 +270,8 @@ spec: - name: workspace mountPath: /workspace resources: - limits: - cpu: 1000m - memory: 1024Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: debian:stable @@ -295,12 +283,8 @@ spec: - name: KONTINUOUS_INPUT value: /kontinuous-input resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} securityContext: runAsUser: 1000 runAsGroup: 1000 @@ -435,12 +419,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} lifecycle: postStart: exec: diff --git a/packages/kontinuous/tests/__snapshots__/needs-using-argocd-sync-waves.dev.yaml b/packages/kontinuous/tests/__snapshots__/needs-using-argocd-sync-waves.dev.yaml index c318595d1a..b7f55d1cb4 100644 --- a/packages/kontinuous/tests/__snapshots__/needs-using-argocd-sync-waves.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/needs-using-argocd-sync-waves.dev.yaml @@ -177,12 +177,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} lifecycle: postStart: exec: @@ -303,12 +299,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} lifecycle: postStart: exec: @@ -429,12 +421,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} lifecycle: postStart: exec: @@ -555,12 +543,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} lifecycle: postStart: exec: @@ -681,12 +665,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} lifecycle: postStart: exec: @@ -807,12 +787,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} lifecycle: postStart: exec: diff --git a/packages/kontinuous/tests/__snapshots__/output.dev.yaml b/packages/kontinuous/tests/__snapshots__/output.dev.yaml index 53249a8bd3..cf0ac23541 100644 --- a/packages/kontinuous/tests/__snapshots__/output.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/output.dev.yaml @@ -173,12 +173,8 @@ spec: - name: workspace mountPath: /workspace resources: - limits: - cpu: 1000m - memory: 1024Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: debian:stable @@ -196,12 +192,8 @@ spec: set -e echo earth>$KONTINUOUS_OUTPUT/WORLD resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} securityContext: runAsUser: 1000 runAsGroup: 1000 @@ -310,12 +302,8 @@ spec: - name: workspace mountPath: /workspace resources: - limits: - cpu: 1000m - memory: 1024Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: debian:stable @@ -335,12 +323,8 @@ spec: echo \\"Hello $PLANET !\\" sleep 10 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} securityContext: runAsUser: 1000 runAsGroup: 1000 diff --git a/packages/kontinuous/tests/__snapshots__/override-env-default.dev.yaml b/packages/kontinuous/tests/__snapshots__/override-env-default.dev.yaml index a935e88fcd..f0c114db0c 100644 --- a/packages/kontinuous/tests/__snapshots__/override-env-default.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/override-env-default.dev.yaml @@ -227,12 +227,8 @@ spec: - name: action mountPath: /action resources: - limits: - cpu: 1000m - memory: 1024Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: bitnami/kubectl:latest @@ -271,12 +267,8 @@ spec: set -e /action/create-secrets.sh resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} securityContext: runAsUser: 1001 runAsGroup: 1001 diff --git a/packages/kontinuous/tests/__snapshots__/persist.dev.yaml b/packages/kontinuous/tests/__snapshots__/persist.dev.yaml index af023b5bef..6daa88daf1 100644 --- a/packages/kontinuous/tests/__snapshots__/persist.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/persist.dev.yaml @@ -177,12 +177,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} lifecycle: postStart: exec: diff --git a/packages/kontinuous/tests/__snapshots__/pg.prod.yaml b/packages/kontinuous/tests/__snapshots__/pg.prod.yaml index 76e2faaaef..c3db237ff8 100644 --- a/packages/kontinuous/tests/__snapshots__/pg.prod.yaml +++ b/packages/kontinuous/tests/__snapshots__/pg.prod.yaml @@ -227,12 +227,8 @@ spec: - name: action mountPath: /action resources: - limits: - cpu: 1000m - memory: 1024Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: bitnami/kubectl:latest @@ -271,12 +267,8 @@ spec: set -e /action/create-secrets.sh resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} securityContext: runAsUser: 1001 runAsGroup: 1001 @@ -396,12 +388,8 @@ spec: initialDelaySeconds: 5 periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} startupProbe: failureThreshold: 30 httpGet: diff --git a/packages/kontinuous/tests/__snapshots__/pgweb.dev.yaml b/packages/kontinuous/tests/__snapshots__/pgweb.dev.yaml index 893f174265..b2adb91382 100644 --- a/packages/kontinuous/tests/__snapshots__/pgweb.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/pgweb.dev.yaml @@ -182,10 +182,7 @@ spec: - /var/run/readiness-check/readiness-file initialDelaySeconds: 5 periodSeconds: 5 - resources: - requests: - cpu: 81m - memory: 262Mi + resources: {} lifecycle: postStart: exec: diff --git a/packages/kontinuous/tests/__snapshots__/post-renderer.dev.yaml b/packages/kontinuous/tests/__snapshots__/post-renderer.dev.yaml index 7ec19d5213..1a3155988c 100644 --- a/packages/kontinuous/tests/__snapshots__/post-renderer.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/post-renderer.dev.yaml @@ -178,12 +178,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} lifecycle: postStart: exec: diff --git a/packages/kontinuous/tests/__snapshots__/private-mode.dev.yaml b/packages/kontinuous/tests/__snapshots__/private-mode.dev.yaml index e5a0a39a72..d575b9fc36 100644 --- a/packages/kontinuous/tests/__snapshots__/private-mode.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/private-mode.dev.yaml @@ -177,12 +177,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} lifecycle: postStart: exec: diff --git a/packages/kontinuous/tests/__snapshots__/project-chart-implicit-enabled.dev.yaml b/packages/kontinuous/tests/__snapshots__/project-chart-implicit-enabled.dev.yaml index 2ae30696cc..d3ce45dbca 100644 --- a/packages/kontinuous/tests/__snapshots__/project-chart-implicit-enabled.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/project-chart-implicit-enabled.dev.yaml @@ -132,10 +132,6 @@ spec: image: nginx:1.14.2 ports: - containerPort: 80 - resources: - requests: - cpu: 81m - memory: 262Mi lifecycle: postStart: exec: diff --git a/packages/kontinuous/tests/__snapshots__/repo.domifa.dev.yaml b/packages/kontinuous/tests/__snapshots__/repo.domifa.dev.yaml index 2bd417d167..8034791ca7 100644 --- a/packages/kontinuous/tests/__snapshots__/repo.domifa.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/repo.domifa.dev.yaml @@ -186,12 +186,8 @@ spec: - name: workspace mountPath: /workspace resources: - limits: - cpu: 2000m - memory: 4096Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: moby/buildkit:v0.13.0-rootless @@ -473,12 +469,8 @@ spec: - name: workspace mountPath: /workspace resources: - limits: - cpu: 2000m - memory: 4096Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: moby/buildkit:v0.13.0-rootless @@ -761,12 +753,8 @@ spec: - name: workspace mountPath: /workspace resources: - limits: - cpu: 2000m - memory: 4096Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: moby/buildkit:v0.13.0-rootless @@ -1045,12 +1033,8 @@ spec: - name: workspace mountPath: /workspace resources: - limits: - cpu: 2000m - memory: 4096Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: moby/buildkit:v0.13.0-rootless @@ -1327,12 +1311,8 @@ spec: - name: action mountPath: /action resources: - limits: - cpu: 1000m - memory: 1024Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: ghcr.io/socialgouv/docker/psql:6.70.0 @@ -1381,12 +1361,8 @@ spec: set -e /action/ensure-db.sh resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} securityContext: runAsUser: 1000 runAsGroup: 1000 @@ -1491,12 +1467,8 @@ spec: - name: action mountPath: /action resources: - limits: - cpu: 1000m - memory: 1024Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: bitnami/kubectl:latest @@ -1532,12 +1504,8 @@ spec: set -e /action/create-secret.sh resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} securityContext: runAsUser: 1001 runAsGroup: 1001 @@ -1650,12 +1618,8 @@ spec: - name: action mountPath: /action resources: - limits: - cpu: 1000m - memory: 1024Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: ghcr.io/socialgouv/docker/psql:7.0.0 @@ -1679,12 +1643,8 @@ spec: set -e /action/drop-db.sh resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} securityContext: runAsUser: 1000 runAsGroup: 1000 @@ -1792,12 +1752,8 @@ spec: - name: workspace mountPath: /workspace resources: - limits: - cpu: 1000m - memory: 1024Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} - name: degit-action image: ghcr.io/socialgouv/kontinuous/degit:v1.176.5 command: @@ -1812,12 +1768,8 @@ spec: - name: action mountPath: /action resources: - limits: - cpu: 1000m - memory: 1024Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: ghcr.io/socialgouv/docker/psql:7.0.0 @@ -1839,12 +1791,8 @@ spec: set -e /action/seed-db.sh resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} securityContext: runAsUser: 1000 runAsGroup: 1000 @@ -2417,12 +2365,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} lifecycle: postStart: exec: @@ -2542,12 +2486,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} lifecycle: postStart: exec: diff --git a/packages/kontinuous/tests/__snapshots__/repo.domifa.preprod.yaml b/packages/kontinuous/tests/__snapshots__/repo.domifa.preprod.yaml index 2cd06ba772..5b5213bdb4 100644 --- a/packages/kontinuous/tests/__snapshots__/repo.domifa.preprod.yaml +++ b/packages/kontinuous/tests/__snapshots__/repo.domifa.preprod.yaml @@ -185,12 +185,8 @@ spec: - name: workspace mountPath: /workspace resources: - limits: - cpu: 2000m - memory: 4096Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: moby/buildkit:v0.13.0-rootless @@ -468,12 +464,8 @@ spec: - name: workspace mountPath: /workspace resources: - limits: - cpu: 2000m - memory: 4096Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: moby/buildkit:v0.13.0-rootless @@ -756,12 +748,8 @@ spec: - name: workspace mountPath: /workspace resources: - limits: - cpu: 2000m - memory: 4096Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: moby/buildkit:v0.13.0-rootless @@ -1040,12 +1028,8 @@ spec: - name: workspace mountPath: /workspace resources: - limits: - cpu: 2000m - memory: 4096Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: moby/buildkit:v0.13.0-rootless @@ -1793,12 +1777,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} lifecycle: postStart: exec: @@ -1918,12 +1898,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} lifecycle: postStart: exec: diff --git a/packages/kontinuous/tests/__snapshots__/repo.domifa.prod.yaml b/packages/kontinuous/tests/__snapshots__/repo.domifa.prod.yaml index 707f839cdb..97e8f2776a 100644 --- a/packages/kontinuous/tests/__snapshots__/repo.domifa.prod.yaml +++ b/packages/kontinuous/tests/__snapshots__/repo.domifa.prod.yaml @@ -240,12 +240,8 @@ spec: - name: workspace mountPath: /workspace resources: - limits: - cpu: 2000m - memory: 4096Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: moby/buildkit:v0.13.0-rootless @@ -526,12 +522,8 @@ spec: - name: workspace mountPath: /workspace resources: - limits: - cpu: 2000m - memory: 4096Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: moby/buildkit:v0.13.0-rootless @@ -814,12 +806,8 @@ spec: - name: workspace mountPath: /workspace resources: - limits: - cpu: 2000m - memory: 4096Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: moby/buildkit:v0.13.0-rootless @@ -1099,12 +1087,8 @@ spec: - name: workspace mountPath: /workspace resources: - limits: - cpu: 2000m - memory: 4096Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: moby/buildkit:v0.13.0-rootless @@ -1862,12 +1846,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} lifecycle: postStart: exec: @@ -1987,12 +1967,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} lifecycle: postStart: exec: diff --git a/packages/kontinuous/tests/__snapshots__/sample-1.dev.yaml b/packages/kontinuous/tests/__snapshots__/sample-1.dev.yaml index 0a590e4c5d..9da8dc2d2d 100644 --- a/packages/kontinuous/tests/__snapshots__/sample-1.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/sample-1.dev.yaml @@ -256,12 +256,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} envFrom: - secretRef: name: pg-user @@ -396,12 +392,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} envFrom: - secretRef: name: pg-user @@ -504,12 +496,8 @@ spec: initialDelaySeconds: 5 periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} startupProbe: failureThreshold: 30 httpGet: @@ -625,10 +613,7 @@ spec: - /var/run/readiness-check/readiness-file initialDelaySeconds: 5 periodSeconds: 5 - resources: - requests: - cpu: 81m - memory: 262Mi + resources: {} lifecycle: postStart: exec: diff --git a/packages/kontinuous/tests/__snapshots__/sample-1.preprod.yaml b/packages/kontinuous/tests/__snapshots__/sample-1.preprod.yaml index 57e50309d1..ea5881e0c6 100644 --- a/packages/kontinuous/tests/__snapshots__/sample-1.preprod.yaml +++ b/packages/kontinuous/tests/__snapshots__/sample-1.preprod.yaml @@ -255,12 +255,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} envFrom: - secretRef: name: pg-user @@ -386,12 +382,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} envFrom: - secretRef: name: pg-user @@ -492,12 +484,8 @@ spec: initialDelaySeconds: 5 periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} startupProbe: failureThreshold: 30 httpGet: @@ -612,10 +600,7 @@ spec: - /var/run/readiness-check/readiness-file initialDelaySeconds: 5 periodSeconds: 5 - resources: - requests: - cpu: 81m - memory: 262Mi + resources: {} lifecycle: postStart: exec: diff --git a/packages/kontinuous/tests/__snapshots__/sample-1.prod.yaml b/packages/kontinuous/tests/__snapshots__/sample-1.prod.yaml index 5a9eadf799..a54c18cd08 100644 --- a/packages/kontinuous/tests/__snapshots__/sample-1.prod.yaml +++ b/packages/kontinuous/tests/__snapshots__/sample-1.prod.yaml @@ -251,12 +251,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} envFrom: - secretRef: name: pg-user @@ -382,12 +378,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} envFrom: - secretRef: name: pg-user @@ -488,12 +480,8 @@ spec: initialDelaySeconds: 5 periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} startupProbe: failureThreshold: 30 httpGet: @@ -608,10 +596,7 @@ spec: - /var/run/readiness-check/readiness-file initialDelaySeconds: 5 periodSeconds: 5 - resources: - requests: - cpu: 81m - memory: 262Mi + resources: {} lifecycle: postStart: exec: diff --git a/packages/kontinuous/tests/__snapshots__/socialgouv-autodevops-override.dev.yaml b/packages/kontinuous/tests/__snapshots__/socialgouv-autodevops-override.dev.yaml index 7934796281..c372bab1b3 100644 --- a/packages/kontinuous/tests/__snapshots__/socialgouv-autodevops-override.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/socialgouv-autodevops-override.dev.yaml @@ -150,12 +150,8 @@ spec: - name: workspace mountPath: /workspace resources: - limits: - cpu: 2000m - memory: 4096Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: moby/buildkit:v0.13.0-rootless @@ -461,12 +457,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} lifecycle: postStart: exec: diff --git a/packages/kontinuous/tests/__snapshots__/socialgouv-autodevops.dev.yaml b/packages/kontinuous/tests/__snapshots__/socialgouv-autodevops.dev.yaml index bc2988b681..89af04cf5e 100644 --- a/packages/kontinuous/tests/__snapshots__/socialgouv-autodevops.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/socialgouv-autodevops.dev.yaml @@ -150,12 +150,8 @@ spec: - name: workspace mountPath: /workspace resources: - limits: - cpu: 2000m - memory: 4096Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: moby/buildkit:v0.13.0-rootless @@ -460,12 +456,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} lifecycle: postStart: exec: diff --git a/packages/kontinuous/tests/__snapshots__/standalone-charts.dev.yaml b/packages/kontinuous/tests/__snapshots__/standalone-charts.dev.yaml index add18df18c..a89c4e4ea3 100644 --- a/packages/kontinuous/tests/__snapshots__/standalone-charts.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/standalone-charts.dev.yaml @@ -59,10 +59,6 @@ spec: - | set -e echo Hello World - resources: - requests: - cpu: 81m - memory: 262Mi affinity: nodeAffinity: preferredDuringSchedulingIgnoredDuringExecution: diff --git a/packages/kontinuous/tests/__snapshots__/values-extends.dev.yaml b/packages/kontinuous/tests/__snapshots__/values-extends.dev.yaml index ae6e872be7..c5ed9a05f9 100644 --- a/packages/kontinuous/tests/__snapshots__/values-extends.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/values-extends.dev.yaml @@ -149,12 +149,8 @@ spec: - name: workspace mountPath: /workspace resources: - limits: - cpu: 1000m - memory: 1024Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: harbor.fabrique.social.gouv.fr/test-values-extends/app:sha-ffac537e6cbbf934b08745a378932722df287a53 @@ -171,12 +167,8 @@ spec: set -e yarn seed resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} securityContext: runAsUser: 1000 runAsGroup: 1000 @@ -312,12 +304,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} lifecycle: postStart: exec: diff --git a/packages/kontinuous/tests/__snapshots__/values-extends.preprod.yaml b/packages/kontinuous/tests/__snapshots__/values-extends.preprod.yaml index 305d866bed..a5f84ef87d 100644 --- a/packages/kontinuous/tests/__snapshots__/values-extends.preprod.yaml +++ b/packages/kontinuous/tests/__snapshots__/values-extends.preprod.yaml @@ -149,12 +149,8 @@ spec: - name: workspace mountPath: /workspace resources: - limits: - cpu: 1000m - memory: 1024Mi - requests: - cpu: \\"0\\" - memory: \\"0\\" + limits: {} + requests: {} containers: - name: job image: harbor.fabrique.social.gouv.fr/test-values-extends/app:preprod-ffac537e6cbbf934b08745a378932722df287a53 @@ -171,12 +167,8 @@ spec: set -e yarn seed resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} securityContext: runAsUser: 1000 runAsGroup: 1000 @@ -312,12 +304,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} lifecycle: postStart: exec: diff --git a/packages/kontinuous/tests/__snapshots__/values-js.dev.yaml b/packages/kontinuous/tests/__snapshots__/values-js.dev.yaml index d7ae739ec0..fef88bfdd0 100644 --- a/packages/kontinuous/tests/__snapshots__/values-js.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/values-js.dev.yaml @@ -176,12 +176,8 @@ spec: port: http periodSeconds: 5 resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 81m - memory: 262Mi + limits: {} + requests: {} lifecycle: postStart: exec: diff --git a/plugins/contrib/config.schema.json b/plugins/contrib/config.schema.json index c02bfa4b15..0e967407e0 100644 --- a/plugins/contrib/config.schema.json +++ b/plugins/contrib/config.schema.json @@ -297,42 +297,6 @@ } } }, - "defaultMinResourcesRequests": { - "type": "object", - "title": "defaultMinResourcesRequests", - "markdownDescription": "Configuration of the defaultMinResourcesRequests plugin\n\nSee [plugin source](https://github.com/SocialGouv/kontinuous/blob/master/plugins/contrib/patches/20-default-min-resources-requests.js)", - "properties": { - "enabled": { - "title": "defaultMinResourcesRequests.enabled", - "description": "Enable or disable this plugin", - "type": "boolean" - }, - "options": { - "title": "defaultMinResourcesRequests.options", - "markdownDescription": "Options of the defaultMinResourcesRequests plugin\n\nSee [plugin source](https://github.com/SocialGouv/kontinuous/blob/master/plugins/contrib/patches/20-default-min-resources-requests.js)", - "type": "object", - "properties": {} - } - } - }, - "defaultMaxResourcesLimits": { - "type": "object", - "title": "defaultMaxResourcesLimits", - "markdownDescription": "Configuration of the defaultMaxResourcesLimits plugin\n\nSee [plugin source](https://github.com/SocialGouv/kontinuous/blob/master/plugins/contrib/patches/21-default-max-resources-limits.js)", - "properties": { - "enabled": { - "title": "defaultMaxResourcesLimits.enabled", - "description": "Enable or disable this plugin", - "type": "boolean" - }, - "options": { - "title": "defaultMaxResourcesLimits.options", - "markdownDescription": "Options of the defaultMaxResourcesLimits plugin\n\nSee [plugin source](https://github.com/SocialGouv/kontinuous/blob/master/plugins/contrib/patches/21-default-max-resources-limits.js)", - "type": "object", - "properties": {} - } - } - }, "janitor": { "type": "object", "title": "janitor", @@ -971,4 +935,4 @@ } } } -} +} \ No newline at end of file diff --git a/plugins/contrib/patches/20-default-min-resources-requests.js b/plugins/contrib/patches/20-default-min-resources-requests.js deleted file mode 100644 index 6bdf351309..0000000000 --- a/plugins/contrib/patches/20-default-min-resources-requests.js +++ /dev/null @@ -1,155 +0,0 @@ -const runnableKinds = ["Deployment", "Job", "StatefulSet", "DaemonSet"] - -const { - getCpuAsNum, - getMemoryAsNum, - getCpuAsString, - getMemoryAsString, -} = require("../lib/kubernetes-resource-helpers") - -module.exports = (manifests, options, { logger }) => { - const { - requests = {}, - avoidOutOfpods = false, - avoidOutOfpodsMargin = {}, - nodeConfig = {}, - } = options - - const { - maxPods = 110, - cpu: cpuNodeConfig, - memory: memoryNodeConfig, - } = nodeConfig - - const { - cpu: cpuAvoidOutOfpodsMargin = 0, - memory: memoryAvoidOutOfpodsMargin = 0, - } = avoidOutOfpodsMargin - - let { cpu, memory } = requests - - if (cpu === undefined || cpu === null) { - if (avoidOutOfpods) { - if (!cpuNodeConfig) { - throw new Error( - `you have enable "avoidOutOfpods" and doesn't specified default cpu request, so it requires missing nodeConfig.cpu to make the calculation` - ) - } - const cpuNodeAsNum = getCpuAsNum(cpuNodeConfig) - const cpuMarginAsNum = getCpuAsNum(cpuAvoidOutOfpodsMargin) - - const minimumCpuNumber = cpuNodeAsNum / maxPods + cpuMarginAsNum - cpu = getCpuAsString(minimumCpuNumber) - logger.trace( - `calculated min cpu: ${cpuNodeConfig}/${maxPods}${ - cpuMarginAsNum ? ` + ${cpuAvoidOutOfpodsMargin}` : "" - } = ${cpu}` - ) - } else { - cpu = "0" - } - } - if (memory === undefined || memory === null) { - if (avoidOutOfpods) { - if (!memoryNodeConfig) { - throw new Error( - `you have enable "avoidOutOfpods" and doesn't specified default memory request, so it requires missing nodeConfig.memory to make the calculation` - ) - } - const memoryNodeAsNum = getMemoryAsNum(memoryNodeConfig) - const memoryMarginAsNum = getMemoryAsNum(memoryAvoidOutOfpodsMargin) - const minimumMemoryNumber = memoryNodeAsNum / maxPods + memoryMarginAsNum - memory = getMemoryAsString(minimumMemoryNumber) - logger.trace( - `calculated min memory: ${memoryNodeConfig}/${maxPods}${ - memoryMarginAsNum ? ` + ${memoryAvoidOutOfpodsMargin}` : "" - } = ${memory}` - ) - } else { - memory = 0 - } - } - - for (const manifest of manifests) { - const { kind } = manifest - - if (!runnableKinds.includes(kind)) { - continue - } - - const containers = manifest.spec?.template?.spec?.containers - if (containers && containers.length > 0) { - let cpuByContainer = cpu - let memoryByContainer = memory - if (containers.length > 1) { - const cpuByContainerNumber = - Math.ceil((getCpuAsNum(cpu) / containers.length) * 1000) / 1000 - const memoryByContainerNumber = Math.ceil( - getMemoryAsNum(memory) / containers.length - ) - cpuByContainer = getCpuAsString(cpuByContainerNumber) - memoryByContainer = getMemoryAsString(memoryByContainerNumber) - } - for (const container of containers) { - if (!container.resources) { - container.resources = {} - } - - // if limits are specified and are lower than request we adjust request up - const cpuLimit = container.resources?.limits?.cpu - if (cpuLimit) { - const cpuLimitNumber = getCpuAsNum(cpuLimit) - let cpuByContainerNumber = getCpuAsNum(cpuByContainer) - if (cpuLimitNumber < cpuByContainerNumber) { - cpuByContainerNumber = cpuLimitNumber - cpuByContainer = getCpuAsString(cpuByContainerNumber) - } - } - const memoryLimit = container.resources?.limits?.memory - if (memoryLimit) { - const memoryLimitNumber = getMemoryAsNum(memoryLimit) - let memoryByContainerNumber = getCpuAsNum(cpuByContainer) - if (memoryLimitNumber < memoryByContainerNumber) { - memoryByContainerNumber = memoryLimitNumber - memoryByContainer = getMemoryAsString(memoryByContainerNumber) - } - } - - if (!container.resources.requests) { - container.resources.requests = {} - } - const definedCpu = container.resources.requests?.cpu - if (definedCpu === undefined || definedCpu === null) { - container.resources.requests.cpu = cpuByContainer.toString() - } - const definedMemory = container.resources.requests?.memory - if (definedMemory === undefined || definedMemory === null) { - container.resources.requests.memory = memoryByContainer.toString() - } - } - } - - const initContainers = manifest.spec?.template?.spec?.initContainers || [] - const { initContainersResourcesRequests = {} } = options - for (const container of initContainers) { - if (!container.resources) { - container.resources = {} - } - if (!container.resources.requests) { - container.resources.requests = {} - } - const definedCpu = container.resources.requests?.cpu - if (definedCpu === undefined || definedCpu === null) { - container.resources.requests.cpu = - initContainersResourcesRequests.cpu || "0" - } - const definedMemory = container.resources.requests?.memory - if (definedMemory === undefined || definedMemory === null) { - container.resources.requests.memory = - initContainersResourcesRequests.memory || "0" - } - } - } - - return manifests -} diff --git a/plugins/contrib/patches/21-default-max-resources-limits.js b/plugins/contrib/patches/21-default-max-resources-limits.js deleted file mode 100644 index 8ff3969697..0000000000 --- a/plugins/contrib/patches/21-default-max-resources-limits.js +++ /dev/null @@ -1,69 +0,0 @@ -/* -see https://kubernetes.io/docs/concepts/workloads/pods/init-containers/#resources -Given the ordering and execution for init containers, the following rules for resource usage apply: -- The highest of any particular resource request or limit defined on all init containers is the effective init request/limit. If any resource has no resource limit specified this is considered as the highest limit. -- The Pod's effective request/limit for a resource is the higher of: - - the sum of all app containers request/limit for a resource - - the effective init request/limit for a resource -*/ - -const { - getCpuAsNum, - getMemoryAsNum, - getCpuAsString, - getMemoryAsString, -} = require("../lib/kubernetes-resource-helpers") - -module.exports = (manifests, options, { logger }) => { - const { cpu = 3, memory = "8Gi" } = options - - for (const manifest of manifests) { - const spec = manifest.spec?.template?.spec - const { kind, metadata } = manifest - const { name, namespace } = metadata - - const containers = spec?.containers || [] - - let sumOfContainersCpuLimit = 0 - let sumOfContainersMemoryLimit = 0 - - for (const container of containers) { - if (!container.resources) { - container.resources = {} - } - const { resources: { limits = {} } = {} } = container - if (limits.cpu === undefined || limits.cpu === null) { - logger.warn( - `defaulting cpu limit: ${namespace}/${kind}/${name} container ${container.name} does not have cpu limits defaulting to ${cpu}` - ) - limits.cpu = cpu - } - if (limits.memory === undefined || limits.memory === null) { - logger.warn( - `defaulting memory limit: ${namespace}/${kind}/${name} container ${container.name} does not have memory limits defaulting to ${memory}` - ) - limits.memory = memory - } - sumOfContainersCpuLimit += getCpuAsNum(limits.cpu) - sumOfContainersMemoryLimit += getMemoryAsNum(limits.memory) - } - - const initContainers = spec?.initContainers || [] - for (const initContainer of initContainers) { - if (!initContainer.resources) { - initContainer.resources = {} - } - const { - resources: { limits = {} }, - } = initContainer - if (limits.cpu === undefined || limits.cpu === null) { - limits.cpu = getCpuAsString(sumOfContainersCpuLimit) - } - if (limits.memory === undefined || limits.memory === null) { - limits.memory = getMemoryAsString(sumOfContainersMemoryLimit) - } - } - } - - return manifests -} diff --git a/plugins/contrib/patches/tests/default-min-resources-requests.test.js b/plugins/contrib/patches/tests/default-min-resources-requests.test.js deleted file mode 100644 index 958419540a..0000000000 --- a/plugins/contrib/patches/tests/default-min-resources-requests.test.js +++ /dev/null @@ -1,330 +0,0 @@ -const defaultMinRequests = require("../20-default-min-resources-requests") - -const samples = [ - { - title: "without initial requests without avoidOutOfpods", - options: { - avoidOutOfpods: false, - }, - manifests: [ - { - kind: "Deployment", - spec: { template: { spec: { containers: [{ name: "container1" }] } } }, - }, - ], - expected: { - containers: [ - { - cpu: "0", - memory: "0", - }, - ], - }, - }, - { - title: "with avoidOutOfpods", - options: { - avoidOutOfpods: true, - nodeConfig: { - cpu: "7820m", - memory: "24505448Ki", - }, - }, - manifests: [ - { - kind: "Deployment", - metadata: { - annotations: {}, - }, - spec: { - template: { - spec: { - containers: [ - { - name: "container1", - resources: { requests: { cpu: 0.5, memory: "64Mi" } }, - }, - ], - }, - }, - }, - }, - ], - expected: { - containers: [ - { - cpu: 0.5, - memory: "64Mi", - }, - ], - }, - }, - { - title: "with avoidOutOfpods and no requests", - options: { - avoidOutOfpods: true, - nodeConfig: { - cpu: "7820m", - memory: "24505448Ki", - }, - }, - manifests: [ - { - kind: "Deployment", - metadata: { - annotations: {}, - }, - spec: { - template: { - spec: { - containers: [ - { - name: "container1", - resources: { requests: {} }, - }, - ], - }, - }, - }, - }, - ], - expected: { - containers: [ - { - cpu: "71m", - memory: "218Mi", - }, - ], - }, - }, - { - title: "with avoidOutOfpods, multiple containers and initcontainers", - options: { - avoidOutOfpods: true, - nodeConfig: { - cpu: "7820m", - memory: "24505448Ki", - }, - }, - manifests: [ - { - kind: "Deployment", - metadata: { - annotations: {}, - }, - spec: { - template: { - spec: { - containers: [ - { - name: "container1", - resources: { requests: { cpu: 0.5, memory: "64Mi" } }, - }, - { - name: "container2", - resources: { requests: { cpu: 1, memory: "128Mi" } }, - }, - ], - initContainers: [ - { - name: "initcontainer1", - resources: { requests: { cpu: 0.5, memory: "64Mi" } }, - }, - { - name: "initcontainer2", - resources: { requests: { cpu: 1, memory: "128Mi" } }, - }, - ], - }, - }, - }, - }, - ], - expected: { - containers: [ - { - cpu: 0.5, - memory: "64Mi", - }, - { - cpu: 1, - memory: "128Mi", - }, - ], - initContainers: [ - { - cpu: 0.5, - memory: "64Mi", - }, - { - cpu: 1, - memory: "128Mi", - }, - ], - }, - }, - { - title: - "with avoidOutOfpods, multiple containers and initcontainers, no requests", - options: { - avoidOutOfpods: true, - nodeConfig: { - cpu: "7820m", - memory: "24505448Ki", - }, - }, - manifests: [ - { - kind: "Deployment", - metadata: { - annotations: {}, - }, - spec: { - template: { - spec: { - containers: [ - { - name: "container1", - resources: { requests: {} }, - }, - { - name: "container2", - resources: { requests: {} }, - }, - ], - initContainers: [ - { - name: "initcontainer1", - resources: { requests: {} }, - }, - { - name: "initcontainer2", - resources: { requests: {} }, - }, - ], - }, - }, - }, - }, - ], - expected: { - containers: [ - { - cpu: "36m", - memory: "109Mi", - }, - { - cpu: "36m", - memory: "109Mi", - }, - ], - initContainers: [ - { - cpu: "0", - memory: "0", - }, - { - cpu: "0", - memory: "0", - }, - ], - }, - }, - { - title: - "avoidOutOfpods: with minimize-dev-resources-requests-disable annotation", - options: { - avoidOutOfpods: true, - nodeConfig: { - cpu: "7820m", - memory: "24505448Ki", - }, - }, - manifests: [ - { - kind: "Deployment", - metadata: { - annotations: { - "patches.kontinuous/minimize-dev-resources-requests-disable": true, - }, - }, - spec: { - template: { - spec: { - containers: [ - { - name: "container1", - resources: { requests: { cpu: 0.5, memory: "64Mi" } }, - }, - { - name: "container2", - resources: { requests: { cpu: 1, memory: "128Mi" } }, - }, - ], - initContainers: [ - { - name: "initcontainer1", - resources: { requests: { cpu: 0.5, memory: "64Mi" } }, - }, - { - name: "initcontainer2", - resources: { requests: { cpu: 1, memory: "128Mi" } }, - }, - ], - }, - }, - }, - }, - ], - expected: { - containers: [ - { - cpu: 0.5, - memory: "64Mi", - }, - { - cpu: 1, - memory: "128Mi", - }, - ], - initContainers: [ - { - cpu: 0.5, - memory: "64Mi", - }, - { - cpu: 1, - memory: "128Mi", - }, - ], - }, - }, -] - -samples.forEach((sample) => { - test(`${sample.title}`, async () => { - const ctx = require("~common/ctx") - - const res = defaultMinRequests(sample.manifests, sample.options, { - config: { environment: "dev" }, - ctx, - logger: { - trace: () => {}, - }, - }) - expect( - res[0].spec.template.spec.containers.map( - (container) => container.resources.requests - ) - ).toEqual(sample.expected.containers) - - if (sample.expected.initContainers) { - // eslint-disable-next-line jest/no-conditional-expect - expect( - res[0].spec.template.spec.initContainers.map( - (container) => container.resources.requests - ) - ).toEqual(sample.expected.initContainers) - } - }) -}) diff --git a/plugins/fabrique/kontinuous.yaml b/plugins/fabrique/kontinuous.yaml index c1e94546b1..b383c9cddf 100644 --- a/plugins/fabrique/kontinuous.yaml +++ b/plugins/fabrique/kontinuous.yaml @@ -43,20 +43,6 @@ dependencies: enabled: false filterDisableKapp: enabled: true - defaultMinResourcesRequests: - options: - avoidOutOfpods: true - avoidOutOfpodsMargin: - cpu: 10m - memory: 10Mi - nodeConfig: - maxPods: 110 - cpu: 7820m - memory: 27717Mi - defaultMaxResourcesLimits: - options: - cpu: 1 - memory: 1Gi addJobsAffinityAndTolerations: enabled: true options: