Merge branch 'master' into cnpg-limits

SocialGouv · Oct 16, 2023 · 7f755f0 · 7f755f0
2 parents 916aa47 + 1158dc0
commit 7f755f0
Show file tree

Hide file tree

Showing 75 changed files with 218 additions and 577 deletions.
diff --git a/.github/actions/deploy-via-github/Dockerfile b/.github/actions/deploy-via-github/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/socialgouv/kontinuous:v1.166.1
+FROM ghcr.io/socialgouv/kontinuous:v1.166.3
 
 COPY entrypoint.sh /entrypoint.sh
 

diff --git a/.github/actions/deploy-via-github/action.yaml b/.github/actions/deploy-via-github/action.yaml
@@ -45,7 +45,7 @@ inputs:
 runs:
   using: docker
   # image: Dockerfile
-  image: docker://ghcr.io/socialgouv/kontinuous/deploy-via-github:v1.166.1
+  image: docker://ghcr.io/socialgouv/kontinuous/deploy-via-github:v1.166.3
   env:
     KS_ENVIRONMENT: ${{ inputs.environment }}
     KS_CHART: ${{ inputs.chart }}

diff --git a/.github/actions/deploy-via-webhook/Dockerfile b/.github/actions/deploy-via-webhook/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/socialgouv/kontinuous:v1.166.1 as base
+FROM ghcr.io/socialgouv/kontinuous:v1.166.3 as base
 
 USER 0
 

diff --git a/.github/actions/deploy-via-webhook/action.yaml b/.github/actions/deploy-via-webhook/action.yaml
@@ -29,7 +29,7 @@ inputs:
 runs:
   using: docker
   # image: Dockerfile
-  image: docker://ghcr.io/socialgouv/kontinuous/deploy-via-webhook:v1.166.1
+  image: docker://ghcr.io/socialgouv/kontinuous/deploy-via-webhook:v1.166.3
   env:
     KS_WEBHOOK_TOKEN: ${{ inputs.webhookToken }}
     KS_WEBHOOK_URI: ${{ inputs.webhookUri }}

diff --git a/.github/actions/deploy-via-webhook/kontinuousVersion b/.github/actions/deploy-via-webhook/kontinuousVersion
@@ -1 +1 @@
-ghcr.io/socialgouv/kontinuous:v1.166.1
+ghcr.io/socialgouv/kontinuous:v1.166.3
diff --git a/.github/actions/env/Dockerfile b/.github/actions/env/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/socialgouv/kontinuous:v1.166.1
+FROM ghcr.io/socialgouv/kontinuous:v1.166.3
 
 COPY entrypoint.sh /entrypoint.sh
 

diff --git a/.github/actions/env/action.yaml b/.github/actions/env/action.yaml
@@ -11,7 +11,7 @@ inputs:
 runs:
   using: docker
   # image: Dockerfile
-  image: docker://ghcr.io/socialgouv/kontinuous/env:v1.166.1
+  image: docker://ghcr.io/socialgouv/kontinuous/env:v1.166.3
   env:
     KS_GIT_BRANCH: ${{ inputs.branch }}
     KSENV_REPOSITORY_NAME: ${{ inputs.repositoryName }}

diff --git a/.github/kontinuousVersion b/.github/kontinuousVersion
@@ -1 +1 @@
-ghcr.io/socialgouv/kontinuous:v1.166.1
+ghcr.io/socialgouv/kontinuous:v1.166.3
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## 1.166.3 (2023-10-13)
+
+
+### Bug Fixes
+
+* **pg:** remove default cnpg pooler (currently never used) ([#430](https://github.com/socialgouv/kontinuous/issues/430)) ([9971ab3](https://github.com/socialgouv/kontinuous/commit/9971ab3b9e8f4b3cf86e997663af9ea3fecdfcda))
+
+## 1.166.2 (2023-10-06)
+
+
+### Bug Fixes
+
+* **pg:** add data.compression: gzip ([#426](https://github.com/socialgouv/kontinuous/issues/426)) ([5fdbd83](https://github.com/socialgouv/kontinuous/commit/5fdbd83f70884c2fe5d67f7302ec34588e83eb51))
+
 ## 1.166.1 (2023-10-06)
 
 

diff --git a/boilerplates/infra-samples/argocd/kontinuous-webhook/values.yaml b/boilerplates/infra-samples/argocd/kontinuous-webhook/values.yaml
@@ -1,5 +1,5 @@
 kontinuous-webhook:
-  image: ghcr.io/socialgouv/kontinuous/webhook:v1.166.1
+  image: ghcr.io/socialgouv/kontinuous/webhook:v1.166.3
   # image: harbor.fabrique.social.gouv.fr/sre/kontinuous/webhook:1
   host: "kontinuous.fabrique.social.gouv.fr"
 

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -17,8 +17,8 @@ services:
       KUBEWEBHOOK_CONFIG_PATH: config.sample.yaml
       KUBEWEBHOOK_SUPERTOKEN: ${KUBEWEBHOOK_SUPERTOKEN:-1234}
       KUBEWEBHOOK_EXPOSED_PORT: ${KUBEWEBHOOK_EXPOSED_PORT:-7530}
-      KUBEWEBHOOK_PIPELINE_IMAGE: ${KUBEWEBHOOK_PIPELINE_IMAGE:-"ghcr.io/socialgouv/kontinuous:v1.166.1"}
-      KUBEWEBHOOK_PIPELINE_CHECKOUT_IMAGE: ${KUBEWEBHOOK_PIPELINE_CHECKOUT_IMAGE:-"ghcr.io/socialgouv/kontinuous/degit:v1.166.1"}
+      KUBEWEBHOOK_PIPELINE_IMAGE: ${KUBEWEBHOOK_PIPELINE_IMAGE:-"ghcr.io/socialgouv/kontinuous:v1.166.3"}
+      KUBEWEBHOOK_PIPELINE_CHECKOUT_IMAGE: ${KUBEWEBHOOK_PIPELINE_CHECKOUT_IMAGE:-"ghcr.io/socialgouv/kontinuous/degit:v1.166.3"}
       KUBEWEBHOOK_CI_NAMESPACE_ALLOW_ALL: ${KUBEWEBHOOK_CI_NAMESPACE_ALLOW_ALL:-"true"}
       KUBEWEBHOOK_HTTPLOGGER_IGNOREUSERAGENTS: backbox-robot
       KUBEWEBHOOK_SENTRY_DSN: ${KUBEWEBHOOK_SENTRY_DSN}

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "~dev",
-  "version": "1.166.1",
+  "version": "1.166.3",
   "repository": "[email protected]:socialgouv/kontinuous.git",
   "license": "MIT",
   "private": true,

diff --git a/packages/argocd/Dockerfile b/packages/argocd/Dockerfile
@@ -25,8 +25,8 @@ RUN chown 1001:1001 /workspace
 RUN git config --global --add safe.directory /workspace
 
 
-COPY --from=ghcr.io/socialgouv/kontinuous:v1.166.1 /usr/local/bin /usr/local/bin/
-COPY --from=ghcr.io/socialgouv/kontinuous:v1.166.1 --chown=999:999 /opt/kontinuous /opt/kontinuous/
+COPY --from=ghcr.io/socialgouv/kontinuous:v1.166.3 /usr/local/bin /usr/local/bin/
+COPY --from=ghcr.io/socialgouv/kontinuous:v1.166.3 --chown=999:999 /opt/kontinuous /opt/kontinuous/
 
 # Switch back to non-root user
 USER 999
diff --git a/packages/common/package.json b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "~common",
-  "version": "1.166.1",
+  "version": "1.166.3",
   "description": "",
   "license": "MIT",
   "engines": {

diff --git a/packages/dev-tools/package.json b/packages/dev-tools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "~dev-tools",
-  "version": "1.166.1",
+  "version": "1.166.3",
   "dependencies": {
     "replace": "^1.2.2",
     "~common": "workspace:^"

diff --git a/packages/helm-tree/package.json b/packages/helm-tree/package.json
@@ -1,6 +1,6 @@
 {
   "name": "helm-tree",
-  "version": "1.166.1",
+  "version": "1.166.3",
   "description": "",
   "license": "MIT",
   "engines": {

diff --git a/packages/kontinuous/package.json b/packages/kontinuous/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kontinuous",
-  "version": "1.166.1",
+  "version": "1.166.3",
   "repository": "https://github.com/socialgouv/kontinuous.git",
   "homepage": "https://socialgouv.github.io/kontinuous/",
   "license": "MIT",

diff --git a/packages/kontinuous/tests/__snapshots__/app-simple-options.dev.yaml b/packages/kontinuous/tests/__snapshots__/app-simple-options.dev.yaml
@@ -136,7 +136,7 @@ spec:
       restartPolicy: Never
       initContainers:
         - name: degit-action
-          image: ghcr.io/socialgouv/kontinuous/degit:v1.166.1
+          image: ghcr.io/socialgouv/kontinuous/degit:v1.166.3
           command:
             - sh
             - -c
@@ -285,7 +285,7 @@ spec:
       restartPolicy: Never
       initContainers:
         - name: degit-action
-          image: ghcr.io/socialgouv/kontinuous/degit:v1.166.1
+          image: ghcr.io/socialgouv/kontinuous/degit:v1.166.3
           command:
             - sh
             - -c
@@ -431,7 +431,7 @@ spec:
       restartPolicy: Never
       initContainers:
         - name: degit-repository
-          image: ghcr.io/socialgouv/kontinuous/degit:v1.166.1
+          image: ghcr.io/socialgouv/kontinuous/degit:v1.166.3
           imagePullPolicy: IfNotPresent
           command:
             - sh
@@ -555,7 +555,7 @@ spec:
       restartPolicy: Never
       initContainers:
         - name: degit-repository
-          image: ghcr.io/socialgouv/kontinuous/degit:v1.166.1
+          image: ghcr.io/socialgouv/kontinuous/degit:v1.166.3
           imagePullPolicy: IfNotPresent
           command:
             - sh
@@ -578,7 +578,7 @@ spec:
               cpu: \\"0\\"
               memory: \\"0\\"
         - name: degit-action
-          image: ghcr.io/socialgouv/kontinuous/degit:v1.166.1
+          image: ghcr.io/socialgouv/kontinuous/degit:v1.166.3
           command:
             - sh
             - -c

diff --git a/packages/kontinuous/tests/__snapshots__/cnpg.dev.yaml b/packages/kontinuous/tests/__snapshots__/cnpg.dev.yaml
@@ -303,38 +303,5 @@ spec:
         - CREATE EXTENSION IF NOT EXISTS \\"citext\\";
         - CREATE EXTENSION IF NOT EXISTS \\"pgcrypto\\";
         - CREATE EXTENSION IF NOT EXISTS \\"hstore\\";
----
-apiVersion: postgresql.cnpg.io/v1
-kind: Pooler
-metadata:
-  name: cnpg-cluster-rw
-  labels:
-    helm.sh/chart: cnpg-cluster-1.4.2
-    app.kubernetes.io/name: cnpg-cluster
-    app.kubernetes.io/instance: release-name
-    app.kubernetes.io/version: 14.5-6
-    app.kubernetes.io/managed-by: Helm
-    kontinuous/deployment: test-cnpg-feature-branch-1-ffac537e6cbbf934b08745a378-5k18ynv8
-    kontinuous/deployment.env: test-cnpg-feature-branch-1
-    kontinuous/ref: feature-branch-1
-    kontinuous/gitSha: ffac537e6cbbf934b08745a378932722df287a53
-    kontinuous/appVersion: ffac537e6cbbf934b08745a378932722df287a53
-    kontinuous/resourceName: pooler-cnpg-cluster-rw-t5d0s6ee
-    app.kubernetes.io/manifest-managed-by: kontinuous
-    app.kubernetes.io/manifest-created-by: kontinuous
-  annotations:
-    kontinuous/chartPath: project.cnpg.cnpg-cluster
-    kontinuous/source: project/charts/cnpg/charts/cnpg-cluster/templates/pooler.cnpg.yaml
-    kontinuous/deployment: test-cnpg-feature-branch-1-ffac537e6cbbf934b08745a378-5k18ynv8
-  namespace: test-cnpg-feature-branch-1
-spec:
-  cluster:
-    name: cnpg-cluster
-  instances: 1
-  pgbouncer:
-    parameters:
-      max_client_conn: \\"1000\\"
-    poolMode: session
-  type: rw
 "
 `;
diff --git a/packages/kontinuous/tests/__snapshots__/deactivate.dev.yaml b/packages/kontinuous/tests/__snapshots__/deactivate.dev.yaml
@@ -56,7 +56,7 @@ spec:
       restartPolicy: Never
       initContainers:
         - name: degit-action
-          image: ghcr.io/socialgouv/kontinuous/degit:v1.166.1
+          image: ghcr.io/socialgouv/kontinuous/degit:v1.166.3
           command:
             - sh
             - -c

diff --git a/packages/kontinuous/tests/__snapshots__/extends-ovh.dev.yaml b/packages/kontinuous/tests/__snapshots__/extends-ovh.dev.yaml
@@ -135,7 +135,7 @@ spec:
       restartPolicy: Never
       initContainers:
         - name: degit-action
-          image: ghcr.io/socialgouv/kontinuous/degit:v1.166.1
+          image: ghcr.io/socialgouv/kontinuous/degit:v1.166.3
           command:
             - sh
             - -c
@@ -284,7 +284,7 @@ spec:
       restartPolicy: Never
       initContainers:
         - name: degit-action
-          image: ghcr.io/socialgouv/kontinuous/degit:v1.166.1
+          image: ghcr.io/socialgouv/kontinuous/degit:v1.166.3
           command:
             - sh
             - -c
@@ -685,75 +685,5 @@ spec:
         - CREATE EXTENSION IF NOT EXISTS \\"citext\\";
         - CREATE EXTENSION IF NOT EXISTS \\"pgcrypto\\";
         - CREATE EXTENSION IF NOT EXISTS \\"hstore\\";
----
-apiVersion: postgresql.cnpg.io/v1
-kind: Pooler
-metadata:
-  name: pg-hasura-rw
-  labels:
-    helm.sh/chart: cnpg-cluster-1.9.12
-    app.kubernetes.io/name: pg-hasura
-    app.kubernetes.io/instance: release-name
-    app.kubernetes.io/version: \\"15\\"
-    app.kubernetes.io/managed-by: Helm
-    kontinuous/deployment: test-extends-ovh-feature-branch-1-ffac537e6cbbf934b08-5oa7s3iv
-    kontinuous/deployment.env: test-extends-ovh-feature-branch-1
-    kontinuous/ref: feature-branch-1
-    kontinuous/gitSha: ffac537e6cbbf934b08745a378932722df287a53
-    kontinuous/appVersion: ffac537e6cbbf934b08745a378932722df287a53
-    kontinuous/resourceName: pooler-pg-hasura-rw-qzqjyuru
-    app.kubernetes.io/manifest-managed-by: kontinuous
-    app.kubernetes.io/manifest-created-by: kontinuous
-  annotations:
-    kontinuous/chartPath: project.fabrique.pg-hasura.cnpg-cluster
-    kontinuous/source: project/charts/fabrique/charts/pg-hasura/charts/cnpg-cluster/templates/pooler.cnpg.yaml
-    kontinuous/plugin.needs: |
-      - project.fabrique.pg-hasura.jobs-pg
-    kontinuous/deployment: test-extends-ovh-feature-branch-1-ffac537e6cbbf934b08-5oa7s3iv
-  namespace: test-extends-ovh-feature-branch-1
-spec:
-  cluster:
-    name: pg-hasura
-  instances: 1
-  pgbouncer:
-    parameters:
-      max_client_conn: \\"1000\\"
-    poolMode: session
-  type: rw
----
-apiVersion: postgresql.cnpg.io/v1
-kind: Pooler
-metadata:
-  name: pg-keycloak-rw
-  labels:
-    helm.sh/chart: cnpg-cluster-1.9.12
-    app.kubernetes.io/name: pg-keycloak
-    app.kubernetes.io/instance: release-name
-    app.kubernetes.io/version: \\"15\\"
-    app.kubernetes.io/managed-by: Helm
-    kontinuous/deployment: test-extends-ovh-feature-branch-1-ffac537e6cbbf934b08-5oa7s3iv
-    kontinuous/deployment.env: test-extends-ovh-feature-branch-1
-    kontinuous/ref: feature-branch-1
-    kontinuous/gitSha: ffac537e6cbbf934b08745a378932722df287a53
-    kontinuous/appVersion: ffac537e6cbbf934b08745a378932722df287a53
-    kontinuous/resourceName: pooler-pg-keycloak-rw-ljgr35td
-    app.kubernetes.io/manifest-managed-by: kontinuous
-    app.kubernetes.io/manifest-created-by: kontinuous
-  annotations:
-    kontinuous/chartPath: project.fabrique.pg-keycloak.cnpg-cluster
-    kontinuous/source: project/charts/fabrique/charts/pg-keycloak/charts/cnpg-cluster/templates/pooler.cnpg.yaml
-    kontinuous/plugin.needs: |
-      - project.fabrique.pg-keycloak.jobs-pg
-    kontinuous/deployment: test-extends-ovh-feature-branch-1-ffac537e6cbbf934b08-5oa7s3iv
-  namespace: test-extends-ovh-feature-branch-1
-spec:
-  cluster:
-    name: pg-keycloak
-  instances: 1
-  pgbouncer:
-    parameters:
-      max_client_conn: \\"1000\\"
-    poolMode: session
-  type: rw
 "
 `;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ghcr.io/socialgouv/kontinuous:v1.166.1
		ghcr.io/socialgouv/kontinuous:v1.166.3