From 479feee326a198959ad55fb403647992f4f078fc Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Thu, 7 Mar 2024 21:26:07 +0100 Subject: [PATCH 01/48] avoid tika pod going n crashloop backoff --- test/community-integration-test-values.yaml | 2 +- test/enterprise-integration-test-values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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..ea9f5bf6e 100644 --- a/test/enterprise-integration-test-values.yaml +++ b/test/enterprise-integration-test-values.yaml @@ -96,7 +96,7 @@ alfresco-transform-service: memory: "256Mi" limits: cpu: "2" - memory: "512Mi" + memory: "1Gi" replicaCount: 1 transformmisc: livenessProbe: From c0c2817e302d9352d9085f5b8c97b20eff81c1bf Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Thu, 7 Mar 2024 21:27:03 +0100 Subject: [PATCH 02/48] allow upgrades with community values --- helm/alfresco-content-services/community_values.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/helm/alfresco-content-services/community_values.yaml b/helm/alfresco-content-services/community_values.yaml index 75cb8de01..be33bad98 100644 --- a/helm/alfresco-content-services/community_values.yaml +++ b/helm/alfresco-content-services/community_values.yaml @@ -2,6 +2,10 @@ # the latest version of the chart alfresco-repository: replicaCount: 1 + strategy: + type: Recreate + autoscaling: + enabled: false image: repository: alfresco/alfresco-content-repository-community tag: 23.2.1 From 5fcb7669140fdc455b51efcfd9ab4a1f3c9676e2 Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Thu, 7 Mar 2024 21:27:56 +0100 Subject: [PATCH 03/48] use dynamic clustering toggle --- helm/alfresco-content-services/templates/config-repository.yaml | 1 - 1 file changed, 1 deletion(-) 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" . }} From 6ffed9e62626aca7f7f0d2e4ba878b4832eaefb9 Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Thu, 7 Mar 2024 21:29:10 +0100 Subject: [PATCH 04/48] bump alfresco-repo chart for autoscaling --- helm/alfresco-content-services/Chart.yaml | 2 +- helm/alfresco-content-services/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/alfresco-content-services/Chart.yaml b/helm/alfresco-content-services/Chart.yaml index db240a059..2bf1998d8 100644 --- a/helm/alfresco-content-services/Chart.yaml +++ b/helm/alfresco-content-services/Chart.yaml @@ -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..8221b0086 100644 --- a/helm/alfresco-content-services/README.md +++ b/helm/alfresco-content-services/README.md @@ -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 | From 6b428414d34d12cfa5f9837a5229a7fbb92fc10e Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Wed, 13 Mar 2024 13:44:02 +0100 Subject: [PATCH 05/48] update chart dependencies lock file --- helm/alfresco-content-services/Chart.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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" From adcf51e3c24f721e85f836b0395be936f1554286 Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Wed, 13 Mar 2024 13:58:09 +0100 Subject: [PATCH 06/48] fix recreate strategy for community & comunity ci --- helm/alfresco-content-services/community_values.yaml | 1 + test/community-integration-test-values.yaml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/helm/alfresco-content-services/community_values.yaml b/helm/alfresco-content-services/community_values.yaml index be33bad98..530154367 100644 --- a/helm/alfresco-content-services/community_values.yaml +++ b/helm/alfresco-content-services/community_values.yaml @@ -4,6 +4,7 @@ alfresco-repository: replicaCount: 1 strategy: type: Recreate + rollingUpdate: null autoscaling: enabled: false image: diff --git a/test/community-integration-test-values.yaml b/test/community-integration-test-values.yaml index 1c1b4d652..1e56b91c8 100644 --- a/test/community-integration-test-values.yaml +++ b/test/community-integration-test-values.yaml @@ -1,5 +1,8 @@ --- alfresco-repository: + strategy: + type: Recreate + rollingUpdate: null resources: requests: cpu: "0.01" From c02c87aef6f191018e4b4234e8248fab6d6be836 Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Wed, 13 Mar 2024 14:59:06 +0100 Subject: [PATCH 07/48] test enterprise charts with autoscaling --- test/enterprise-integration-test-values.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/enterprise-integration-test-values.yaml b/test/enterprise-integration-test-values.yaml index ea9f5bf6e..6b8e08d9d 100644 --- a/test/enterprise-integration-test-values.yaml +++ b/test/enterprise-integration-test-values.yaml @@ -1,8 +1,10 @@ --- alfresco-repository: + autoscaling: + enabled: true resources: requests: - cpu: "0.01" + cpu: "1" memory: "1024Mi" limits: cpu: "2" From ae4d2f8852f03c83d5901f31284c9b4e5b74bfe6 Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Wed, 13 Mar 2024 22:01:24 +0100 Subject: [PATCH 08/48] Revert "fix recreate strategy for community & comunity ci" This reverts commit 00e1f3ca66105063f0d7b915d7eba7601ac438d7. --- helm/alfresco-content-services/community_values.yaml | 1 - test/community-integration-test-values.yaml | 3 --- 2 files changed, 4 deletions(-) diff --git a/helm/alfresco-content-services/community_values.yaml b/helm/alfresco-content-services/community_values.yaml index 530154367..be33bad98 100644 --- a/helm/alfresco-content-services/community_values.yaml +++ b/helm/alfresco-content-services/community_values.yaml @@ -4,7 +4,6 @@ alfresco-repository: replicaCount: 1 strategy: type: Recreate - rollingUpdate: null autoscaling: enabled: false image: diff --git a/test/community-integration-test-values.yaml b/test/community-integration-test-values.yaml index 1e56b91c8..1c1b4d652 100644 --- a/test/community-integration-test-values.yaml +++ b/test/community-integration-test-values.yaml @@ -1,8 +1,5 @@ --- alfresco-repository: - strategy: - type: Recreate - rollingUpdate: null resources: requests: cpu: "0.01" From 4c068b6ce4bb71238dbb2a85da0ed71a49757cc9 Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Wed, 13 Mar 2024 22:01:29 +0100 Subject: [PATCH 09/48] Revert "allow upgrades with community values" This reverts commit 91d6fd4fab7653a098fdf787b486827fa9b5eb79. --- helm/alfresco-content-services/community_values.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/helm/alfresco-content-services/community_values.yaml b/helm/alfresco-content-services/community_values.yaml index be33bad98..75cb8de01 100644 --- a/helm/alfresco-content-services/community_values.yaml +++ b/helm/alfresco-content-services/community_values.yaml @@ -2,10 +2,6 @@ # the latest version of the chart alfresco-repository: replicaCount: 1 - strategy: - type: Recreate - autoscaling: - enabled: false image: repository: alfresco/alfresco-content-repository-community tag: 23.2.1 From 7d329b0ea5f7e88ae8cd29c725aca5ac0abbbd77 Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Wed, 13 Mar 2024 22:02:26 +0100 Subject: [PATCH 10/48] no autoscaling for community --- helm/alfresco-content-services/community_values.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/helm/alfresco-content-services/community_values.yaml b/helm/alfresco-content-services/community_values.yaml index 75cb8de01..33a4bda3b 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: true replicaCount: 1 image: repository: alfresco/alfresco-content-repository-community From 048c348b0b21695686a61e024e2304ce64300c76 Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Thu, 14 Mar 2024 10:40:06 +0100 Subject: [PATCH 11/48] report events in the default namespace --- .github/workflows/helm-enterprise.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml index ac6ede7c0..7fc9be489 100644 --- a/.github/workflows/helm-enterprise.yml +++ b/.github/workflows/helm-enterprise.yml @@ -170,3 +170,4 @@ jobs: helm ls --all-namespaces kubectl get all --all-namespaces kubectl describe pod + kubectl get events From edb83b95f1ead5bc665d0415dfe3b1491314e0bd Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Thu, 14 Mar 2024 14:25:29 +0100 Subject: [PATCH 12/48] add metrics server --- .github/workflows/helm-enterprise.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml index 7fc9be489..bfc727691 100644 --- a/.github/workflows/helm-enterprise.yml +++ b/.github/workflows/helm-enterprise.yml @@ -82,9 +82,10 @@ jobs: 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@OPSEXP-2524 with: ingress-nginx-ref: controller-v1.8.2 + with-metrics: "true" - name: Set nginx ingress config run: >- @@ -158,6 +159,7 @@ jobs: helm ls --all-namespaces kubectl get all --all-namespaces kubectl describe pod + kubectl get hpa - name: Run helm test id: helm_test @@ -170,4 +172,4 @@ jobs: helm ls --all-namespaces kubectl get all --all-namespaces kubectl describe pod - kubectl get events + kubectl get hpa From 1c97917d9ca344cf454c3e8d05ef2c22f5926bc7 Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Thu, 14 Mar 2024 16:08:19 +0100 Subject: [PATCH 13/48] try triggering scale up more consistently --- test/enterprise-integration-test-values.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/enterprise-integration-test-values.yaml b/test/enterprise-integration-test-values.yaml index 6b8e08d9d..fdb4e7544 100644 --- a/test/enterprise-integration-test-values.yaml +++ b/test/enterprise-integration-test-values.yaml @@ -2,9 +2,11 @@ alfresco-repository: autoscaling: enabled: true + scaleUp: + stabilizationWindowSeconds: 5 resources: requests: - cpu: "1" + cpu: "0.5" memory: "1024Mi" limits: cpu: "2" From 0a68dc31ee5b7c580198bed0631ded5695a27e4f Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Thu, 14 Mar 2024 18:05:07 +0100 Subject: [PATCH 14/48] debug repo deployment events --- .github/workflows/helm-enterprise.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml index bfc727691..30aa8cabb 100644 --- a/.github/workflows/helm-enterprise.yml +++ b/.github/workflows/helm-enterprise.yml @@ -159,7 +159,7 @@ jobs: helm ls --all-namespaces kubectl get all --all-namespaces kubectl describe pod - kubectl get hpa + kubectl events --for deployment/acs-alfresco-repository - name: Run helm test id: helm_test @@ -172,4 +172,4 @@ jobs: helm ls --all-namespaces kubectl get all --all-namespaces kubectl describe pod - kubectl get hpa + kubectl events --for deployment/acs-alfresco-repository From bc7c449d18f7cf6febe0781379269221add857da Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Thu, 14 Mar 2024 18:58:24 +0100 Subject: [PATCH 15/48] revert to default stabilization window --- test/enterprise-integration-test-values.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/enterprise-integration-test-values.yaml b/test/enterprise-integration-test-values.yaml index fdb4e7544..337570057 100644 --- a/test/enterprise-integration-test-values.yaml +++ b/test/enterprise-integration-test-values.yaml @@ -2,8 +2,6 @@ alfresco-repository: autoscaling: enabled: true - scaleUp: - stabilizationWindowSeconds: 5 resources: requests: cpu: "0.5" From acce705796359d19c5c5940c3196fe7c45be8f36 Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Thu, 14 Mar 2024 20:51:49 +0100 Subject: [PATCH 16/48] try fixing 401 on HEAD requests --- .github/workflows/helm-enterprise.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml index 30aa8cabb..8d325bebb 100644 --- a/.github/workflows/helm-enterprise.yml +++ b/.github/workflows/helm-enterprise.yml @@ -64,9 +64,9 @@ jobs: steps: - uses: actions/checkout@v4 - - 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 From 937c56a898b345dc994cf03fa8ce494fe5d95330 Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Thu, 14 Mar 2024 21:57:40 +0100 Subject: [PATCH 17/48] better track deployment timings --- .github/workflows/helm-enterprise.yml | 28 +++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml index 8d325bebb..c8bf3b356 100644 --- a/.github/workflows/helm-enterprise.yml +++ b/.github/workflows/helm-enterprise.yml @@ -121,23 +121,25 @@ jobs: fi - name: Helm install - run: >- + run: | helm dep up ./helm/alfresco-content-services && - helm install acs ./helm/alfresco-content-services - --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 }} + helm install acs ./helm/alfresco-content-services \ + --set global.search.sharedSecret="$(openssl rand -hex 24)" \ + --set global.known_urls=http://localhost \ + --set global.alfrescoRegistryPullSecrets=regcred \ + --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 }} + kubectl get pods --watch-only & + KWPID=$! + kubectl wait --timeout=7m --all=true --for=condition=Available deploy && kill $KWPID - 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 @@ -156,7 +158,6 @@ 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 @@ -169,7 +170,6 @@ 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 From f32835cbe320f6a382f448c286e7f099b6120ece Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Fri, 15 Mar 2024 15:38:18 +0100 Subject: [PATCH 18/48] try to make install stage faster & more reliable --- test/enterprise-integration-test-values.yaml | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/test/enterprise-integration-test-values.yaml b/test/enterprise-integration-test-values.yaml index 337570057..1a48f721e 100644 --- a/test/enterprise-integration-test-values.yaml +++ b/test/enterprise-integration-test-values.yaml @@ -42,7 +42,7 @@ elasticsearch: esJavaOpts: "-Xmx512m -Xms512m" resources: requests: - cpu: "0.01" + cpu: "0.25" memory: "512Mi" limits: cpu: "1" @@ -94,7 +94,7 @@ alfresco-transform-service: initialDelaySeconds: 30 resources: requests: - cpu: "0.01" + cpu: "0.25" memory: "256Mi" limits: cpu: "2" @@ -152,19 +152,6 @@ alfresco-sync-service: cpu: "2" memory: "1Gi" postgresql: *postgresql-sync -alfresco-ai-transformer: - enabled: true - replicaCount: 1 - aws: - accessKeyId: AAAAAAAAAAAAAAAAA - secretAccessKey: ZZZZZZZZZZZZZZZZZ - s3Bucket: somebucket - region: us-east-1 - comprehendRoleARN: arn:aws:iam::000000000000:user/comprehend - resources: - requests: - cpu: "0.01" - memory: "512Mi" activemq: resources: requests: From 69f8f9d42fec05e00e0330387334f801cb8c1bf5 Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Fri, 15 Mar 2024 16:46:32 +0100 Subject: [PATCH 19/48] wait for reindex job before starting tests --- .github/workflows/helm-enterprise.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml index c8bf3b356..8db5d5c73 100644 --- a/.github/workflows/helm-enterprise.yml +++ b/.github/workflows/helm-enterprise.yml @@ -111,16 +111,14 @@ 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" - fi if [ "${{ matrix.values }}" = "7.0.N_values.yaml" ]; then echo "Skipping renditions tests on ACS 7.0.N" echo "helm_install_params=--set dtas.additionalArgs[0]='-k not test_renditions'" >> "$GITHUB_OUTPUT" fi - name: Helm install + env: + VALUES_FILE: ${{ matrix.values }} run: | helm dep up ./helm/alfresco-content-services && helm install acs ./helm/alfresco-content-services \ @@ -134,6 +132,9 @@ jobs: kubectl get pods --watch-only & KWPID=$! kubectl wait --timeout=7m --all=true --for=condition=Available deploy && kill $KWPID + if [ "${VALUES_FILE:0:2}" != "7." ] ; then echo "Waiting for ESC Reindexing job to complete" + kubectl wait --timeout=4m --for=condition=complete job/acs-alfresco-search-enterprise-reindexing + fi - name: Spit cluster status after install if: always() From 7c84fa51576d7e732f9ee11fbd2b10bf3958bb63 Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Fri, 15 Mar 2024 17:09:35 +0100 Subject: [PATCH 20/48] move autoscaling enablement to workflow job --- .github/workflows/helm-enterprise.yml | 4 ++++ test/enterprise-integration-test-values.yaml | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml index 8db5d5c73..6f3b51972 100644 --- a/.github/workflows/helm-enterprise.yml +++ b/.github/workflows/helm-enterprise.yml @@ -111,6 +111,10 @@ 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.autoscaling.enabled=true --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" echo "helm_install_params=--set dtas.additionalArgs[0]='-k not test_renditions'" >> "$GITHUB_OUTPUT" diff --git a/test/enterprise-integration-test-values.yaml b/test/enterprise-integration-test-values.yaml index 1a48f721e..9718c6cea 100644 --- a/test/enterprise-integration-test-values.yaml +++ b/test/enterprise-integration-test-values.yaml @@ -1,7 +1,5 @@ --- alfresco-repository: - autoscaling: - enabled: true resources: requests: cpu: "0.5" @@ -129,7 +127,7 @@ postgresql: primary: resources: requests: - cpu: "0.01" + cpu: "0.25" memory: "512Mi" limits: cpu: "2" From 4dd4ae8f3d668c794fac637092d986bb2416591b Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Fri, 15 Mar 2024 17:10:35 +0100 Subject: [PATCH 21/48] disable autoscaling for community (no cluster) --- helm/alfresco-content-services/community_values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/alfresco-content-services/community_values.yaml b/helm/alfresco-content-services/community_values.yaml index 33a4bda3b..a525e1e3b 100644 --- a/helm/alfresco-content-services/community_values.yaml +++ b/helm/alfresco-content-services/community_values.yaml @@ -2,7 +2,7 @@ # the latest version of the chart alfresco-repository: autoscaling: - enabled: true + enabled: false replicaCount: 1 image: repository: alfresco/alfresco-content-repository-community From 63cdc488d1a661926bfcc160652d4c9ffd8fb7b5 Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Fri, 15 Mar 2024 17:48:56 +0100 Subject: [PATCH 22/48] try to speed up reindexing --- test/enterprise-integration-test-values.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/enterprise-integration-test-values.yaml b/test/enterprise-integration-test-values.yaml index 9718c6cea..815317785 100644 --- a/test/enterprise-integration-test-values.yaml +++ b/test/enterprise-integration-test-values.yaml @@ -31,7 +31,7 @@ share: alfresco-search: resources: requests: - cpu: "0.01" + cpu: "0.25" memory: "512Mi" limits: cpu: "2" @@ -48,7 +48,7 @@ elasticsearch: alfresco-search-enterprise: resources: requests: - cpu: "0.01" + cpu: "0.1" memory: "128Mi" limits: cpu: "1" @@ -127,8 +127,8 @@ postgresql: primary: resources: requests: - cpu: "0.25" - memory: "512Mi" + cpu: "0.5" + memory: "1Gi" limits: cpu: "2" memory: "1Gi" @@ -153,7 +153,7 @@ alfresco-sync-service: activemq: resources: requests: - cpu: "0.01" + cpu: "0.1" memory: "512Mi" alfresco-digital-workspace: resources: From d422dfb1768386f7fbca017a1ab58ff031b19c0a Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Fri, 15 Mar 2024 17:52:05 +0100 Subject: [PATCH 23/48] Debug reindexing --- .github/workflows/helm-enterprise.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml index 6f3b51972..07a4726b5 100644 --- a/.github/workflows/helm-enterprise.yml +++ b/.github/workflows/helm-enterprise.yml @@ -137,6 +137,7 @@ jobs: KWPID=$! kubectl wait --timeout=7m --all=true --for=condition=Available deploy && kill $KWPID if [ "${VALUES_FILE:0:2}" != "7." ] ; then echo "Waiting for ESC Reindexing job to complete" + kubectl logs jobs/acs-alfresco-search-enterprise-reindexing & kubectl wait --timeout=4m --for=condition=complete job/acs-alfresco-search-enterprise-reindexing fi From cfa4414386e467af2fb641a0c689cd8046359123 Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Fri, 15 Mar 2024 18:35:37 +0100 Subject: [PATCH 24/48] we really need more time to complete --- .github/workflows/helm-enterprise.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml index 07a4726b5..e030cfa9a 100644 --- a/.github/workflows/helm-enterprise.yml +++ b/.github/workflows/helm-enterprise.yml @@ -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 }} @@ -137,8 +137,10 @@ jobs: KWPID=$! kubectl wait --timeout=7m --all=true --for=condition=Available deploy && kill $KWPID if [ "${VALUES_FILE:0:2}" != "7." ] ; then echo "Waiting for ESC Reindexing job to complete" - kubectl logs jobs/acs-alfresco-search-enterprise-reindexing & - kubectl wait --timeout=4m --for=condition=complete job/acs-alfresco-search-enterprise-reindexing + kubectl logs jobs/acs-alfresco-search-enterprise-reindexing -c wait-for-repository -f + sleep 5 + kubectl logs jobs/acs-alfresco-search-enterprise-reindexing -c alfresco-search-enterprise-reindexing -f & + kubectl wait --timeout=5m --for=condition=complete job/acs-alfresco-search-enterprise-reindexing fi - name: Spit cluster status after install From ac5dc2ffeafc0ec6f04be87ce3696a2aa93d550e Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Fri, 15 Mar 2024 19:17:50 +0100 Subject: [PATCH 25/48] Debug trouter --- .github/workflows/helm-enterprise.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml index e030cfa9a..f9e625bea 100644 --- a/.github/workflows/helm-enterprise.yml +++ b/.github/workflows/helm-enterprise.yml @@ -137,9 +137,8 @@ jobs: KWPID=$! kubectl wait --timeout=7m --all=true --for=condition=Available deploy && kill $KWPID if [ "${VALUES_FILE:0:2}" != "7." ] ; then echo "Waiting for ESC Reindexing job to complete" - kubectl logs jobs/acs-alfresco-search-enterprise-reindexing -c wait-for-repository -f - sleep 5 - kubectl logs jobs/acs-alfresco-search-enterprise-reindexing -c alfresco-search-enterprise-reindexing -f & + kubectl logs jobs/acs-alfresco-search-enterprise-reindexing -c wait-for-repository -f > /dev/null + kubectl logs deployments/acs-transform-router -f & kubectl wait --timeout=5m --for=condition=complete job/acs-alfresco-search-enterprise-reindexing fi From 06ca1783622c762983f10fe982c7dcd44bbf2b0b Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Fri, 15 Mar 2024 22:58:58 +0100 Subject: [PATCH 26/48] ugly hack to make sure trouter works ok --- test/enterprise-integration-test-values.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/test/enterprise-integration-test-values.yaml b/test/enterprise-integration-test-values.yaml index 815317785..80612ff99 100644 --- a/test/enterprise-integration-test-values.yaml +++ b/test/enterprise-integration-test-values.yaml @@ -121,6 +121,7 @@ alfresco-transform-service: initialDelaySeconds: 40 timeoutSeconds: 20 livenessProbe: + path: /transform/config initialDelaySeconds: 40 timeoutSeconds: 20 postgresql: From 1db34b2645b1b3bc33169bc08aef0d8b9785c04c Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Fri, 15 Mar 2024 23:53:13 +0100 Subject: [PATCH 27/48] try re-enabling rendition tests --- .github/workflows/helm-enterprise.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml index f9e625bea..9c16c3967 100644 --- a/.github/workflows/helm-enterprise.yml +++ b/.github/workflows/helm-enterprise.yml @@ -113,7 +113,7 @@ jobs: run: | if [ "${{ matrix.values }}" = "values.yaml" ]; then echo "Enabling clustered tests" - echo "helm_install_params=--set alfresco-repository.autoscaling.enabled=true --set dtas.additionalArgs[0]='-k not test_renditions'" >> "$GITHUB_OUTPUT" + echo "helm_install_params=--set alfresco-repository.autoscaling.enabled=true" >> "$GITHUB_OUTPUT" fi if [ "${{ matrix.values }}" = "7.0.N_values.yaml" ]; then echo "Skipping renditions tests on ACS 7.0.N" From 47cc5f69637c094992287c61e69f1dec3bc4437e Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Sat, 16 Mar 2024 00:06:26 +0100 Subject: [PATCH 28/48] try re-enabling cluster for all versions --- test/enterprise-integration-test-values.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/enterprise-integration-test-values.yaml b/test/enterprise-integration-test-values.yaml index 80612ff99..c8a3c8d32 100644 --- a/test/enterprise-integration-test-values.yaml +++ b/test/enterprise-integration-test-values.yaml @@ -1,5 +1,7 @@ --- alfresco-repository: + autoscaling: + enabled: true resources: requests: cpu: "0.5" From 120b8e4fc96d851dfe0285e060759abf1fbe81b9 Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Sat, 16 Mar 2024 00:21:19 +0100 Subject: [PATCH 29/48] Revert "try re-enabling rendition tests" This reverts commit 1db34b2645b1b3bc33169bc08aef0d8b9785c04c. --- .github/workflows/helm-enterprise.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml index 9c16c3967..f9e625bea 100644 --- a/.github/workflows/helm-enterprise.yml +++ b/.github/workflows/helm-enterprise.yml @@ -113,7 +113,7 @@ jobs: run: | if [ "${{ matrix.values }}" = "values.yaml" ]; then echo "Enabling clustered tests" - echo "helm_install_params=--set alfresco-repository.autoscaling.enabled=true" >> "$GITHUB_OUTPUT" + echo "helm_install_params=--set alfresco-repository.autoscaling.enabled=true --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" From 14642a29b67cec038791aac2e2de2b785b8eca21 Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Mon, 18 Mar 2024 10:47:35 +0100 Subject: [PATCH 30/48] use pragmatic liveness probe due to https://alfresco.atlassian.net/browse/ACS-7269 --- helm/alfresco-content-services/README.md | 1 + helm/alfresco-content-services/values.yaml | 4 ++++ test/enterprise-integration-test-values.yaml | 1 - 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/helm/alfresco-content-services/README.md b/helm/alfresco-content-services/README.md index 8221b0086..2559b26b3 100644 --- a/helm/alfresco-content-services/README.md +++ b/helm/alfresco-content-services/README.md @@ -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/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/enterprise-integration-test-values.yaml b/test/enterprise-integration-test-values.yaml index c8a3c8d32..f475dfdaa 100644 --- a/test/enterprise-integration-test-values.yaml +++ b/test/enterprise-integration-test-values.yaml @@ -123,7 +123,6 @@ alfresco-transform-service: initialDelaySeconds: 40 timeoutSeconds: 20 livenessProbe: - path: /transform/config initialDelaySeconds: 40 timeoutSeconds: 20 postgresql: From 55c3147de6ff54daeb345a6b3010c459916afcfe Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Mon, 18 Mar 2024 10:52:23 +0100 Subject: [PATCH 31/48] handle pre-release test just like currnet GA --- .github/workflows/helm-enterprise.yml | 2 +- test/enterprise-integration-test-values.yaml | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml index f9e625bea..a87175ab6 100644 --- a/.github/workflows/helm-enterprise.yml +++ b/.github/workflows/helm-enterprise.yml @@ -111,7 +111,7 @@ jobs: - name: Check if we want additional helm customizations id: configurable-extra-values run: | - if [ "${{ matrix.values }}" = "values.yaml" ]; then + if [ "${{ matrix.values }}" = "values.yaml" -o "${{ matrix.values }}" = "pre-release_values.yaml"]; then echo "Enabling clustered tests" echo "helm_install_params=--set alfresco-repository.autoscaling.enabled=true --set dtas.additionalArgs[0]='-k not test_renditions'" >> "$GITHUB_OUTPUT" fi diff --git a/test/enterprise-integration-test-values.yaml b/test/enterprise-integration-test-values.yaml index f475dfdaa..815317785 100644 --- a/test/enterprise-integration-test-values.yaml +++ b/test/enterprise-integration-test-values.yaml @@ -1,7 +1,5 @@ --- alfresco-repository: - autoscaling: - enabled: true resources: requests: cpu: "0.5" From 63bcde4d2a2a254fd92f9c01241841d048629f3b Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Mon, 18 Mar 2024 15:29:57 +0100 Subject: [PATCH 32/48] bump actions --- .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 | 12 +++++----- .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 +- 9 files changed, 37 insertions(+), 37 deletions(-) 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 a87175ab6..371251134 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 @@ -62,27 +62,27 @@ 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@b7246b12e77f7134dc2d460a3d5bad15bbe29390 with: 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@OPSEXP-2524 + uses: Alfresco/alfresco-build-tools/.github/actions/setup-kind@v5.20.0 with: ingress-nginx-ref: controller-v1.8.2 with-metrics: "true" @@ -150,7 +150,7 @@ jobs: 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 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 \ From a4ec803eb9d5c94716fefc53e74ea383e0987295 Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Mon, 18 Mar 2024 17:32:23 +0100 Subject: [PATCH 33/48] add a simple hpa test for repo --- .github/workflows/helm-enterprise.yml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml index 371251134..8cc668421 100644 --- a/.github/workflows/helm-enterprise.yml +++ b/.github/workflows/helm-enterprise.yml @@ -113,7 +113,9 @@ jobs: run: | if [ "${{ matrix.values }}" = "values.yaml" -o "${{ matrix.values }}" = "pre-release_values.yaml"]; then echo "Enabling clustered tests" - echo "helm_install_params=--set alfresco-repository.autoscaling.enabled=true --set dtas.additionalArgs[0]='-k not test_renditions'" >> "$GITHUB_OUTPUT" + echo "helm_install_params=--set alfresco-repository.autoscaling.enabled=true \ + --set alfresco-repository.autoscaling.maxReplicas=2 \ + --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" @@ -180,3 +182,18 @@ jobs: kubectl get all --all-namespaces kubectl describe pod kubectl events --for deployment/acs-alfresco-repository + + - name: Check HPA behavior (${{ matrix.values }}) + if: matrix.values == 'values.yaml' || matrix.values == 'pre-release_values.yaml' + run: | + 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. Now waiting for scaling down" + kubectl patch hpa acs-alfresco-repository \ + -p '{"spec": {"behavior": {"scaleDown": {"stabilizationWindowSeconds": 20}}}}' + kubectl wait --timeout=40s --for=jsonpath='spec.replicas'=1 hpa/acs-alfresco-repository + fi From f365b0ba24f58d8f57fdae4d820dbf52c9b86370 Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Mon, 18 Mar 2024 18:35:40 +0100 Subject: [PATCH 34/48] fix some more shell issues --- .github/workflows/helm-enterprise.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml index 8cc668421..c331c4ff7 100644 --- a/.github/workflows/helm-enterprise.yml +++ b/.github/workflows/helm-enterprise.yml @@ -99,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 @@ -111,10 +112,11 @@ jobs: - name: Check if we want additional helm customizations id: configurable-extra-values run: | - if [ "${{ matrix.values }}" = "values.yaml" -o "${{ matrix.values }}" = "pre-release_values.yaml"]; then + if [ "${{ matrix.values }}" = "values.yaml" -o "${{ matrix.values }}" = "pre-release_values.yaml" ]; then echo "Enabling clustered tests" echo "helm_install_params=--set alfresco-repository.autoscaling.enabled=true \ --set alfresco-repository.autoscaling.maxReplicas=2 \ + --set alfresco-repository.autoscaling.scaleUp.stabilizationWindowSeconds=20 \ --set dtas.additionalArgs[0]='-k not test_renditions'" >> "$GITHUB_OUTPUT" fi if [ "${{ matrix.values }}" = "7.0.N_values.yaml" ]; then @@ -139,8 +141,6 @@ jobs: KWPID=$! kubectl wait --timeout=7m --all=true --for=condition=Available deploy && kill $KWPID if [ "${VALUES_FILE:0:2}" != "7." ] ; then echo "Waiting for ESC Reindexing job to complete" - kubectl logs jobs/acs-alfresco-search-enterprise-reindexing -c wait-for-repository -f > /dev/null - kubectl logs deployments/acs-transform-router -f & kubectl wait --timeout=5m --for=condition=complete job/acs-alfresco-search-enterprise-reindexing fi From 8e6f72d6f5c46ade56025e29d2b680a21425e2d5 Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Mon, 18 Mar 2024 18:53:16 +0100 Subject: [PATCH 35/48] test rendition again --- .github/workflows/helm-enterprise.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml index c331c4ff7..6f6604d24 100644 --- a/.github/workflows/helm-enterprise.yml +++ b/.github/workflows/helm-enterprise.yml @@ -113,11 +113,10 @@ jobs: id: configurable-extra-values run: | if [ "${{ matrix.values }}" = "values.yaml" -o "${{ matrix.values }}" = "pre-release_values.yaml" ]; then - echo "Enabling clustered tests" + echo "Enabling clustered tests via auto-scalling: 2 replicas max, 20s stabilization window" echo "helm_install_params=--set alfresco-repository.autoscaling.enabled=true \ --set alfresco-repository.autoscaling.maxReplicas=2 \ - --set alfresco-repository.autoscaling.scaleUp.stabilizationWindowSeconds=20 \ - --set dtas.additionalArgs[0]='-k not test_renditions'" >> "$GITHUB_OUTPUT" + --set alfresco-repository.autoscaling.behavior.scaleUp.stabilizationWindowSeconds=20" >> "$GITHUB_OUTPUT" fi if [ "${{ matrix.values }}" = "7.0.N_values.yaml" ]; then echo "Skipping renditions tests on ACS 7.0.N" @@ -184,8 +183,10 @@ jobs: kubectl events --for deployment/acs-alfresco-repository - name: Check HPA behavior (${{ matrix.values }}) - if: matrix.values == 'values.yaml' || matrix.values == 'pre-release_values.yaml' + 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 From 527ca5503ad41fe2a1d6398459f99d6501506826 Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Mon, 18 Mar 2024 19:22:26 +0100 Subject: [PATCH 36/48] re-enable metrics server properly --- .github/workflows/helm-enterprise.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml index 6f6604d24..42e411280 100644 --- a/.github/workflows/helm-enterprise.yml +++ b/.github/workflows/helm-enterprise.yml @@ -85,7 +85,7 @@ jobs: uses: Alfresco/alfresco-build-tools/.github/actions/setup-kind@v5.20.0 with: ingress-nginx-ref: controller-v1.8.2 - with-metrics: "true" + metrics: "true" - name: Set nginx ingress config run: >- From 411bf93eba0ae37fbf89dd9b739a27cb5c136483 Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Tue, 19 Mar 2024 09:20:09 +0100 Subject: [PATCH 37/48] give scale down more time --- .github/workflows/helm-enterprise.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml index 42e411280..332521f5b 100644 --- a/.github/workflows/helm-enterprise.yml +++ b/.github/workflows/helm-enterprise.yml @@ -193,8 +193,10 @@ jobs: echo "Got $SETSIZE instead" exit 1 else - echo "Got $SETSIZE. Now waiting for scaling down" + echo -n "Got $SETSIZE. Now waiting for scaling down. " kubectl patch hpa acs-alfresco-repository \ -p '{"spec": {"behavior": {"scaleDown": {"stabilizationWindowSeconds": 20}}}}' - kubectl wait --timeout=40s --for=jsonpath='spec.replicas'=1 hpa/acs-alfresco-repository + echo -n "(speeding scale down up)... " + kubectl wait --timeout=2m --for=jsonpath='spec.replicas'=1 hpa/acs-alfresco-repository + echo "Scale down completed" fi From d7188e085bec1b8de840587f3716ee64002ead75 Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Tue, 19 Mar 2024 10:08:37 +0100 Subject: [PATCH 38/48] debug --- .github/workflows/helm-enterprise.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml index 332521f5b..d2010c2bb 100644 --- a/.github/workflows/helm-enterprise.yml +++ b/.github/workflows/helm-enterprise.yml @@ -197,6 +197,7 @@ jobs: 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 hpa/acs-alfresco-repository + kubectl wait --timeout=2m --for=jsonpath='spec.replicas'=1 hpa/acs-alfresco-repository \ + || kubectl get hpa acs-alfresco-repository && kubectl get deployment/acs-alfresco-repository echo "Scale down completed" fi From b15ca69be5ef04d04f1f246e8756f3b1d50b69e1 Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Tue, 19 Mar 2024 11:11:54 +0100 Subject: [PATCH 39/48] cleanup --- .github/workflows/helm-enterprise.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml index d2010c2bb..0010288e0 100644 --- a/.github/workflows/helm-enterprise.yml +++ b/.github/workflows/helm-enterprise.yml @@ -116,7 +116,7 @@ jobs: echo "Enabling clustered tests via auto-scalling: 2 replicas max, 20s 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=20" >> "$GITHUB_OUTPUT" + --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" @@ -182,7 +182,7 @@ jobs: kubectl describe pod kubectl events --for deployment/acs-alfresco-repository - - name: Check HPA behavior (${{ matrix.values }}) + - 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" @@ -197,7 +197,6 @@ jobs: 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 hpa/acs-alfresco-repository \ - || kubectl get hpa acs-alfresco-repository && kubectl get deployment/acs-alfresco-repository + kubectl wait --timeout=2m --for=jsonpath='spec.replicas'=1 deployment/acs-alfresco-repository echo "Scale down completed" fi From 813ead8a17f9d69e4e0a33fdc73ba3504e6c7ed3 Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Tue, 19 Mar 2024 11:33:27 +0100 Subject: [PATCH 40/48] cosmetics --- .github/workflows/helm-enterprise.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml index 0010288e0..8d1d21ddb 100644 --- a/.github/workflows/helm-enterprise.yml +++ b/.github/workflows/helm-enterprise.yml @@ -193,10 +193,11 @@ jobs: echo "Got $SETSIZE instead" exit 1 else - echo -n "Got $SETSIZE. Now waiting for scaling down. " + 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 + kubectl wait --timeout=40s --for=jsonpath='spec.replicas'=1 deployment/acs-alfresco-repository echo "Scale down completed" fi From c778e8d3758d9ef58072a8281f84867b0636a06a Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Tue, 19 Mar 2024 15:30:52 +0100 Subject: [PATCH 41/48] increase timeout --- .github/workflows/helm-enterprise.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml index 8d1d21ddb..d26ec25fa 100644 --- a/.github/workflows/helm-enterprise.yml +++ b/.github/workflows/helm-enterprise.yml @@ -116,6 +116,7 @@ jobs: echo "Enabling clustered tests via auto-scalling: 2 replicas max, 20s 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=20 \ --set dtas.additionalArgs[0]='-k not test_renditions'" >> "$GITHUB_OUTPUT" fi if [ "${{ matrix.values }}" = "7.0.N_values.yaml" ]; then @@ -198,6 +199,6 @@ jobs: kubectl patch hpa acs-alfresco-repository \ -p '{"spec": {"behavior": {"scaleDown": {"stabilizationWindowSeconds": 20}}}}' echo -n "(speeding scale down up)... " - kubectl wait --timeout=40s --for=jsonpath='spec.replicas'=1 deployment/acs-alfresco-repository + kubectl wait --timeout=2m --for=jsonpath='spec.replicas'=1 deployment/acs-alfresco-repository echo "Scale down completed" fi From abd6ba95ac84a2c4ab15db8de9eab5cc730e3f5d Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Wed, 20 Mar 2024 14:20:38 +0100 Subject: [PATCH 42/48] review comments --- .github/workflows/helm-enterprise.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml index d26ec25fa..dacffb662 100644 --- a/.github/workflows/helm-enterprise.yml +++ b/.github/workflows/helm-enterprise.yml @@ -113,7 +113,7 @@ jobs: id: configurable-extra-values run: | if [ "${{ matrix.values }}" = "values.yaml" -o "${{ matrix.values }}" = "pre-release_values.yaml" ]; then - echo "Enabling clustered tests via auto-scalling: 2 replicas max, 20s stabilization window" + echo "Enabling clustered tests via auto-scaling: 2 replicas max, 20s 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=20 \ From 63f975ddaccf9f7354dfc2387fe2fd0950928169 Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Wed, 20 Mar 2024 15:26:56 +0100 Subject: [PATCH 43/48] make separate steps for install & watch --- .github/workflows/helm-enterprise.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml index dacffb662..6e2bc4c10 100644 --- a/.github/workflows/helm-enterprise.yml +++ b/.github/workflows/helm-enterprise.yml @@ -125,8 +125,6 @@ jobs: fi - name: Helm install - env: - VALUES_FILE: ${{ matrix.values }} run: | helm dep up ./helm/alfresco-content-services && helm install acs ./helm/alfresco-content-services \ @@ -137,7 +135,12 @@ jobs: --values test/enterprise-integration-test-values.yaml \ ${{ steps.cgroupv2-workaround-extra-values.outputs.helm_install_params }} \ ${{ steps.configurable-extra-values.outputs.helm_install_params }} - kubectl get pods --watch-only & + + - 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 "Waiting for ESC Reindexing job to complete" From 6c4c2a2d2bb5f829fd204ef4164a44eff0dced02 Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Wed, 20 Mar 2024 15:27:51 +0100 Subject: [PATCH 44/48] try reintroducing ai-transfomer in ent. tests --- test/enterprise-integration-test-values.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/test/enterprise-integration-test-values.yaml b/test/enterprise-integration-test-values.yaml index 815317785..0daed74ba 100644 --- a/test/enterprise-integration-test-values.yaml +++ b/test/enterprise-integration-test-values.yaml @@ -163,5 +163,18 @@ alfresco-control-center: resources: requests: cpu: "0.01" +alfresco-ai-transformer: + enabled: true + replicaCount: 1 + aws: + accessKeyId: AAAAAAAAAAAAAAAAA + secretAccessKey: ZZZZZZZZZZZZZZZZZ + s3Bucket: somebucket + region: us-east-1 + comprehendRoleARN: arn:aws:iam::000000000000:user/comprehend + resources: + requests: + cpu: "0.01" + memory: "512Mi" dtas: enabled: true From 12edaa81f890bf75707f667689896edf87030d3d Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Wed, 20 Mar 2024 18:18:16 +0100 Subject: [PATCH 45/48] try to scale up earlier --- .github/workflows/helm-enterprise.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml index 6e2bc4c10..d37fb465e 100644 --- a/.github/workflows/helm-enterprise.yml +++ b/.github/workflows/helm-enterprise.yml @@ -113,10 +113,10 @@ jobs: id: configurable-extra-values run: | if [ "${{ matrix.values }}" = "values.yaml" -o "${{ matrix.values }}" = "pre-release_values.yaml" ]; then - echo "Enabling clustered tests via auto-scaling: 2 replicas max, 20s stabilization window" + 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=20 \ + --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 From ba16e432eef6aa0937f4faecd81d3366fcf36089 Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Thu, 21 Mar 2024 09:59:06 +0100 Subject: [PATCH 46/48] review comment --- .github/workflows/helm-enterprise.yml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml index d37fb465e..264e4b4af 100644 --- a/.github/workflows/helm-enterprise.yml +++ b/.github/workflows/helm-enterprise.yml @@ -125,16 +125,16 @@ jobs: fi - name: Helm install - run: | + run: >- helm dep up ./helm/alfresco-content-services && - helm install acs ./helm/alfresco-content-services \ - --set global.search.sharedSecret="$(openssl rand -hex 24)" \ - --set global.known_urls=http://localhost \ - --set global.alfrescoRegistryPullSecrets=regcred \ - --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 }} + helm install acs ./helm/alfresco-content-services + --set global.search.sharedSecret="$(openssl rand -hex 24)" + --set global.known_urls=http://localhost + --set global.alfrescoRegistryPullSecrets=regcred + --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: @@ -143,8 +143,9 @@ jobs: 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 "Waiting for ESC Reindexing job to complete" + 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 From a2e4d84f649827cc8c1e41c56fb48e3ca8e7058c Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Thu, 21 Mar 2024 15:23:51 +0100 Subject: [PATCH 47/48] bump chart --- helm/alfresco-content-services/Chart.yaml | 2 +- helm/alfresco-content-services/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/alfresco-content-services/Chart.yaml b/helm/alfresco-content-services/Chart.yaml index 2bf1998d8..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: diff --git a/helm/alfresco-content-services/README.md b/helm/alfresco-content-services/README.md index 2559b26b3..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 From 926b1e56a3e54ff1661f6267c75258c1d7db3dbc Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Thu, 21 Mar 2024 15:24:04 +0100 Subject: [PATCH 48/48] add doc --- docs/helm/autoscaling.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 docs/helm/autoscaling.md 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.