Skip to content

Commit

Permalink
Merge branch 'master' into fix/disable-plugins-on-test
Browse files Browse the repository at this point in the history
  • Loading branch information
devthejo authored Jul 24, 2023
2 parents e095121 + b26a343 commit 5689bb6
Show file tree
Hide file tree
Showing 79 changed files with 210 additions and 190 deletions.
2 changes: 1 addition & 1 deletion .github/actions/deploy-via-github/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/socialgouv/kontinuous:v1.159.0
FROM ghcr.io/socialgouv/kontinuous:v1.159.2

COPY entrypoint.sh /entrypoint.sh

Expand Down
2 changes: 1 addition & 1 deletion .github/actions/deploy-via-github/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ inputs:
runs:
using: docker
# image: Dockerfile
image: docker://ghcr.io/socialgouv/kontinuous/deploy-via-github:v1.159.0
image: docker://ghcr.io/socialgouv/kontinuous/deploy-via-github:v1.159.2
env:
KS_ENVIRONMENT: ${{ inputs.environment }}
KS_CHART: ${{ inputs.chart }}
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/deploy-via-webhook/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/socialgouv/kontinuous:v1.159.0 as base
FROM ghcr.io/socialgouv/kontinuous:v1.159.2 as base

USER 0

Expand Down
2 changes: 1 addition & 1 deletion .github/actions/deploy-via-webhook/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ inputs:
runs:
using: docker
# image: Dockerfile
image: docker://ghcr.io/socialgouv/kontinuous/deploy-via-webhook:v1.159.0
image: docker://ghcr.io/socialgouv/kontinuous/deploy-via-webhook:v1.159.2
env:
KS_WEBHOOK_TOKEN: ${{ inputs.webhookToken }}
KS_WEBHOOK_URI: ${{ inputs.webhookUri }}
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/deploy-via-webhook/kontinuousVersion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ghcr.io/socialgouv/kontinuous:v1.159.0
ghcr.io/socialgouv/kontinuous:v1.159.2
2 changes: 1 addition & 1 deletion .github/actions/env/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/socialgouv/kontinuous:v1.159.0
FROM ghcr.io/socialgouv/kontinuous:v1.159.2

COPY entrypoint.sh /entrypoint.sh

Expand Down
2 changes: 1 addition & 1 deletion .github/actions/env/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ inputs:
runs:
using: docker
# image: Dockerfile
image: docker://ghcr.io/socialgouv/kontinuous/env:v1.159.0
image: docker://ghcr.io/socialgouv/kontinuous/env:v1.159.2
env:
KS_GIT_BRANCH: ${{ inputs.branch }}
KSENV_REPOSITORY_NAME: ${{ inputs.repositoryName }}
Expand Down
2 changes: 1 addition & 1 deletion .github/kontinuousVersion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ghcr.io/socialgouv/kontinuous:v1.159.0
ghcr.io/socialgouv/kontinuous:v1.159.2
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.159.2 (2023-07-21)


### Bug Fixes

* upgrade metabase to v0.46.6.1 ([#361](https://github.com/socialgouv/kontinuous/issues/361)) ([c06ea0e](https://github.com/socialgouv/kontinuous/commit/c06ea0e63dacf89b603ef0f93db1bb1195085ffd))

## 1.159.1 (2023-07-20)


### Bug Fixes

* **mattermost:** add github debug link if any ([#360](https://github.com/socialgouv/kontinuous/issues/360)) ([0789256](https://github.com/socialgouv/kontinuous/commit/07892569778c981dd91b362d856ae43c7f7b5b5a))

## 1.159.0 (2023-07-18)


Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kontinuous-webhook:
image: ghcr.io/socialgouv/kontinuous/webhook:v1.159.0
image: ghcr.io/socialgouv/kontinuous/webhook:v1.159.2
# image: harbor.fabrique.social.gouv.fr/sre/kontinuous/webhook:1
host: "kontinuous.fabrique.social.gouv.fr"

Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.0"}
KUBEWEBHOOK_PIPELINE_CHECKOUT_IMAGE: ${KUBEWEBHOOK_PIPELINE_CHECKOUT_IMAGE:-"ghcr.io/socialgouv/kontinuous/degit:v1.159.0"}
KUBEWEBHOOK_PIPELINE_IMAGE: ${KUBEWEBHOOK_PIPELINE_IMAGE:-"ghcr.io/socialgouv/kontinuous:v1.159.2"}
KUBEWEBHOOK_PIPELINE_CHECKOUT_IMAGE: ${KUBEWEBHOOK_PIPELINE_CHECKOUT_IMAGE:-"ghcr.io/socialgouv/kontinuous/degit:v1.159.2"}
KUBEWEBHOOK_CI_NAMESPACE_ALLOW_ALL: ${KUBEWEBHOOK_CI_NAMESPACE_ALLOW_ALL:-"true"}
KUBEWEBHOOK_HTTPLOGGER_IGNOREUSERAGENTS: backbox-robot
KUBEWEBHOOK_SENTRY_DSN: ${KUBEWEBHOOK_SENTRY_DSN}
Expand Down
2 changes: 1 addition & 1 deletion docs/advanced/features.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,5 @@ See [Plugins details](./advanced/plugins.md)
- on demand resource cleaner
- ...
- post-deploy plugins
- notify mattermost (coming soon)
- notify mattermost/slack
- ...
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "~dev",
"version": "1.159.0",
"version": "1.159.2",
"repository": "[email protected]:socialgouv/kontinuous.git",
"license": "MIT",
"private": true,
Expand Down
4 changes: 2 additions & 2 deletions packages/argocd/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.0 /usr/local/bin /usr/local/bin/
COPY --from=ghcr.io/socialgouv/kontinuous:v1.159.0 --chown=999:999 /opt/kontinuous /opt/kontinuous/
COPY --from=ghcr.io/socialgouv/kontinuous:v1.159.2 /usr/local/bin /usr/local/bin/
COPY --from=ghcr.io/socialgouv/kontinuous:v1.159.2 --chown=999:999 /opt/kontinuous /opt/kontinuous/

# Switch back to non-root user
USER 999
2 changes: 1 addition & 1 deletion packages/common/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "~common",
"version": "1.159.0",
"version": "1.159.2",
"description": "",
"license": "MIT",
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion packages/dev-tools/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "~dev-tools",
"version": "1.159.0",
"version": "1.159.2",
"dependencies": {
"replace": "^1.2.2",
"~common": "workspace:^"
Expand Down
2 changes: 1 addition & 1 deletion packages/helm-tree/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "helm-tree",
"version": "1.159.0",
"version": "1.159.2",
"description": "",
"license": "MIT",
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion packages/kontinuous/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kontinuous",
"version": "1.159.0",
"version": "1.159.2",
"repository": "https://github.com/socialgouv/kontinuous.git",
"homepage": "https://socialgouv.github.io/kontinuous/",
"license": "MIT",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ spec:
restartPolicy: Never
initContainers:
- name: degit-action
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.0
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.2
command:
- sh
- -c
Expand Down
4 changes: 2 additions & 2 deletions packages/kontinuous/tests/__snapshots__/extends-ovh.dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ spec:
restartPolicy: Never
initContainers:
- name: degit-action
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.0
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.2
command:
- sh
- -c
Expand Down Expand Up @@ -284,7 +284,7 @@ spec:
restartPolicy: Never
initContainers:
- name: degit-action
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.0
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.2
command:
- sh
- -c
Expand Down
4 changes: 2 additions & 2 deletions packages/kontinuous/tests/__snapshots__/extends-ovh.prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ spec:
restartPolicy: Never
initContainers:
- name: degit-action
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.0
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.2
command:
- sh
- -c
Expand Down Expand Up @@ -282,7 +282,7 @@ spec:
restartPolicy: Never
initContainers:
- name: degit-action
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.0
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.2
command:
- sh
- -c
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ spec:
restartPolicy: Never
initContainers:
- name: degit-repository
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.0
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.2
imagePullPolicy: IfNotPresent
command:
- sh
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ spec:
fsGroup: 1000
runAsNonRoot: true
containers:
- image: metabase/metabase:v0.45.3
- image: metabase/metabase:v0.46.6.1
name: metabase
securityContext:
allowPrivilegeEscalation: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ spec:
fsGroup: 1000
runAsNonRoot: true
containers:
- image: metabase/metabase:v0.45.3
- image: metabase/metabase:v0.46.6.1
name: metabase
securityContext:
allowPrivilegeEscalation: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ spec:
fsGroup: 1000
runAsNonRoot: true
containers:
- image: metabase/metabase:v0.45.3
- image: metabase/metabase:v0.46.6.1
name: metabase
securityContext:
allowPrivilegeEscalation: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ spec:
fsGroup: 1000
runAsNonRoot: true
containers:
- image: metabase/metabase:v0.45.3
- image: metabase/metabase:v0.46.6.1
name: metabase
securityContext:
allowPrivilegeEscalation: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ spec:
restartPolicy: Never
initContainers:
- name: degit-repository
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.0
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.2
imagePullPolicy: IfNotPresent
command:
- sh
Expand Down
4 changes: 2 additions & 2 deletions packages/kontinuous/tests/__snapshots__/job-builds.dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ spec:
restartPolicy: Never
initContainers:
- name: degit-repository
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.0
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.2
imagePullPolicy: IfNotPresent
command:
- sh
Expand Down Expand Up @@ -315,7 +315,7 @@ spec:
restartPolicy: Never
initContainers:
- name: degit-repository
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.0
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.2
imagePullPolicy: IfNotPresent
command:
- sh
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ spec:
restartPolicy: Never
initContainers:
- name: degit-repository
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.0
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.2
imagePullPolicy: IfNotPresent
command:
- sh
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ spec:
restartPolicy: Never
initContainers:
- name: degit-action
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.0
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.2
command:
- sh
- -c
Expand Down Expand Up @@ -285,7 +285,7 @@ spec:
restartPolicy: Never
initContainers:
- name: degit-action
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.0
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.2
command:
- sh
- -c
Expand Down Expand Up @@ -432,7 +432,7 @@ spec:
restartPolicy: Never
initContainers:
- name: degit-repository
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.0
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.2
imagePullPolicy: IfNotPresent
command:
- sh
Expand Down Expand Up @@ -612,7 +612,7 @@ spec:
restartPolicy: Never
initContainers:
- name: degit-repository
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.0
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.2
imagePullPolicy: IfNotPresent
command:
- sh
Expand Down
8 changes: 4 additions & 4 deletions packages/kontinuous/tests/__snapshots__/jobs-build.dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ spec:
restartPolicy: Never
initContainers:
- name: degit-action
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.0
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.2
command:
- sh
- -c
Expand Down Expand Up @@ -285,7 +285,7 @@ spec:
restartPolicy: Never
initContainers:
- name: degit-action
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.0
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.2
command:
- sh
- -c
Expand Down Expand Up @@ -431,7 +431,7 @@ spec:
restartPolicy: Never
initContainers:
- name: degit-repository
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.0
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.2
imagePullPolicy: IfNotPresent
command:
- sh
Expand Down Expand Up @@ -610,7 +610,7 @@ spec:
restartPolicy: Never
initContainers:
- name: degit-repository
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.0
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.2
imagePullPolicy: IfNotPresent
command:
- sh
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ spec:
restartPolicy: Never
initContainers:
- name: degit-action
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.0
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.2
command:
- sh
- -c
Expand Down Expand Up @@ -284,7 +284,7 @@ spec:
restartPolicy: Never
initContainers:
- name: degit-action
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.0
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.2
command:
- sh
- -c
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ spec:
restartPolicy: Never
initContainers:
- name: degit-action
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.0
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.2
command:
- sh
- -c
Expand Down Expand Up @@ -285,7 +285,7 @@ spec:
restartPolicy: Never
initContainers:
- name: degit-action
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.0
image: ghcr.io/socialgouv/kontinuous/degit:v1.159.2
command:
- sh
- -c
Expand Down
Loading

0 comments on commit 5689bb6

Please sign in to comment.