From 5b0fbf8cda4285f5829fe72fae55f5f24f4e7a7e Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo <71768+gionn@users.noreply.github.com> Date: Mon, 2 Dec 2024 09:57:28 +0100 Subject: [PATCH 1/2] Update link to docs in docker-compose readme (#1259) --- docker-compose/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose/README.md b/docker-compose/README.md index eb5d58542..dabeeac8b 100644 --- a/docker-compose/README.md +++ b/docker-compose/README.md @@ -1,3 +1,3 @@ # Alfresco Content Services (ACS) Docker Compose -Please refer to the [documentation](/docs/docker-compose/README.md) for information on the Docker compose file and deployment instructions. +Please refer to the [documentation](https://alfresco.github.io/acs-deployment/docs/docker-compose/README.html) for information on the Docker compose file and deployment instructions. From eae432370e54fe36f0024346f2ff521d4a095025 Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo <71768+gionn@users.noreply.github.com> Date: Mon, 2 Dec 2024 11:19:30 +0100 Subject: [PATCH 2/2] OPSEXP-2938 Bump acs-sso-example chart version (#1261) --- .pre-commit-config.yaml | 2 +- README.md | 10 ++++++---- helm/acs-sso-example/Chart.yaml | 4 ++-- helm/acs-sso-example/README.md | 2 +- helm/acs-sso-example/updatecli-matrix-targets.yaml | 1 + 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8bf13c49f..99e267b31 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -24,7 +24,7 @@ repos: hooks: - id: helm-deps-build - repo: https://github.com/gruntwork-io/pre-commit - rev: v0.1.23 + rev: v0.1.24 hooks: - id: helmlint - repo: https://github.com/bridgecrewio/checkov.git diff --git a/README.md b/README.md index 5300df4b0..a166a3ad4 100644 --- a/README.md +++ b/README.md @@ -47,20 +47,22 @@ First ensure that: necessary before proceeding. * the [components charts](https://github.com/Alfresco/alfresco-helm-charts) have been released in stable versions (no pre-release version should be present in - Chart.yaml). + Chart.yaml at the time of tagging). Start the release by opening a PR against the appropriate branch that will: * Update the [EOL table](docs/index.md#acs-end-of-lifed-versions) in case a version is deprecated -* In [alfresco-content-services](helm/alfresco-content-services/Chart.yaml), - bump chart version to the version you want to release +* In [alfresco-content-services](helm/alfresco-content-services/Chart.yaml) and + [acs-sso-example](helm/acs-sso-example/Chart.yaml) charts:bump chart version + to the version you want to release. * Run `pre-commit run --all-files helm-docs` to update helm docs * Edit [upgrades docs](docs/helm/upgrades.md) renaming the `To be released` section to the current version and create a new `To be released` section for the future. * Run [Bump versions][1] workflow against the same newly created branch, the first time with `charts` option. Inspect the changes pushed on the branch, - revert unwanted changes if necessary. + revert unwanted changes if necessary - all charts dependencies should not be + using any `-alpha.` version. * Run [Bump versions][1] workflow against the same branch with option `values`. This will update both docker compose tags and helm charts values. Inspect the changes pushed on the branch, looking for any missing update. diff --git a/helm/acs-sso-example/Chart.yaml b/helm/acs-sso-example/Chart.yaml index 437f38b21..6155c56a0 100644 --- a/helm/acs-sso-example/Chart.yaml +++ b/helm/acs-sso-example/Chart.yaml @@ -20,8 +20,8 @@ description: | :warning: All components have persistence disabled so all data is lost after a deployment is destroyed or rolled back! type: application -version: 1.1.0-alpha.0 -appVersion: 23.3.0 +version: 1.1.0 +appVersion: 23.4.0 home: https://www.alfresco.com sources: - https://github.com/Alfresco/acs-deployment diff --git a/helm/acs-sso-example/README.md b/helm/acs-sso-example/README.md index ce86ed3a7..f146a6a4a 100644 --- a/helm/acs-sso-example/README.md +++ b/helm/acs-sso-example/README.md @@ -6,7 +6,7 @@ grand_parent: Helm # acs-sso-example -![Version: 1.1.0-alpha.0](https://img.shields.io/badge/Version-1.1.0--alpha.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 23.3.0](https://img.shields.io/badge/AppVersion-23.3.0-informational?style=flat-square) +![Version: 1.1.0](https://img.shields.io/badge/Version-1.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 23.4.0](https://img.shields.io/badge/AppVersion-23.4.0-informational?style=flat-square) An example Chart to demonstrate how to compose your own Alfresco platform with SSO on kubernetes using a nthrid party Keycloak. diff --git a/helm/acs-sso-example/updatecli-matrix-targets.yaml b/helm/acs-sso-example/updatecli-matrix-targets.yaml index 001189009..1569f5b57 100644 --- a/helm/acs-sso-example/updatecli-matrix-targets.yaml +++ b/helm/acs-sso-example/updatecli-matrix-targets.yaml @@ -12,6 +12,7 @@ matrix: helm_key: $.alfresco-repository.image.tag pattern: image: + helm_update_appVersion: true share: version: helm_target: *helmvaluesSso