diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ee39cd26908dcb52c7e0bb6ccf911a7c5b55321..30302df52e54a292dadf6237dc357e88a7463dc4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [1.2.7](https://gitlab.com/to-be-continuous/openshift/compare/1.2.6...1.2.7) (2022-02-24) + + +### Bug Fixes + +* **vault:** revert Vault JWT authentication not working ([d82538b](https://gitlab.com/to-be-continuous/openshift/commit/d82538bf1013911267b6717106140a91e3e39119)) + ## [1.2.6](https://gitlab.com/to-be-continuous/openshift/compare/1.2.5...1.2.6) (2022-02-23) diff --git a/README.md b/README.md index a33317a26132e26eaa4fd003c38c3cb8add28260..e17f037a88495ca2a0c134c0b7088bd058e8fdbb 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ In order to include this template in your project, add the following to your `gi ```yaml include: - project: 'to-be-continuous/openshift' - ref: '1.2.6' + ref: '1.2.7' file: '/templates/gitlab-ci-openshift.yml' ``` @@ -458,11 +458,11 @@ With: include: # main template - project: 'to-be-continuous/openshift' - ref: '1.2.6' + ref: '1.2.7' file: '/templates/gitlab-ci-openshift.yml' # Vault variant - project: 'to-be-continuous/openshift' - ref: '1.2.6' + ref: '1.2.7' file: '/templates/gitlab-ci-openshift-vault.yml' variables: @@ -488,7 +488,7 @@ variables: ```yaml include: - project: 'to-be-continuous/openshift' - ref: '1.2.6' + ref: '1.2.7' file: '/templates/gitlab-ci-openshift.yml' variables: diff --git a/templates/gitlab-ci-openshift-vault.yml b/templates/gitlab-ci-openshift-vault.yml index b53b147e47629b3e4de25408d21b8f1d950a318e..86ae66dc4caf3669acbdfd10a464feca5eba8ce0 100644 --- a/templates/gitlab-ci-openshift-vault.yml +++ b/templates/gitlab-ci-openshift-vault.yml @@ -9,6 +9,6 @@ variables: .os-base: services: - name: "$CI_REGISTRY/to-be-continuous/tools/tracking:master" - command: ["--service", "openshift", "1.2.6" ] + command: ["--service", "openshift", "1.2.7" ] - name: "$CI_REGISTRY/to-be-continuous/tools/vault-secrets-provider:master" alias: "vault-secrets-provider" diff --git a/templates/gitlab-ci-openshift.yml b/templates/gitlab-ci-openshift.yml index 2b8245afc1ee79c48df58a9c64366613ca49b9ea..e4f7078c236ed3115a9e0bc439602f972d99c63d 100644 --- a/templates/gitlab-ci-openshift.yml +++ b/templates/gitlab-ci-openshift.yml @@ -566,7 +566,7 @@ stages: fi } - if [[ "$TEMPLATE_CHECK_UPDATE_DISABLED" != "true" ]]; then check_for_update openshift "1.2.6"; fi + if [[ "$TEMPLATE_CHECK_UPDATE_DISABLED" != "true" ]]; then check_for_update openshift "1.2.7"; fi # export tool functions (might be used in after_script) export -f log_info log_warn log_error assert_defined last_rollout_status force_rollout poll_last_rollout extract_oldest_tags_from_image_stream_definition purge_old_image_tags @@ -581,7 +581,7 @@ stages: image: $OS_CLI_IMAGE services: - name: "$CI_REGISTRY/to-be-continuous/tools/tracking:master" - command: ["--service", "openshift", "1.2.6" ] + command: ["--service", "openshift", "1.2.7" ] before_script: - *os-scripts - install_ca_certs "${CUSTOM_CA_CERTS:-$DEFAULT_CA_CERTS}"