From f33cf927aa2f3e07010ed70be68a00a5d580e999 Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo <71768+gionn@users.noreply.github.com> Date: Mon, 22 Jan 2024 09:19:20 +0100 Subject: [PATCH] OPSEXP-2445 Prepare for 8.0.0-M.1 release (#1073) Co-authored-by: gionn Co-authored-by: Alex Chapellon --- .github/workflows/bumpVersions.yml | 9 +- .github/workflows/pre-commit-compose.yml | 2 +- .pre-commit-config.yaml | 5 +- README.md | 2 + docker-compose/23.N-docker-compose.yml | 203 ++++++++++++++++++ docker-compose/7.4.N-docker-compose.yml | 2 +- docker-compose/community-docker-compose.yml | 2 +- docker-compose/docker-compose.yml | 8 +- docs/helm/upgrades.md | 17 ++ .../23.N_values.yaml | 77 +++++++ .../7.4.N_values.yaml | 4 +- helm/alfresco-content-services/Chart.lock | 22 +- helm/alfresco-content-services/Chart.yaml | 22 +- helm/alfresco-content-services/README.md | 30 +-- .../community_values.yaml | 2 +- .../linter_values.yaml | 13 ++ helm/alfresco-content-services/values.yaml | 10 +- test/enterprise-integration-test-values.yaml | 8 + updatecli-matrix-targets.yaml | 173 ++++++++++++--- 19 files changed, 525 insertions(+), 86 deletions(-) create mode 100644 docker-compose/23.N-docker-compose.yml create mode 100644 helm/alfresco-content-services/23.N_values.yaml create mode 100644 helm/alfresco-content-services/linter_values.yaml diff --git a/.github/workflows/bumpVersions.yml b/.github/workflows/bumpVersions.yml index 6a59ee16e..815bfe5a2 100644 --- a/.github/workflows/bumpVersions.yml +++ b/.github/workflows/bumpVersions.yml @@ -1,5 +1,6 @@ --- name: Bump versions +run-name: Bump ${{ inputs.update-type }} using alfresco-updatecli/${{ inputs.alfresco-updatecli-ref }} on: push: @@ -22,7 +23,7 @@ on: default: master env: - UPDATE_CLI_VERSION: v0.66.1 + UPDATE_CLI_VERSION: v0.71.0 DEFAULT_BRANCH_NAME: master jobs: @@ -47,7 +48,7 @@ jobs: with: version: ${{ env.UPDATE_CLI_VERSION }} - - run: updatecli apply --experimental + - run: updatecli apply env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} @@ -62,7 +63,7 @@ jobs: uses: stefanzweifel/git-auto-commit-action@v5.0.0 with: commit_message: | - 🛠 Updatecli pipeline bump + 🛠 Updatecli pipeline charts bump commit_user_name: ${{ vars.BOT_GITHUB_USERNAME }} commit_user_email: ${{ vars.BOT_GITHUB_EMAIL }} branch: ${{ github.ref_name == env.DEFAULT_BRANCH_NAME && 'updatecli-bump-helm' || github.ref_name }} @@ -117,7 +118,7 @@ jobs: uses: stefanzweifel/git-auto-commit-action@v5.0.0 with: commit_message: | - 🛠 Updatecli pipeline acs bump + 🛠 Updatecli pipeline values bump commit_user_name: ${{ vars.BOT_GITHUB_USERNAME }} commit_user_email: ${{ vars.BOT_GITHUB_EMAIL }} branch: ${{ github.ref_name == env.DEFAULT_BRANCH_NAME && 'updatecli-bump-acs' || github.ref_name }} diff --git a/.github/workflows/pre-commit-compose.yml b/.github/workflows/pre-commit-compose.yml index 08908abac..9a1dd2d95 100644 --- a/.github/workflows/pre-commit-compose.yml +++ b/.github/workflows/pre-commit-compose.yml @@ -17,7 +17,7 @@ on: env: # https://pre-commit.com/#temporarily-disabling-hooks - SKIP: helm-docs,helm-deps-build,helm-lint,checkov + SKIP: helm-docs,helm-deps-build,helmlint,checkov jobs: pre_commit: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 54b8995a8..5de30026a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -23,7 +23,10 @@ repos: rev: v2.1.0 hooks: - id: helm-deps-build - - id: helm-lint + - repo: https://github.com/gruntwork-io/pre-commit + rev: v0.1.23 + hooks: + - id: helmlint - repo: https://github.com/bridgecrewio/checkov.git rev: 2.3.288 hooks: diff --git a/README.md b/README.md index f88041b23..0c29a43d0 100644 --- a/README.md +++ b/README.md @@ -89,6 +89,7 @@ The table below shows the exact version of ACS deployed with each chart version/ | [7.0.1][7.0.1] | 23.1.1 | 7.4.1.3 | 7.3.1.2 | 7.2.1.13 | 7.1.1.10 | 7.0.1.10 | 23.1.0 | | [7.0.2][7.0.2] | 23.1.1 | 7.4.1.3 | 7.3.1.2 | 7.2.1.13 | 7.1.1.10 | 7.0.1.10 | 23.1.0 | | [7.0.3][7.0.3] | 23.1.1 | 7.4.1.3 | 7.3.1.2 | 7.2.1.13 | 7.1.1.10 | 7.0.1.10 | 23.1.0 | +| [8.0.0-M.1][8.0.0-M.1] | 23.2.0-M1 | 7.4.1.3 | 7.3.1.2 | 7.2.1.13 | 7.1.1.10 | 7.0.1.10 | 23.1.0 | [5.0.1]: https://github.com/Alfresco/acs-deployment/releases/tag/v5.0.1 [5.1.1]: https://github.com/Alfresco/acs-deployment/releases/tag/v5.1.1 @@ -104,6 +105,7 @@ The table below shows the exact version of ACS deployed with each chart version/ [7.0.1]: https://github.com/Alfresco/acs-deployment/releases/tag/v7.0.1 [7.0.2]: https://github.com/Alfresco/acs-deployment/releases/tag/v7.0.2 [7.0.3]: https://github.com/Alfresco/acs-deployment/releases/tag/v7.0.3 +[8.0.0-M.1]: https://github.com/Alfresco/acs-deployment/releases/tag/v8.0.0-M.1 ### Why there is no 5.4.0? diff --git a/docker-compose/23.N-docker-compose.yml b/docker-compose/23.N-docker-compose.yml new file mode 100644 index 000000000..67b58e585 --- /dev/null +++ b/docker-compose/23.N-docker-compose.yml @@ -0,0 +1,203 @@ +# This docker-compose file will spin up an ACS cluster on a local host. +# It requires a minimum of 13GB Memory to distribute among containers. +# +# For performance tuning, assign the container memory and give a percentage of +# it to the JVM. Use either the -Xms,-Xmx flags or the newly added flags in +# java 10+: -XX:MaxRAMPercentage and -XX:MinRAMPercentage. +# More details here: +# https://www.oracle.com/technetwork/java/javase/10-relnote-issues-4108729.html +# +# Note: The docker-compose file from github.com is a limited trial that goes +# into read-only mode after 2 days. Get the latest docker-compose.yml file with +# a 30-day trial license by accessing the Alfresco Content Services trial +# download page at: +# https://www.alfresco.com/platform/content-services-ecm/trial/download +# +# Using version 2 as 3 does not support resource constraint options +# (cpu_*, mem_* limits) for non swarm mode in Compose +version: "2" +services: + alfresco: + image: quay.io/alfresco/alfresco-content-repository:23.1.1 + mem_limit: 1900m + environment: + JAVA_TOOL_OPTIONS: >- + -Dencryption.keystore.type=JCEKS + -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding + -Dencryption.keyAlgorithm=DESede + -Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore + -Dmetadata-keystore.password=mp6yc0UD9e + -Dmetadata-keystore.aliases=metadata + -Dmetadata-keystore.metadata.password=oKIWzVdEdA + -Dmetadata-keystore.metadata.algorithm=DESede + JAVA_OPTS: >- + -Ddb.driver=org.postgresql.Driver + -Ddb.username=alfresco + -Ddb.password=alfresco + -Ddb.url=jdbc:postgresql://postgres:5432/alfresco + -Dsolr.host=solr6 + -Dsolr.port=8983 + -Dsolr.secureComms=secret + -Dsolr.sharedSecret=secret + -Dsolr.base.url=/solr + -Dindex.subsystem.name=solr6 + -Dshare.host=127.0.0.1 + -Dshare.port=8080 + -Dalfresco.host=localhost + -Dalfresco.port=8080 + -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos + -Dmessaging.broker.url="failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true" + -Ddeployment.method=DOCKER_COMPOSE + -Dtransform.service.enabled=true + -Dtransform.service.url=http://transform-router:8095 + -Dsfs.url=http://shared-file-store:8099/ + -DlocalTransform.core-aio.url=http://transform-core-aio:8090/ + -Dcsrf.filter.enabled=false + -Ddsync.service.uris=http://localhost:9090/alfresco + -XX:MinRAMPercentage=50 + -XX:MaxRAMPercentage=80 + transform-router: + mem_limit: 512m + image: quay.io/alfresco/alfresco-transform-router:4.0.1 + environment: + JAVA_OPTS: >- + -XX:MinRAMPercentage=50 + -XX:MaxRAMPercentage=80 + ACTIVEMQ_URL: nio://activemq:61616 + CORE_AIO_URL: http://transform-core-aio:8090 + FILE_STORE_URL: >- + http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file + ports: + - "8095:8095" + links: + - activemq + transform-core-aio: + image: alfresco/alfresco-transform-core-aio:5.0.1 + mem_limit: 1536m + environment: + JAVA_OPTS: >- + -XX:MinRAMPercentage=50 + -XX:MaxRAMPercentage=80 + ACTIVEMQ_URL: nio://activemq:61616 + FILE_STORE_URL: >- + http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file + ports: + - "8090:8090" + links: + - activemq + shared-file-store: + image: quay.io/alfresco/alfresco-shared-file-store:4.0.1 + mem_limit: 512m + environment: + JAVA_OPTS: >- + -XX:MinRAMPercentage=50 + -XX:MaxRAMPercentage=80 + scheduler.content.age.millis: 86400000 + scheduler.cleanup.interval: 86400000 + ports: + - "8099:8099" + volumes: + - shared-file-store-volume:/tmp/Alfresco/sfs + share: + image: quay.io/alfresco/alfresco-share:23.1.1 + mem_limit: 1g + environment: + REPO_HOST: "alfresco" + REPO_PORT: "8080" + JAVA_OPTS: >- + -XX:MinRAMPercentage=50 + -XX:MaxRAMPercentage=80 + -Dalfresco.host=localhost + -Dalfresco.port=8080 + -Dalfresco.context=alfresco + -Dalfresco.protocol=http + postgres: + image: postgres:14.4 + mem_limit: 512m + environment: + - POSTGRES_PASSWORD=alfresco + - POSTGRES_USER=alfresco + - POSTGRES_DB=alfresco + command: postgres -c max_connections=300 -c log_min_messages=LOG + ports: + - "5432:5432" + solr6: + image: quay.io/alfresco/search-services:2.0.9 + mem_limit: 2g + environment: + # Solr needs to know how to register itself with Alfresco + SOLR_ALFRESCO_HOST: "alfresco" + SOLR_ALFRESCO_PORT: "8080" + # Alfresco needs to know how to call solr + SOLR_SOLR_HOST: "solr6" + SOLR_SOLR_PORT: "8983" + # Create the default alfresco and archive cores + SOLR_CREATE_ALFRESCO_DEFAULTS: "alfresco,archive" + # HTTPS or SECRET + ALFRESCO_SECURE_COMMS: "secret" + # SHARED SECRET VALUE + JAVA_TOOL_OPTIONS: >- + -Dalfresco.secureComms.secret=secret + ports: + - "8083:8983" # Browser port + activemq: + image: alfresco/alfresco-activemq:5.18-jre17-rockylinux8 + mem_limit: 1g + ports: + - "8161:8161" # Web Console + - "5672:5672" # AMQP + - "61616:61616" # OpenWire + - "61613:61613" # STOMP + digital-workspace: + image: quay.io/alfresco/alfresco-digital-workspace:4.3.0 + mem_limit: 128m + environment: + APP_CONFIG_PROVIDER: "ECM" + APP_CONFIG_AUTH_TYPE: "BASIC" + BASE_PATH: ./ + APP_CONFIG_PLUGIN_PROCESS_SERVICE: "false" + APP_CONFIG_PLUGIN_MICROSOFT_ONLINE: "false" + APP_BASE_SHARE_URL: "http://localhost:8080/workspace/#/preview/s" + control-center: + image: quay.io/alfresco/alfresco-control-center:8.3.0 + mem_limit: 128m + environment: + APP_CONFIG_PROVIDER: "ECM" + APP_CONFIG_AUTH_TYPE: "BASIC" + BASE_PATH: ./ + proxy: + image: alfresco/alfresco-acs-nginx:3.4.2 + mem_limit: 128m + depends_on: + - alfresco + - digital-workspace + - control-center + ports: + - "8080:8080" + links: + - digital-workspace + - alfresco + - share + - control-center + sync-service: + image: quay.io/alfresco/service-sync:4.0.1 + mem_limit: 1g + environment: + JAVA_OPTS: >- + -Dsql.db.driver=org.postgresql.Driver + -Dsql.db.url=jdbc:postgresql://postgres:5432/alfresco + -Dsql.db.username=alfresco + -Dsql.db.password=alfresco + -Dmessaging.broker.host=activemq + -Drepo.hostname=alfresco + -Drepo.port=8080 + -Ddw.server.applicationConnectors[0].type=http + -XX:MinRAMPercentage=50 + -XX:MaxRAMPercentage=80 + ports: + - "9090:9090" +volumes: + shared-file-store-volume: + driver_opts: + type: tmpfs + device: tmpfs diff --git a/docker-compose/7.4.N-docker-compose.yml b/docker-compose/7.4.N-docker-compose.yml index 24223a536..9d3860e2a 100644 --- a/docker-compose/7.4.N-docker-compose.yml +++ b/docker-compose/7.4.N-docker-compose.yml @@ -122,7 +122,7 @@ services: ports: - "5432:5432" solr6: - image: quay.io/alfresco/search-services:2.0.8.2 + image: quay.io/alfresco/search-services:2.0.9 mem_limit: 2g environment: # Solr needs to know how to register itself with Alfresco diff --git a/docker-compose/community-docker-compose.yml b/docker-compose/community-docker-compose.yml index 09e90cd28..1ddaabbeb 100644 --- a/docker-compose/community-docker-compose.yml +++ b/docker-compose/community-docker-compose.yml @@ -80,7 +80,7 @@ services: ports: - "5432:5432" solr6: - image: docker.io/alfresco/alfresco-search-services:2.0.8.2 + image: docker.io/alfresco/alfresco-search-services:2.0.9 mem_limit: 2g environment: # Solr needs to know how to register itself with Alfresco diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 07fcda368..7141c4ed0 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -18,7 +18,7 @@ version: "2" services: alfresco: - image: quay.io/alfresco/alfresco-content-repository:23.1.1 + image: quay.io/alfresco/alfresco-content-repository:23.2.0-M1 mem_limit: 1900m environment: JAVA_TOOL_OPTIONS: >- @@ -99,7 +99,7 @@ services: volumes: - shared-file-store-volume:/tmp/Alfresco/sfs share: - image: quay.io/alfresco/alfresco-share:23.1.1 + image: quay.io/alfresco/alfresco-share:23.2.0-M1 mem_limit: 1g environment: REPO_HOST: "alfresco" @@ -122,7 +122,7 @@ services: ports: - "5432:5432" solr6: - image: quay.io/alfresco/search-services:2.0.8.2 + image: quay.io/alfresco/search-services:2.0.9 mem_limit: 2g environment: # Solr needs to know how to register itself with Alfresco @@ -180,7 +180,7 @@ services: - share - control-center sync-service: - image: quay.io/alfresco/service-sync:4.0.1 + image: quay.io/alfresco/service-sync:5.0.0-M2 mem_limit: 1g environment: JAVA_OPTS: >- diff --git a/docs/helm/upgrades.md b/docs/helm/upgrades.md index 5b7644623..0c84745b8 100644 --- a/docs/helm/upgrades.md +++ b/docs/helm/upgrades.md @@ -10,6 +10,23 @@ Releases](https://github.com/Alfresco/acs-deployment/releases). Here follows a more detailed explanation of any breaking change grouped by version in which they have been released. +## 8.0.0-M.1 + +* `.global.ai.enabled` has been removed since adw doesn't need anymore to + explicitly enable the AI features. +* Postgres database configuration for Sync Service has been moved from + `.alfresco-sync-service.postgresql` to `.postgresql-sync`. Connection details + for database can be provided also via an existing configMap/secret in + `.alfresco-sync-service.database`. Message broker configuration has been split + from a single secret provided via + `.alfresco-sync-service.messaBroker.existingSecretName` to two separate + existing configMap/secret. More details at [sync chart + docs](https://github.com/Alfresco/alfresco-helm-charts/blob/main/charts/alfresco-sync-service/README.md) +* ATS message broker configuration has been split from a single secret provided + via `.alfresco-transform-service.messageBroker.existingSecretName` to two separate existing configMap/secret. + More details at [ATS chart docs](https://github.com/Alfresco/alfresco-helm-charts/blob/main/charts/alfresco-transform-service/README.md) +* AI transformer configuration has been refactored, please take a look at the updated [AI example docs](./examples/with-ai.md) + ## 7.0.0 ### Values refactoring diff --git a/helm/alfresco-content-services/23.N_values.yaml b/helm/alfresco-content-services/23.N_values.yaml new file mode 100644 index 000000000..95cffc52b --- /dev/null +++ b/helm/alfresco-content-services/23.N_values.yaml @@ -0,0 +1,77 @@ +# This values file can be used to install ACS 23.x using the latest version of +# the chart +alfresco-repository: + image: + tag: 23.1.1 +alfresco-transform-service: + transformrouter: + image: + tag: 4.0.1 + pdfrenderer: + image: + tag: 5.0.1 + imagemagick: + image: + tag: 5.0.1 + libreoffice: + image: + tag: 5.0.1 + tika: + image: + tag: 5.0.1 + transformmisc: + image: + tag: 5.0.1 + filestore: + image: + tag: 4.0.1 +alfresco-ai-transformer: + image: + tag: 3.0.1 +share: + image: + tag: 23.1.1 +alfresco-search: + searchServicesImage: + tag: 2.0.9 + insightEngineImage: + tag: 2.0.9 +alfresco-search-enterprise: + enabled: false + liveIndexing: + mediation: + image: + tag: 4.0.0.1 + content: + image: + tag: 4.0.0.1 + metadata: + image: + tag: 4.0.0.1 + path: + image: + tag: 4.0.0.1 + reindexing: + image: + tag: 4.0.0.1 +alfresco-digital-workspace: + image: + tag: 4.3.0 +alfresco-control-center: + image: + tag: 8.3.0 +postgresql: + image: + tag: 14.4.0 +postgresql-syncservice: + image: + tag: 14.4.0 +alfresco-sync-service: + image: + tag: 4.0.1 +alfresco-connector-ms365: + image: + tag: 2.0.0 +alfresco-connector-msteams: + image: + tag: 2.0.0 diff --git a/helm/alfresco-content-services/7.4.N_values.yaml b/helm/alfresco-content-services/7.4.N_values.yaml index 85ef0b011..35c98e564 100644 --- a/helm/alfresco-content-services/7.4.N_values.yaml +++ b/helm/alfresco-content-services/7.4.N_values.yaml @@ -33,9 +33,9 @@ share: tag: 7.4.1.3 alfresco-search: searchServicesImage: - tag: 2.0.8.2 + tag: 2.0.9 insightEngineImage: - tag: 2.0.8.2 + tag: 2.0.9 alfresco-search-enterprise: enabled: false liveIndexing: diff --git a/helm/alfresco-content-services/Chart.lock b/helm/alfresco-content-services/Chart.lock index b27053ee7..c09e42775 100644 --- a/helm/alfresco-content-services/Chart.lock +++ b/helm/alfresco-content-services/Chart.lock @@ -10,42 +10,42 @@ dependencies: version: 12.8.5 - name: common repository: https://activiti.github.io/activiti-cloud-helm-charts - version: 8.0.0 + version: 8.1.0 - name: common repository: https://activiti.github.io/activiti-cloud-helm-charts - version: 8.0.0 + version: 8.1.0 - name: alfresco-repository repository: https://alfresco.github.io/alfresco-helm-charts/ - version: 0.1.2 + version: 0.1.3 - name: activemq repository: https://alfresco.github.io/alfresco-helm-charts/ version: 3.4.1 - name: alfresco-transform-service repository: https://alfresco.github.io/alfresco-helm-charts/ - version: 1.0.0-alpha.2 + version: 1.0.0 - name: alfresco-search-service repository: https://alfresco.github.io/alfresco-helm-charts/ - version: 3.0.0-alpha.0 + version: 3.0.0 - name: alfresco-sync-service repository: https://alfresco.github.io/alfresco-helm-charts/ - version: 5.0.0-alpha.2 + version: 5.0.0 - name: alfresco-search-enterprise repository: https://alfresco.github.io/alfresco-helm-charts/ - version: 3.1.0-alpha.1 + version: 3.1.0 - name: alfresco-connector-msteams repository: https://alfresco.github.io/alfresco-helm-charts/ - version: 0.2.0 + version: 0.3.0 - name: alfresco-share repository: https://alfresco.github.io/alfresco-helm-charts/ version: 0.3.0 - name: alfresco-connector-ms365 repository: https://alfresco.github.io/alfresco-helm-charts/ - version: 0.5.0-alpha.0 + version: 0.5.0 - name: alfresco-ai-transformer repository: https://alfresco.github.io/alfresco-helm-charts/ version: 1.0.0-alpha.6 - name: elasticsearch repository: https://helm.elastic.co version: 7.17.3 -digest: sha256:e403533d6ddceea2004ec7dc476f274bbfd4468fb9f1942700a22bb0a71b2ca7 -generated: "2024-01-18T18:12:35.957453+01:00" +digest: sha256:8e1b79d92cbcdbd995e16bc1e242dc1af32e6a3458d571148aeefe6c5fb80412 +generated: "2024-01-19T14:05:50.371933+01:00" diff --git a/helm/alfresco-content-services/Chart.yaml b/helm/alfresco-content-services/Chart.yaml index 13c588be1..e1da403d8 100644 --- a/helm/alfresco-content-services/Chart.yaml +++ b/helm/alfresco-content-services/Chart.yaml @@ -4,8 +4,8 @@ # https://www.alfresco.com/platform/content-services-ecm/trial/download apiVersion: v2 name: alfresco-content-services -version: 7.0.3 -appVersion: 23.1.1 +version: 8.0.0-M.1 +appVersion: 23.2.0-M1 description: A Helm chart for deploying Alfresco Content Services keywords: - content @@ -31,41 +31,41 @@ dependencies: - name: common alias: alfresco-control-center repository: https://activiti.github.io/activiti-cloud-helm-charts - version: 8.0.0 + version: 8.1.0 condition: >- alfresco-admin-app.enabled - name: common alias: alfresco-digital-workspace repository: https://activiti.github.io/activiti-cloud-helm-charts - version: 8.0.0 + version: 8.1.0 condition: >- alfresco-digital-workspace.enabled - name: alfresco-repository - version: 0.1.2 + version: 0.1.3 repository: https://alfresco.github.io/alfresco-helm-charts/ - name: activemq version: 3.4.1 repository: https://alfresco.github.io/alfresco-helm-charts/ condition: activemq.enabled - name: alfresco-transform-service - version: 1.0.0-alpha.2 + version: 1.0.0 repository: https://alfresco.github.io/alfresco-helm-charts/ condition: alfresco-transform-service.enabled - name: alfresco-search-service alias: alfresco-search repository: https://alfresco.github.io/alfresco-helm-charts/ - version: 3.0.0-alpha.0 + version: 3.0.0 condition: alfresco-search.enabled - name: alfresco-sync-service repository: https://alfresco.github.io/alfresco-helm-charts/ - version: 5.0.0-alpha.2 + version: 5.0.0 condition: alfresco-sync-service.enabled - name: alfresco-search-enterprise - version: 3.1.0-alpha.1 + version: 3.1.0 repository: https://alfresco.github.io/alfresco-helm-charts/ condition: alfresco-search-enterprise.enabled - name: alfresco-connector-msteams - version: 0.2.0 + version: 0.3.0 repository: https://alfresco.github.io/alfresco-helm-charts/ condition: alfresco-connector-msteams.enabled - name: alfresco-share @@ -74,7 +74,7 @@ dependencies: repository: https://alfresco.github.io/alfresco-helm-charts/ condition: share.enabled - name: alfresco-connector-ms365 - version: 0.5.0-alpha.0 + version: 0.5.0 repository: https://alfresco.github.io/alfresco-helm-charts/ condition: alfresco-connector-ms365.enabled - name: alfresco-ai-transformer diff --git a/helm/alfresco-content-services/README.md b/helm/alfresco-content-services/README.md index e86bccff0..3aa45f1e7 100644 --- a/helm/alfresco-content-services/README.md +++ b/helm/alfresco-content-services/README.md @@ -1,6 +1,6 @@ # alfresco-content-services -![Version: 7.0.3](https://img.shields.io/badge/Version-7.0.3-informational?style=flat-square) ![AppVersion: 23.1.1](https://img.shields.io/badge/AppVersion-23.1.1-informational?style=flat-square) +![Version: 8.0.0-M.1](https://img.shields.io/badge/Version-8.0.0--M.1-informational?style=flat-square) ![AppVersion: 23.2.0-M1](https://img.shields.io/badge/AppVersion-23.2.0--M1-informational?style=flat-square) A Helm chart for deploying Alfresco Content Services @@ -16,19 +16,19 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b | Repository | Name | Version | |------------|------|---------| -| https://activiti.github.io/activiti-cloud-helm-charts | alfresco-control-center(common) | 8.0.0 | -| https://activiti.github.io/activiti-cloud-helm-charts | alfresco-digital-workspace(common) | 8.0.0 | +| https://activiti.github.io/activiti-cloud-helm-charts | alfresco-control-center(common) | 8.1.0 | +| https://activiti.github.io/activiti-cloud-helm-charts | alfresco-digital-workspace(common) | 8.1.0 | | https://alfresco.github.io/alfresco-helm-charts/ | activemq | 3.4.1 | | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-ai-transformer | 1.0.0-alpha.6 | | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-common | 3.1.1 | -| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-connector-ms365 | 0.5.0-alpha.0 | -| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-connector-msteams | 0.2.0 | -| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-repository | 0.1.2 | -| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-search-enterprise | 3.1.0-alpha.1 | -| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-search(alfresco-search-service) | 3.0.0-alpha.0 | +| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-connector-ms365 | 0.5.0 | +| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-connector-msteams | 0.3.0 | +| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-repository | 0.1.3 | +| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-search-enterprise | 3.1.0 | +| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-search(alfresco-search-service) | 3.0.0 | | https://alfresco.github.io/alfresco-helm-charts/ | share(alfresco-share) | 0.3.0 | -| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-sync-service | 5.0.0-alpha.2 | -| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-transform-service | 1.0.0-alpha.2 | +| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-sync-service | 5.0.0 | +| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-transform-service | 1.0.0 | | https://helm.elastic.co | elasticsearch | 7.17.3 | | oci://registry-1.docker.io/bitnamicharts | postgresql-sync(postgresql) | 12.8.5 | | oci://registry-1.docker.io/bitnamicharts | postgresql | 12.8.5 | @@ -123,7 +123,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b | alfresco-repository.configuration.search.existingSecret.name | string | `"alfresco-search-secret"` | | | alfresco-repository.configuration.search.flavor | string | `"solr6"` | | | alfresco-repository.image.repository | string | `"quay.io/alfresco/alfresco-content-repository"` | | -| alfresco-repository.image.tag | string | `"23.1.1"` | | +| alfresco-repository.image.tag | string | `"23.2.0-M1"` | | | alfresco-repository.nameOverride | string | `"alfresco-repository"` | | | alfresco-repository.persistence.accessModes | list | `["ReadWriteMany"]` | Specify a storageClass for dynamic provisioning | | alfresco-repository.persistence.baseSize | string | `"20Gi"` | | @@ -151,7 +151,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b | alfresco-search.ingress.enabled | bool | `false` | Alfresco Search services endpoint ('/solr') | | alfresco-search.ingress.tls | list | `[]` | | | alfresco-search.insightEngineImage.repository | string | `"quay.io/alfresco/insight-engine"` | | -| alfresco-search.insightEngineImage.tag | string | `"2.0.8.2"` | | +| alfresco-search.insightEngineImage.tag | string | `"2.0.9"` | | | alfresco-search.nameOverride | string | `"alfresco-search"` | | | alfresco-search.repository.existingConfigMap.keys.host | string | `"repo_svc_name"` | | | alfresco-search.repository.existingConfigMap.keys.port | string | `"repo_svc_port"` | | @@ -160,12 +160,12 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b | alfresco-search.repository.existingSecret.keys.sharedSecret | string | `"SOLR_SECRET"` | | | alfresco-search.repository.existingSecret.name | string | `"alfresco-search-secret"` | | | alfresco-search.searchServicesImage.repository | string | `"quay.io/alfresco/search-services"` | | -| alfresco-search.searchServicesImage.tag | string | `"2.0.8.2"` | | +| alfresco-search.searchServicesImage.tag | string | `"2.0.9"` | | | alfresco-sync-service.database.existingConfigMap.keys.url | string | `"SYNC_DATABASE_URL"` | | | alfresco-sync-service.database.existingConfigMap.name | string | `"alfresco-infrastructure"` | | | alfresco-sync-service.database.existingSecret.name | string | `"alfresco-cs-sync"` | | | alfresco-sync-service.enabled | bool | `true` | Toggle deployment of Alfresco Sync Service (Desktop-Sync) Check [Alfresco Sync Service Documentation](https://github.com/Alfresco/alfresco-helm-charts/tree/main/charts/alfresco-sync-service) | -| alfresco-sync-service.image.tag | string | `"4.0.1"` | | +| alfresco-sync-service.image.tag | string | `"5.0.0-M2"` | | | alfresco-sync-service.messageBroker.existingConfigMap.name | string | `"alfresco-infrastructure"` | | | alfresco-sync-service.messageBroker.existingSecret.name | string | `"acs-alfresco-cs-brokersecret"` | | | alfresco-sync-service.repository.existingConfigMap.keys.host | string | `"repo_svc_name"` | | @@ -264,7 +264,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b | postgresql.primary.resources.requests.memory | string | `"1Gi"` | | | share.enabled | bool | `true` | toggle deploying Alfresco Share UI | | share.image.repository | string | `"quay.io/alfresco/alfresco-share"` | | -| share.image.tag | string | `"23.1.1"` | | +| share.image.tag | string | `"23.2.0-M1"` | | | share.nameOverride | string | `"share"` | | | share.repository.existingConfigMap.keys.host | string | `"repo_svc_name"` | Name of the key in the configmap which points to the repository service hostname | | share.repository.existingConfigMap.keys.port | string | `"repo_svc_port"` | Name of the key in the configmap which points to the repository service port | diff --git a/helm/alfresco-content-services/community_values.yaml b/helm/alfresco-content-services/community_values.yaml index 189937c60..e232bf40b 100644 --- a/helm/alfresco-content-services/community_values.yaml +++ b/helm/alfresco-content-services/community_values.yaml @@ -15,7 +15,7 @@ share: alfresco-search: searchServicesImage: repository: alfresco/alfresco-search-services - tag: 2.0.8.2 + tag: 2.0.9 # Disable Enterprise only features alfresco-transform-service: enabled: true diff --git a/helm/alfresco-content-services/linter_values.yaml b/helm/alfresco-content-services/linter_values.yaml new file mode 100644 index 000000000..467873304 --- /dev/null +++ b/helm/alfresco-content-services/linter_values.yaml @@ -0,0 +1,13 @@ +alfresco-transform-service: + messageBroker: + url: "tcp://activemq:61616" + user: alfresco + password: alfresco +alfresco-ai-transformer: + enabled: true + aws: + accessKeyId: AAAAAAAAAAAAAAAAA + secretAccessKey: ZZZZZZZZZZZZZZZZZ + s3Bucket: somebucket + region: us-east-1 + comprehendRoleARN: arn:aws:iam::000000000000:user/comprehend diff --git a/helm/alfresco-content-services/values.yaml b/helm/alfresco-content-services/values.yaml index f33fbd2ad..8af858388 100644 --- a/helm/alfresco-content-services/values.yaml +++ b/helm/alfresco-content-services/values.yaml @@ -101,7 +101,7 @@ alfresco-repository: nameOverride: alfresco-repository image: repository: quay.io/alfresco/alfresco-content-repository - tag: 23.1.1 + tag: 23.2.0-M1 configuration: repository: existingConfigMap: repository @@ -244,7 +244,7 @@ share: enabled: true image: repository: quay.io/alfresco/alfresco-share - tag: 23.1.1 + tag: 23.2.0-M1 nameOverride: share repository: existingConfigMap: @@ -272,10 +272,10 @@ alfresco-search: sharedSecret: SOLR_SECRET searchServicesImage: repository: quay.io/alfresco/search-services - tag: 2.0.8.2 + tag: 2.0.9 insightEngineImage: repository: quay.io/alfresco/insight-engine - tag: 2.0.8.2 + tag: 2.0.9 nameOverride: alfresco-search # If an external Solr service is to be used then enabled must be set to false # and external has to be configured accordingly. @@ -460,7 +460,7 @@ alfresco-sync-service: # Documentation](https://github.com/Alfresco/alfresco-helm-charts/tree/main/charts/alfresco-sync-service) enabled: true image: - tag: 4.0.1 + tag: 5.0.0-M2 database: existingSecret: name: *sync_database_secretName diff --git a/test/enterprise-integration-test-values.yaml b/test/enterprise-integration-test-values.yaml index 52cf27dcb..073657ae9 100644 --- a/test/enterprise-integration-test-values.yaml +++ b/test/enterprise-integration-test-values.yaml @@ -125,3 +125,11 @@ alfresco-sync-service: limits: cpu: "2" memory: "1Gi" +alfresco-ai-transformer: + enabled: true + aws: + accessKeyId: AAAAAAAAAAAAAAAAA + secretAccessKey: ZZZZZZZZZZZZZZZZZ + s3Bucket: somebucket + region: us-east-1 + comprehendRoleARN: arn:aws:iam::000000000000:user/comprehend diff --git a/updatecli-matrix-targets.yaml b/updatecli-matrix-targets.yaml index c88856ad8..105818ca1 100644 --- a/updatecli-matrix-targets.yaml +++ b/updatecli-matrix-targets.yaml @@ -2,37 +2,152 @@ # This file is meant to be used with updatecli uber-manifest pipeline # https://github.com/Alfresco/alfresco-updatecli/tree/master/deployments matrix: - 23.N: - id: 23n + next: + id: next acs: version: pattern: image: - compose_target: &compose231 >- + compose_target: &composeNext >- docker-compose/docker-compose.yml compose_key: $.services.alfresco.image - helm_target: &helmvalues231 >- + helm_target: &helmvaluesNext >- helm/alfresco-content-services/values.yaml helm_key: $.alfresco-repository.image.tag - helm_update_appVersion: true + # keep the unused anchor to detect multiple usages when copying blocks for new versions + helm_update_appVersion: &helm_update_appVersion true share: version: pattern: image: - compose_target: *compose231 + compose_target: *composeNext compose_key: $.services.share.image - helm_target: *helmvalues231 + helm_target: *helmvaluesNext helm_key: $.share.image.tag search: version: - compose_target: *compose231 + compose_target: *composeNext compose_key: $.services.solr6.image - helm_target: *helmvalues231 + helm_target: *helmvaluesNext helm_keys: &search_helm_keys search: $.alfresco-search.searchServicesImage.tag insight: $.alfresco-search.insightEngineImage.tag image: pattern: + search-enterprise: + version: + pattern: + helm_target: *helmvaluesNext + helm_keys: + Reindexing: $.alfresco-search-enterprise.reindexing.image.tag + Liveindexing: + Mediation: >- + $.alfresco-search-enterprise.liveIndexing.mediation.image.tag + Content: >- + $.alfresco-search-enterprise.liveIndexing.content.image.tag + Metadata: >- + $.alfresco-search-enterprise.liveIndexing.metadata.image.tag + Path: >- + $.alfresco-search-enterprise.liveIndexing.path.image.tag + sync: + version: + compose_target: *composeNext + compose_key: $.services.sync-service.image + helm_target: *helmvaluesNext + helm_key: $.alfresco-sync-service.image.tag + pattern: + adw: + version: + compose_target: *composeNext + compose_key: $.services.digital-workspace.image + helm_target: *helmvaluesNext + helm_key: $.alfresco-digital-workspace.image.tag + pattern: + adminApp: + version: + compose_target: *composeNext + compose_key: $.services.control-center.image + helm_target: *helmvaluesNext + helm_key: $.alfresco-control-center.image.tag + pattern: + onedrive: + version: + helm_target: *helmvaluesNext + helm_key: $.alfresco-connector-ms365.image.tag + pattern: + msteams: + version: + helm_target: *helmvaluesNext + helm_key: $.alfresco-connector-msteams.image.tag + pattern: + intelligence: + version: + helm_target: *helmvaluesNext + helm_key: $.alfresco-ai-transformer.image.tag + trouter: + version: + compose_target: *composeNext + compose_key: $.services.transform-router.image + helm_target: *helmvaluesNext + helm_key: $.alfresco-transform-service.transformrouter.image.tag + sfs: + version: + compose_target: *composeNext + compose_key: $.services.shared-file-store.image + helm_target: *helmvaluesNext + helm_key: $.alfresco-transform-service.filestore.image.tag + tengine-aio: + version: + compose_target: *composeNext + compose_key: $.services.transform-core-aio.image + tengine-misc: + version: + helm_target: *helmvaluesNext + helm_key: $.alfresco-transform-service.transformmisc.image.tag + tengine-im: + version: + helm_target: *helmvaluesNext + helm_key: $.alfresco-transform-service.imagemagick.image.tag + tengine-lo: + version: + helm_target: *helmvaluesNext + helm_key: $.alfresco-transform-service.libreoffice.image.tag + tengine-pdf: + version: + helm_target: *helmvaluesNext + helm_key: $.alfresco-transform-service.pdfrenderer.image.tag + tengine-tika: + version: + helm_target: *helmvaluesNext + helm_key: $.alfresco-transform-service.tika.image.tag + 23.N: + id: 23n + acs: + version: + pattern: + image: + compose_target: &compose23n >- + docker-compose/23.N-docker-compose.yml + compose_key: $.services.alfresco.image + helm_target: &helmvalues23n >- + helm/alfresco-content-services/23.N_values.yaml + helm_key: $.alfresco-repository.image.tag + share: + version: + pattern: + image: + compose_target: *compose23n + compose_key: $.services.share.image + helm_target: *helmvalues23n + helm_key: $.share.image.tag + search: + version: + compose_target: *compose23n + compose_key: $.services.solr6.image + helm_target: *helmvalues23n + helm_keys: *search_helm_keys + image: + pattern: search-enterprise: version: pattern: @@ -41,7 +156,7 @@ matrix: compose_keys: live-indexing: $.services.search.image reindexing: $.services.search-reindexing.image - helm_target: *helmvalues231 + helm_target: *helmvalues23n helm_keys: Reindexing: $.alfresco-search-enterprise.reindexing.image.tag Liveindexing: @@ -55,74 +170,74 @@ matrix: $.alfresco-search-enterprise.liveIndexing.path.image.tag sync: version: - compose_target: *compose231 + compose_target: *compose23n compose_key: $.services.sync-service.image - helm_target: *helmvalues231 + helm_target: *helmvalues23n helm_key: $.alfresco-sync-service.image.tag pattern: adw: version: - compose_target: *compose231 + compose_target: *compose23n compose_key: $.services.digital-workspace.image - helm_target: *helmvalues231 + helm_target: *helmvalues23n helm_key: $.alfresco-digital-workspace.image.tag pattern: adminApp: version: - compose_target: *compose231 + compose_target: *compose23n compose_key: $.services.control-center.image - helm_target: *helmvalues231 + helm_target: *helmvalues23n helm_key: $.alfresco-control-center.image.tag pattern: onedrive: version: - helm_target: *helmvalues231 + helm_target: *helmvalues23n helm_key: $.alfresco-connector-ms365.image.tag pattern: msteams: version: - helm_target: *helmvalues231 + helm_target: *helmvalues23n helm_key: $.alfresco-connector-msteams.image.tag pattern: intelligence: version: - helm_target: *helmvalues231 + helm_target: *helmvalues23n helm_key: $.alfresco-ai-transformer.image.tag trouter: version: - compose_target: *compose231 + compose_target: *compose23n compose_key: $.services.transform-router.image - helm_target: *helmvalues231 + helm_target: *helmvalues23n helm_key: $.alfresco-transform-service.transformrouter.image.tag sfs: version: - compose_target: *compose231 + compose_target: *compose23n compose_key: $.services.shared-file-store.image - helm_target: *helmvalues231 + helm_target: *helmvalues23n helm_key: $.alfresco-transform-service.filestore.image.tag tengine-aio: version: - compose_target: *compose231 + compose_target: *compose23n compose_key: $.services.transform-core-aio.image tengine-misc: version: - helm_target: *helmvalues231 + helm_target: *helmvalues23n helm_key: $.alfresco-transform-service.transformmisc.image.tag tengine-im: version: - helm_target: *helmvalues231 + helm_target: *helmvalues23n helm_key: $.alfresco-transform-service.imagemagick.image.tag tengine-lo: version: - helm_target: *helmvalues231 + helm_target: *helmvalues23n helm_key: $.alfresco-transform-service.libreoffice.image.tag tengine-pdf: version: - helm_target: *helmvalues231 + helm_target: *helmvalues23n helm_key: $.alfresco-transform-service.pdfrenderer.image.tag tengine-tika: version: - helm_target: *helmvalues231 + helm_target: *helmvalues23n helm_key: $.alfresco-transform-service.tika.image.tag 7.4.N: id: 74n