diff --git a/CHANGELOG.md b/CHANGELOG.md index 28a43e4d98777b6908624173b05aca537cd90751..5262387334c28ebb95c36f1d2a6d6225a2f69299 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [6.1.3](https://gitlab.com/to-be-continuous/kubernetes/compare/6.1.2...6.1.3) (2024-05-05) + + +### Bug Fixes + +* **workflow:** disable MR pipeline from prod & integ branches ([ef6f248](https://gitlab.com/to-be-continuous/kubernetes/commit/ef6f248b4c213e48cf5f254baadcbea1f94d03bf)) + ## [6.1.2](https://gitlab.com/to-be-continuous/kubernetes/compare/6.1.1...6.1.2) (2024-05-05) diff --git a/README.md b/README.md index 4c7a2980c77da8b8029e99a88e990227b0d8bfe2..575c7758e144446e3001b3a45331327e51bcc703 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Add the following to your `gitlab-ci.yml`: ```yaml include: # 1: include the component - - component: gitlab.com/to-be-continuous/kubernetes/gitlab-ci-k8s@6.1.2 + - component: gitlab.com/to-be-continuous/kubernetes/gitlab-ci-k8s@6.1.3 # 2: set/override component inputs inputs: # ⚠ this is only an example @@ -35,7 +35,7 @@ Add the following to your `gitlab-ci.yml`: include: # 1: include the template - project: 'to-be-continuous/kubernetes' - ref: '6.1.2' + ref: '6.1.3' file: '/templates/gitlab-ci-k8s.yml' variables: @@ -532,12 +532,12 @@ With: ```yaml include: # main template - - component: gitlab.com/to-be-continuous/kubernetes/gitlab-ci-k8s@6.1.2 + - component: gitlab.com/to-be-continuous/kubernetes/gitlab-ci-k8s@6.1.3 inputs: # ⚠ oc-container image (includes required curl) kubectl-image: registry.hub.docker.com/docker.io/appuio/oc:v4.14 # Vault variant - - component: gitlab.com/to-be-continuous/kubernetes/gitlab-ci-k8s-vault@6.1.2 + - component: gitlab.com/to-be-continuous/kubernetes/gitlab-ci-k8s-vault@6.1.3 inputs: # audience claim for JWT vault-oidc-aud: "https://vault.acme.host" diff --git a/templates/gitlab-ci-k8s-vault.yml b/templates/gitlab-ci-k8s-vault.yml index 22856298532a56b94072106667a7d6fc3dabd5f2..6a07c0f2863c5c12acc8425b9850bc3d0d2dada7 100644 --- a/templates/gitlab-ci-k8s-vault.yml +++ b/templates/gitlab-ci-k8s-vault.yml @@ -22,7 +22,7 @@ variables: .k8s-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "--port", "8082", "kubernetes", "6.1.2"] + command: ["--service", "--port", "8082", "kubernetes", "6.1.3"] - name: "$TBC_VAULT_IMAGE" alias: "vault-secrets-provider" variables: diff --git a/templates/gitlab-ci-k8s.yml b/templates/gitlab-ci-k8s.yml index a39b4ac322840e10b8acd687fee105c0dfa115dc..4b95ef993b85e1d6ed979942932dc515bcafd11e 100644 --- a/templates/gitlab-ci-k8s.yml +++ b/templates/gitlab-ci-k8s.yml @@ -765,7 +765,7 @@ stages: entrypoint: [""] services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "kubernetes", "6.1.2"] + command: ["--service", "kubernetes", "6.1.3"] before_script: - !reference [.k8s-scripts] - install_ca_certs "${CUSTOM_CA_CERTS:-$DEFAULT_CA_CERTS}"