From b4f51e8ecf6b8fe8df2e3647a87ad1be0c2b4283 Mon Sep 17 00:00:00 2001 From: Gary van Woerkens Date: Mon, 6 May 2024 16:46:06 +0200 Subject: [PATCH 1/2] feat: set ovh as default env --- plugins/fabrique/extends/ovh.yaml | 41 ------------------------------- plugins/fabrique/kontinuous.yaml | 31 ++++++++++++----------- 2 files changed, 17 insertions(+), 55 deletions(-) diff --git a/plugins/fabrique/extends/ovh.yaml b/plugins/fabrique/extends/ovh.yaml index 9f4baa35cf..e69de29bb2 100644 --- a/plugins/fabrique/extends/ovh.yaml +++ b/plugins/fabrique/extends/ovh.yaml @@ -1,41 +0,0 @@ -config: - kubeconfigContext: ovh - provider: ovh - -valuesCompilers: - globalDefaults: - options: - devDomain: ovh.fabrique.social.gouv.fr -patches: - setUndefinedStorageClassname: - options: - defaultStorageClassName: "" - setUndefinedStorageClassnameCnpg: - options: - defaultStorageClassName: csi-cinder-high-speed - -dependencies: - contrib: - validators: - sealedSecrets: - options: - clusters: - dev: - kubesealEndpoint: "https://kubeseal.ovh.fabrique.social.gouv.fr" - prod: - kubesealEndpoint: "https://kubeseal.ovh-prod.fabrique.social.gouv.fr" - patches: - certs: - options: - wildcardHost: ".ovh.fabrique.social.gouv.fr" - - defaultMinResourcesRequests: - options: - avoidOutOfpods: true - avoidOutOfpodsMargin: - cpu: 10m - memory: 10Mi - nodeConfig: - maxPods: 110 - cpu: 7820m - memory: 27717Mi diff --git a/plugins/fabrique/kontinuous.yaml b/plugins/fabrique/kontinuous.yaml index 97b9553942..c1bec638c4 100644 --- a/plugins/fabrique/kontinuous.yaml +++ b/plugins/fabrique/kontinuous.yaml @@ -1,10 +1,10 @@ patches: setUndefinedStorageClassname: options: - defaultStorageClassName: "azurefile" + defaultStorageClassName: "" setUndefinedStorageClassnameCnpg: options: - defaultStorageClassName: "managed-csi" + defaultStorageClassName: sc-hspeed-gen2-delete dependencies: contrib: @@ -24,7 +24,7 @@ dependencies: certs: enabled: true options: - wildcardHost: ".dev.fabrique.social.gouv.fr" + wildcardHost: ".ovh.fabrique.social.gouv.fr" internalHosts: - ".fabrique.social.gouv.fr" - ".beta.gouv.fr" @@ -48,7 +48,7 @@ dependencies: cpu: 10m memory: 10Mi nodeConfig: - maxPods: 250 + maxPods: 110 cpu: 7820m memory: 27717Mi defaultMaxResourcesLimits: @@ -86,6 +86,12 @@ dependencies: enabled: true sealedSecrets: enabled: true + options: + clusters: + dev: + kubesealEndpoint: "https://kubeseal.ovh.fabrique.social.gouv.fr" + prod: + kubesealEndpoint: "https://kubeseal.ovh-prod.fabrique.social.gouv.fr" kubeconform: options: kubeVersion: null @@ -165,20 +171,17 @@ dependencies: config: webhookUri: https://kontinuous.fabrique.social.gouv.fr + kubeconfigContext: ovh options: kubernetesMethod: kubeconfig surviveOnBrokenCluster: true - clusters: - dev: - kubesealEndpoint: "https://kubeseal.dev2.fabrique.social.gouv.fr" - environments: - - dev - - preprod - prod: - kubesealEndpoint: "https://kubeseal.prod2.fabrique.social.gouv.fr" - environments: - - prod + registry: "harbor.fabrique.social.gouv.fr" domain: "fabrique.social.gouv.fr" + +valuesCompilers: + globalDefaults: + options: + devDomain: ovh.fabrique.social.gouv.fr From 7bfebb908110656c2964f2b40b46254c2a24fccb Mon Sep 17 00:00:00 2001 From: Gary van Woerkens Date: Mon, 6 May 2024 18:05:20 +0200 Subject: [PATCH 2/2] chore: update snapshot --- .../tests/__snapshots__/app-sidecar.dev.yaml | 12 +-- .../__snapshots__/app-simple-options.dev.yaml | 20 ++--- .../tests/__snapshots__/app-simple.dev.yaml | 8 +- .../tests/__snapshots__/app-simple.prod.yaml | 4 +- .../tests/__snapshots__/chart-group.dev.yaml | 16 ++-- .../tests/__snapshots__/chart-groups.dev.yaml | 16 ++-- .../chart-not-in-values.dev.yaml | 8 +- .../tests/__snapshots__/charts.dev.yaml | 4 +- .../tests/__snapshots__/daemon.dev.yaml | 4 +- .../tests/__snapshots__/deactivate.dev.yaml | 4 +- .../tests/__snapshots__/extends-ovh.dev.yaml | 4 +- .../tests/__snapshots__/extends-ovh.prod.yaml | 16 ++-- .../__snapshots__/hasura-no-ing.prod.yaml | 4 +- .../tests/__snapshots__/if-env.dev.yaml | 8 +- .../tests/__snapshots__/if-env.local.yaml | 8 +- .../tests/__snapshots__/include-file.dev.yaml | 4 +- .../__snapshots__/inline-values.dev.yaml | 8 +- .../tests/__snapshots__/job-builds.dev.yaml | 2 +- .../__snapshots__/jobs-build-options.dev.yaml | 8 +- .../__snapshots__/jobs-build-stage.dev.yaml | 24 +++--- .../tests/__snapshots__/jobs-build.dev.yaml | 24 +++--- .../__snapshots__/jobs-runs-map.dev.yaml | 8 +- .../__snapshots__/jobs-uses-relative.dev.yaml | 8 +- .../__snapshots__/jobs-uses-self-ref.dev.yaml | 8 +- .../long-branch-host-patch.dev.yaml | 8 +- .../__snapshots__/long-branch-host.dev.yaml | 8 +- .../tests/__snapshots__/maildev.dev.yaml | 8 +- .../tests/__snapshots__/maildev.prod.yaml | 4 +- .../tests/__snapshots__/meta-log.dev.yaml | 16 ++-- .../needs-using-argocd-sync-waves.dev.yaml | 48 ++++++------ .../tests/__snapshots__/output.dev.yaml | 9 +-- .../override-env-default.dev.yaml | 2 +- .../tests/__snapshots__/persist.dev.yaml | 8 +- .../tests/__snapshots__/pg.prod.yaml | 10 +-- .../tests/__snapshots__/pgweb.dev.yaml | 8 +- .../__snapshots__/post-renderer.dev.yaml | 8 +- .../tests/__snapshots__/private-mode.dev.yaml | 8 +- .../project-chart-implicit-enabled.dev.yaml | 4 +- .../tests/__snapshots__/repo.domifa.dev.yaml | 74 +++++++++---------- .../__snapshots__/repo.domifa.preprod.yaml | 50 ++++++------- .../tests/__snapshots__/repo.domifa.prod.yaml | 8 +- .../tests/__snapshots__/sample-1.dev.yaml | 32 ++++---- .../tests/__snapshots__/sample-1.preprod.yaml | 32 ++++---- .../tests/__snapshots__/sample-1.prod.yaml | 16 ++-- .../socialgouv-autodevops-override.dev.yaml | 8 +- .../socialgouv-autodevops.dev.yaml | 8 +- .../__snapshots__/standalone-charts.dev.yaml | 4 +- .../__snapshots__/values-extends.dev.yaml | 12 +-- .../__snapshots__/values-extends.preprod.yaml | 12 +-- .../tests/__snapshots__/values-js.dev.yaml | 4 +- 50 files changed, 319 insertions(+), 320 deletions(-) diff --git a/packages/kontinuous/tests/__snapshots__/app-sidecar.dev.yaml b/packages/kontinuous/tests/__snapshots__/app-sidecar.dev.yaml index 6f169a82ca..2cd59d303f 100644 --- a/packages/kontinuous/tests/__snapshots__/app-sidecar.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/app-sidecar.dev.yaml @@ -183,8 +183,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 21m - memory: 61Mi + cpu: 41m + memory: 131Mi - name: cronjob image: test/background-cronjob command: @@ -196,8 +196,8 @@ spec: runAsUser: 1000 resources: requests: - cpu: 21m - memory: 61Mi + cpu: 41m + memory: 131Mi --- apiVersion: v1 kind: Service @@ -251,7 +251,7 @@ metadata: namespace: test-app-sidecar-feature-branch-1 spec: rules: - - host: test-app-sidecar-feature-branch-1.dev.fabrique.social.gouv.fr + - host: test-app-sidecar-feature-branch-1.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -263,7 +263,7 @@ spec: pathType: Prefix tls: - hosts: - - test-app-sidecar-feature-branch-1.dev.fabrique.social.gouv.fr + - test-app-sidecar-feature-branch-1.ovh.fabrique.social.gouv.fr secretName: wildcard-crt " `; diff --git a/packages/kontinuous/tests/__snapshots__/app-simple-options.dev.yaml b/packages/kontinuous/tests/__snapshots__/app-simple-options.dev.yaml index 7016bc85d4..29fd4cab96 100644 --- a/packages/kontinuous/tests/__snapshots__/app-simple-options.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/app-simple-options.dev.yaml @@ -205,8 +205,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi securityContext: runAsUser: 1000 runAsGroup: 1000 @@ -355,8 +355,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi securityContext: runAsUser: 1001 runAsGroup: 1001 @@ -502,8 +502,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi securityContext: runAsUser: 1000 runAsGroup: 1000 @@ -662,8 +662,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi securityContext: runAsUser: 1000 runAsGroup: 1000 @@ -877,7 +877,7 @@ metadata: namespace: test-app-simple-options-feature-branch-1 spec: rules: - - host: test-app-simple-options-feature-branch-1.dev.fabrique.social.gouv.fr + - host: test-app-simple-options-feature-branch-1.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -889,7 +889,7 @@ spec: pathType: Prefix tls: - hosts: - - test-app-simple-options-feature-branch-1.dev.fabrique.social.gouv.fr + - test-app-simple-options-feature-branch-1.ovh.fabrique.social.gouv.fr secretName: wildcard-crt " `; diff --git a/packages/kontinuous/tests/__snapshots__/app-simple.dev.yaml b/packages/kontinuous/tests/__snapshots__/app-simple.dev.yaml index e35a929b94..83450a5859 100644 --- a/packages/kontinuous/tests/__snapshots__/app-simple.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/app-simple.dev.yaml @@ -183,8 +183,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi --- apiVersion: v1 kind: Service @@ -238,7 +238,7 @@ metadata: namespace: test-app-simple-feature-branch-1 spec: rules: - - host: test-app-simple-feature-branch-1.dev.fabrique.social.gouv.fr + - host: test-app-simple-feature-branch-1.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -250,7 +250,7 @@ spec: pathType: Prefix tls: - hosts: - - test-app-simple-feature-branch-1.dev.fabrique.social.gouv.fr + - test-app-simple-feature-branch-1.ovh.fabrique.social.gouv.fr secretName: wildcard-crt " `; diff --git a/packages/kontinuous/tests/__snapshots__/app-simple.prod.yaml b/packages/kontinuous/tests/__snapshots__/app-simple.prod.yaml index 8b2f084bdd..5709cbcaff 100644 --- a/packages/kontinuous/tests/__snapshots__/app-simple.prod.yaml +++ b/packages/kontinuous/tests/__snapshots__/app-simple.prod.yaml @@ -182,8 +182,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi --- apiVersion: v1 kind: Service diff --git a/packages/kontinuous/tests/__snapshots__/chart-group.dev.yaml b/packages/kontinuous/tests/__snapshots__/chart-group.dev.yaml index fb92796793..8c3e97404d 100644 --- a/packages/kontinuous/tests/__snapshots__/chart-group.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/chart-group.dev.yaml @@ -106,8 +106,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi --- apiVersion: apps/v1 kind: Deployment @@ -214,8 +214,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi --- apiVersion: v1 kind: Service @@ -301,7 +301,7 @@ metadata: namespace: test-chart-group-feature-branch-1 spec: rules: - - host: api1-test-chart-group-feature-branch-1.dev.fabrique.social.gouv.fr + - host: api1-test-chart-group-feature-branch-1.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -313,7 +313,7 @@ spec: pathType: Prefix tls: - hosts: - - api1-test-chart-group-feature-branch-1.dev.fabrique.social.gouv.fr + - api1-test-chart-group-feature-branch-1.ovh.fabrique.social.gouv.fr secretName: wildcard-crt --- apiVersion: networking.k8s.io/v1 @@ -340,7 +340,7 @@ metadata: namespace: test-chart-group-feature-branch-1 spec: rules: - - host: api2-test-chart-group-feature-branch-1.dev.fabrique.social.gouv.fr + - host: api2-test-chart-group-feature-branch-1.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -352,7 +352,7 @@ spec: pathType: Prefix tls: - hosts: - - api2-test-chart-group-feature-branch-1.dev.fabrique.social.gouv.fr + - api2-test-chart-group-feature-branch-1.ovh.fabrique.social.gouv.fr secretName: wildcard-crt " `; diff --git a/packages/kontinuous/tests/__snapshots__/chart-groups.dev.yaml b/packages/kontinuous/tests/__snapshots__/chart-groups.dev.yaml index 2a414965d7..6f662dd2e3 100644 --- a/packages/kontinuous/tests/__snapshots__/chart-groups.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/chart-groups.dev.yaml @@ -106,8 +106,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi --- apiVersion: apps/v1 kind: Deployment @@ -214,8 +214,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi --- apiVersion: v1 kind: Service @@ -301,7 +301,7 @@ metadata: namespace: test-chart-groups-feature-branch-1 spec: rules: - - host: api1-test-chart-groups-feature-branch-1.dev.fabrique.social.gouv.fr + - host: api1-test-chart-groups-feature-branch-1.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -313,7 +313,7 @@ spec: pathType: Prefix tls: - hosts: - - api1-test-chart-groups-feature-branch-1.dev.fabrique.social.gouv.fr + - api1-test-chart-groups-feature-branch-1.ovh.fabrique.social.gouv.fr secretName: wildcard-crt --- apiVersion: networking.k8s.io/v1 @@ -340,7 +340,7 @@ metadata: namespace: test-chart-groups-feature-branch-1 spec: rules: - - host: api2-test-chart-groups-feature-branch-1.dev.fabrique.social.gouv.fr + - host: api2-test-chart-groups-feature-branch-1.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -352,7 +352,7 @@ spec: pathType: Prefix tls: - hosts: - - api2-test-chart-groups-feature-branch-1.dev.fabrique.social.gouv.fr + - api2-test-chart-groups-feature-branch-1.ovh.fabrique.social.gouv.fr secretName: wildcard-crt " `; 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 be8d7a472b..6e18806f99 100644 --- a/packages/kontinuous/tests/__snapshots__/chart-not-in-values.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/chart-not-in-values.dev.yaml @@ -105,8 +105,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi --- apiVersion: v1 kind: Service @@ -160,7 +160,7 @@ metadata: namespace: test-chart-not-in-values-feature-branch-1 spec: rules: - - host: test-chart-not-in-values-feature-branch-1.dev.fabrique.social.gouv.fr + - host: test-chart-not-in-values-feature-branch-1.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -172,7 +172,7 @@ spec: pathType: Prefix tls: - hosts: - - test-chart-not-in-values-feature-branch-1.dev.fabrique.social.gouv.fr + - test-chart-not-in-values-feature-branch-1.ovh.fabrique.social.gouv.fr secretName: wildcard-crt " `; diff --git a/packages/kontinuous/tests/__snapshots__/charts.dev.yaml b/packages/kontinuous/tests/__snapshots__/charts.dev.yaml index 977b62a9f4..03962dce64 100644 --- a/packages/kontinuous/tests/__snapshots__/charts.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/charts.dev.yaml @@ -159,8 +159,8 @@ spec: FOO=\\"barjo\\"\\" resources: requests: - cpu: 41m - memory: 121Mi + 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 2b370aca99..3791add487 100644 --- a/packages/kontinuous/tests/__snapshots__/daemon.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/daemon.dev.yaml @@ -156,7 +156,7 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi " `; diff --git a/packages/kontinuous/tests/__snapshots__/deactivate.dev.yaml b/packages/kontinuous/tests/__snapshots__/deactivate.dev.yaml index 325dc2a891..b99b0e36de 100644 --- a/packages/kontinuous/tests/__snapshots__/deactivate.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/deactivate.dev.yaml @@ -100,8 +100,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi 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 42a7435022..2308054ec0 100644 --- a/packages/kontinuous/tests/__snapshots__/extends-ovh.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/extends-ovh.dev.yaml @@ -627,7 +627,7 @@ spec: memory: 1G storage: size: 8Gi - storageClass: csi-cinder-high-speed + storageClass: sc-hspeed-gen2-delete minSyncReplicas: 0 maxSyncReplicas: 0 postgresql: @@ -706,7 +706,7 @@ spec: memory: 1G storage: size: 8Gi - storageClass: csi-cinder-high-speed + storageClass: sc-hspeed-gen2-delete minSyncReplicas: 0 maxSyncReplicas: 0 postgresql: diff --git a/packages/kontinuous/tests/__snapshots__/extends-ovh.prod.yaml b/packages/kontinuous/tests/__snapshots__/extends-ovh.prod.yaml index a3b19d6bce..a898dd3af6 100644 --- a/packages/kontinuous/tests/__snapshots__/extends-ovh.prod.yaml +++ b/packages/kontinuous/tests/__snapshots__/extends-ovh.prod.yaml @@ -356,8 +356,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi securityContext: runAsUser: 1001 runAsGroup: 1001 @@ -519,8 +519,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi securityContext: runAsUser: 1001 runAsGroup: 1001 @@ -670,8 +670,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi --- apiVersion: v1 kind: Service @@ -791,7 +791,7 @@ spec: memory: 1G storage: size: 8Gi - storageClass: managed-csi + storageClass: sc-hspeed-gen2-delete backup: retentionPolicy: 60d barmanObjectStore: @@ -889,7 +889,7 @@ spec: memory: 1G storage: size: 8Gi - storageClass: managed-csi + storageClass: sc-hspeed-gen2-delete backup: retentionPolicy: 60d barmanObjectStore: diff --git a/packages/kontinuous/tests/__snapshots__/hasura-no-ing.prod.yaml b/packages/kontinuous/tests/__snapshots__/hasura-no-ing.prod.yaml index 1c9f19196d..d090a2289e 100644 --- a/packages/kontinuous/tests/__snapshots__/hasura-no-ing.prod.yaml +++ b/packages/kontinuous/tests/__snapshots__/hasura-no-ing.prod.yaml @@ -157,8 +157,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi 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 57e974411e..9a65510a6e 100644 --- a/packages/kontinuous/tests/__snapshots__/if-env.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/if-env.dev.yaml @@ -183,8 +183,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi --- apiVersion: v1 kind: Service @@ -238,7 +238,7 @@ metadata: namespace: test-if-env-feature-branch-1 spec: rules: - - host: test-if-env-feature-branch-1.dev.fabrique.social.gouv.fr + - host: test-if-env-feature-branch-1.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -250,7 +250,7 @@ spec: pathType: Prefix tls: - hosts: - - test-if-env-feature-branch-1.dev.fabrique.social.gouv.fr + - test-if-env-feature-branch-1.ovh.fabrique.social.gouv.fr secretName: wildcard-crt " `; diff --git a/packages/kontinuous/tests/__snapshots__/if-env.local.yaml b/packages/kontinuous/tests/__snapshots__/if-env.local.yaml index 76ba804171..f09c9649e1 100644 --- a/packages/kontinuous/tests/__snapshots__/if-env.local.yaml +++ b/packages/kontinuous/tests/__snapshots__/if-env.local.yaml @@ -180,8 +180,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi --- apiVersion: v1 kind: Service @@ -235,7 +235,7 @@ metadata: namespace: test-if-env-feature-branch-1 spec: rules: - - host: test-if-env-feature-branch-1.dev.fabrique.social.gouv.fr + - host: test-if-env-feature-branch-1.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -247,7 +247,7 @@ spec: pathType: Prefix tls: - hosts: - - test-if-env-feature-branch-1.dev.fabrique.social.gouv.fr + - test-if-env-feature-branch-1.ovh.fabrique.social.gouv.fr secretName: app-crt " `; diff --git a/packages/kontinuous/tests/__snapshots__/include-file.dev.yaml b/packages/kontinuous/tests/__snapshots__/include-file.dev.yaml index 9ab3a28730..3bff50fed7 100644 --- a/packages/kontinuous/tests/__snapshots__/include-file.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/include-file.dev.yaml @@ -175,8 +175,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi 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 71aea8df69..8498218a39 100644 --- a/packages/kontinuous/tests/__snapshots__/inline-values.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/inline-values.dev.yaml @@ -183,8 +183,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi --- apiVersion: v1 kind: Service @@ -238,7 +238,7 @@ metadata: namespace: test-inline-values-feature-branch-1 spec: rules: - - host: test-inline-values-feature-branch-1.dev.fabrique.social.gouv.fr + - host: test-inline-values-feature-branch-1.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -250,7 +250,7 @@ spec: pathType: Prefix tls: - hosts: - - test-inline-values-feature-branch-1.dev.fabrique.social.gouv.fr + - test-inline-values-feature-branch-1.ovh.fabrique.social.gouv.fr secretName: wildcard-crt " `; diff --git a/packages/kontinuous/tests/__snapshots__/job-builds.dev.yaml b/packages/kontinuous/tests/__snapshots__/job-builds.dev.yaml index a49168a0ec..d1a7a9e50c 100644 --- a/packages/kontinuous/tests/__snapshots__/job-builds.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/job-builds.dev.yaml @@ -272,7 +272,7 @@ spec: --opt filename=./Dockerfile \\\\ --output type=image,\\\\\\"name=$IMAGE_PATH:sha-ffac537e6cbbf934b08745a378932722df287a53,$IMAGE_PATH:feature-branch-1$LATEST_TAG\\\\\\",push=true \\\\ $buildctl_options_cache \\\\ - --opt build-arg:\\"NEXT_PUBLIC_HASURA_URL=https://hasura-test-job-builds-feature-branch-1.dev.fabrique.social.gouv.fr/v1/graphql\\" \\\\ + --opt build-arg:\\"NEXT_PUBLIC_HASURA_URL=https://hasura-test-job-builds-feature-branch-1.ovh.fabrique.social.gouv.fr/v1/graphql\\" \\\\ >\\"$pipe\\" 2>&1 return $? } diff --git a/packages/kontinuous/tests/__snapshots__/jobs-build-options.dev.yaml b/packages/kontinuous/tests/__snapshots__/jobs-build-options.dev.yaml index 890cfd31ca..147b4da1fd 100644 --- a/packages/kontinuous/tests/__snapshots__/jobs-build-options.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/jobs-build-options.dev.yaml @@ -468,8 +468,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi envFrom: - secretRef: name: pg-user @@ -532,7 +532,7 @@ metadata: namespace: test-jobs-build-options-feature-branch-1 spec: rules: - - host: test-jobs-build-options-feature-branch-1.dev.fabrique.social.gouv.fr + - host: test-jobs-build-options-feature-branch-1.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -544,7 +544,7 @@ spec: pathType: Prefix tls: - hosts: - - test-jobs-build-options-feature-branch-1.dev.fabrique.social.gouv.fr + - test-jobs-build-options-feature-branch-1.ovh.fabrique.social.gouv.fr secretName: wildcard-crt " `; diff --git a/packages/kontinuous/tests/__snapshots__/jobs-build-stage.dev.yaml b/packages/kontinuous/tests/__snapshots__/jobs-build-stage.dev.yaml index 2d129a4f01..e77bd3c2a3 100644 --- a/packages/kontinuous/tests/__snapshots__/jobs-build-stage.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/jobs-build-stage.dev.yaml @@ -205,8 +205,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi securityContext: runAsUser: 1000 runAsGroup: 1000 @@ -355,8 +355,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi securityContext: runAsUser: 1001 runAsGroup: 1001 @@ -1073,8 +1073,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi envFrom: - secretRef: name: pg-user @@ -1163,8 +1163,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi startupProbe: failureThreshold: 30 httpGet: @@ -1264,7 +1264,7 @@ metadata: namespace: test-jobs-build-stage-feature-branch-1 spec: rules: - - host: test-jobs-build-stage-feature-branch-1.dev.fabrique.social.gouv.fr + - host: test-jobs-build-stage-feature-branch-1.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -1276,7 +1276,7 @@ spec: pathType: Prefix tls: - hosts: - - test-jobs-build-stage-feature-branch-1.dev.fabrique.social.gouv.fr + - test-jobs-build-stage-feature-branch-1.ovh.fabrique.social.gouv.fr secretName: wildcard-crt --- apiVersion: networking.k8s.io/v1 @@ -1303,7 +1303,7 @@ metadata: namespace: test-jobs-build-stage-feature-branch-1 spec: rules: - - host: hasura-test-jobs-build-stage-feature-branch-1.dev.fabrique.social.gouv.fr + - host: hasura-test-jobs-build-stage-feature-branch-1.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -1315,7 +1315,7 @@ spec: pathType: Prefix tls: - hosts: - - hasura-test-jobs-build-stage-feature-branch-1.dev.fabrique.social.gouv.fr + - hasura-test-jobs-build-stage-feature-branch-1.ovh.fabrique.social.gouv.fr secretName: wildcard-crt " `; diff --git a/packages/kontinuous/tests/__snapshots__/jobs-build.dev.yaml b/packages/kontinuous/tests/__snapshots__/jobs-build.dev.yaml index ba4850f9eb..4b171107a8 100644 --- a/packages/kontinuous/tests/__snapshots__/jobs-build.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/jobs-build.dev.yaml @@ -205,8 +205,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi securityContext: runAsUser: 1000 runAsGroup: 1000 @@ -355,8 +355,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi securityContext: runAsUser: 1001 runAsGroup: 1001 @@ -1071,8 +1071,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi envFrom: - secretRef: name: pg-user @@ -1161,8 +1161,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi startupProbe: failureThreshold: 30 httpGet: @@ -1262,7 +1262,7 @@ metadata: namespace: test-jobs-build-feature-branch-1 spec: rules: - - host: test-jobs-build-feature-branch-1.dev.fabrique.social.gouv.fr + - host: test-jobs-build-feature-branch-1.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -1274,7 +1274,7 @@ spec: pathType: Prefix tls: - hosts: - - test-jobs-build-feature-branch-1.dev.fabrique.social.gouv.fr + - test-jobs-build-feature-branch-1.ovh.fabrique.social.gouv.fr secretName: wildcard-crt --- apiVersion: networking.k8s.io/v1 @@ -1301,7 +1301,7 @@ metadata: namespace: test-jobs-build-feature-branch-1 spec: rules: - - host: hasura-test-jobs-build-feature-branch-1.dev.fabrique.social.gouv.fr + - host: hasura-test-jobs-build-feature-branch-1.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -1313,7 +1313,7 @@ spec: pathType: Prefix tls: - hosts: - - hasura-test-jobs-build-feature-branch-1.dev.fabrique.social.gouv.fr + - hasura-test-jobs-build-feature-branch-1.ovh.fabrique.social.gouv.fr secretName: wildcard-crt " `; diff --git a/packages/kontinuous/tests/__snapshots__/jobs-runs-map.dev.yaml b/packages/kontinuous/tests/__snapshots__/jobs-runs-map.dev.yaml index 996affa5f1..36792504fa 100644 --- a/packages/kontinuous/tests/__snapshots__/jobs-runs-map.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/jobs-runs-map.dev.yaml @@ -204,8 +204,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi securityContext: runAsUser: 1000 runAsGroup: 1000 @@ -354,8 +354,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi 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 f38359f6fb..9efb7d9732 100644 --- a/packages/kontinuous/tests/__snapshots__/jobs-uses-relative.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/jobs-uses-relative.dev.yaml @@ -204,8 +204,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi securityContext: runAsUser: 1000 runAsGroup: 1000 @@ -354,8 +354,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi 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 d674852385..6b511138d6 100644 --- a/packages/kontinuous/tests/__snapshots__/jobs-uses-self-ref.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/jobs-uses-self-ref.dev.yaml @@ -204,8 +204,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi securityContext: runAsUser: 1000 runAsGroup: 1000 @@ -354,8 +354,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi 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 25858edc87..f453f2a9b2 100644 --- a/packages/kontinuous/tests/__snapshots__/long-branch-host-patch.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/long-branch-host-patch.dev.yaml @@ -183,8 +183,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi --- apiVersion: v1 kind: Service @@ -238,7 +238,7 @@ metadata: namespace: test-long-branch-host-patch-a-very-very-very-long-bra-2h9265rk spec: rules: - - host: some-long-prefix-name-test-long-branch-host-patch-a-v-6vwodrjq.dev.fabrique.social.gouv.fr + - host: some-long-prefix-name-test-long-branch-host-patch-a-v-6vwodrjq.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -250,7 +250,7 @@ spec: pathType: Prefix tls: - hosts: - - some-long-prefix-name-test-long-branch-host-patch-a-v-6vwodrjq.dev.fabrique.social.gouv.fr + - some-long-prefix-name-test-long-branch-host-patch-a-v-6vwodrjq.ovh.fabrique.social.gouv.fr secretName: wildcard-crt " `; diff --git a/packages/kontinuous/tests/__snapshots__/long-branch-host.dev.yaml b/packages/kontinuous/tests/__snapshots__/long-branch-host.dev.yaml index 10ddbe02cc..848ea6f241 100644 --- a/packages/kontinuous/tests/__snapshots__/long-branch-host.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/long-branch-host.dev.yaml @@ -183,8 +183,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi --- apiVersion: v1 kind: Service @@ -238,7 +238,7 @@ metadata: namespace: test-long-branch-host-a-very-very-very-long-branch-na-47z9um9b spec: rules: - - host: app-api-test-long-branch-host-a-very-very-very-long-b-4php810x.dev.fabrique.social.gouv.fr + - host: app-api-test-long-branch-host-a-very-very-very-long-b-4php810x.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -250,7 +250,7 @@ spec: pathType: Prefix tls: - hosts: - - app-api-test-long-branch-host-a-very-very-very-long-b-4php810x.dev.fabrique.social.gouv.fr + - app-api-test-long-branch-host-a-very-very-very-long-b-4php810x.ovh.fabrique.social.gouv.fr secretName: wildcard-crt " `; diff --git a/packages/kontinuous/tests/__snapshots__/maildev.dev.yaml b/packages/kontinuous/tests/__snapshots__/maildev.dev.yaml index bcad834c1d..714983f9ef 100644 --- a/packages/kontinuous/tests/__snapshots__/maildev.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/maildev.dev.yaml @@ -159,8 +159,8 @@ spec: runAsGroup: 1000 resources: requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi volumes: - name: data emptyDir: {} @@ -220,7 +220,7 @@ metadata: namespace: test-maildev-feature-branch-1 spec: rules: - - host: maildev-test-maildev-feature-branch-1.dev.fabrique.social.gouv.fr + - host: maildev-test-maildev-feature-branch-1.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -232,7 +232,7 @@ spec: pathType: Prefix tls: - hosts: - - maildev-test-maildev-feature-branch-1.dev.fabrique.social.gouv.fr + - maildev-test-maildev-feature-branch-1.ovh.fabrique.social.gouv.fr secretName: wildcard-crt " `; diff --git a/packages/kontinuous/tests/__snapshots__/maildev.prod.yaml b/packages/kontinuous/tests/__snapshots__/maildev.prod.yaml index ad1e389a19..bb3183aeac 100644 --- a/packages/kontinuous/tests/__snapshots__/maildev.prod.yaml +++ b/packages/kontinuous/tests/__snapshots__/maildev.prod.yaml @@ -158,8 +158,8 @@ spec: runAsGroup: 1000 resources: requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi volumes: - name: data emptyDir: {} diff --git a/packages/kontinuous/tests/__snapshots__/meta-log.dev.yaml b/packages/kontinuous/tests/__snapshots__/meta-log.dev.yaml index 3edfcfa017..53a17624c9 100644 --- a/packages/kontinuous/tests/__snapshots__/meta-log.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/meta-log.dev.yaml @@ -170,8 +170,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi securityContext: runAsUser: 1000 runAsGroup: 1000 @@ -299,8 +299,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi securityContext: runAsUser: 1000 runAsGroup: 1000 @@ -441,8 +441,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi --- apiVersion: v1 kind: Service @@ -496,7 +496,7 @@ metadata: namespace: test-meta-log-feature-branch-1 spec: rules: - - host: test-meta-log-feature-branch-1.dev.fabrique.social.gouv.fr + - host: test-meta-log-feature-branch-1.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -508,7 +508,7 @@ spec: pathType: Prefix tls: - hosts: - - test-meta-log-feature-branch-1.dev.fabrique.social.gouv.fr + - test-meta-log-feature-branch-1.ovh.fabrique.social.gouv.fr secretName: wildcard-crt " `; 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 36f3573b4d..45c11336f8 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 @@ -183,8 +183,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi --- apiVersion: apps/v1 kind: Deployment @@ -292,8 +292,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi --- apiVersion: apps/v1 kind: Deployment @@ -401,8 +401,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi --- apiVersion: apps/v1 kind: Deployment @@ -510,8 +510,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi --- apiVersion: apps/v1 kind: Deployment @@ -619,8 +619,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi --- apiVersion: apps/v1 kind: Deployment @@ -728,8 +728,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi --- apiVersion: v1 kind: Service @@ -933,7 +933,7 @@ metadata: namespace: test-needs-using-argocd-sync-waves-feature-branch-1 spec: rules: - - host: app1-test-needs-using-argocd-sync-waves-feature-branch-1.dev.fabrique.social.gouv.fr + - host: app1-test-needs-using-argocd-sync-waves-feature-branch-1.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -945,7 +945,7 @@ spec: pathType: Prefix tls: - hosts: - - app1-test-needs-using-argocd-sync-waves-feature-branch-1.dev.fabrique.social.gouv.fr + - app1-test-needs-using-argocd-sync-waves-feature-branch-1.ovh.fabrique.social.gouv.fr secretName: wildcard-crt --- apiVersion: networking.k8s.io/v1 @@ -972,7 +972,7 @@ metadata: namespace: test-needs-using-argocd-sync-waves-feature-branch-1 spec: rules: - - host: app2-bis-test-needs-using-argocd-sync-waves-feature-branch-1.dev.fabrique.social.gouv.fr + - host: app2-bis-test-needs-using-argocd-sync-waves-feature-branch-1.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -984,7 +984,7 @@ spec: pathType: Prefix tls: - hosts: - - app2-bis-test-needs-using-argocd-sync-waves-feature-branch-1.dev.fabrique.social.gouv.fr + - app2-bis-test-needs-using-argocd-sync-waves-feature-branch-1.ovh.fabrique.social.gouv.fr secretName: wildcard-crt --- apiVersion: networking.k8s.io/v1 @@ -1011,7 +1011,7 @@ metadata: namespace: test-needs-using-argocd-sync-waves-feature-branch-1 spec: rules: - - host: app2-test-needs-using-argocd-sync-waves-feature-branch-1.dev.fabrique.social.gouv.fr + - host: app2-test-needs-using-argocd-sync-waves-feature-branch-1.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -1023,7 +1023,7 @@ spec: pathType: Prefix tls: - hosts: - - app2-test-needs-using-argocd-sync-waves-feature-branch-1.dev.fabrique.social.gouv.fr + - app2-test-needs-using-argocd-sync-waves-feature-branch-1.ovh.fabrique.social.gouv.fr secretName: wildcard-crt --- apiVersion: networking.k8s.io/v1 @@ -1050,7 +1050,7 @@ metadata: namespace: test-needs-using-argocd-sync-waves-feature-branch-1 spec: rules: - - host: app3-test-needs-using-argocd-sync-waves-feature-branch-1.dev.fabrique.social.gouv.fr + - host: app3-test-needs-using-argocd-sync-waves-feature-branch-1.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -1062,7 +1062,7 @@ spec: pathType: Prefix tls: - hosts: - - app3-test-needs-using-argocd-sync-waves-feature-branch-1.dev.fabrique.social.gouv.fr + - app3-test-needs-using-argocd-sync-waves-feature-branch-1.ovh.fabrique.social.gouv.fr secretName: wildcard-crt --- apiVersion: networking.k8s.io/v1 @@ -1089,7 +1089,7 @@ metadata: namespace: test-needs-using-argocd-sync-waves-feature-branch-1 spec: rules: - - host: app4-test-needs-using-argocd-sync-waves-feature-branch-1.dev.fabrique.social.gouv.fr + - host: app4-test-needs-using-argocd-sync-waves-feature-branch-1.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -1101,7 +1101,7 @@ spec: pathType: Prefix tls: - hosts: - - app4-test-needs-using-argocd-sync-waves-feature-branch-1.dev.fabrique.social.gouv.fr + - app4-test-needs-using-argocd-sync-waves-feature-branch-1.ovh.fabrique.social.gouv.fr secretName: wildcard-crt --- apiVersion: networking.k8s.io/v1 @@ -1128,7 +1128,7 @@ metadata: namespace: test-needs-using-argocd-sync-waves-feature-branch-1 spec: rules: - - host: app5-test-needs-using-argocd-sync-waves-feature-branch-1.dev.fabrique.social.gouv.fr + - host: app5-test-needs-using-argocd-sync-waves-feature-branch-1.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -1140,7 +1140,7 @@ spec: pathType: Prefix tls: - hosts: - - app5-test-needs-using-argocd-sync-waves-feature-branch-1.dev.fabrique.social.gouv.fr + - app5-test-needs-using-argocd-sync-waves-feature-branch-1.ovh.fabrique.social.gouv.fr secretName: wildcard-crt " `; diff --git a/packages/kontinuous/tests/__snapshots__/output.dev.yaml b/packages/kontinuous/tests/__snapshots__/output.dev.yaml index 2af9b7b0b0..a32c6520ec 100644 --- a/packages/kontinuous/tests/__snapshots__/output.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/output.dev.yaml @@ -102,7 +102,6 @@ spec: resources: requests: storage: 20Mi - storageClassName: azurefile --- apiVersion: batch/v1 kind: Job @@ -201,8 +200,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi securityContext: runAsUser: 1000 runAsGroup: 1000 @@ -340,8 +339,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi 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 6e5b301ec1..3d44ad28d9 100644 --- a/packages/kontinuous/tests/__snapshots__/override-env-default.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/override-env-default.dev.yaml @@ -370,7 +370,7 @@ spec: memory: 1G storage: size: 8Gi - storageClass: csi-cinder-high-speed + storageClass: sc-hspeed-gen2-delete backup: retentionPolicy: 60d barmanObjectStore: diff --git a/packages/kontinuous/tests/__snapshots__/persist.dev.yaml b/packages/kontinuous/tests/__snapshots__/persist.dev.yaml index d5e122ce74..ee6a34b08b 100644 --- a/packages/kontinuous/tests/__snapshots__/persist.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/persist.dev.yaml @@ -183,8 +183,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi --- apiVersion: v1 kind: Service @@ -238,7 +238,7 @@ metadata: namespace: test-persist-my-env-persist-4c70122w spec: rules: - - host: test-persist-my-env-persist-4c70122w.dev.fabrique.social.gouv.fr + - host: test-persist-my-env-persist-4c70122w.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -250,7 +250,7 @@ spec: pathType: Prefix tls: - hosts: - - test-persist-my-env-persist-4c70122w.dev.fabrique.social.gouv.fr + - test-persist-my-env-persist-4c70122w.ovh.fabrique.social.gouv.fr secretName: wildcard-crt " `; diff --git a/packages/kontinuous/tests/__snapshots__/pg.prod.yaml b/packages/kontinuous/tests/__snapshots__/pg.prod.yaml index 936453ff51..435149bcbc 100644 --- a/packages/kontinuous/tests/__snapshots__/pg.prod.yaml +++ b/packages/kontinuous/tests/__snapshots__/pg.prod.yaml @@ -275,8 +275,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi securityContext: runAsUser: 1001 runAsGroup: 1001 @@ -402,8 +402,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi startupProbe: failureThreshold: 30 httpGet: @@ -535,7 +535,7 @@ spec: memory: 42Mb storage: size: 8Gi - storageClass: managed-csi + storageClass: sc-hspeed-gen2-delete backup: retentionPolicy: 60d barmanObjectStore: diff --git a/packages/kontinuous/tests/__snapshots__/pgweb.dev.yaml b/packages/kontinuous/tests/__snapshots__/pgweb.dev.yaml index 24b070e775..629c08b3e3 100644 --- a/packages/kontinuous/tests/__snapshots__/pgweb.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/pgweb.dev.yaml @@ -181,8 +181,8 @@ spec: port: http resources: requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi --- apiVersion: v1 kind: Service @@ -235,7 +235,7 @@ metadata: namespace: test-pgweb-feature-branch-1 spec: rules: - - host: pgweb-test-pgweb-feature-branch-1.dev.fabrique.social.gouv.fr + - host: pgweb-test-pgweb-feature-branch-1.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -247,7 +247,7 @@ spec: pathType: Prefix tls: - hosts: - - pgweb-test-pgweb-feature-branch-1.dev.fabrique.social.gouv.fr + - pgweb-test-pgweb-feature-branch-1.ovh.fabrique.social.gouv.fr secretName: wildcard-crt " `; diff --git a/packages/kontinuous/tests/__snapshots__/post-renderer.dev.yaml b/packages/kontinuous/tests/__snapshots__/post-renderer.dev.yaml index eda46c5f57..6209f3799a 100644 --- a/packages/kontinuous/tests/__snapshots__/post-renderer.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/post-renderer.dev.yaml @@ -184,8 +184,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi --- apiVersion: v1 kind: Service @@ -239,7 +239,7 @@ metadata: namespace: test-post-renderer-feature-branch-1 spec: rules: - - host: test-post-renderer-feature-branch-1.dev.fabrique.social.gouv.fr + - host: test-post-renderer-feature-branch-1.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -251,7 +251,7 @@ spec: pathType: Prefix tls: - hosts: - - test-post-renderer-feature-branch-1.dev.fabrique.social.gouv.fr + - test-post-renderer-feature-branch-1.ovh.fabrique.social.gouv.fr secretName: wildcard-crt " `; diff --git a/packages/kontinuous/tests/__snapshots__/private-mode.dev.yaml b/packages/kontinuous/tests/__snapshots__/private-mode.dev.yaml index 55414d8d75..602a530ad1 100644 --- a/packages/kontinuous/tests/__snapshots__/private-mode.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/private-mode.dev.yaml @@ -183,8 +183,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi imagePullSecrets: - name: harbor-pull-secret --- @@ -240,7 +240,7 @@ metadata: namespace: test-private-mode-feature-branch-1 spec: rules: - - host: test-private-mode-feature-branch-1.dev.fabrique.social.gouv.fr + - host: test-private-mode-feature-branch-1.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -252,7 +252,7 @@ spec: pathType: Prefix tls: - hosts: - - test-private-mode-feature-branch-1.dev.fabrique.social.gouv.fr + - test-private-mode-feature-branch-1.ovh.fabrique.social.gouv.fr secretName: wildcard-crt " `; 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 55b34f7242..bfe2f743f3 100644 --- a/packages/kontinuous/tests/__snapshots__/project-chart-implicit-enabled.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/project-chart-implicit-enabled.dev.yaml @@ -134,7 +134,7 @@ spec: - containerPort: 80 resources: requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi " `; diff --git a/packages/kontinuous/tests/__snapshots__/repo.domifa.dev.yaml b/packages/kontinuous/tests/__snapshots__/repo.domifa.dev.yaml index c7d5f73589..4538269d42 100644 --- a/packages/kontinuous/tests/__snapshots__/repo.domifa.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/repo.domifa.dev.yaml @@ -309,11 +309,11 @@ spec: --opt filename=./packages/backend/Dockerfile \\\\ --output type=image,\\\\\\"name=$IMAGE_PATH:sha-ffac537e6cbbf934b08745a378932722df287a53,$IMAGE_PATH:feature-branch-1$LATEST_TAG\\\\\\",push=true \\\\ $buildctl_options_cache \\\\ - --opt build-arg:\\"DOMIFA_BACKEND_URL=https://api-test-repo-domifa-feature-branch-1-o91f7v1i.dev.fabrique.social.gouv.fr/\\" \\\\ + --opt build-arg:\\"DOMIFA_BACKEND_URL=https://api-test-repo-domifa-feature-branch-1-o91f7v1i.ovh.fabrique.social.gouv.fr/\\" \\\\ --opt build-arg:\\"DOMIFA_ENV_ID=dev\\" \\\\ - --opt build-arg:\\"DOMIFA_FRONTEND_URL=https://test-repo-domifa-feature-branch-1-o91f7v1i.dev.fabrique.social.gouv.fr/\\" \\\\ - --opt build-arg:\\"DOMIFA_PORTAIL_ADMINS_URL=https://admin-test-repo-domifa-feature-branch-1-o91f7v1i.dev.fabrique.social.gouv.fr/\\" \\\\ - --opt build-arg:\\"DOMIFA_PORTAIL_USAGERS_URL=https://mon-test-repo-domifa-feature-branch-1-o91f7v1i.dev.fabrique.social.gouv.fr/\\" \\\\ + --opt build-arg:\\"DOMIFA_FRONTEND_URL=https://test-repo-domifa-feature-branch-1-o91f7v1i.ovh.fabrique.social.gouv.fr/\\" \\\\ + --opt build-arg:\\"DOMIFA_PORTAIL_ADMINS_URL=https://admin-test-repo-domifa-feature-branch-1-o91f7v1i.ovh.fabrique.social.gouv.fr/\\" \\\\ + --opt build-arg:\\"DOMIFA_PORTAIL_USAGERS_URL=https://mon-test-repo-domifa-feature-branch-1-o91f7v1i.ovh.fabrique.social.gouv.fr/\\" \\\\ >\\"$pipe\\" 2>&1 return $? } @@ -596,11 +596,11 @@ spec: --opt filename=./packages/frontend/Dockerfile \\\\ --output type=image,\\\\\\"name=$IMAGE_PATH:sha-ffac537e6cbbf934b08745a378932722df287a53,$IMAGE_PATH:feature-branch-1$LATEST_TAG\\\\\\",push=true \\\\ $buildctl_options_cache \\\\ - --opt build-arg:\\"DOMIFA_BACKEND_URL=https://api-test-repo-domifa-feature-branch-1-o91f7v1i.dev.fabrique.social.gouv.fr/\\" \\\\ + --opt build-arg:\\"DOMIFA_BACKEND_URL=https://api-test-repo-domifa-feature-branch-1-o91f7v1i.ovh.fabrique.social.gouv.fr/\\" \\\\ --opt build-arg:\\"DOMIFA_ENV_ID=dev\\" \\\\ --opt build-arg:\\"DOMIFA_FRONTEND_META_ROBOTS=noindex,nofollow\\" \\\\ - --opt build-arg:\\"DOMIFA_PORTAIL_ADMINS_URL=https://admin-test-repo-domifa-feature-branch-1-o91f7v1i.dev.fabrique.social.gouv.fr/\\" \\\\ - --opt build-arg:\\"DOMIFA_PORTAIL_USAGERS_URL=https://mon-test-repo-domifa-feature-branch-1-o91f7v1i.dev.fabrique.social.gouv.fr/\\" \\\\ + --opt build-arg:\\"DOMIFA_PORTAIL_ADMINS_URL=https://admin-test-repo-domifa-feature-branch-1-o91f7v1i.ovh.fabrique.social.gouv.fr/\\" \\\\ + --opt build-arg:\\"DOMIFA_PORTAIL_USAGERS_URL=https://mon-test-repo-domifa-feature-branch-1-o91f7v1i.ovh.fabrique.social.gouv.fr/\\" \\\\ --opt build-arg:\\"DOMIFA_SENTRY_DSN_FRONTEND=https://***@sentry.fabrique.social.gouv.fr/31\\" \\\\ >\\"$pipe\\" 2>&1 return $? @@ -884,7 +884,7 @@ spec: --opt filename=./packages/portail-admins/Dockerfile \\\\ --output type=image,\\\\\\"name=$IMAGE_PATH:sha-ffac537e6cbbf934b08745a378932722df287a53,$IMAGE_PATH:feature-branch-1$LATEST_TAG\\\\\\",push=true \\\\ $buildctl_options_cache \\\\ - --opt build-arg:\\"DOMIFA_BACKEND_URL=https://api-test-repo-domifa-feature-branch-1-o91f7v1i.dev.fabrique.social.gouv.fr/\\" \\\\ + --opt build-arg:\\"DOMIFA_BACKEND_URL=https://api-test-repo-domifa-feature-branch-1-o91f7v1i.ovh.fabrique.social.gouv.fr/\\" \\\\ --opt build-arg:\\"DOMIFA_ENV_ID=dev\\" \\\\ >\\"$pipe\\" 2>&1 return $? @@ -1168,7 +1168,7 @@ spec: --opt filename=./packages/portail-usagers/Dockerfile \\\\ --output type=image,\\\\\\"name=$IMAGE_PATH:sha-ffac537e6cbbf934b08745a378932722df287a53,$IMAGE_PATH:feature-branch-1$LATEST_TAG\\\\\\",push=true \\\\ $buildctl_options_cache \\\\ - --opt build-arg:\\"DOMIFA_BACKEND_URL=https://api-test-repo-domifa-feature-branch-1-o91f7v1i.dev.fabrique.social.gouv.fr/\\" \\\\ + --opt build-arg:\\"DOMIFA_BACKEND_URL=https://api-test-repo-domifa-feature-branch-1-o91f7v1i.ovh.fabrique.social.gouv.fr/\\" \\\\ --opt build-arg:\\"DOMIFA_ENV_ID=dev\\" \\\\ --opt build-arg:\\"DOMIFA_SENTRY_DSN_PORTAIL=https://***@sentry.fabrique.social.gouv.fr/58\\" \\\\ >\\"$pipe\\" 2>&1 @@ -1385,8 +1385,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi securityContext: runAsUser: 1000 runAsGroup: 1000 @@ -1536,8 +1536,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi securityContext: runAsUser: 1001 runAsGroup: 1001 @@ -1683,8 +1683,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi securityContext: runAsUser: 1000 runAsGroup: 1000 @@ -1843,8 +1843,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi securityContext: runAsUser: 1000 runAsGroup: 1000 @@ -2000,13 +2000,13 @@ spec: - name: POSTGRES_DATABASE value: $(PGDATABASE) - name: DOMIFA_BACKEND_URL - value: https://api-test-repo-domifa-feature-branch-1-o91f7v1i.dev.fabrique.social.gouv.fr/ + value: https://api-test-repo-domifa-feature-branch-1-o91f7v1i.ovh.fabrique.social.gouv.fr/ - name: DOMIFA_FRONTEND_URL - value: https://test-repo-domifa-feature-branch-1-o91f7v1i.dev.fabrique.social.gouv.fr/ + value: https://test-repo-domifa-feature-branch-1-o91f7v1i.ovh.fabrique.social.gouv.fr/ - name: DOMIFA_PORTAIL_USAGERS_URL - value: https://mon-test-repo-domifa-feature-branch-1-o91f7v1i.dev.fabrique.social.gouv.fr/ + value: https://mon-test-repo-domifa-feature-branch-1-o91f7v1i.ovh.fabrique.social.gouv.fr/ - name: DOMIFA_PORTAIL_ADMINS_URL - value: https://admin-test-repo-domifa-feature-branch-1-o91f7v1i.dev.fabrique.social.gouv.fr/ + value: https://admin-test-repo-domifa-feature-branch-1-o91f7v1i.ovh.fabrique.social.gouv.fr/ - name: DOMIFA_CRON_ENABLED value: \\"true\\" - name: ELASTIC_APM_SERVICE_NAME @@ -2141,13 +2141,13 @@ spec: - name: POSTGRES_DATABASE value: $(PGDATABASE) - name: DOMIFA_BACKEND_URL - value: https://api-test-repo-domifa-feature-branch-1-o91f7v1i.dev.fabrique.social.gouv.fr/ + value: https://api-test-repo-domifa-feature-branch-1-o91f7v1i.ovh.fabrique.social.gouv.fr/ - name: DOMIFA_FRONTEND_URL - value: https://test-repo-domifa-feature-branch-1-o91f7v1i.dev.fabrique.social.gouv.fr/ + value: https://test-repo-domifa-feature-branch-1-o91f7v1i.ovh.fabrique.social.gouv.fr/ - name: DOMIFA_PORTAIL_USAGERS_URL - value: https://mon-test-repo-domifa-feature-branch-1-o91f7v1i.dev.fabrique.social.gouv.fr/ + value: https://mon-test-repo-domifa-feature-branch-1-o91f7v1i.ovh.fabrique.social.gouv.fr/ - name: DOMIFA_PORTAIL_ADMINS_URL - value: https://admin-test-repo-domifa-feature-branch-1-o91f7v1i.dev.fabrique.social.gouv.fr/ + value: https://admin-test-repo-domifa-feature-branch-1-o91f7v1i.ovh.fabrique.social.gouv.fr/ - name: DOMIFA_CRON_ENABLED value: \\"false\\" envFrom: @@ -2374,8 +2374,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi --- apiVersion: apps/v1 kind: Deployment @@ -2482,8 +2482,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi --- apiVersion: v1 kind: Service @@ -2659,7 +2659,7 @@ metadata: namespace: test-repo-domifa-feature-branch-1-o91f7v1i spec: rules: - - host: api-test-repo-domifa-feature-branch-1-o91f7v1i.dev.fabrique.social.gouv.fr + - host: api-test-repo-domifa-feature-branch-1-o91f7v1i.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -2671,7 +2671,7 @@ spec: pathType: Prefix tls: - hosts: - - api-test-repo-domifa-feature-branch-1-o91f7v1i.dev.fabrique.social.gouv.fr + - api-test-repo-domifa-feature-branch-1-o91f7v1i.ovh.fabrique.social.gouv.fr secretName: wildcard-crt --- apiVersion: networking.k8s.io/v1 @@ -2698,7 +2698,7 @@ metadata: namespace: test-repo-domifa-feature-branch-1-o91f7v1i spec: rules: - - host: test-repo-domifa-feature-branch-1-o91f7v1i.dev.fabrique.social.gouv.fr + - host: test-repo-domifa-feature-branch-1-o91f7v1i.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -2710,7 +2710,7 @@ spec: pathType: Prefix tls: - hosts: - - test-repo-domifa-feature-branch-1-o91f7v1i.dev.fabrique.social.gouv.fr + - test-repo-domifa-feature-branch-1-o91f7v1i.ovh.fabrique.social.gouv.fr secretName: wildcard-crt --- apiVersion: networking.k8s.io/v1 @@ -2737,7 +2737,7 @@ metadata: namespace: test-repo-domifa-feature-branch-1-o91f7v1i spec: rules: - - host: admin-test-repo-domifa-feature-branch-1-o91f7v1i.dev.fabrique.social.gouv.fr + - host: admin-test-repo-domifa-feature-branch-1-o91f7v1i.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -2749,7 +2749,7 @@ spec: pathType: Prefix tls: - hosts: - - admin-test-repo-domifa-feature-branch-1-o91f7v1i.dev.fabrique.social.gouv.fr + - admin-test-repo-domifa-feature-branch-1-o91f7v1i.ovh.fabrique.social.gouv.fr secretName: wildcard-crt --- apiVersion: networking.k8s.io/v1 @@ -2776,7 +2776,7 @@ metadata: namespace: test-repo-domifa-feature-branch-1-o91f7v1i spec: rules: - - host: mon-test-repo-domifa-feature-branch-1-o91f7v1i.dev.fabrique.social.gouv.fr + - host: mon-test-repo-domifa-feature-branch-1-o91f7v1i.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -2788,7 +2788,7 @@ spec: pathType: Prefix tls: - hosts: - - mon-test-repo-domifa-feature-branch-1-o91f7v1i.dev.fabrique.social.gouv.fr + - mon-test-repo-domifa-feature-branch-1-o91f7v1i.ovh.fabrique.social.gouv.fr secretName: wildcard-crt " `; diff --git a/packages/kontinuous/tests/__snapshots__/repo.domifa.preprod.yaml b/packages/kontinuous/tests/__snapshots__/repo.domifa.preprod.yaml index c4d0a3a1ad..fabb04de84 100644 --- a/packages/kontinuous/tests/__snapshots__/repo.domifa.preprod.yaml +++ b/packages/kontinuous/tests/__snapshots__/repo.domifa.preprod.yaml @@ -591,11 +591,11 @@ spec: --opt filename=./packages/frontend/Dockerfile \\\\ --output type=image,\\\\\\"name=$IMAGE_PATH:preprod-ffac537e6cbbf934b08745a378932722df287a53,$IMAGE_PATH:feature-branch-1$LATEST_TAG\\\\\\",push=true \\\\ $buildctl_options_cache \\\\ - --opt build-arg:\\"DOMIFA_BACKEND_URL=https://api-test-repo.domifa-preprod.dev.fabrique.social.gouv.fr/\\" \\\\ + --opt build-arg:\\"DOMIFA_BACKEND_URL=https://api-test-repo.domifa-preprod.ovh.fabrique.social.gouv.fr/\\" \\\\ --opt build-arg:\\"DOMIFA_ENV_ID=preprod\\" \\\\ --opt build-arg:\\"DOMIFA_FRONTEND_META_ROBOTS=noindex,nofollow\\" \\\\ - --opt build-arg:\\"DOMIFA_PORTAIL_ADMINS_URL=https://admin-test-repo.domifa-preprod.dev.fabrique.social.gouv.fr/\\" \\\\ - --opt build-arg:\\"DOMIFA_PORTAIL_USAGERS_URL=https://mon-test-repo.domifa-preprod.dev.fabrique.social.gouv.fr/\\" \\\\ + --opt build-arg:\\"DOMIFA_PORTAIL_ADMINS_URL=https://admin-test-repo.domifa-preprod.ovh.fabrique.social.gouv.fr/\\" \\\\ + --opt build-arg:\\"DOMIFA_PORTAIL_USAGERS_URL=https://mon-test-repo.domifa-preprod.ovh.fabrique.social.gouv.fr/\\" \\\\ --opt build-arg:\\"DOMIFA_SENTRY_DSN_FRONTEND=https://***@sentry.fabrique.social.gouv.fr/31\\" \\\\ >\\"$pipe\\" 2>&1 return $? @@ -879,7 +879,7 @@ spec: --opt filename=./packages/portail-admins/Dockerfile \\\\ --output type=image,\\\\\\"name=$IMAGE_PATH:preprod-ffac537e6cbbf934b08745a378932722df287a53,$IMAGE_PATH:feature-branch-1$LATEST_TAG\\\\\\",push=true \\\\ $buildctl_options_cache \\\\ - --opt build-arg:\\"DOMIFA_BACKEND_URL=https://api-test-repo.domifa-preprod.dev.fabrique.social.gouv.fr/\\" \\\\ + --opt build-arg:\\"DOMIFA_BACKEND_URL=https://api-test-repo.domifa-preprod.ovh.fabrique.social.gouv.fr/\\" \\\\ --opt build-arg:\\"DOMIFA_ENV_ID=preprod\\" \\\\ >\\"$pipe\\" 2>&1 return $? @@ -1163,7 +1163,7 @@ spec: --opt filename=./packages/portail-usagers/Dockerfile \\\\ --output type=image,\\\\\\"name=$IMAGE_PATH:preprod-ffac537e6cbbf934b08745a378932722df287a53,$IMAGE_PATH:feature-branch-1$LATEST_TAG\\\\\\",push=true \\\\ $buildctl_options_cache \\\\ - --opt build-arg:\\"DOMIFA_BACKEND_URL=https://api-test-repo.domifa-preprod.dev.fabrique.social.gouv.fr/\\" \\\\ + --opt build-arg:\\"DOMIFA_BACKEND_URL=https://api-test-repo.domifa-preprod.ovh.fabrique.social.gouv.fr/\\" \\\\ --opt build-arg:\\"DOMIFA_ENV_ID=preprod\\" \\\\ --opt build-arg:\\"DOMIFA_SENTRY_DSN_PORTAIL=https://***@sentry.fabrique.social.gouv.fr/58\\" \\\\ >\\"$pipe\\" 2>&1 @@ -1373,13 +1373,13 @@ spec: - name: POSTGRES_DATABASE value: $(PGDATABASE) - name: DOMIFA_BACKEND_URL - value: https://api-test-repo.domifa-preprod.dev.fabrique.social.gouv.fr/ + value: https://api-test-repo.domifa-preprod.ovh.fabrique.social.gouv.fr/ - name: DOMIFA_FRONTEND_URL - value: https://test-repo.domifa-preprod.dev.fabrique.social.gouv.fr/ + value: https://test-repo.domifa-preprod.ovh.fabrique.social.gouv.fr/ - name: DOMIFA_PORTAIL_USAGERS_URL - value: https://mon-test-repo.domifa-preprod.dev.fabrique.social.gouv.fr/ + value: https://mon-test-repo.domifa-preprod.ovh.fabrique.social.gouv.fr/ - name: DOMIFA_PORTAIL_ADMINS_URL - value: https://admin-test-repo.domifa-preprod.dev.fabrique.social.gouv.fr/ + value: https://admin-test-repo.domifa-preprod.ovh.fabrique.social.gouv.fr/ - name: DOMIFA_CRON_ENABLED value: \\"true\\" - name: ELASTIC_APM_SERVICE_NAME @@ -1515,13 +1515,13 @@ spec: - name: POSTGRES_DATABASE value: $(PGDATABASE) - name: DOMIFA_BACKEND_URL - value: https://api-test-repo.domifa-preprod.dev.fabrique.social.gouv.fr/ + value: https://api-test-repo.domifa-preprod.ovh.fabrique.social.gouv.fr/ - name: DOMIFA_FRONTEND_URL - value: https://test-repo.domifa-preprod.dev.fabrique.social.gouv.fr/ + value: https://test-repo.domifa-preprod.ovh.fabrique.social.gouv.fr/ - name: DOMIFA_PORTAIL_USAGERS_URL - value: https://mon-test-repo.domifa-preprod.dev.fabrique.social.gouv.fr/ + value: https://mon-test-repo.domifa-preprod.ovh.fabrique.social.gouv.fr/ - name: DOMIFA_PORTAIL_ADMINS_URL - value: https://admin-test-repo.domifa-preprod.dev.fabrique.social.gouv.fr/ + value: https://admin-test-repo.domifa-preprod.ovh.fabrique.social.gouv.fr/ - name: DOMIFA_CRON_ENABLED value: \\"false\\" envFrom: @@ -1750,8 +1750,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi --- apiVersion: apps/v1 kind: Deployment @@ -1858,8 +1858,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi --- apiVersion: v1 kind: Service @@ -2035,7 +2035,7 @@ metadata: namespace: test-repo.domifa-preprod spec: rules: - - host: api-test-repo.domifa-preprod.dev.fabrique.social.gouv.fr + - host: api-test-repo.domifa-preprod.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -2047,7 +2047,7 @@ spec: pathType: Prefix tls: - hosts: - - api-test-repo.domifa-preprod.dev.fabrique.social.gouv.fr + - api-test-repo.domifa-preprod.ovh.fabrique.social.gouv.fr secretName: wildcard-crt --- apiVersion: networking.k8s.io/v1 @@ -2074,7 +2074,7 @@ metadata: namespace: test-repo.domifa-preprod spec: rules: - - host: test-repo.domifa-preprod.dev.fabrique.social.gouv.fr + - host: test-repo.domifa-preprod.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -2086,7 +2086,7 @@ spec: pathType: Prefix tls: - hosts: - - test-repo.domifa-preprod.dev.fabrique.social.gouv.fr + - test-repo.domifa-preprod.ovh.fabrique.social.gouv.fr secretName: wildcard-crt --- apiVersion: networking.k8s.io/v1 @@ -2113,7 +2113,7 @@ metadata: namespace: test-repo.domifa-preprod spec: rules: - - host: admin-test-repo.domifa-preprod.dev.fabrique.social.gouv.fr + - host: admin-test-repo.domifa-preprod.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -2125,7 +2125,7 @@ spec: pathType: Prefix tls: - hosts: - - admin-test-repo.domifa-preprod.dev.fabrique.social.gouv.fr + - admin-test-repo.domifa-preprod.ovh.fabrique.social.gouv.fr secretName: wildcard-crt --- apiVersion: networking.k8s.io/v1 @@ -2152,7 +2152,7 @@ metadata: namespace: test-repo.domifa-preprod spec: rules: - - host: mon-test-repo.domifa-preprod.dev.fabrique.social.gouv.fr + - host: mon-test-repo.domifa-preprod.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -2164,7 +2164,7 @@ spec: pathType: Prefix tls: - hosts: - - mon-test-repo.domifa-preprod.dev.fabrique.social.gouv.fr + - mon-test-repo.domifa-preprod.ovh.fabrique.social.gouv.fr secretName: wildcard-crt " `; diff --git a/packages/kontinuous/tests/__snapshots__/repo.domifa.prod.yaml b/packages/kontinuous/tests/__snapshots__/repo.domifa.prod.yaml index 500a84468e..adf47a7321 100644 --- a/packages/kontinuous/tests/__snapshots__/repo.domifa.prod.yaml +++ b/packages/kontinuous/tests/__snapshots__/repo.domifa.prod.yaml @@ -1821,8 +1821,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi --- apiVersion: apps/v1 kind: Deployment @@ -1929,8 +1929,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi --- apiVersion: v1 kind: Service diff --git a/packages/kontinuous/tests/__snapshots__/sample-1.dev.yaml b/packages/kontinuous/tests/__snapshots__/sample-1.dev.yaml index 1a6cddf838..1362867205 100644 --- a/packages/kontinuous/tests/__snapshots__/sample-1.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/sample-1.dev.yaml @@ -262,8 +262,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi envFrom: - secretRef: name: pg-user @@ -383,8 +383,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi envFrom: - secretRef: name: pg-user @@ -478,8 +478,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi startupProbe: failureThreshold: 30 httpGet: @@ -575,8 +575,8 @@ spec: port: http resources: requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi --- apiVersion: v1 kind: Service @@ -719,7 +719,7 @@ metadata: namespace: test-sample-1-feature-branch-1 spec: rules: - - host: app-2nd-instance-test-sample-1-feature-branch-1.dev.fabrique.social.gouv.fr + - host: app-2nd-instance-test-sample-1-feature-branch-1.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -731,7 +731,7 @@ spec: pathType: Prefix tls: - hosts: - - app-2nd-instance-test-sample-1-feature-branch-1.dev.fabrique.social.gouv.fr + - app-2nd-instance-test-sample-1-feature-branch-1.ovh.fabrique.social.gouv.fr secretName: wildcard-crt --- apiVersion: networking.k8s.io/v1 @@ -768,7 +768,7 @@ metadata: namespace: test-sample-1-feature-branch-1 spec: rules: - - host: test-sample-1-feature-branch-1.dev.fabrique.social.gouv.fr + - host: test-sample-1-feature-branch-1.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -780,7 +780,7 @@ spec: pathType: Prefix tls: - hosts: - - test-sample-1-feature-branch-1.dev.fabrique.social.gouv.fr + - test-sample-1-feature-branch-1.ovh.fabrique.social.gouv.fr secretName: wildcard-crt --- apiVersion: networking.k8s.io/v1 @@ -807,7 +807,7 @@ metadata: namespace: test-sample-1-feature-branch-1 spec: rules: - - host: hasura-test-sample-1-feature-branch-1.dev.fabrique.social.gouv.fr + - host: hasura-test-sample-1-feature-branch-1.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -819,7 +819,7 @@ spec: pathType: Prefix tls: - hosts: - - hasura-test-sample-1-feature-branch-1.dev.fabrique.social.gouv.fr + - hasura-test-sample-1-feature-branch-1.ovh.fabrique.social.gouv.fr secretName: wildcard-crt --- apiVersion: networking.k8s.io/v1 @@ -845,7 +845,7 @@ metadata: namespace: test-sample-1-feature-branch-1 spec: rules: - - host: pgweb-test-sample-1-feature-branch-1.dev.fabrique.social.gouv.fr + - host: pgweb-test-sample-1-feature-branch-1.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -857,7 +857,7 @@ spec: pathType: Prefix tls: - hosts: - - pgweb-test-sample-1-feature-branch-1.dev.fabrique.social.gouv.fr + - pgweb-test-sample-1-feature-branch-1.ovh.fabrique.social.gouv.fr secretName: wildcard-crt " `; diff --git a/packages/kontinuous/tests/__snapshots__/sample-1.preprod.yaml b/packages/kontinuous/tests/__snapshots__/sample-1.preprod.yaml index e5f939cb78..28f5257cf3 100644 --- a/packages/kontinuous/tests/__snapshots__/sample-1.preprod.yaml +++ b/packages/kontinuous/tests/__snapshots__/sample-1.preprod.yaml @@ -261,8 +261,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi envFrom: - secretRef: name: pg-user @@ -375,8 +375,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi envFrom: - secretRef: name: pg-user @@ -464,8 +464,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi startupProbe: failureThreshold: 30 httpGet: @@ -560,8 +560,8 @@ spec: port: http resources: requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi --- apiVersion: v1 kind: Service @@ -702,7 +702,7 @@ metadata: namespace: test-sample-1-preprod spec: rules: - - host: app-2nd-instance-test-sample-1-preprod.dev.fabrique.social.gouv.fr + - host: app-2nd-instance-test-sample-1-preprod.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -714,7 +714,7 @@ spec: pathType: Prefix tls: - hosts: - - app-2nd-instance-test-sample-1-preprod.dev.fabrique.social.gouv.fr + - app-2nd-instance-test-sample-1-preprod.ovh.fabrique.social.gouv.fr secretName: wildcard-crt --- apiVersion: networking.k8s.io/v1 @@ -751,7 +751,7 @@ metadata: namespace: test-sample-1-preprod spec: rules: - - host: test-sample-1-preprod.dev.fabrique.social.gouv.fr + - host: test-sample-1-preprod.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -763,7 +763,7 @@ spec: pathType: Prefix tls: - hosts: - - test-sample-1-preprod.dev.fabrique.social.gouv.fr + - test-sample-1-preprod.ovh.fabrique.social.gouv.fr secretName: wildcard-crt --- apiVersion: networking.k8s.io/v1 @@ -789,7 +789,7 @@ metadata: namespace: test-sample-1-preprod spec: rules: - - host: hasura-test-sample-1-preprod.dev.fabrique.social.gouv.fr + - host: hasura-test-sample-1-preprod.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -801,7 +801,7 @@ spec: pathType: Prefix tls: - hosts: - - hasura-test-sample-1-preprod.dev.fabrique.social.gouv.fr + - hasura-test-sample-1-preprod.ovh.fabrique.social.gouv.fr secretName: wildcard-crt --- apiVersion: networking.k8s.io/v1 @@ -826,7 +826,7 @@ metadata: namespace: test-sample-1-preprod spec: rules: - - host: pgweb-test-sample-1-preprod.dev.fabrique.social.gouv.fr + - host: pgweb-test-sample-1-preprod.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -838,7 +838,7 @@ spec: pathType: Prefix tls: - hosts: - - pgweb-test-sample-1-preprod.dev.fabrique.social.gouv.fr + - pgweb-test-sample-1-preprod.ovh.fabrique.social.gouv.fr secretName: wildcard-crt " `; diff --git a/packages/kontinuous/tests/__snapshots__/sample-1.prod.yaml b/packages/kontinuous/tests/__snapshots__/sample-1.prod.yaml index 37352ffcae..fb7824e68a 100644 --- a/packages/kontinuous/tests/__snapshots__/sample-1.prod.yaml +++ b/packages/kontinuous/tests/__snapshots__/sample-1.prod.yaml @@ -257,8 +257,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi envFrom: - secretRef: name: pg-user @@ -371,8 +371,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi envFrom: - secretRef: name: pg-user @@ -460,8 +460,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi startupProbe: failureThreshold: 30 httpGet: @@ -556,8 +556,8 @@ spec: port: http resources: requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi --- apiVersion: v1 kind: Service diff --git a/packages/kontinuous/tests/__snapshots__/socialgouv-autodevops-override.dev.yaml b/packages/kontinuous/tests/__snapshots__/socialgouv-autodevops-override.dev.yaml index ea0b85ff94..219454da08 100644 --- a/packages/kontinuous/tests/__snapshots__/socialgouv-autodevops-override.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/socialgouv-autodevops-override.dev.yaml @@ -467,8 +467,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi --- apiVersion: v1 kind: Service @@ -535,7 +535,7 @@ metadata: namespace: test-socialgouv-autodevops-override-feature-branch-1 spec: rules: - - host: test-socialgouv-autodevops-override-feature-branch-1.dev.fabrique.social.gouv.fr + - host: test-socialgouv-autodevops-override-feature-branch-1.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -547,7 +547,7 @@ spec: pathType: Prefix tls: - hosts: - - test-socialgouv-autodevops-override-feature-branch-1.dev.fabrique.social.gouv.fr + - test-socialgouv-autodevops-override-feature-branch-1.ovh.fabrique.social.gouv.fr secretName: wildcard-crt " `; diff --git a/packages/kontinuous/tests/__snapshots__/socialgouv-autodevops.dev.yaml b/packages/kontinuous/tests/__snapshots__/socialgouv-autodevops.dev.yaml index 9b083dd0df..9cdf8ac0c4 100644 --- a/packages/kontinuous/tests/__snapshots__/socialgouv-autodevops.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/socialgouv-autodevops.dev.yaml @@ -466,8 +466,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi --- apiVersion: v1 kind: Service @@ -523,7 +523,7 @@ metadata: namespace: test-socialgouv-autodevops-feature-branch-1 spec: rules: - - host: test-socialgouv-autodevops-feature-branch-1.dev.fabrique.social.gouv.fr + - host: test-socialgouv-autodevops-feature-branch-1.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -535,7 +535,7 @@ spec: pathType: Prefix tls: - hosts: - - test-socialgouv-autodevops-feature-branch-1.dev.fabrique.social.gouv.fr + - test-socialgouv-autodevops-feature-branch-1.ovh.fabrique.social.gouv.fr secretName: wildcard-crt " `; diff --git a/packages/kontinuous/tests/__snapshots__/standalone-charts.dev.yaml b/packages/kontinuous/tests/__snapshots__/standalone-charts.dev.yaml index b92e004b7a..add18df18c 100644 --- a/packages/kontinuous/tests/__snapshots__/standalone-charts.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/standalone-charts.dev.yaml @@ -61,8 +61,8 @@ spec: echo Hello World resources: requests: - cpu: 41m - memory: 121Mi + 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 b1a3eb5898..9294478235 100644 --- a/packages/kontinuous/tests/__snapshots__/values-extends.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/values-extends.dev.yaml @@ -175,8 +175,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi securityContext: runAsUser: 1000 runAsGroup: 1000 @@ -318,8 +318,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi --- apiVersion: v1 kind: Service @@ -375,7 +375,7 @@ metadata: namespace: test-values-extends-feature-branch-1 spec: rules: - - host: test-values-extends-feature-branch-1.dev.fabrique.social.gouv.fr + - host: test-values-extends-feature-branch-1.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -387,7 +387,7 @@ spec: pathType: Prefix tls: - hosts: - - test-values-extends-feature-branch-1.dev.fabrique.social.gouv.fr + - test-values-extends-feature-branch-1.ovh.fabrique.social.gouv.fr secretName: wildcard-crt " `; diff --git a/packages/kontinuous/tests/__snapshots__/values-extends.preprod.yaml b/packages/kontinuous/tests/__snapshots__/values-extends.preprod.yaml index 455df9504b..f0cb197f99 100644 --- a/packages/kontinuous/tests/__snapshots__/values-extends.preprod.yaml +++ b/packages/kontinuous/tests/__snapshots__/values-extends.preprod.yaml @@ -175,8 +175,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi securityContext: runAsUser: 1000 runAsGroup: 1000 @@ -318,8 +318,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi --- apiVersion: v1 kind: Service @@ -375,7 +375,7 @@ metadata: namespace: test-values-extends-preprod spec: rules: - - host: test-values-extends-preprod.dev.fabrique.social.gouv.fr + - host: test-values-extends-preprod.ovh.fabrique.social.gouv.fr http: paths: - backend: @@ -387,7 +387,7 @@ spec: pathType: Prefix tls: - hosts: - - test-values-extends-preprod.dev.fabrique.social.gouv.fr + - test-values-extends-preprod.ovh.fabrique.social.gouv.fr secretName: wildcard-crt " `; diff --git a/packages/kontinuous/tests/__snapshots__/values-js.dev.yaml b/packages/kontinuous/tests/__snapshots__/values-js.dev.yaml index a4b3d41b62..c911f90047 100644 --- a/packages/kontinuous/tests/__snapshots__/values-js.dev.yaml +++ b/packages/kontinuous/tests/__snapshots__/values-js.dev.yaml @@ -182,8 +182,8 @@ spec: cpu: 1 memory: 1Gi requests: - cpu: 41m - memory: 121Mi + cpu: 81m + memory: 262Mi --- apiVersion: v1 kind: Service