From c1096488a9dd2bef4fe20f9677a14afba4fc8932 Mon Sep 17 00:00:00 2001 From: Alex Chapellon Date: Fri, 22 Mar 2024 12:21:44 +0100 Subject: [PATCH] OPSEXP-2526: bump alfresco-repository to allow repo hpa and add tests (#1119) --- .github/workflows/bumpVersions.yml | 24 +++--- .../workflows/docker-compose-community.yml | 2 +- .../workflows/docker-compose-enterprise.yml | 4 +- .github/workflows/helm-community.yml | 10 +-- .github/workflows/helm-enterprise.yml | 76 ++++++++++++++----- .github/workflows/helm-release.yml | 4 +- .github/workflows/helm-static-checks.yml | 14 ++-- .github/workflows/pre-commit-compose.yml | 2 +- .github/workflows/pre-commit-helm.yml | 2 +- docs/helm/autoscaling.md | 17 +++++ helm/alfresco-content-services/Chart.lock | 6 +- helm/alfresco-content-services/Chart.yaml | 4 +- helm/alfresco-content-services/README.md | 5 +- .../community_values.yaml | 2 + .../templates/config-repository.yaml | 1 - helm/alfresco-content-services/values.yaml | 4 + test/community-integration-test-values.yaml | 2 +- test/enterprise-integration-test-values.yaml | 42 +++++----- 18 files changed, 140 insertions(+), 81 deletions(-) create mode 100644 docs/helm/autoscaling.md diff --git a/.github/workflows/bumpVersions.yml b/.github/workflows/bumpVersions.yml index 55d5a552f..8d3174461 100644 --- a/.github/workflows/bumpVersions.yml +++ b/.github/workflows/bumpVersions.yml @@ -32,19 +32,19 @@ jobs: name: Helm charts dependencies if: inputs.update-type == 'charts' steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: token: ${{ secrets.BOT_GITHUB_TOKEN }} - name: Login to quay.io - uses: docker/login-action@v3 + uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0 with: registry: quay.io username: ${{ secrets.QUAY_USERNAME }} password: ${{ secrets.QUAY_PASSWORD }} - name: Install Updatecli - uses: updatecli/updatecli-action@v2 + uses: updatecli/updatecli-action@9b35aa663a924d5d5faf89dac76594e3034bcf1f # v2.56.0 with: version: ${{ env.UPDATE_CLI_VERSION }} @@ -52,15 +52,15 @@ jobs: env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} - - uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@v5.13.1 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@v5.20.0 - name: Regenerate helm docs if necessary - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v5.13.1 + uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v5.20.0 with: pre-commit-args: helm-docs || true skip_checkout: "true" - name: Git Auto Commit - uses: stefanzweifel/git-auto-commit-action@v5.0.0 + uses: stefanzweifel/git-auto-commit-action@8756aa072ef5b4a080af5dc8fef36c5d586e521d # v5.0.0 with: commit_message: | 🛠 Updatecli pipeline charts bump @@ -76,17 +76,17 @@ jobs: if: inputs.update-type == 'values' steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: token: ${{ secrets.BOT_GITHUB_TOKEN }} - name: Install Updatecli - uses: updatecli/updatecli-action@v2 + uses: updatecli/updatecli-action@9b35aa663a924d5d5faf89dac76594e3034bcf1f # v2.56.0 with: version: ${{ env.UPDATE_CLI_VERSION }} - name: Checkout updatecli configs - uses: actions/checkout@v4 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: repository: alfresco/alfresco-updatecli ref: ${{ inputs.alfresco-updatecli-ref || env.DEFAULT_BRANCH_NAME }} @@ -107,15 +107,15 @@ jobs: QUAY_PASSWORD: ${{ secrets.QUAY_PASSWORD }} UPDATECLI_GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }} - - uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@v5.13.1 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@v5.20.0 - name: Regenerate helm docs if necessary - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v5.13.1 + uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v5.20.0 with: pre-commit-args: helm-docs || true skip_checkout: "true" - name: Git Auto Commit - uses: stefanzweifel/git-auto-commit-action@v5.0.0 + uses: stefanzweifel/git-auto-commit-action@8756aa072ef5b4a080af5dc8fef36c5d586e521d # v5.0.0 with: commit_message: | 🛠 Updatecli pipeline values bump diff --git a/.github/workflows/docker-compose-community.yml b/.github/workflows/docker-compose-community.yml index 27e83063b..0c7073b12 100644 --- a/.github/workflows/docker-compose-community.yml +++ b/.github/workflows/docker-compose-community.yml @@ -22,6 +22,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: >- - Alfresco/alfresco-build-tools/.github/actions/dbp-charts/verify-compose@v5.13.1 + Alfresco/alfresco-build-tools/.github/actions/dbp-charts/verify-compose@v5.20.0 with: compose_file_path: docker-compose/community-docker-compose.yml diff --git a/.github/workflows/docker-compose-enterprise.yml b/.github/workflows/docker-compose-enterprise.yml index 799af00be..1fcbb5d33 100644 --- a/.github/workflows/docker-compose-enterprise.yml +++ b/.github/workflows/docker-compose-enterprise.yml @@ -27,7 +27,7 @@ jobs: outputs: matrix_json: ${{ steps.eval.outputs.matrix_json }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Evaluate Matrix id: eval run: >- @@ -54,7 +54,7 @@ jobs: steps: - name: Verify docker-compose uses: >- - Alfresco/alfresco-build-tools/.github/actions/dbp-charts/verify-compose@v5.13.1 + Alfresco/alfresco-build-tools/.github/actions/dbp-charts/verify-compose@v5.20.0 timeout-minutes: 10 with: compose_file_path: docker-compose/${{ matrix.compose_file }} diff --git a/.github/workflows/helm-community.yml b/.github/workflows/helm-community.yml index 689a5a2f8..d15cce03b 100644 --- a/.github/workflows/helm-community.yml +++ b/.github/workflows/helm-community.yml @@ -24,7 +24,7 @@ jobs: outputs: ver_json: ${{ steps.app_versions.outputs.json }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: fetch-depth: 0 - name: Get charts @@ -54,21 +54,21 @@ jobs: matrix: include: ${{ fromJSON(needs.build_vars.outputs.ver_json) }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - uses: azure/setup-helm@v4 + - uses: azure/setup-helm@b7246b12e77f7134dc2d460a3d5bad15bbe29390 # v4.1.0 with: version: "3.12.1" - name: Login to Docker Hub - uses: docker/login-action@v3 + uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0 if: ${{ ! github.event.repository.fork }} with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - name: Setup cluster - uses: Alfresco/alfresco-build-tools/.github/actions/setup-kind@v5.13.1 + uses: Alfresco/alfresco-build-tools/.github/actions/setup-kind@v5.20.0 with: ingress-nginx-ref: controller-v1.8.2 diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml index ac6ede7c0..264e4b4af 100644 --- a/.github/workflows/helm-enterprise.yml +++ b/.github/workflows/helm-enterprise.yml @@ -30,7 +30,7 @@ jobs: outputs: ver_json: ${{ steps.app_versions.outputs.json }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: fetch-depth: 0 - name: Get charts @@ -53,7 +53,7 @@ jobs: helm_integration: runs-on: alfrescoPub-ubuntu2204-16G-4CPU - timeout-minutes: 10 + timeout-minutes: 12 needs: - build_vars name: ${{ matrix.values }} on ${{ matrix.name }} @@ -62,29 +62,30 @@ jobs: matrix: include: ${{ fromJSON(needs.build_vars.outputs.ver_json) }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - uses: azure/setup-helm@v4 + - uses: azure/setup-helm@b7246b12e77f7134dc2d460a3d5bad15bbe29390 with: - version: "3.12.1" + version: "3.14.3" - name: Login to Docker Hub - uses: docker/login-action@v3 + uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - name: Login to Quay.io - uses: docker/login-action@v3 + uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0 with: registry: quay.io username: ${{ secrets.QUAY_USERNAME }} password: ${{ secrets.QUAY_PASSWORD }} - name: Setup cluster - uses: Alfresco/alfresco-build-tools/.github/actions/setup-kind@v5.13.1 + uses: Alfresco/alfresco-build-tools/.github/actions/setup-kind@v5.20.0 with: ingress-nginx-ref: controller-v1.8.2 + metrics: "true" - name: Set nginx ingress config run: >- @@ -98,11 +99,12 @@ jobs: --type=kubernetes.io/dockerconfigjson - name: Check if cgroup v2 workaround is needed + if: startsWith(matrix.values, '7.') + env: + VALUES_FILE: ${{ matrix.values }} id: cgroupv2-workaround-extra-values run: | - acs_version=$(echo ${{ matrix.values }} | cut -d'.' -f1,2) - is_affected=$(echo "$acs_version <= 7.2" | bc -l) - if [ "$is_affected" -eq 1 ]; then + if [ ${VALUES_FILE:2:1} -le 2 ]; then echo "Enabling cgroupv v2 workaround" echo "helm_install_params=--values test/cgroup-v2-workaround-values.yaml" >> "$GITHUB_OUTPUT" fi @@ -110,9 +112,12 @@ jobs: - name: Check if we want additional helm customizations id: configurable-extra-values run: | - if [ "${{ matrix.values }}" = "values.yaml" ]; then - echo "Enabling clustered tests" - echo "helm_install_params=--set alfresco-repository.replicaCount=2 --set dtas.additionalArgs[0]='-k not test_renditions'" >> "$GITHUB_OUTPUT" + if [ "${{ matrix.values }}" = "values.yaml" -o "${{ matrix.values }}" = "pre-release_values.yaml" ]; then + echo "Enabling clustered tests via auto-scaling: 2 replicas max, 10s stabilization window" + echo "helm_install_params=--set alfresco-repository.autoscaling.enabled=true \ + --set alfresco-repository.autoscaling.maxReplicas=2 \ + --set alfresco-repository.autoscaling.behavior.scaleUp.stabilizationWindowSeconds=10 \ + --set dtas.additionalArgs[0]='-k not test_renditions'" >> "$GITHUB_OUTPUT" fi if [ "${{ matrix.values }}" = "7.0.N_values.yaml" ]; then echo "Skipping renditions tests on ACS 7.0.N" @@ -126,21 +131,32 @@ jobs: --set global.search.sharedSecret="$(openssl rand -hex 24)" --set global.known_urls=http://localhost --set global.alfrescoRegistryPullSecrets=regcred - --wait --timeout 7m0s --values helm/${{ matrix.name }}/${{ matrix.values }} --values test/enterprise-integration-test-values.yaml ${{ steps.cgroupv2-workaround-extra-values.outputs.helm_install_params }} ${{ steps.configurable-extra-values.outputs.helm_install_params }} + - name: Watch Helm deployment + env: + VALUES_FILE: ${{ matrix.values }} + run: | + kubectl get pods --watch & + KWPID=$! + kubectl wait --timeout=7m --all=true --for=condition=Available deploy && kill $KWPID + if [ "${VALUES_FILE:0:2}" != "7." ] ; then echo -n "Waiting for ESC Reindexing job to complete... " + kubectl wait --timeout=5m --for=condition=complete job/acs-alfresco-search-enterprise-reindexing + echo "Completed." + fi + - name: Spit cluster status after install if: always() run: | - helm ls --all-namespaces - kubectl get all --all-namespaces + helm ls --all-namespaces --all + helm status acs --show-resources kubectl describe pod - name: Run Newman tests - uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e # v.3.0.0 + uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e # v3.0.0 id: newman with: timeout_minutes: 1 @@ -155,9 +171,9 @@ jobs: - name: Spit cluster status after newman tests if: always() && steps.newman.outcome != 'skipped' run: | - helm ls --all-namespaces kubectl get all --all-namespaces kubectl describe pod + kubectl events --for deployment/acs-alfresco-repository - name: Run helm test id: helm_test @@ -167,6 +183,26 @@ jobs: if: always() && steps.helm_test.outcome != 'skipped' run: | kubectl logs -l app.kubernetes.io/component=dtas --tail=-1 - helm ls --all-namespaces kubectl get all --all-namespaces kubectl describe pod + kubectl events --for deployment/acs-alfresco-repository + + - name: Check HPA behavior during tests + if: always() && (matrix.values == 'values.yaml' || matrix.values == 'pre-release_values.yaml') && steps.helm_test.outcome != 'skipped' + run: | + echo "Checking current repo hpa status" + kubectl get hpa acs-alfresco-repository + echo -n "Repository should have 2 replicas after Helm test... " + SETSIZE=$(kubectl get deployment/acs-alfresco-repository -o jsonpath='{@.spec.replicas}') + if [ "$SETSIZE" -ne 2 ]; then + echo "Got $SETSIZE instead" + exit 1 + else + echo "Got $SETSIZE" + echo -n "Now waiting for scale down" + kubectl patch hpa acs-alfresco-repository \ + -p '{"spec": {"behavior": {"scaleDown": {"stabilizationWindowSeconds": 20}}}}' + echo -n "(speeding scale down up)... " + kubectl wait --timeout=2m --for=jsonpath='spec.replicas'=1 deployment/acs-alfresco-repository + echo "Scale down completed" + fi diff --git a/.github/workflows/helm-release.yml b/.github/workflows/helm-release.yml index 1fe3f1b8b..4e367d53f 100644 --- a/.github/workflows/helm-release.yml +++ b/.github/workflows/helm-release.yml @@ -10,7 +10,7 @@ jobs: publish: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: fetch-depth: 0 @@ -20,7 +20,7 @@ jobs: - name: Publish chart uses: >- - Alfresco/alfresco-build-tools/.github/actions/dbp-charts/publish-chart@v5.13.1 + Alfresco/alfresco-build-tools/.github/actions/dbp-charts/publish-chart@v5.20.0 with: chart_name: alfresco-content-services github_token: ${{ secrets.BOT_GITHUB_TOKEN }} diff --git a/.github/workflows/helm-static-checks.yml b/.github/workflows/helm-static-checks.yml index 6ea3ae40a..9a9461a00 100644 --- a/.github/workflows/helm-static-checks.yml +++ b/.github/workflows/helm-static-checks.yml @@ -21,7 +21,7 @@ jobs: app_charts: ${{ steps.getcharts.outputs.app }} lib_charts: ${{ steps.getcharts.outputs.lib }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: fetch-depth: 2 - id: getcharts @@ -38,13 +38,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - uses: >- - Alfresco/alfresco-build-tools/.github/actions/helm-build-chart@v5.13.1 + Alfresco/alfresco-build-tools/.github/actions/helm-build-chart@v5.20.0 with: chart-dir: helm/${{ matrix.charts.name }} - uses: >- - Alfresco/alfresco-build-tools/.github/actions/helm-plugin@v5.13.1 + Alfresco/alfresco-build-tools/.github/actions/helm-plugin@v5.20.0 with: plugin_url: https://github.com/helm-unittest/helm-unittest - name: Run Helm unit tests if present @@ -61,13 +61,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - uses: >- - Alfresco/alfresco-build-tools/.github/actions/helm-build-chart@v5.13.1 + Alfresco/alfresco-build-tools/.github/actions/helm-build-chart@v5.20.0 with: chart-dir: helm/${{ matrix.charts.name }} - uses: >- - Alfresco/alfresco-build-tools/.github/actions/helm-template-yamllint@v5.13.1 + Alfresco/alfresco-build-tools/.github/actions/helm-template-yamllint@v5.20.0 with: chart-dir: helm/${{ matrix.charts.name }} helm-options: >- diff --git a/.github/workflows/pre-commit-compose.yml b/.github/workflows/pre-commit-compose.yml index 37d06a586..1e6ca9236 100644 --- a/.github/workflows/pre-commit-compose.yml +++ b/.github/workflows/pre-commit-compose.yml @@ -24,4 +24,4 @@ jobs: name: Run pre-commit runs-on: ubuntu-latest steps: - - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v5.13.1 + - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v5.20.0 diff --git a/.github/workflows/pre-commit-helm.yml b/.github/workflows/pre-commit-helm.yml index 92bec1f38..1e794076e 100644 --- a/.github/workflows/pre-commit-helm.yml +++ b/.github/workflows/pre-commit-helm.yml @@ -28,7 +28,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # 4.1.1 - - uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@v5.13.1 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@v5.20.0 - name: Add dependency chart repos run: | for repo in $(yq eval-all \ diff --git a/docs/helm/autoscaling.md b/docs/helm/autoscaling.md new file mode 100644 index 000000000..1729ba686 --- /dev/null +++ b/docs/helm/autoscaling.md @@ -0,0 +1,17 @@ +# Alfresco components auto-scaling + +`alfresco-content-services` can leverage Kubernetes HorinzontalPodAutoscaling +provided by individual Alfresco components. This means that you can add more +instances of the same service to handle more load. This is a common pattern in +cloud environments, where you can add more instances of a service to handle +more load, and remove instances when the load decreases. +This document aims at providing a details on configuring each of the components +which support HPA. + +## Alfresco Repository + +Refer to the +[alfresco-repository auto-scaling +documentation](https://github.com/Alfresco/alfresco-helm-charts/blob/main/charts/alfresco-repository/docs/autoscaling.md) +for a detailed guide on Alfresco repository auto-scaling configuration and +implications. diff --git a/helm/alfresco-content-services/Chart.lock b/helm/alfresco-content-services/Chart.lock index 69e6c0bc2..d5f2e19ce 100644 --- a/helm/alfresco-content-services/Chart.lock +++ b/helm/alfresco-content-services/Chart.lock @@ -16,7 +16,7 @@ dependencies: version: 0.1.0 - name: alfresco-repository repository: https://alfresco.github.io/alfresco-helm-charts/ - version: 0.4.1 + version: 0.5.0-alpha.0 - name: activemq repository: https://alfresco.github.io/alfresco-helm-charts/ version: 3.5.2 @@ -47,5 +47,5 @@ dependencies: - name: elasticsearch repository: https://helm.elastic.co version: 7.17.3 -digest: sha256:b395454280a70e7c3525dabfaeb5bd6417d7ccab663247500926365f3995317f -generated: "2024-03-14T14:44:47.280329+01:00" +digest: sha256:fc1714cd8e2316eb6ff29c7d655cc2e36676abf9c2083518e04195d7e5e7354c +generated: "2024-03-14T15:34:47.588969+01:00" diff --git a/helm/alfresco-content-services/Chart.yaml b/helm/alfresco-content-services/Chart.yaml index db240a059..cbec6b8e6 100644 --- a/helm/alfresco-content-services/Chart.yaml +++ b/helm/alfresco-content-services/Chart.yaml @@ -4,7 +4,7 @@ # https://www.alfresco.com/platform/content-services-ecm/trial/download apiVersion: v2 name: alfresco-content-services -version: 8.0.1 +version: 8.1.0-alpha.0 appVersion: 23.2.1 description: A Helm chart for deploying Alfresco Content Services keywords: @@ -41,7 +41,7 @@ dependencies: condition: >- alfresco-digital-workspace.enabled - name: alfresco-repository - version: 0.4.1 + version: 0.5.0-alpha.0 repository: https://alfresco.github.io/alfresco-helm-charts/ - name: activemq version: 3.5.2 diff --git a/helm/alfresco-content-services/README.md b/helm/alfresco-content-services/README.md index 6503e14b8..45da3787e 100644 --- a/helm/alfresco-content-services/README.md +++ b/helm/alfresco-content-services/README.md @@ -1,6 +1,6 @@ # alfresco-content-services -![Version: 8.0.1](https://img.shields.io/badge/Version-8.0.1-informational?style=flat-square) ![AppVersion: 23.2.1](https://img.shields.io/badge/AppVersion-23.2.1-informational?style=flat-square) +![Version: 8.1.0-alpha.0](https://img.shields.io/badge/Version-8.1.0--alpha.0-informational?style=flat-square) ![AppVersion: 23.2.1](https://img.shields.io/badge/AppVersion-23.2.1-informational?style=flat-square) A Helm chart for deploying Alfresco Content Services @@ -23,7 +23,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-common | 3.1.2 | | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-connector-ms365 | 0.7.0 | | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-connector-msteams | 0.5.0 | -| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-repository | 0.4.1 | +| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-repository | 0.5.0-alpha.0 | | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-search-enterprise | 3.2.4 | | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-search(alfresco-search-service) | 3.3.0 | | https://alfresco.github.io/alfresco-helm-charts/ | share(alfresco-share) | 0.6.0 | @@ -180,6 +180,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b | alfresco-transform-service.transformrouter.enabled | bool | `true` | Declares the alfresco-transform-router service used by the content repository to route transformation requests | | alfresco-transform-service.transformrouter.image.repository | string | `"quay.io/alfresco/alfresco-transform-router"` | | | alfresco-transform-service.transformrouter.image.tag | string | `"4.1.0"` | | +| alfresco-transform-service.transformrouter.livenessProbe.path | string | `"/transform/config"` | Overrride liveness probe endpoint to work around https://alfresco.atlassian.net/browse/ACS-7269 | | alfresco-transform-service.transformrouter.replicaCount | int | `2` | | | config.repository.additionalGlobalProperties | object | `{}` | | | config.repository.configMapName | string | `"repository"` | | diff --git a/helm/alfresco-content-services/community_values.yaml b/helm/alfresco-content-services/community_values.yaml index 75cb8de01..a525e1e3b 100644 --- a/helm/alfresco-content-services/community_values.yaml +++ b/helm/alfresco-content-services/community_values.yaml @@ -1,6 +1,8 @@ # This values file can be used to install the latest ACS Community version using # the latest version of the chart alfresco-repository: + autoscaling: + enabled: false replicaCount: 1 image: repository: alfresco/alfresco-content-repository-community diff --git a/helm/alfresco-content-services/templates/config-repository.yaml b/helm/alfresco-content-services/templates/config-repository.yaml index b3b4a2fb8..2b5f135f4 100644 --- a/helm/alfresco-content-services/templates/config-repository.yaml +++ b/helm/alfresco-content-services/templates/config-repository.yaml @@ -8,7 +8,6 @@ data: alfresco-global.properties: | {{- $alfUrl := include "alfresco-common.external.url" . }} deployment.method=HELM_CHART - alfresco.cluster.enabled={{ gt (index .Values "alfresco-repository" "replicaCount" | int) 1 }} alfresco.host={{ template "alfresco-common.external.host" . }} alfresco.protocol={{ template "alfresco-common.external.scheme" . }} alfresco.port={{ template "alfresco-common.external.port" . }} diff --git a/helm/alfresco-content-services/values.yaml b/helm/alfresco-content-services/values.yaml index c869505ab..30b2c7900 100644 --- a/helm/alfresco-content-services/values.yaml +++ b/helm/alfresco-content-services/values.yaml @@ -206,6 +206,10 @@ alfresco-transform-service: image: repository: quay.io/alfresco/alfresco-transform-router tag: 4.1.0 + livenessProbe: + # -- Overrride liveness probe endpoint to work around + # https://alfresco.atlassian.net/browse/ACS-7269 + path: /transform/config pdfrenderer: # -- Declares the alfresco-pdf-renderer service used by the content repository # to transform pdf files diff --git a/test/community-integration-test-values.yaml b/test/community-integration-test-values.yaml index 715785d58..1c1b4d652 100644 --- a/test/community-integration-test-values.yaml +++ b/test/community-integration-test-values.yaml @@ -69,7 +69,7 @@ alfresco-transform-service: memory: "256Mi" limits: cpu: "2" - memory: "512Mi" + memory: "1Gi" transformmisc: livenessProbe: initialDelaySeconds: 30 diff --git a/test/enterprise-integration-test-values.yaml b/test/enterprise-integration-test-values.yaml index a5fc9eed1..0daed74ba 100644 --- a/test/enterprise-integration-test-values.yaml +++ b/test/enterprise-integration-test-values.yaml @@ -2,7 +2,7 @@ alfresco-repository: resources: requests: - cpu: "0.01" + cpu: "0.5" memory: "1024Mi" limits: cpu: "2" @@ -31,7 +31,7 @@ share: alfresco-search: resources: requests: - cpu: "0.01" + cpu: "0.25" memory: "512Mi" limits: cpu: "2" @@ -40,7 +40,7 @@ elasticsearch: esJavaOpts: "-Xmx512m -Xms512m" resources: requests: - cpu: "0.01" + cpu: "0.25" memory: "512Mi" limits: cpu: "1" @@ -48,7 +48,7 @@ elasticsearch: alfresco-search-enterprise: resources: requests: - cpu: "0.01" + cpu: "0.1" memory: "128Mi" limits: cpu: "1" @@ -92,11 +92,11 @@ alfresco-transform-service: initialDelaySeconds: 30 resources: requests: - cpu: "0.01" + cpu: "0.25" memory: "256Mi" limits: cpu: "2" - memory: "512Mi" + memory: "1Gi" replicaCount: 1 transformmisc: livenessProbe: @@ -127,8 +127,8 @@ postgresql: primary: resources: requests: - cpu: "0.01" - memory: "512Mi" + cpu: "0.5" + memory: "1Gi" limits: cpu: "2" memory: "1Gi" @@ -150,6 +150,19 @@ alfresco-sync-service: cpu: "2" memory: "1Gi" postgresql: *postgresql-sync +activemq: + resources: + requests: + cpu: "0.1" + memory: "512Mi" +alfresco-digital-workspace: + resources: + requests: + cpu: "0.01" +alfresco-control-center: + resources: + requests: + cpu: "0.01" alfresco-ai-transformer: enabled: true replicaCount: 1 @@ -163,18 +176,5 @@ alfresco-ai-transformer: requests: cpu: "0.01" memory: "512Mi" -activemq: - resources: - requests: - cpu: "0.01" - memory: "512Mi" -alfresco-digital-workspace: - resources: - requests: - cpu: "0.01" -alfresco-control-center: - resources: - requests: - cpu: "0.01" dtas: enabled: true