OPSEXP-1348: [release] acs-deployment 5.2.0 (#687)

* bump all components versions in charts and compose * fix docker-compose community file * remove unnecessary capture groups * block all share proxy endpoint (as per REPO-3596) * improve rendering * fix templating in case host is mentionned in values * remove quay.io images from community
Alfresco · Apr 7, 2022 · 43e1795 · 43e1795
1 parent f24595f
commit 43e1795
Show file tree

Hide file tree

Showing 14 changed files with 50 additions and 45 deletions.
diff --git a/docker-compose/6.2.N-docker-compose.yml b/docker-compose/6.2.N-docker-compose.yml
@@ -12,7 +12,7 @@ version: "2"
 
 services:
   alfresco:
-    image: quay.io/alfresco/alfresco-content-repository:6.2.2
+    image: quay.io/alfresco/alfresco-content-repository:6.2.2.22
     mem_limit: 1700m
     environment:
       JAVA_OPTS: "
@@ -84,7 +84,7 @@ services:
       - shared-file-store-volume:/tmp/Alfresco/sfs
 
   share:
-    image: alfresco/alfresco-share:6.2.2
+    image: alfresco/alfresco-share:6.2.2.6
     mem_limit: 1g
     environment:
       REPO_HOST: "alfresco"
@@ -110,7 +110,7 @@ services:
       - "5432:5432"
 
   solr6:
-    image: alfresco/alfresco-search-services:1.4.3
+    image: alfresco/alfresco-search-services:1.4.3.4
     mem_limit: 2g
     environment:
       # Solr needs to know how to register itself with Alfresco

diff --git a/docker-compose/7.0.N-docker-compose.yml b/docker-compose/7.0.N-docker-compose.yml
@@ -12,7 +12,7 @@ version: "2"
 
 services:
   alfresco:
-    image: quay.io/alfresco/alfresco-content-repository:7.0.1
+    image: quay.io/alfresco/alfresco-content-repository:7.0.1.3
     mem_limit: 1700m
     environment:
       JAVA_TOOL_OPTIONS: "
@@ -89,7 +89,7 @@ services:
       - shared-file-store-volume:/tmp/Alfresco/sfs
 
   share:
-    image: quay.io/alfresco/alfresco-share:7.0.1
+    image: quay.io/alfresco/alfresco-share:7.0.1.3
     mem_limit: 1g
     environment:
       REPO_HOST: "alfresco"
@@ -115,7 +115,7 @@ services:
       - "5432:5432"
 
   solr6:
-    image: alfresco/alfresco-search-services:2.0.2
+    image: alfresco/alfresco-search-services:2.0.2.2
     mem_limit: 2g
     environment:
       # Solr needs to know how to register itself with Alfresco

diff --git a/docker-compose/7.1.N-docker-compose.yml b/docker-compose/7.1.N-docker-compose.yml
@@ -12,7 +12,7 @@ version: "2"
 
 services:
   alfresco:
-    image: quay.io/alfresco/alfresco-content-repository:7.1.1
+    image: quay.io/alfresco/alfresco-content-repository:7.1.1.2
     mem_limit: 1900m
     environment:
       JAVA_TOOL_OPTIONS: "
@@ -89,7 +89,7 @@ services:
       - shared-file-store-volume:/tmp/Alfresco/sfs
 
   share:
-    image: quay.io/alfresco/alfresco-share:7.1.1
+    image: quay.io/alfresco/alfresco-share:7.1.1.2
     mem_limit: 1g
     environment:
       REPO_HOST: "alfresco"
@@ -115,7 +115,7 @@ services:
       - "5432:5432"
 
   solr6:
-    image: alfresco/alfresco-search-services:2.0.2
+    image: alfresco/alfresco-search-services:2.0.2.2
     mem_limit: 2g
     environment:
       # Solr needs to know how to register itself with Alfresco
@@ -162,7 +162,7 @@ services:
       - share
 
   sync-service:
-    image: quay.io/alfresco/service-sync:3.4.0
+    image: quay.io/alfresco/service-sync:3.5.0
     mem_limit: 1g
     environment:
       JAVA_OPTS: "

diff --git a/docker-compose/community-docker-compose.yml b/docker-compose/community-docker-compose.yml
@@ -82,7 +82,7 @@ services:
       - "5432:5432"
 
   solr6:
-    image: quay.io/alfresco/search-services:2.1.0-SNAPSHOT
+    image: alfresco/alfresco-search-services:2.0.3
     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
@@ -146,7 +146,7 @@ services:
       - "61613:61613" # STOMP
 
   digital-workspace:
-    image: quay.io/alfresco/alfresco-digital-workspace:2.6.0
+    image: quay.io/alfresco/alfresco-digital-workspace:2.7.0
     mem_limit: 128m
     environment:
       APP_CONFIG_AUTH_TYPE: "BASIC"

diff --git a/helm/alfresco-content-services/6.2.N_values.yaml b/helm/alfresco-content-services/6.2.N_values.yaml
@@ -2,7 +2,7 @@
 
 repository:
   image:
-    tag: 6.2.2
+    tag: 6.2.2.22
   environment:
     JAVA_OPTS: "
           -Dsolr.base.url=/solr
@@ -21,23 +21,23 @@ transformrouter:
 
 pdfrenderer:
   image:
-    tag: 2.5.1
+    tag: 2.5.3
 
 imagemagick:
   image:
-    tag: 2.5.1
+    tag: 2.5.3
 
 libreoffice:
   image:
-    tag: 2.5.1
+    tag: 2.5.3
 
 tika:
   image:
-    tag: 2.5.1
+    tag: 2.5.3
 
 transformmisc:
   image:
-    tag: 2.5.1
+    tag: 2.5.3
 
 aiTransformer:
   image:
@@ -49,11 +49,11 @@ filestore:
 
 share:
   image:
-    tag: 6.2.2
+    tag: 6.2.2.6
 
 alfresco-search:
   searchServicesImage:
-    tag: 1.4.3
+    tag: 1.4.3.4
 
 alfresco-digital-workspace:
   image:

diff --git a/helm/alfresco-content-services/7.0.N_values.yaml b/helm/alfresco-content-services/7.0.N_values.yaml
@@ -2,31 +2,31 @@
 
 repository:
   image:
-    tag: 7.0.1
+    tag: 7.0.1.3
 
 transformrouter:
   image:
     tag: 1.4.1
 
 pdfrenderer:
   image:
-    tag: 2.5.1
+    tag: 2.5.3
 
 imagemagick:
   image:
-    tag: 2.5.1
+    tag: 2.5.3
 
 libreoffice:
   image:
-    tag: 2.5.1
+    tag: 2.5.3
 
 tika:
   image:
-    tag: 2.5.1
+    tag: 2.5.3
 
 transformmisc:
   image:
-    tag: 2.5.1
+    tag: 2.5.3
 
 aiTransformer:
   image:
@@ -38,11 +38,11 @@ filestore:
 
 share:
   image:
-    tag: 7.0.1
+    tag: 7.0.1.3
 
 alfresco-search:
   searchServicesImage:
-    tag: 2.0.2
+    tag: 2.0.2.2
 
 alfresco-digital-workspace:
   image:

diff --git a/helm/alfresco-content-services/7.1.N_values.yaml b/helm/alfresco-content-services/7.1.N_values.yaml
@@ -2,7 +2,7 @@
 
 repository:
   image:
-    tag: 7.1.1
+    tag: 7.1.1.2
 
 transformrouter:
   image:
@@ -38,16 +38,16 @@ filestore:
 
 share:
   image:
-    tag: 7.1.1
+    tag: 7.1.1.2
 
 alfresco-search:
   searchServicesImage:
-    tag: 2.0.2
+    tag: 2.0.2.2
 
 alfresco-sync-service:
   syncservice:
     image:
-      tag: 3.4.0
+      tag: 3.5.0
 
 global:
   tracking:

diff --git a/helm/alfresco-content-services/README.md b/helm/alfresco-content-services/README.md
@@ -64,7 +64,7 @@ Hence, setting up explicit Container memory and then assigning a percentage of i
 | alfresco-digital-workspace.extraEnv | string | `"{{- if .Values.global.ai.enabled }}\n- name: APP_CONFIG_PLUGIN_AI_SERVICE\n  value: '{{ .Values.global.ai.enabled }}'\n{{- end }}"` |  |
 | alfresco-digital-workspace.image.pullPolicy | string | `"IfNotPresent"` |  |
 | alfresco-digital-workspace.image.repository | string | `"quay.io/alfresco/alfresco-digital-workspace"` |  |
-| alfresco-digital-workspace.image.tag | string | `"2.6.0"` |  |
+| alfresco-digital-workspace.image.tag | string | `"2.7.0"` |  |
 | alfresco-digital-workspace.ingress.annotations."kubernetes.io/ingress.class" | string | `"nginx"` |  |
 | alfresco-digital-workspace.ingress.annotations."nginx.ingress.kubernetes.io/proxy-body-size" | string | `"5g"` |  |
 | alfresco-digital-workspace.ingress.path | string | `"/workspace"` |  |

diff --git a/helm/alfresco-content-services/community_values.yaml b/helm/alfresco-content-services/community_values.yaml
@@ -29,6 +29,10 @@ share:
   image:
     repository: alfresco/alfresco-share
 
+alfresco-search:
+  searchServicesImage:
+    repository: alfresco/alfresco-search-services
+
 # Disable features
 alfresco-digital-workspace:
   enabled: false

diff --git a/helm/alfresco-content-services/templates/_helpers-ingress.tpl b/helm/alfresco-content-services/templates/_helpers-ingress.tpl
@@ -23,7 +23,8 @@ Define required annotations for secure nginx ingress
 {{- else }}
     nginx.ingress.kubernetes.io/server-snippet: |
 {{- end }}
-      location ~ ^(/.*/(wc)?s(ervice)?/api/solr/.*)$ {return 403;}
-      location ~ ^(/.*/(-default-/)?proxy/.*/api/solr/.*)$ {return 403;}
-      location ~ ^(/.*/s/prometheus)$ {return 403;}
+      location ~ ^/.*/(wc)?s(ervice)?/api/solr/.*$ {return 403;}
+      location ~ ^/.*/proxy/.*/api/solr/.*$ {return 403;}
+      location ~ ^/.*/-default-/proxy/.*/api/.*$ {return 403;}
+      location ~ ^/.*/s/prometheus$ {return 403;}
 {{- end }}
diff --git a/helm/alfresco-content-services/templates/config-repository.yaml b/helm/alfresco-content-services/templates/config-repository.yaml
@@ -14,12 +14,12 @@ data:
   {{- end }}
   {{- end }}
   RELEASE_NAME: {{ .Release.Name }}
-  {{ $alfhost := tpl (.Values.externalHost | default (printf "%s-repository" (include "content-services.shortname" .))) $ }}
-  {{ $alfprotocol := tpl (.Values.externalProtocol | default "http") $ }}
-  {{ $alfport := tpl ((.Values.externalPort | default .Values.repository.service.externalPort) | toString) $ }}
+  {{- $alfhost := tpl (.Values.externalHost | default (printf "%s-repository" (include "content-services.shortname" .))) $ }}
+  {{- $alfprotocol := tpl (.Values.externalProtocol | default "http") $ }}
+  {{- $alfport := tpl ((.Values.externalPort | default .Values.repository.service.externalPort) | toString) $ }}
   ALFRESCO_OPTS: "
-      {{ if .Values.repository.licenseSecret -}}
-        -Ddir.license.external=/usr/local/tomcat/shared/classes/alfresco/extension/license/
+      {{- if .Values.repository.licenseSecret -}}
+      -Ddir.license.external=/usr/local/tomcat/shared/classes/alfresco/extension/license/
       {{- end }}
       -Dalfresco.host={{ $alfhost }}
       -Dalfresco.protocol={{ $alfprotocol }}

diff --git a/helm/alfresco-content-services/templates/ingress-share.yaml b/helm/alfresco-content-services/templates/ingress-share.yaml
@@ -32,12 +32,12 @@ spec:
   {{- end }}
   rules:
   - http: 
-  {{- if .Values.share.ingress.hostName }}
-    host: {{ tpl .Values.share.ingress.hostName . }}
-  {{- end }}
       paths:
       - path: {{ .Values.share.ingress.path }}
         {{- if eq "true" (include "common.ingress.supportsPathType" .) }}
         pathType: Prefix
         {{- end }}
         backend: {{- include "common.ingress.backend" (dict "serviceName" $serviceName "servicePort" $servicePort "context" $) | nindent 10 }}
+  {{- if .Values.share.ingress.hostName }}
+    host: {{ tpl .Values.share.ingress.hostName . }}
+  {{- end }}
diff --git a/helm/alfresco-content-services/values.yaml b/helm/alfresco-content-services/values.yaml
@@ -603,7 +603,7 @@ alfresco-digital-workspace:
     #      - chart-example.local
   image:
     repository: quay.io/alfresco/alfresco-digital-workspace
-    tag: 2.6.0
+    tag: 2.7.0
     pullPolicy: IfNotPresent
   env:
     APP_CONFIG_AUTH_TYPE: "BASIC"