From 5594d1c87f6187805a018c3b42d9fc183fcc027a Mon Sep 17 00:00:00 2001 From: Ayman Harake Date: Tue, 18 Aug 2020 10:54:17 +0100 Subject: [PATCH 1/2] ACS-469: Updated component versions --- README.md | 6 +++--- aws/scripts/helmDeploy.sh | 2 +- docker/repository/Dockerfile | 2 +- docker/repository/build.properties | 2 +- docker/share/Dockerfile | 2 +- docker/share/build.properties | 2 +- helm/alfresco-dbp/requirements.yaml | 8 ++++---- helm/alfresco-dbp/templates/pvc.yaml | 18 ------------------ helm/alfresco-dbp/values.yaml | 4 ++-- 9 files changed, 14 insertions(+), 32 deletions(-) delete mode 100644 helm/alfresco-dbp/templates/pvc.yaml diff --git a/README.md b/README.md index 99376f1..0838b2d 100644 --- a/README.md +++ b/README.md @@ -7,15 +7,15 @@ This deployment comprises: ##### Core products - Alfresco Process Services 1.10 - Alfresco Process Services Admin 1.10 -- Alfresco Content Repository 6.2.1-RC4 -- Alfresco Content Share 6.2.1-RC1 +- Alfresco Content Repository 7.0.0-A3 +- Alfresco Content Share 7.0.0-A3 - Alfresco Governance Services 3.3.0 - Alfresco Digital Workspace 1.3.0 - Alfresco Process Workspace 1.3.4 - Alfresco Sync Service 3.1.2 ##### Shared Services -- Alfresco Identity Management Service 1.2.0 +- Alfresco Identity Management Service 1.3.0 - Alfresco Shared File Store 0.5.3 - Alfresco Tika 2.0.17 - Alfresco LibreOffice 2.0.17 diff --git a/aws/scripts/helmDeploy.sh b/aws/scripts/helmDeploy.sh index 13c0ba0..1020ce5 100755 --- a/aws/scripts/helmDeploy.sh +++ b/aws/scripts/helmDeploy.sh @@ -173,7 +173,7 @@ alfresco-content-services: repository: image: repository: \"alfresco/alfresco-content-repository-aws\" - tag: \"6.1.0-EA3\" + tag: \"7.0.0-A3\" replicaCount: $REPO_PODS adminPassword: \"$ALFRESCO_PASSWORD\" environment: diff --git a/docker/repository/Dockerfile b/docker/repository/Dockerfile index d3563d5..ee41c6a 100644 --- a/docker/repository/Dockerfile +++ b/docker/repository/Dockerfile @@ -1,4 +1,4 @@ -FROM alfresco/alfresco-content-repository:6.2.2-RC2 +FROM alfresco/alfresco-content-repository:7.0.0-A3 ARG GROUPNAME=Alfresco ARG USERNAME=alfresco diff --git a/docker/repository/build.properties b/docker/repository/build.properties index d4655e7..dd47bed 100644 --- a/docker/repository/build.properties +++ b/docker/repository/build.properties @@ -1,2 +1,2 @@ DOCKER_IMAGE_NAME=alfresco-dbp-repository -DOCKER_IMAGE_TAG=6.2.2-RC2 +DOCKER_IMAGE_TAG=7.0.0-A3 diff --git a/docker/share/Dockerfile b/docker/share/Dockerfile index f5a35dc..7037fc1 100644 --- a/docker/share/Dockerfile +++ b/docker/share/Dockerfile @@ -1,4 +1,4 @@ -FROM alfresco/alfresco-share:6.2.2 +FROM alfresco/alfresco-share:7.0.0-A3 ARG TOMCAT_DIR=/usr/local/tomcat diff --git a/docker/share/build.properties b/docker/share/build.properties index bcf8f6c..aeae97c 100644 --- a/docker/share/build.properties +++ b/docker/share/build.properties @@ -1,2 +1,2 @@ DOCKER_IMAGE_NAME=alfresco-dbp-share -DOCKER_IMAGE_TAG=6.2.2 +DOCKER_IMAGE_TAG=7.0.0-A3 diff --git a/helm/alfresco-dbp/requirements.yaml b/helm/alfresco-dbp/requirements.yaml index bc749b9..10da34d 100644 --- a/helm/alfresco-dbp/requirements.yaml +++ b/helm/alfresco-dbp/requirements.yaml @@ -1,12 +1,12 @@ dependencies: - name: alfresco-content-services - version: 4.1.0 + version: 4.1.1 condition: alfresco-content-services.enabled repository: https://kubernetes-charts.alfresco.com/incubator - name: alfresco-process-services - version: 0.2.1 + version: 0.3.0 condition: alfresco-process-services.enabled - repository: https://kubernetes-charts.alfresco.com/stable + repository: https://kubernetes-charts.alfresco.com/incubator - name: activemq version: ^1.1.1 repository: https://kubernetes-charts.alfresco.com/stable @@ -14,7 +14,7 @@ dependencies: - name: alfresco-identity-service version: 2.1.0 condition: alfresco-identity-service.enabled - repository: https://kubernetes-charts.alfresco.com/incubator + repository: https://kubernetes-charts.alfresco.com/stable - name: nginx-ingress condition: nginx-ingress.enabled repository: https://kubernetes-charts.storage.googleapis.com/ diff --git a/helm/alfresco-dbp/templates/pvc.yaml b/helm/alfresco-dbp/templates/pvc.yaml deleted file mode 100644 index 1c61f3c..0000000 --- a/helm/alfresco-dbp/templates/pvc.yaml +++ /dev/null @@ -1,18 +0,0 @@ -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: alfresco-volume-claim -spec: - {{ if .Values.persistence.storageClass.enabled }} - accessModes: - {{- range .Values.persistence.storageClass.accessModes }} - - {{ . }} - {{- end }} - storageClassName: {{ .Values.persistence.storageClass.name }} - {{ else }} - accessModes: - - ReadWriteOnce - {{ end }} - resources: - requests: - storage: {{ .Values.persistence.baseSize | quote }} \ No newline at end of file diff --git a/helm/alfresco-dbp/values.yaml b/helm/alfresco-dbp/values.yaml index 9a973da..fa8fd1d 100644 --- a/helm/alfresco-dbp/values.yaml +++ b/helm/alfresco-dbp/values.yaml @@ -208,7 +208,7 @@ alfresco-content-services: share: image: repository: quay.io/alfresco/alfresco-dbp-share - tag: "6.2.2" + tag: "7.0.0-A3" environment: JAVA_OPTS: " -Daims.enabled=true -Daims.realm=alfresco @@ -218,7 +218,7 @@ alfresco-content-services: repository: image: repository: quay.io/alfresco/alfresco-dbp-repository - tag: "6.2.2-RC2" + tag: "7.0.0-A3" environment: # The IDENTITY_SERVICE_URI should contain the details of the ingress host and port. IDENTITY_SERVICE_URI: "https://alfresco-identity-service.REPLACEME/auth" From 661a5dc69876860d0f2ff61345512e764a054149 Mon Sep 17 00:00:00 2001 From: Ayman Harake Date: Tue, 18 Aug 2020 11:58:50 +0100 Subject: [PATCH 2/2] ACS-469: Downgraded alfresco-dbp-share and alfresco-dbp-repository as they were trying to pull images that do not exist yet --- docker/repository/build.properties | 2 +- docker/share/build.properties | 2 +- helm/alfresco-dbp/values.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/repository/build.properties b/docker/repository/build.properties index dd47bed..d4655e7 100644 --- a/docker/repository/build.properties +++ b/docker/repository/build.properties @@ -1,2 +1,2 @@ DOCKER_IMAGE_NAME=alfresco-dbp-repository -DOCKER_IMAGE_TAG=7.0.0-A3 +DOCKER_IMAGE_TAG=6.2.2-RC2 diff --git a/docker/share/build.properties b/docker/share/build.properties index aeae97c..bcf8f6c 100644 --- a/docker/share/build.properties +++ b/docker/share/build.properties @@ -1,2 +1,2 @@ DOCKER_IMAGE_NAME=alfresco-dbp-share -DOCKER_IMAGE_TAG=7.0.0-A3 +DOCKER_IMAGE_TAG=6.2.2 diff --git a/helm/alfresco-dbp/values.yaml b/helm/alfresco-dbp/values.yaml index fa8fd1d..9a973da 100644 --- a/helm/alfresco-dbp/values.yaml +++ b/helm/alfresco-dbp/values.yaml @@ -208,7 +208,7 @@ alfresco-content-services: share: image: repository: quay.io/alfresco/alfresco-dbp-share - tag: "7.0.0-A3" + tag: "6.2.2" environment: JAVA_OPTS: " -Daims.enabled=true -Daims.realm=alfresco @@ -218,7 +218,7 @@ alfresco-content-services: repository: image: repository: quay.io/alfresco/alfresco-dbp-repository - tag: "7.0.0-A3" + tag: "6.2.2-RC2" environment: # The IDENTITY_SERVICE_URI should contain the details of the ingress host and port. IDENTITY_SERVICE_URI: "https://alfresco-identity-service.REPLACEME/auth"