Merge remote-tracking branch 'origin/master' into OPSEXP-2938-drop-hpa

.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

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.

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.

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

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.

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