Skip to content

Commit

Permalink
chore: link major version branch to v1
Browse files Browse the repository at this point in the history
  • Loading branch information
devthejo committed Nov 8, 2022
1 parent a04319f commit c66c9fe
Show file tree
Hide file tree
Showing 35 changed files with 55 additions and 55 deletions.
2 changes: 1 addition & 1 deletion .github/actions/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/socialgouv/kontinuous:v1.96.10 as base
FROM ghcr.io/socialgouv/kontinuous:v1 as base

USER 0
RUN apt-get update && \
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/debug-manifests-output/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/socialgouv/kontinuous/gh-actions-common:v1.96.10
FROM ghcr.io/socialgouv/kontinuous/gh-actions-common:v1

COPY entrypoint.sh /entrypoint.sh

Expand Down
2 changes: 1 addition & 1 deletion .github/actions/debug-manifests/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ runs:
steps:
- name: Debug manifests
id: debug-manifests
uses: socialgouv/kontinuous/.github/actions/debug-manifests-output@v1.96.10
uses: socialgouv/kontinuous/.github/actions/debug-manifests-output@v1
with:
path: manifests.yaml

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/gh-actions-common:v1.96.10
FROM ghcr.io/socialgouv/kontinuous/gh-actions-common:v1

COPY entrypoint.sh /entrypoint.sh

Expand Down
2 changes: 1 addition & 1 deletion .github/actions/deployment-reporting/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ runs:
deployment_id: ${{ inputs.deployment_id }}

- name: Debug manifests
uses: socialgouv/kontinuous/.github/actions/debug-manifests@v1.96.10
uses: socialgouv/kontinuous/.github/actions/debug-manifests@v1
with:
token: ${{ inputs.token }}
2 changes: 1 addition & 1 deletion .github/actions/deployment-starting/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ runs:
steps:
- name: Load kontinuous config
id: kontinuous-config
uses: socialgouv/kontinuous/.github/actions/load-remote-config@v1.96.10
uses: socialgouv/kontinuous/.github/actions/load-remote-config@v1

- name: Notify deployment start
uses: bobheadxi/deployments@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/load-remote-config/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/socialgouv/kontinuous/gh-actions-common:v1.96.10
FROM ghcr.io/socialgouv/kontinuous/gh-actions-common:v1

COPY entrypoint.sh /entrypoint.sh
COPY bin/ /usr/local/bin/
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/workflow-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: kontinuous pipeline
uses: socialgouv/kontinuous/.github/actions/deploy-via-github@v1.96.10
uses: socialgouv/kontinuous/.github/actions/deploy-via-github@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
kubeconfig: ${{ secrets.KUBECONFIG }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/workflow-gotoprod-manual.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ jobs:
steps:

- name: Starting Deployment 🎬
uses: socialgouv/kontinuous/.github/actions/deployment-starting@v1.96.10
uses: socialgouv/kontinuous/.github/actions/deployment-starting@v1
id: deployment-starting
with:
token: ${{ secrets.GITHUB_TOKEN }}

- name: Kontinuous Pipeline 🥷
uses: socialgouv/kontinuous/.github/actions/deploy-via-webhook@v1.96.10
uses: socialgouv/kontinuous/.github/actions/deploy-via-webhook@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
webhookToken: ${{ secrets.KUBEWEBHOOK_TOKEN }}
Expand All @@ -31,7 +31,7 @@ jobs:
environment: "prod"

- name: Reporting 📜
uses: socialgouv/kontinuous/.github/actions/deployment-reporting@v1.96.10
uses: socialgouv/kontinuous/.github/actions/deployment-reporting@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
deployment_id: ${{ steps.deployment-starting.outputs.deployment_id }}
6 changes: 3 additions & 3 deletions .github/workflows/workflow-webhook.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ jobs:
steps:

- name: Starting Deployment 🎬
uses: socialgouv/kontinuous/.github/actions/deployment-starting@v1.96.10
uses: socialgouv/kontinuous/.github/actions/deployment-starting@v1
id: deployment-starting
with:
token: ${{ secrets.GITHUB_TOKEN }}

- name: Kontinuous Pipeline 🥷
uses: socialgouv/kontinuous/.github/actions/deploy-via-webhook@v1.96.10
uses: socialgouv/kontinuous/.github/actions/deploy-via-webhook@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
webhookToken: ${{ secrets.KUBEWEBHOOK_TOKEN }}
Expand All @@ -36,7 +36,7 @@ jobs:
environment: ${{ inputs.environment }}

- name: Reporting 📜
uses: socialgouv/kontinuous/.github/actions/deployment-reporting@v1.96.10
uses: socialgouv/kontinuous/.github/actions/deployment-reporting@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
deployment_id: ${{ steps.deployment-starting.outputs.deployment_id }}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kontinuous-webhook:
image: ghcr.io/socialgouv/kontinuous/webhook:v1.96.10
image: ghcr.io/socialgouv/kontinuous/webhook:v1
# image: harbor.fabrique.social.gouv.fr/sre/kontinuous/webhook:1
host: "kontinuous.fabrique.social.gouv.fr"
kubeconfigSecrets:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ concurrency:

jobs:
cleaning:
uses: socialgouv/kontinuous/.github/workflows/workflow-webhook.yaml@v1.96.10
uses: socialgouv/kontinuous/.github/workflows/workflow-webhook.yaml@v1
secrets: inherit
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ concurrency:

jobs:
deploy:
uses: socialgouv/kontinuous/.github/workflows/workflow-webhook.yaml@v1.96.10
uses: socialgouv/kontinuous/.github/workflows/workflow-webhook.yaml@v1
secrets: inherit
with:
triggerWebhook: true # comment this line when enabling webhook on repository
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ concurrency:

jobs:
cleaning:
uses: socialgouv/kontinuous/.github/workflows/workflow-webhook.yaml@v1.96.10
uses: socialgouv/kontinuous/.github/workflows/workflow-webhook.yaml@v1
secrets: inherit
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ concurrency:

jobs:
deploy:
uses: socialgouv/kontinuous/.github/workflows/workflow-webhook.yaml@v1.96.10
uses: socialgouv/kontinuous/.github/workflows/workflow-webhook.yaml@v1
secrets: inherit
with:
triggerWebhook: true # comment this line when enabling webhook on repository
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ concurrency:

jobs:
deploy:
uses: socialgouv/kontinuous/.github/workflows/workflow-gotoprod-manual.yaml@v1.96.10
uses: socialgouv/kontinuous/.github/workflows/workflow-gotoprod-manual.yaml@v1
secrets: inherit
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ concurrency:

jobs:
cleaning:
uses: socialgouv/kontinuous/.github/workflows/workflow-webhook.yaml@v1.96.10
uses: socialgouv/kontinuous/.github/workflows/workflow-webhook.yaml@v1
secrets: inherit
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ concurrency:

jobs:
deploy:
uses: socialgouv/kontinuous/.github/workflows/workflow-webhook.yaml@v1.96.10
uses: socialgouv/kontinuous/.github/workflows/workflow-webhook.yaml@v1
secrets: inherit
with:
triggerWebhook: true # comment this line when enabling webhook on repository
4 changes: 2 additions & 2 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ 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.96.10"}
KUBEWEBHOOK_PIPELINE_CHECKOUT_IMAGE: ${KUBEWEBHOOK_PIPELINE_CHECKOUT_IMAGE:-"ghcr.io/socialgouv/kontinuous/degit:v1.96.10"}
KUBEWEBHOOK_PIPELINE_IMAGE: ${KUBEWEBHOOK_PIPELINE_IMAGE:-"ghcr.io/socialgouv/kontinuous:v1"}
KUBEWEBHOOK_PIPELINE_CHECKOUT_IMAGE: ${KUBEWEBHOOK_PIPELINE_CHECKOUT_IMAGE:-"ghcr.io/socialgouv/kontinuous/degit:v1"}
KS_LOG_LEVEL: "trace"
4 changes: 2 additions & 2 deletions packages/argocd/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ RUN chown 1001:1001 /workspace
RUN git config --global --add safe.directory /workspace


COPY --from=ghcr.io/socialgouv/kontinuous:v1.96.10 /usr/local/bin /usr/local/bin/
COPY --from=ghcr.io/socialgouv/kontinuous:v1.96.8 --chown=999:v1.96.10 /opt/kontinuous /opt/kontinuous/
COPY --from=ghcr.io/socialgouv/kontinuous:v1 /usr/local/bin /usr/local/bin/
COPY --from=ghcr.io/socialgouv/kontinuous:v1.96.8 --chown=999:v1 /opt/kontinuous /opt/kontinuous/

# Switch back to non-root user
USER 999
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ spec:
restartPolicy: Never
initContainers:
- name: degit-action
image: ghcr.io/socialgouv/kontinuous/degit:v1.96.10
image: ghcr.io/socialgouv/kontinuous/degit:v1
command:
- sh
- '-c'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ spec:
restartPolicy: Never
initContainers:
- name: degit-repository
image: ghcr.io/socialgouv/kontinuous/degit:v1.96.10
image: ghcr.io/socialgouv/kontinuous/degit:v1
imagePullPolicy: IfNotPresent
command:
- sh
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ spec:
restartPolicy: Never
initContainers:
- name: degit-repository
image: ghcr.io/socialgouv/kontinuous/degit:v1.96.10
image: ghcr.io/socialgouv/kontinuous/degit:v1
imagePullPolicy: IfNotPresent
command:
- sh
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ spec:
restartPolicy: Never
initContainers:
- name: degit-repository
image: ghcr.io/socialgouv/kontinuous/degit:v1.96.10
image: ghcr.io/socialgouv/kontinuous/degit:v1
imagePullPolicy: IfNotPresent
command:
- sh
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ spec:
restartPolicy: Never
initContainers:
- name: degit-action
image: ghcr.io/socialgouv/kontinuous/degit:v1.96.10
image: ghcr.io/socialgouv/kontinuous/degit:v1
command:
- sh
- '-c'
Expand Down Expand Up @@ -313,7 +313,7 @@ spec:
restartPolicy: Never
initContainers:
- name: degit-action
image: ghcr.io/socialgouv/kontinuous/degit:v1.96.10
image: ghcr.io/socialgouv/kontinuous/degit:v1
command:
- sh
- '-c'
Expand Down Expand Up @@ -459,7 +459,7 @@ spec:
restartPolicy: Never
initContainers:
- name: degit-repository
image: ghcr.io/socialgouv/kontinuous/degit:v1.96.10
image: ghcr.io/socialgouv/kontinuous/degit:v1
imagePullPolicy: IfNotPresent
command:
- sh
Expand Down Expand Up @@ -632,7 +632,7 @@ spec:
restartPolicy: Never
initContainers:
- name: degit-repository
image: ghcr.io/socialgouv/kontinuous/degit:v1.96.10
image: ghcr.io/socialgouv/kontinuous/degit:v1
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 @@ -154,7 +154,7 @@ spec:
restartPolicy: Never
initContainers:
- name: degit-action
image: ghcr.io/socialgouv/kontinuous/degit:v1.96.10
image: ghcr.io/socialgouv/kontinuous/degit:v1
command:
- sh
- '-c'
Expand Down Expand Up @@ -311,7 +311,7 @@ spec:
restartPolicy: Never
initContainers:
- name: degit-action
image: ghcr.io/socialgouv/kontinuous/degit:v1.96.10
image: ghcr.io/socialgouv/kontinuous/degit:v1
command:
- sh
- '-c'
Expand Down Expand Up @@ -455,7 +455,7 @@ spec:
restartPolicy: Never
initContainers:
- name: degit-repository
image: ghcr.io/socialgouv/kontinuous/degit:v1.96.10
image: ghcr.io/socialgouv/kontinuous/degit:v1
imagePullPolicy: IfNotPresent
command:
- sh
Expand Down Expand Up @@ -626,7 +626,7 @@ spec:
restartPolicy: Never
initContainers:
- name: degit-repository
image: ghcr.io/socialgouv/kontinuous/degit:v1.96.10
image: ghcr.io/socialgouv/kontinuous/degit:v1
imagePullPolicy: IfNotPresent
command:
- sh
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ spec:
restartPolicy: Never
initContainers:
- name: degit-action
image: ghcr.io/socialgouv/kontinuous/degit:v1.96.10
image: ghcr.io/socialgouv/kontinuous/degit:v1
command:
- sh
- '-c'
Expand Down Expand Up @@ -310,7 +310,7 @@ spec:
restartPolicy: Never
initContainers:
- name: degit-action
image: ghcr.io/socialgouv/kontinuous/degit:v1.96.10
image: ghcr.io/socialgouv/kontinuous/degit:v1
command:
- sh
- '-c'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ spec:
restartPolicy: Never
initContainers:
- name: degit-action
image: ghcr.io/socialgouv/kontinuous/degit:v1.96.10
image: ghcr.io/socialgouv/kontinuous/degit:v1
command:
- sh
- '-c'
Expand Down Expand Up @@ -311,7 +311,7 @@ spec:
restartPolicy: Never
initContainers:
- name: degit-action
image: ghcr.io/socialgouv/kontinuous/degit:v1.96.10
image: ghcr.io/socialgouv/kontinuous/degit:v1
command:
- sh
- '-c'
Expand Down
10 changes: 5 additions & 5 deletions packages/kontinuous/tests/__snapshots__/jobs-seed-sql.dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ spec:
restartPolicy: Never
initContainers:
- name: degit-action
image: ghcr.io/socialgouv/kontinuous/degit:v1.96.10
image: ghcr.io/socialgouv/kontinuous/degit:v1
command:
- sh
- '-c'
Expand Down Expand Up @@ -311,7 +311,7 @@ spec:
restartPolicy: Never
initContainers:
- name: degit-action
image: ghcr.io/socialgouv/kontinuous/degit:v1.96.10
image: ghcr.io/socialgouv/kontinuous/degit:v1
command:
- sh
- '-c'
Expand Down Expand Up @@ -457,7 +457,7 @@ spec:
restartPolicy: Never
initContainers:
- name: degit-action
image: ghcr.io/socialgouv/kontinuous/degit:v1.96.10
image: ghcr.io/socialgouv/kontinuous/degit:v1
command:
- sh
- '-c'
Expand Down Expand Up @@ -594,7 +594,7 @@ spec:
restartPolicy: Never
initContainers:
- name: degit-repository
image: ghcr.io/socialgouv/kontinuous/degit:v1.96.10
image: ghcr.io/socialgouv/kontinuous/degit:v1
imagePullPolicy: IfNotPresent
command:
- sh
Expand All @@ -617,7 +617,7 @@ spec:
cpu: 10m
memory: 64Mi
- name: degit-action
image: ghcr.io/socialgouv/kontinuous/degit:v1.96.10
image: ghcr.io/socialgouv/kontinuous/degit:v1
command:
- sh
- '-c'
Expand Down
Loading

0 comments on commit c66c9fe

Please sign in to comment.