From f65f97ccf73c1712bfc53d780f1d0bf2c4c8f7f9 Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Wed, 11 Dec 2024 12:29:20 +0100 Subject: [PATCH 1/5] remove 7.1 from the update matrix of targets --- .../updatecli-matrix-targets.yaml | 94 ------------------- 1 file changed, 94 deletions(-) diff --git a/helm/alfresco-content-services/updatecli-matrix-targets.yaml b/helm/alfresco-content-services/updatecli-matrix-targets.yaml index 9e0ede3b5..c2378ea05 100644 --- a/helm/alfresco-content-services/updatecli-matrix-targets.yaml +++ b/helm/alfresco-content-services/updatecli-matrix-targets.yaml @@ -512,100 +512,6 @@ matrix: version: helm_target: *helmvalues72 helm_key: $.alfresco-transform-service.tika.image.tag - 7.1.N: - id: 71n - acs: - version: - helm_target: &helmvalues71 >- - helm/alfresco-content-services/7.1.N_values.yaml - helm_key: $.alfresco-repository.image.tag - pattern: - image: - activemq: - version: - helm_target: *helmvalues71 - helm_key: $.activemq.image.tag - pattern: - image: - share: - version: - helm_target: *helmvalues71 - helm_key: $.share.image.tag - pattern: - image: - search: - version: - helm_target: *helmvalues71 - helm_keys: *search_helm_keys - pattern: - image: - search-enterprise: - version: - helm_target: *helmvalues71 - 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 - pattern: - sync: - version: - helm_target: *helmvalues71 - helm_key: $.alfresco-sync-service.image.tag - pattern: - adw: - version: - helm_target: *helmvalues71 - helm_key: $.alfresco-digital-workspace.image.tag - pattern: - onedrive: - version: - helm_target: *helmvalues71 - helm_key: $.alfresco-connector-ms365.image.tag - pattern: - msteams: - version: - helm_target: *helmvalues71 - helm_key: $.alfresco-connector-msteams.image.tag - pattern: - intelligence: - version: - helm_target: *helmvalues71 - helm_key: $.alfresco-ai-transformer.image.tag - trouter: - version: - helm_target: *helmvalues71 - helm_key: $.alfresco-transform-service.transformrouter.image.tag - sfs: - version: - helm_target: *helmvalues71 - helm_key: $.alfresco-transform-service.filestore.image.tag - tengine-misc: - version: - helm_target: *helmvalues71 - helm_key: $.alfresco-transform-service.transformmisc.image.tag - tengine-im: - version: - helm_target: *helmvalues71 - helm_key: $.alfresco-transform-service.imagemagick.image.tag - tengine-lo: - version: - helm_target: *helmvalues71 - helm_key: $.alfresco-transform-service.libreoffice.image.tag - tengine-pdf: - version: - helm_target: *helmvalues71 - helm_key: $.alfresco-transform-service.pdfrenderer.image.tag - tengine-tika: - version: - helm_target: *helmvalues71 - helm_key: $.alfresco-transform-service.tika.image.tag community: &community id: com acs: From 09881b670564c985f54f9775dfa418ee04d2deb7 Mon Sep 17 00:00:00 2001 From: alxgomz Date: Wed, 11 Dec 2024 11:40:30 +0000 Subject: [PATCH 2/5] =?UTF-8?q?=F0=9F=9B=A0=20Updatecli=20pipeline=20value?= =?UTF-8?q?s=20bump?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose/7.2.N-compose.yaml | 6 +++--- docker-compose/7.3.N-compose.yaml | 6 +++--- docker-compose/7.4.N-compose.yaml | 4 ++-- docker-compose/pre-release-compose.yaml | 8 ++++---- .../7.2.N_values.yaml | 18 +++++++++--------- .../7.3.N_values.yaml | 18 +++++++++--------- .../7.4.N_values.yaml | 4 ++-- .../pre-release_values.yaml | 8 ++++---- 8 files changed, 36 insertions(+), 36 deletions(-) diff --git a/docker-compose/7.2.N-compose.yaml b/docker-compose/7.2.N-compose.yaml index 2564b2afd..cbb7f2652 100644 --- a/docker-compose/7.2.N-compose.yaml +++ b/docker-compose/7.2.N-compose.yaml @@ -75,7 +75,7 @@ services: - "traefik.http.routers.alfrescomicrometer.middlewares=prometheusipfilter@docker" transform-router: mem_limit: 512m - image: quay.io/alfresco/alfresco-transform-router:2.1.2 + image: quay.io/alfresco/alfresco-transform-router:4.1.5 environment: JAVA_OPTS: >- -XX:MinRAMPercentage=50 @@ -99,7 +99,7 @@ services: shared-file-store: condition: service_healthy transform-core-aio: - image: alfresco/alfresco-transform-core-aio:3.1.2 + image: alfresco/alfresco-transform-core-aio:5.1.5 mem_limit: 1536m environment: JAVA_OPTS: >- @@ -123,7 +123,7 @@ services: shared-file-store: condition: service_healthy shared-file-store: - image: quay.io/alfresco/alfresco-shared-file-store:2.1.2 + image: quay.io/alfresco/alfresco-shared-file-store:4.1.5 mem_limit: 512m environment: JAVA_OPTS: >- diff --git a/docker-compose/7.3.N-compose.yaml b/docker-compose/7.3.N-compose.yaml index 99d4f18c7..1aa517897 100644 --- a/docker-compose/7.3.N-compose.yaml +++ b/docker-compose/7.3.N-compose.yaml @@ -71,7 +71,7 @@ services: - "traefik.http.routers.alfrescomicrometer.middlewares=prometheusipfilter@docker" transform-router: mem_limit: 512m - image: quay.io/alfresco/alfresco-transform-router:2.1.2 + image: quay.io/alfresco/alfresco-transform-router:4.1.5 environment: JAVA_OPTS: >- -XX:MinRAMPercentage=50 @@ -94,7 +94,7 @@ services: shared-file-store: condition: service_healthy transform-core-aio: - image: alfresco/alfresco-transform-core-aio:3.1.2 + image: alfresco/alfresco-transform-core-aio:5.1.5 mem_limit: 1536m environment: JAVA_OPTS: >- @@ -117,7 +117,7 @@ services: shared-file-store: condition: service_healthy shared-file-store: - image: quay.io/alfresco/alfresco-shared-file-store:2.1.2 + image: quay.io/alfresco/alfresco-shared-file-store:4.1.5 mem_limit: 512m environment: JAVA_OPTS: >- diff --git a/docker-compose/7.4.N-compose.yaml b/docker-compose/7.4.N-compose.yaml index c49d6cf32..27da8b384 100644 --- a/docker-compose/7.4.N-compose.yaml +++ b/docker-compose/7.4.N-compose.yaml @@ -15,7 +15,7 @@ # services: alfresco: - image: quay.io/alfresco/alfresco-content-repository:7.4.2.3 + image: quay.io/alfresco/alfresco-content-repository:7.4.2.4 mem_limit: 1900m environment: JAVA_TOOL_OPTIONS: >- @@ -136,7 +136,7 @@ services: volumes: - shared-file-store-volume:/tmp/Alfresco/sfs share: - image: quay.io/alfresco/alfresco-share:7.4.2.3 + image: quay.io/alfresco/alfresco-share:7.4.2.4 mem_limit: 1g environment: CSRF_FILTER_ORIGIN: http://localhost:8080 diff --git a/docker-compose/pre-release-compose.yaml b/docker-compose/pre-release-compose.yaml index 69e055be7..6bf729e67 100644 --- a/docker-compose/pre-release-compose.yaml +++ b/docker-compose/pre-release-compose.yaml @@ -15,7 +15,7 @@ # services: alfresco: - image: quay.io/alfresco/alfresco-content-repository:25.1.0-A.1 + image: quay.io/alfresco/alfresco-content-repository:23.4.0-A9 mem_limit: 1900m environment: JAVA_TOOL_OPTIONS: >- @@ -134,7 +134,7 @@ services: volumes: - shared-file-store-volume:/tmp/Alfresco/sfs share: - image: quay.io/alfresco/alfresco-share:25.1.0-A.1 + image: quay.io/alfresco/alfresco-share:23.4.0-A9 mem_limit: 1g environment: CSRF_FILTER_ORIGIN: http://localhost:8080 @@ -276,7 +276,7 @@ services: retries: 5 start_period: 5s digital-workspace: - image: quay.io/alfresco/alfresco-digital-workspace:5.3.0-12081248559 + image: quay.io/alfresco/alfresco-digital-workspace:5.3.0-12234180624 mem_limit: 128m environment: APP_CONFIG_PROVIDER: "ECM" @@ -320,7 +320,7 @@ services: elasticsearch: condition: service_healthy control-center: - image: quay.io/alfresco/alfresco-control-center:9.3.0-12081248559 + image: quay.io/alfresco/alfresco-control-center:9.3.0-12234180624 mem_limit: 128m environment: APP_CONFIG_PROVIDER: "ECM" diff --git a/helm/alfresco-content-services/7.2.N_values.yaml b/helm/alfresco-content-services/7.2.N_values.yaml index dad0135c3..0e03897b9 100644 --- a/helm/alfresco-content-services/7.2.N_values.yaml +++ b/helm/alfresco-content-services/7.2.N_values.yaml @@ -16,25 +16,25 @@ alfresco-ai-transformer: alfresco-transform-service: transformrouter: image: - tag: 2.1.2 + tag: 4.1.5 pdfrenderer: image: - tag: 3.1.2 + tag: 5.1.5 imagemagick: image: - tag: 3.1.2 + tag: 5.1.5 libreoffice: image: - tag: 3.1.2 + tag: 5.1.5 tika: image: - tag: 3.1.2 + tag: 5.1.5 transformmisc: image: - tag: 3.1.2 + tag: 5.1.5 filestore: image: - tag: 2.1.2 + tag: 4.1.5 share: image: tag: 7.2.2.5 @@ -81,10 +81,10 @@ alfresco-sync-service: tag: 3.11.3 alfresco-connector-ms365: image: - tag: 1.1.3.2 + tag: 2.0.4 alfresco-connector-msteams: image: - tag: 1.1.0 + tag: 2.0.4 elasticsearch-audit: enabled: false kibana-audit: diff --git a/helm/alfresco-content-services/7.3.N_values.yaml b/helm/alfresco-content-services/7.3.N_values.yaml index 508fe0d19..d08ca341e 100644 --- a/helm/alfresco-content-services/7.3.N_values.yaml +++ b/helm/alfresco-content-services/7.3.N_values.yaml @@ -19,25 +19,25 @@ share: alfresco-transform-service: transformrouter: image: - tag: 2.1.2 + tag: 4.1.5 pdfrenderer: image: - tag: 3.1.2 + tag: 5.1.5 imagemagick: image: - tag: 3.1.2 + tag: 5.1.5 libreoffice: image: - tag: 3.1.2 + tag: 5.1.5 tika: image: - tag: 3.1.2 + tag: 5.1.5 transformmisc: image: - tag: 3.1.2 + tag: 5.1.5 filestore: image: - tag: 2.1.2 + tag: 4.1.5 alfresco-search: enabled: true searchServicesImage: @@ -81,10 +81,10 @@ alfresco-sync-service: tag: 3.11.3 alfresco-connector-ms365: image: - tag: 1.1.3.2 + tag: 2.0.4 alfresco-connector-msteams: image: - tag: 1.1.0 + tag: 2.0.4 elasticsearch-audit: enabled: false kibana-audit: diff --git a/helm/alfresco-content-services/7.4.N_values.yaml b/helm/alfresco-content-services/7.4.N_values.yaml index df6d9e95d..32052f6d9 100644 --- a/helm/alfresco-content-services/7.4.N_values.yaml +++ b/helm/alfresco-content-services/7.4.N_values.yaml @@ -2,7 +2,7 @@ # the chart alfresco-repository: image: - tag: 7.4.2.3 + tag: 7.4.2.4 configuration: search: flavor: solr6 @@ -37,7 +37,7 @@ alfresco-ai-transformer: tag: 3.1.7 share: image: - tag: 7.4.2.3 + tag: 7.4.2.4 alfresco-search: enabled: true searchServicesImage: diff --git a/helm/alfresco-content-services/pre-release_values.yaml b/helm/alfresco-content-services/pre-release_values.yaml index 45d8daea4..544d32818 100644 --- a/helm/alfresco-content-services/pre-release_values.yaml +++ b/helm/alfresco-content-services/pre-release_values.yaml @@ -2,7 +2,7 @@ # the chart alfresco-repository: image: - tag: 25.1.0-A.1 + tag: 23.4.0-A9 activemq: image: repository: quay.io/alfresco/alfresco-activemq @@ -34,7 +34,7 @@ alfresco-ai-transformer: tag: 3.1.7 share: image: - tag: 25.1.0-A.1 + tag: 23.4.0-A9 alfresco-search: searchServicesImage: tag: 2.1.0-A9 @@ -59,10 +59,10 @@ alfresco-search-enterprise: tag: 4.3.0-A.1 alfresco-digital-workspace: image: - tag: 5.3.0-12081248559 + tag: 5.3.0-12234180624 alfresco-control-center: image: - tag: 9.3.0-12081248559 + tag: 9.3.0-12234180624 postgresql: image: tag: 14.4.0 From 2d87c7857eb0f5dca424de79b12533d8e92195a1 Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Thu, 12 Dec 2024 16:34:09 +0100 Subject: [PATCH 3/5] change merging strategy to build the full matrix of targets --- .github/workflows/bumpVersions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bumpVersions.yml b/.github/workflows/bumpVersions.yml index 94ffe32aa..cb738219b 100644 --- a/.github/workflows/bumpVersions.yml +++ b/.github/workflows/bumpVersions.yml @@ -98,7 +98,7 @@ jobs: for i in {docker-compose,helm/*}/updatecli-matrix-targets.yaml; do TARGET=$(basename $(dirname $i)) echo -e "\n###### Building UpdateCli manifest for ${TARGET}\n" - yq '. *? load("alfresco-updatecli/deployments/values/supported-matrix.yaml") | explode(.)' ${i} | tee ./${TARGET}_merged.yaml + yq 'explode(.) *? (load("alfresco-updatecli/deployments/values/supported-matrix.yaml")|explode(.))' ${i} | tee ./${TARGET}_merged.yaml updatecli apply -c alfresco-updatecli/deployments/uber-manifest.tpl -v ./${TARGET}_merged.yaml done env: From cd5b30a5ca918bc67304f8d736210e4c6a39cc1d Mon Sep 17 00:00:00 2001 From: Alexandre Chapellon Date: Fri, 13 Dec 2024 12:54:34 +0100 Subject: [PATCH 4/5] add versionFilterKind to acs & share for proper merging --- docker-compose/updatecli-matrix-targets.yaml | 2 ++ helm/alfresco-content-services/updatecli-matrix-targets.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/docker-compose/updatecli-matrix-targets.yaml b/docker-compose/updatecli-matrix-targets.yaml index 1b1f6ed09..6a957cd99 100644 --- a/docker-compose/updatecli-matrix-targets.yaml +++ b/docker-compose/updatecli-matrix-targets.yaml @@ -7,6 +7,7 @@ matrix: id: next acs: version: + versionFilterKind: pattern: image: compose_target: &composeNext >- @@ -18,6 +19,7 @@ matrix: image: share: version: + versionFilterKind: pattern: image: compose_target: *composeNext diff --git a/helm/alfresco-content-services/updatecli-matrix-targets.yaml b/helm/alfresco-content-services/updatecli-matrix-targets.yaml index c2378ea05..3d1a1b0eb 100644 --- a/helm/alfresco-content-services/updatecli-matrix-targets.yaml +++ b/helm/alfresco-content-services/updatecli-matrix-targets.yaml @@ -7,6 +7,7 @@ matrix: id: next acs: version: + versionFilterKind: pattern: image: helm_target: &helmvaluesNext >- @@ -20,6 +21,7 @@ matrix: helm_key: $.activemq.image.tag share: version: + versionFilterKind: pattern: image: helm_target: *helmvaluesNext From 0af1ec93c6dd42912563a5f57a84990d5cccf176 Mon Sep 17 00:00:00 2001 From: alxgomz Date: Fri, 13 Dec 2024 12:45:22 +0000 Subject: [PATCH 5/5] =?UTF-8?q?=F0=9F=9B=A0=20Updatecli=20pipeline=20value?= =?UTF-8?q?s=20bump?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose/pre-release-compose.yaml | 10 +++++----- helm/alfresco-content-services/pre-release_values.yaml | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docker-compose/pre-release-compose.yaml b/docker-compose/pre-release-compose.yaml index 6bf729e67..8d5da672d 100644 --- a/docker-compose/pre-release-compose.yaml +++ b/docker-compose/pre-release-compose.yaml @@ -15,7 +15,7 @@ # services: alfresco: - image: quay.io/alfresco/alfresco-content-repository:23.4.0-A9 + image: quay.io/alfresco/alfresco-content-repository:25.1.0-A.3 mem_limit: 1900m environment: JAVA_TOOL_OPTIONS: >- @@ -134,7 +134,7 @@ services: volumes: - shared-file-store-volume:/tmp/Alfresco/sfs share: - image: quay.io/alfresco/alfresco-share:23.4.0-A9 + image: quay.io/alfresco/alfresco-share:25.1.0-A.3 mem_limit: 1g environment: CSRF_FILTER_ORIGIN: http://localhost:8080 @@ -276,7 +276,7 @@ services: retries: 5 start_period: 5s digital-workspace: - image: quay.io/alfresco/alfresco-digital-workspace:5.3.0-12234180624 + image: quay.io/alfresco/alfresco-digital-workspace:5.3.0-12312682746 mem_limit: 128m environment: APP_CONFIG_PROVIDER: "ECM" @@ -320,7 +320,7 @@ services: elasticsearch: condition: service_healthy control-center: - image: quay.io/alfresco/alfresco-control-center:9.3.0-12234180624 + image: quay.io/alfresco/alfresco-control-center:9.3.0-12312682746 mem_limit: 128m environment: APP_CONFIG_PROVIDER: "ECM" @@ -366,7 +366,7 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock:ro sync-service: - image: quay.io/alfresco/service-sync:5.1.0-A9 + image: quay.io/alfresco/service-sync:5.2.0-A1 mem_limit: 1g environment: JAVA_OPTS: >- diff --git a/helm/alfresco-content-services/pre-release_values.yaml b/helm/alfresco-content-services/pre-release_values.yaml index 544d32818..0982cdc19 100644 --- a/helm/alfresco-content-services/pre-release_values.yaml +++ b/helm/alfresco-content-services/pre-release_values.yaml @@ -2,7 +2,7 @@ # the chart alfresco-repository: image: - tag: 23.4.0-A9 + tag: 25.1.0-A.3 activemq: image: repository: quay.io/alfresco/alfresco-activemq @@ -34,7 +34,7 @@ alfresco-ai-transformer: tag: 3.1.7 share: image: - tag: 23.4.0-A9 + tag: 25.1.0-A.3 alfresco-search: searchServicesImage: tag: 2.1.0-A9 @@ -59,10 +59,10 @@ alfresco-search-enterprise: tag: 4.3.0-A.1 alfresco-digital-workspace: image: - tag: 5.3.0-12234180624 + tag: 5.3.0-12312682746 alfresco-control-center: image: - tag: 9.3.0-12234180624 + tag: 9.3.0-12312682746 postgresql: image: tag: 14.4.0 @@ -71,7 +71,7 @@ postgresql-syncservice: tag: 14.4.0 alfresco-sync-service: image: - tag: 5.1.0-A9 + tag: 5.2.0-A1 alfresco-connector-ms365: image: tag: 2.0.4-A4