Merge branch 'master' into feat/ci-ns-fallback

SocialGouv · Jul 24, 2023 · 65a636e · 65a636e
2 parents df13090 + a99a896
commit 65a636e
Show file tree

Hide file tree

Showing 71 changed files with 298 additions and 186 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.159.4
+FROM ghcr.io/socialgouv/kontinuous:v1.159.5
 
 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.159.4
+  image: docker://ghcr.io/socialgouv/kontinuous/deploy-via-github:v1.159.5
   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.159.4 as base
+FROM ghcr.io/socialgouv/kontinuous:v1.159.5 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.159.4
+  image: docker://ghcr.io/socialgouv/kontinuous/deploy-via-webhook:v1.159.5
   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.159.4
+ghcr.io/socialgouv/kontinuous:v1.159.5
diff --git a/.github/actions/env/Dockerfile b/.github/actions/env/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/socialgouv/kontinuous:v1.159.4
+FROM ghcr.io/socialgouv/kontinuous:v1.159.5
 
 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.159.4
+  image: docker://ghcr.io/socialgouv/kontinuous/env:v1.159.5
   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.159.4
+ghcr.io/socialgouv/kontinuous:v1.159.5
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 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.159.5 (2023-07-24)
+
 ## 1.159.4 (2023-07-24)
 
 ## 1.159.3 (2023-07-24)

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.159.4
+  image: ghcr.io/socialgouv/kontinuous/webhook:v1.159.5
   # 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.159.4"}
-      KUBEWEBHOOK_PIPELINE_CHECKOUT_IMAGE: ${KUBEWEBHOOK_PIPELINE_CHECKOUT_IMAGE:-"ghcr.io/socialgouv/kontinuous/degit:v1.159.4"}
+      KUBEWEBHOOK_PIPELINE_IMAGE: ${KUBEWEBHOOK_PIPELINE_IMAGE:-"ghcr.io/socialgouv/kontinuous:v1.159.5"}
+      KUBEWEBHOOK_PIPELINE_CHECKOUT_IMAGE: ${KUBEWEBHOOK_PIPELINE_CHECKOUT_IMAGE:-"ghcr.io/socialgouv/kontinuous/degit:v1.159.5"}
       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/docs/faq.md b/docs/faq.md
@@ -12,10 +12,6 @@ We want a full portable and sef-hostable solution from repositories, to CI/CD.
 
 see [🐉 paradigm](./advanced/paradigm.md) for more detailed explanation.
 
-## Define a custom docker registry
-
-[TODO]
-
 ## Disable some plugin
 
 In your `.kontinuous/config.yaml` :
@@ -30,6 +26,120 @@ dependencies:
 
 See [kontinuous configuration](/advanced/configuration)
 
+## Add custom ingress annotations
+
+NGINX ingress [allows various annotations](https://docs.nginx.com/nginx-ingress-controller/configuration/ingress-resources/advanced-configuration-with-annotations/) : rate-limiting, headers...
+
+To add custom ingress annotations to your app :
+
+```yaml
+# .kontinuous/values.yaml
+
+app:
+  ingress:
+    annotations:
+      nginx.ingress.kubernetes.io/proxy-body-size: 512m
+      nginx.ingress.kubernetes.io/configuration-snippet: |
+        more_set_headers "X-Frame-Options: deny";
+        more_set_headers "X-XSS-Protection: 1; mode=block";
+```
+
+## Add additionnal build-args on some environment
+
+For example in `.kontinuous/env/prod/values.yaml` :
+
+```yaml
+# .kontinuous/values.yaml
+
+jobs:
+  runs:
+    build-app:
+      with:
+        buildArgs:
+          PRODUCTION: "true"
+```
+
+## Create some database
+
+This will create a postgres cluster with an `app` user `app` database. Database secrets will be provisionned in the `pg-xxx-app` secret.
+
+```yaml
+# .kontinuous/values.yaml
+
+# create a PG cluster
+pg-xxx:
+  ~chart: pg
+  cnpg-cluster:
+    # see https://github.com/SocialGouv/helm-charts/blob/main/charts/cnpg-cluster
+    monitoring:
+      ~tpl~enablePodMonitor: "true"
+
+app:
+  # Wait for DB cluster to be ready
+  ~needs: ["pg-xxx"]
+  # Attach generated PG credentials to your app
+  envFrom:
+    - secretRef:
+        name: pg-xxx-app
+```
+
+## Add a custom HELM chart
+
+To add a custom HELM chart to your deployment :
+
+Add a `.kontinuous/Chart.yaml` with HELM dependencies:
+
+```yaml
+dependencies:
+  - name: keycloakx
+    repository: https://codecentric.github.io/helm-charts
+    version: 2.1.0
+    condition: keycloakx.enabled
+```
+
+In `.kontinuous/values.yaml` define your HELM values as usual :
+
+```yaml
+keycloakx:
+  ~needs: ["pg-keycloak"]
+  database:
+    vendor: postgres
+```
+
+## Build and deploy multiple docker images
+
+In `.kontinuous/values.yaml` :
+
+```yaml
+app:
+  ~chart: app
+  ~needs: [build-app, api]
+  imagePackage: app
+
+api:
+  ~chart: app
+  ~needs: [build-api]
+  imagePackage: api
+
+jobs:
+  ~chart: jobs
+  runs:
+    build-app:
+      use: build
+      with:
+        imagePackage: app
+        context: packages/app
+    build-api:
+      use: build
+      with:
+        imagePackage: api
+        context: packages/api
+```
+
+## Define a custom docker registry
+
+[TODO]
+
 ## Local dev
 
 [TODO]
@@ -56,4 +166,4 @@ See [kontinuous configuration](/advanced/configuration)
 
 – Are you kidding me ? Roll up your sleeves and find it, you developer !
 
-[![rabbit-thug](./images/rabbit-thug.png)](https://github.com/SocialGouv/kontinuous/blob/master/packages/kontinuous/src/cli/commands/test.js)
+[![rabbit-thug](./images/rabbit-thug.png)](https://github.com/SocialGouv/kontinuous/blob/master/packages/kontinuous/src/cli/commands/test.js)
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "~dev",
-  "version": "1.159.4",
+  "version": "1.159.5",
   "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.159.4 /usr/local/bin /usr/local/bin/
-COPY --from=ghcr.io/socialgouv/kontinuous:v1.159.4 --chown=999:999 /opt/kontinuous /opt/kontinuous/
+COPY --from=ghcr.io/socialgouv/kontinuous:v1.159.5 /usr/local/bin /usr/local/bin/
+COPY --from=ghcr.io/socialgouv/kontinuous:v1.159.5 --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.159.4",
+  "version": "1.159.5",
   "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.159.4",
+  "version": "1.159.5",
   "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.159.4",
+  "version": "1.159.5",
   "description": "",
   "license": "MIT",
   "engines": {

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

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.159.4
+          image: ghcr.io/socialgouv/kontinuous/degit:v1.159.5
           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.159.4
+          image: ghcr.io/socialgouv/kontinuous/degit:v1.159.5
           command:
             - sh
             - -c
@@ -284,7 +284,7 @@ spec:
       restartPolicy: Never
       initContainers:
         - name: degit-action
-          image: ghcr.io/socialgouv/kontinuous/degit:v1.159.4
+          image: ghcr.io/socialgouv/kontinuous/degit:v1.159.5
           command:
             - sh
             - -c

diff --git a/packages/kontinuous/tests/__snapshots__/extends-ovh.prod.yaml b/packages/kontinuous/tests/__snapshots__/extends-ovh.prod.yaml
@@ -133,7 +133,7 @@ spec:
       restartPolicy: Never
       initContainers:
         - name: degit-action
-          image: ghcr.io/socialgouv/kontinuous/degit:v1.159.4
+          image: ghcr.io/socialgouv/kontinuous/degit:v1.159.5
           command:
             - sh
             - -c
@@ -282,7 +282,7 @@ spec:
       restartPolicy: Never
       initContainers:
         - name: degit-action
-          image: ghcr.io/socialgouv/kontinuous/degit:v1.159.4
+          image: ghcr.io/socialgouv/kontinuous/degit:v1.159.5
           command:
             - sh
             - -c

diff --git a/packages/kontinuous/tests/__snapshots__/include-file.dev.yaml b/packages/kontinuous/tests/__snapshots__/include-file.dev.yaml
@@ -134,7 +134,7 @@ spec:
       restartPolicy: Never
       initContainers:
         - name: degit-repository
-          image: ghcr.io/socialgouv/kontinuous/degit:v1.159.4
+          image: ghcr.io/socialgouv/kontinuous/degit:v1.159.5
           imagePullPolicy: IfNotPresent
           command:
             - sh

diff --git a/packages/kontinuous/tests/__snapshots__/init-container.dev.yaml b/packages/kontinuous/tests/__snapshots__/init-container.dev.yaml
@@ -136,7 +136,7 @@ spec:
       restartPolicy: Never
       initContainers:
         - name: degit-repository
-          image: ghcr.io/socialgouv/kontinuous/degit:v1.159.4
+          image: ghcr.io/socialgouv/kontinuous/degit:v1.159.5
           imagePullPolicy: IfNotPresent
           command:
             - sh

diff --git a/packages/kontinuous/tests/__snapshots__/job-builds.dev.yaml b/packages/kontinuous/tests/__snapshots__/job-builds.dev.yaml
@@ -135,7 +135,7 @@ spec:
       restartPolicy: Never
       initContainers:
         - name: degit-repository
-          image: ghcr.io/socialgouv/kontinuous/degit:v1.159.4
+          image: ghcr.io/socialgouv/kontinuous/degit:v1.159.5
           imagePullPolicy: IfNotPresent
           command:
             - sh
@@ -315,7 +315,7 @@ spec:
       restartPolicy: Never
       initContainers:
         - name: degit-repository
-          image: ghcr.io/socialgouv/kontinuous/degit:v1.159.4
+          image: ghcr.io/socialgouv/kontinuous/degit:v1.159.5
           imagePullPolicy: IfNotPresent
           command:
             - sh

diff --git a/packages/kontinuous/tests/__snapshots__/jobs-build-options.dev.yaml b/packages/kontinuous/tests/__snapshots__/jobs-build-options.dev.yaml
@@ -136,7 +136,7 @@ spec:
       restartPolicy: Never
       initContainers:
         - name: degit-repository
-          image: ghcr.io/socialgouv/kontinuous/degit:v1.159.4
+          image: ghcr.io/socialgouv/kontinuous/degit:v1.159.5
           imagePullPolicy: IfNotPresent
           command:
             - sh

diff --git a/packages/kontinuous/tests/__snapshots__/jobs-build-stage.dev.yaml b/packages/kontinuous/tests/__snapshots__/jobs-build-stage.dev.yaml
@@ -136,7 +136,7 @@ spec:
       restartPolicy: Never
       initContainers:
         - name: degit-action
-          image: ghcr.io/socialgouv/kontinuous/degit:v1.159.4
+          image: ghcr.io/socialgouv/kontinuous/degit:v1.159.5
           command:
             - sh
             - -c
@@ -285,7 +285,7 @@ spec:
       restartPolicy: Never
       initContainers:
         - name: degit-action
-          image: ghcr.io/socialgouv/kontinuous/degit:v1.159.4
+          image: ghcr.io/socialgouv/kontinuous/degit:v1.159.5
           command:
             - sh
             - -c
@@ -432,7 +432,7 @@ spec:
       restartPolicy: Never
       initContainers:
         - name: degit-repository
-          image: ghcr.io/socialgouv/kontinuous/degit:v1.159.4
+          image: ghcr.io/socialgouv/kontinuous/degit:v1.159.5
           imagePullPolicy: IfNotPresent
           command:
             - sh
@@ -612,7 +612,7 @@ spec:
       restartPolicy: Never
       initContainers:
         - name: degit-repository
-          image: ghcr.io/socialgouv/kontinuous/degit:v1.159.4
+          image: ghcr.io/socialgouv/kontinuous/degit:v1.159.5
           imagePullPolicy: IfNotPresent
           command:
             - sh