OPSEXP-2462 Create new values file for pre-released versions and make…

… default values file only for released images (#1104)
Alfresco · Mar 1, 2024 · 1dfc056 · 1dfc056
1 parent 4db0437
commit 1dfc056
Show file tree

Hide file tree

Showing 7 changed files with 95 additions and 87 deletions.
diff --git 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.2.0-M1
+    image: quay.io/alfresco/alfresco-content-repository:23.1.1
     mem_limit: 1900m
     environment:
       JAVA_TOOL_OPTIONS: >-
@@ -107,7 +107,7 @@ services:
     volumes:
       - shared-file-store-volume:/tmp/Alfresco/sfs
   share:
-    image: quay.io/alfresco/alfresco-share:23.2.0-M1
+    image: quay.io/alfresco/alfresco-share:23.1.1
     mem_limit: 1g
     environment:
       REPO_HOST: "alfresco"
@@ -214,7 +214,7 @@ services:
       - share
       - control-center
   sync-service:
-    image: quay.io/alfresco/service-sync:5.0.0-M2
+    image: quay.io/alfresco/service-sync:4.0.1
     mem_limit: 1g
     environment:
       JAVA_OPTS: >-

diff --git a/docker-compose/23.N-docker-compose.yml → ...er-compose/pre-release-docker-compose.yml b/docker-compose/23.N-docker-compose.yml → ...er-compose/pre-release-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-A21
     mem_limit: 1900m
     environment:
       JAVA_TOOL_OPTIONS: >-
@@ -66,7 +66,7 @@ services:
       start_period: 1m
   transform-router:
     mem_limit: 512m
-    image: quay.io/alfresco/alfresco-transform-router:4.0.1
+    image: quay.io/alfresco/alfresco-transform-router:4.1.0
     environment:
       JAVA_OPTS: >-
         -XX:MinRAMPercentage=50
@@ -80,7 +80,7 @@ services:
     depends_on:
       - activemq
   transform-core-aio:
-    image: alfresco/alfresco-transform-core-aio:5.0.1
+    image: alfresco/alfresco-transform-core-aio:5.1.0
     mem_limit: 1536m
     environment:
       JAVA_OPTS: >-
@@ -94,7 +94,7 @@ services:
     depends_on:
       - activemq
   shared-file-store:
-    image: quay.io/alfresco/alfresco-shared-file-store:4.0.1
+    image: quay.io/alfresco/alfresco-shared-file-store:4.1.0
     mem_limit: 512m
     environment:
       JAVA_OPTS: >-
@@ -107,7 +107,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-A21
     mem_limit: 1g
     environment:
       REPO_HOST: "alfresco"
@@ -147,7 +147,8 @@ services:
       - 9200:9200
       - 9300:9300
   search:
-    image: quay.io/alfresco/alfresco-elasticsearch-live-indexing:4.0.0.1
+    image: quay.io/alfresco/alfresco-elasticsearch-live-indexing:4.0.1-A3
+    mem_limit: 1g
     depends_on:
       - elasticsearch
       - alfresco
@@ -159,7 +160,8 @@ services:
       SPRING_ACTIVEMQ_BROKERURL: nio://activemq:61616
       SPRING_ELASTICSEARCH_REST_URIS: http://elasticsearch:9200
   search-reindexing:
-    image: quay.io/alfresco/alfresco-elasticsearch-reindexing:4.0.0.1
+    image: quay.io/alfresco/alfresco-elasticsearch-reindexing:4.0.1-A3
+    mem_limit: 1g
     restart: on-failure:10
     environment:
       ALFRESCO_ACCEPTED_CONTENT_MEDIA_TYPES_CACHE_BASE_URL: >-
@@ -185,7 +187,7 @@ services:
       - "61616:61616" # OpenWire
       - "61613:61613" # STOMP
   digital-workspace:
-    image: quay.io/alfresco/alfresco-digital-workspace:4.3.0
+    image: quay.io/alfresco/alfresco-digital-workspace:4.4.0-8081773191
     mem_limit: 128m
     environment:
       APP_CONFIG_PROVIDER: "ECM"
@@ -195,7 +197,7 @@ services:
       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
+    image: quay.io/alfresco/alfresco-control-center:8.4.0-8081773191
     mem_limit: 128m
     environment:
       APP_CONFIG_PROVIDER: "ECM"
@@ -204,15 +206,15 @@ services:
   proxy:
     image: alfresco/alfresco-acs-nginx:3.4.2
     mem_limit: 128m
+    ports:
+      - "8080:8080"
     depends_on:
-      - alfresco
       - digital-workspace
-      - control-center
+      - alfresco
       - share
-    ports:
-      - "8080:8080"
+      - 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/helm/alfresco-content-services/Chart.yaml b/helm/alfresco-content-services/Chart.yaml
@@ -5,7 +5,7 @@
 apiVersion: v2
 name: alfresco-content-services
 version: 8.0.0-M.1
-appVersion: 23.2.0-M1
+appVersion: 23.1.1
 description: A Helm chart for deploying Alfresco Content Services
 keywords:
   - content

diff --git a/helm/alfresco-content-services/README.md b/helm/alfresco-content-services/README.md
@@ -1,6 +1,6 @@
 # alfresco-content-services
 
-![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)
+![Version: 8.0.0-M.1](https://img.shields.io/badge/Version-8.0.0--M.1-informational?style=flat-square) ![AppVersion: 23.1.1](https://img.shields.io/badge/AppVersion-23.1.1-informational?style=flat-square)
 
 A Helm chart for deploying Alfresco Content Services
 
@@ -125,7 +125,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 | `"elasticsearch"` |  |
 | alfresco-repository.image.repository | string | `"quay.io/alfresco/alfresco-content-repository"` |  |
-| alfresco-repository.image.tag | string | `"23.2.0-M1"` |  |
+| alfresco-repository.image.tag | string | `"23.1.1"` |  |
 | alfresco-repository.nameOverride | string | `"alfresco-repository"` |  |
 | alfresco-repository.persistence.accessModes | list | `["ReadWriteMany"]` | Specify a storageClass for dynamic provisioning |
 | alfresco-repository.persistence.baseSize | string | `"20Gi"` |  |
@@ -167,7 +167,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | 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 | `"5.0.0-M2"` |  |
+| alfresco-sync-service.image.tag | string | `"4.0.1"` |  |
 | alfresco-sync-service.messageBroker.existingConfigMap.name | string | `"alfresco-infrastructure"` |  |
 | alfresco-sync-service.messageBroker.existingSecret.name | string | `"acs-alfresco-cs-brokersecret"` |  |
 | alfresco-sync-service.replicaCount | int | `1` |  |
@@ -220,7 +220,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | database.sync.user | string | `nil` | External Postgresql database user |
 | database.url | string | `nil` | External Postgresql jdbc url ex: `jdbc:postgresql://oldfashioned-mule-postgresql-acs:5432/alfresco` |
 | database.user | string | `nil` | External Postgresql database user |
-| dtas.additionalArgs | list | `[]` |  |
+| dtas.additionalArgs[0] | string | `"--tb=short"` |  |
 | dtas.config.assertions.acs.edition | string | `"Enterprise"` |  |
 | dtas.config.assertions.acs.identity | bool | `false` |  |
 | dtas.config.assertions.acs.modules[0].id | string | `"org.alfresco.integrations.google.docs"` |  |
@@ -229,7 +229,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | dtas.config.assertions.acs.modules[1].id | string | `"alfresco-aos-module"` |  |
 | dtas.config.assertions.acs.modules[1].installed | bool | `true` |  |
 | dtas.config.assertions.acs.modules[1].version | string | `"2.0.0"` |  |
-| dtas.config.assertions.acs.version | string | `"23.2.0"` |  |
+| dtas.config.assertions.acs.version | string | `"23.1.1"` |  |
 | dtas.config.assertions.adw.base_path | string | `"/workspace"` |  |
 | dtas.config.config.host | string | `"http://ingress-nginx-controller.ingress-nginx.svc.cluster.local"` |  |
 | dtas.config.config.password | string | `"admin"` |  |
@@ -294,7 +294,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.2.0-M1"` |  |
+| share.image.tag | string | `"23.1.1"` |  |
 | 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/...lfresco-content-services/23.N_values.yaml → ...-content-services/pre-release_values.yaml b/...lfresco-content-services/23.N_values.yaml → ...-content-services/pre-release_values.yaml
@@ -1,68 +1,68 @@
-# This values file can be used to install ACS 23.x using the latest version of
+# This values file can be used to install ACS with pre released images using the latest version of
 # the chart
 alfresco-repository:
   image:
-    tag: 23.1.1
+    tag: 23.2.0-A21
 activemq:
   image:
     repository: quay.io/alfresco/alfresco-activemq
     tag: 5.18.3-jre17-rockylinux8
 alfresco-transform-service:
   transformrouter:
     image:
-      tag: 4.0.1
+      tag: 4.1.0
   pdfrenderer:
     image:
-      tag: 5.0.1
+      tag: 5.1.0
   imagemagick:
     image:
-      tag: 5.0.1
+      tag: 5.1.0
   libreoffice:
     image:
-      tag: 5.0.1
+      tag: 5.1.0
   tika:
     image:
-      tag: 5.0.1
+      tag: 5.1.0
   transformmisc:
     image:
-      tag: 5.0.1
+      tag: 5.1.0
   filestore:
     image:
-      tag: 4.0.1
+      tag: 4.1.0
 alfresco-ai-transformer:
   image:
-    tag: 3.0.1
+    tag: 3.1.1-A1
 share:
   image:
-    tag: 23.1.1
+    tag: 23.2.0-A21
 alfresco-search:
   searchServicesImage:
-    tag: 2.0.9
+    tag: 2.0.9.1
   insightEngineImage:
-    tag: 2.0.9
+    tag: 2.0.9.1
 alfresco-search-enterprise:
   liveIndexing:
     mediation:
       image:
-        tag: 4.0.0.1
+        tag: 4.0.1-A3
     content:
       image:
-        tag: 4.0.0.1
+        tag: 4.0.1-A3
     metadata:
       image:
-        tag: 4.0.0.1
+        tag: 4.0.1-A3
     path:
       image:
-        tag: 4.0.0.1
+        tag: 4.0.1-A3
   reindexing:
     image:
-      tag: 4.0.0.1
+      tag: 4.0.1-A3
 alfresco-digital-workspace:
   image:
-    tag: 4.3.0
+    tag: 4.4.0-8081773191
 alfresco-control-center:
   image:
-    tag: 8.3.0
+    tag: 8.4.0-8081773191
 postgresql:
   image:
     tag: 14.4.0
@@ -71,7 +71,7 @@ postgresql-syncservice:
     tag: 14.4.0
 alfresco-sync-service:
   image:
-    tag: 4.0.1
+    tag: 5.0.0-A14
 alfresco-connector-ms365:
   image:
     tag: 2.0.0
@@ -82,4 +82,8 @@ dtas:
   config:
     assertions:
       acs:
-        version: 23.1.1
+        version: 23.2.0
+        modules:
+        - id: org.alfresco.integrations.google.docs
+          version: 4.1.0-A2
+          installed: true
diff --git a/helm/alfresco-content-services/values.yaml b/helm/alfresco-content-services/values.yaml
@@ -117,7 +117,7 @@ alfresco-repository:
   nameOverride: alfresco-repository
   image:
     repository: quay.io/alfresco/alfresco-content-repository
-    tag: 23.2.0-M1
+    tag: 23.1.1
   configuration:
     repository:
       existingConfigMap: *repository_cmName
@@ -263,7 +263,7 @@ share:
   enabled: true
   image:
     repository: quay.io/alfresco/alfresco-share
-    tag: 23.2.0-M1
+    tag: 23.1.1
   nameOverride: share
   repository:
     existingConfigMap:
@@ -480,7 +480,7 @@ alfresco-sync-service:
   enabled: true
   replicaCount: 1
   image:
-    tag: 5.0.0-M2
+    tag: 4.0.1
   database:
     existingSecret:
       name: *sync_database_secretName
@@ -554,15 +554,15 @@ elasticsearch:
   enabled: true
   replicas: 1
   clusterHealthCheckParams: "wait_for_status=yellow&timeout=1s"
-
 dtas:
   # -- Enables the deployment test suite which can run via `helm test` (currently available for Enterprise only)
   enabled: false
   image:
     repository: quay.io/alfresco/alfresco-deployment-test-automation-scripts
     tag: v1.5.1
     pullPolicy: IfNotPresent
-  additionalArgs: []
+  additionalArgs:
+    - --tb=short
   config:
     config:
       host: http://ingress-nginx-controller.ingress-nginx.svc.cluster.local
@@ -571,7 +571,7 @@ dtas:
     assertions:
       acs:
         edition: Enterprise
-        version: 23.2.0
+        version: 23.1.1
         identity: false
         modules:
         - id: org.alfresco.integrations.google.docs