new helm chart version updates

ministryofjustice · Dec 2, 2024 · 6964c0b · 6964c0b
1 parent d429e45
commit 6964c0b
Show file tree

Hide file tree

Showing 26 changed files with 800 additions and 138 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,5 @@ kustomize/base/resources.yaml
 jobs/reindex/values-reindex-*.yaml
 completed.txt
 ids.json
+alfresco-content-services/
+s3-config/
diff --git a/jobs/reindex-list/templates/reindexing-config.yaml b/jobs/reindex-list/templates/reindexing-config.yaml
@@ -5,7 +5,7 @@ metadata:
 data:
   ELASTICSEARCH_INDEXNAME: "{{ .Values.indexName }}"
   {{ template "alfresco-search-enterprise.config.spring" . }}
-  ALFRESCO_SHAREDFILESTORE_BASEURL: http://alfresco-content-services-alfresco-filestore:80/alfresco/api/-default-/private/sfs/versions/1/file/
+  ALFRESCO_SHAREDFILESTORE_BASEURL: https://alf-sfs.preprod.delius-core.hmpps-preproduction.modernisation-platform.service.justice.gov.uk/alfresco/api/-default-/private/sfs/versions/1/file/
   ALFRESCO_ACCEPTEDCONTENTMEDIATYPESCACHE_BASEURL: http://alfresco-content-services-alfresco-router/transform/config
   ALFRESCO_REINDEX_PATHINDEXINGENABLED: {{ .Values.pathIndexingEnabled | quote }}
   SPRING_DATASOURCE_URL: {{ .Values.postgresql.url }}

diff --git a/jobs/reindex/templates/reindexing-config.yaml b/jobs/reindex/templates/reindexing-config.yaml
@@ -5,7 +5,7 @@ metadata:
 data:
   ELASTICSEARCH_INDEXNAME: "{{ .Values.indexName }}"
   {{ template "alfresco-search-enterprise.config.spring" . }}
-  ALFRESCO_SHAREDFILESTORE_BASEURL: http://alfresco-content-services-alfresco-filestore:80/alfresco/api/-default-/private/sfs/versions/1/file/
+  ALFRESCO_SHAREDFILESTORE_BASEURL: https://alf-sfs.preprod.delius-core.hmpps-preproduction.modernisation-platform.service.justice.gov.uk/alfresco/api/-default-/private/sfs/versions/1/file/
   ALFRESCO_ACCEPTEDCONTENTMEDIATYPESCACHE_BASEURL: http://alfresco-content-services-alfresco-router/transform/config
   ALFRESCO_REINDEX_PATHINDEXINGENABLED: {{ .Values.pathIndexingEnabled | quote }}
   SPRING_DATASOURCE_URL: {{ .Values.postgresql.url }}

diff --git a/jobs/reindex_date/templates/reindexing-config.yaml b/jobs/reindex_date/templates/reindexing-config.yaml
@@ -5,7 +5,7 @@ metadata:
 data:
   ELASTICSEARCH_INDEXNAME: "{{ .Values.indexName }}"
   {{ template "alfresco-search-enterprise.config.spring" . }}
-  ALFRESCO_SHAREDFILESTORE_BASEURL: http://alfresco-content-services-alfresco-filestore:80/alfresco/api/-default-/private/sfs/versions/1/file/
+  ALFRESCO_SHAREDFILESTORE_BASEURL: https://alf-sfs.preprod.delius-core.hmpps-preproduction.modernisation-platform.service.justice.gov.uk/alfresco/api/-default-/private/sfs/versions/1/file/
   ALFRESCO_ACCEPTEDCONTENTMEDIATYPESCACHE_BASEURL: http://alfresco-content-services-alfresco-router/transform/config
   ALFRESCO_REINDEX_PATHINDEXINGENABLED: {{ .Values.pathIndexingEnabled | quote }}
   SPRING_DATASOURCE_URL: {{ .Values.postgresql.url }}

diff --git a/kustomize/base/kustomization.yaml b/kustomize/base/kustomization.yaml
@@ -7,10 +7,9 @@ resources:
 patches:
   - path: patch-ingress-repository.yaml
   - path: patch-ingress-share.yaml
-  - path: patch-delete-reindexing-config-map.yaml
-  - path: patch-live-path-indexing.yaml
-  - path: patch-live-metadata-indexing.yaml
-  - path: patch-live-content-indexing.yaml
-  - path: patch-live-mediation-indexing.yaml
-  - path: patch-shared-filestore.yaml
+  # - path: patch-delete-reindexing-config-map.yaml
+  # - path: patch-live-path-indexing.yaml
+  # - path: patch-live-metadata-indexing.yaml
+  # - path: patch-live-content-indexing.yaml
+  # - path: patch-live-mediation-indexing.yaml
   - path: patch-router.yaml
diff --git a/kustomize/base/patch-ingress-repository.yaml b/kustomize/base/patch-ingress-repository.yaml
@@ -1,7 +1,7 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: alfresco-content-services-alfresco-cs-repository
+  name:  alfresco-content-services-alfresco-repository
   annotations:
     external-dns.alpha.kubernetes.io/aws-weight: "100"
     kubernetes.io/ingress.class: default

diff --git a/kustomize/base/patch-ingress-share.yaml b/kustomize/base/patch-ingress-share.yaml
@@ -1,7 +1,7 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: alfresco-content-services-alfresco-cs-share
+  name: alfresco-content-services-share
   annotations:
     external-dns.alpha.kubernetes.io/aws-weight: "100"
     kubernetes.io/ingress.class: default

diff --git a/kustomize/base/patch-router.yaml b/kustomize/base/patch-router.yaml
@@ -1,12 +1,12 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: alfresco-content-services-alfresco-router
+  name:  alfresco-content-services-transform-router
 spec:
   template:
     spec:
       containers:
-        - name: alfresco-content-services
+        - name: alfresco-transform-service
           env:
             - name: SPRING_ACTIVEMQ_POOL_ENABLED
               value: "true"

diff --git a/kustomize/base/patch-shared-filestore.yaml b/kustomize/base/patch-shared-filestore.yaml
diff --git a/kustomize/base/values-versions.yaml b/kustomize/base/values-versions.yaml
@@ -0,0 +1,80 @@
+# This values file can be used to install ACS 7.3.x using the latest version of
+# the chart
+alfresco-repository:
+  image:
+    repository: 754256621582.dkr.ecr.eu-west-2.amazonaws.com/hmpps-migration/alfresco-content-repository
+    tag: release_7.3.2_elasticsearch-r5.0.1-content-latest
+alfresco-ai-transformer:
+  image:
+    tag: 1.5.1
+share:
+  image:
+    repository: 754256621582.dkr.ecr.eu-west-2.amazonaws.com/hmpps-migration/alfresco-share
+    tag: release_7.3.2_elasticsearch-r5.0.1-share-latest
+alfresco-transform-service:
+  transformrouter:
+    image:
+      repository: quay.io/alfresco/alfresco-transform-router
+      tag: 2.1.1
+  pdfrenderer:
+    image:
+      tag: 3.1.1
+  imagemagick:
+    image:
+      tag: 3.1.1
+  libreoffice:
+    image:
+      tag: 3.1.1
+  tika:
+    image:
+      tag: 3.1.1
+  transformmisc:
+    image:
+      tag: 3.1.1
+  filestore:
+    image:
+      tag: 2.1.1
+alfresco-search:
+  searchServicesImage:
+    tag: 2.0.5.2
+  insightEngineImage:
+    tag: 2.0.5.2
+alfresco-search-enterprise:
+  enabled: false
+  liveIndexing:
+    mediation:
+      image:
+        tag: 3.2.0.2
+    content:
+      image:
+        tag: 3.2.0.2
+    metadata:
+      image:
+        tag: 3.2.0.2
+    path:
+      image:
+        tag: 3.2.0.2
+  reindexing:
+    image:
+      tag: 3.2.0.2
+alfresco-digital-workspace:
+  image:
+    tag: 3.1.1
+alfresco-control-center:
+  image:
+    tag: 7.9.0
+postgresql:
+  image:
+    tag: 14.4.0
+postgresql-syncservice:
+  image:
+    tag: 14.4.0
+alfresco-sync-service:
+  image:
+    tag: 3.11.1
+alfresco-connector-ms365:
+  image:
+    tag: 1.1.3.2
+alfresco-connector-msteams:
+  image:
+    tag: 1.1.0
diff --git a/kustomize/base/values.yaml b/kustomize/base/values.yaml
@@ -78,6 +78,7 @@ repository:
       -Dsystem.delete_not_exists.timeout_seconds=3600
       -Dfilecontentstore.subsystem.name=S3
       -Ds3.flatRoot=false
+      -Dsfs.url=https://alf-sfs.preprod.delius-core.hmpps-preproduction.modernisation-platform.service.justice.gov.uk
   securityContext:
     allowPrivilegeEscalation: false
     runAsNonRoot: true
@@ -564,74 +565,7 @@ aiTransformer:
 # -- Declares the alfresco-shared-file-store used by the content repository
 # and transform service
 filestore:
-  replicaCount: 1
-  nodeSelector: {}
-  image:
-    repository: ghcr.io/ministryofjustice/hmpps-delius-alfresco-shared-file-store
-    tag: 2.1.2-4
-    pullPolicy: IfNotPresent
-    internalPort: 8099
-  initContainer:
-    image:
-      repository: busybox
-      tag: 1.35.0
-      pullPolicy: IfNotPresent
-    resources:
-      limits:
-        cpu: "0.50"
-        memory: "10Mi"
-  service:
-    name: filestore
-    type: ClusterIP
-    externalPort: 80
-  securityContext:
-    allowPrivilegeEscalation: false
-    runAsNonRoot: true
-    capabilities:
-      drop:
-        - ALL
-    seccompProfile:
-      type: RuntimeDefault
-  podSecurityContext:
-    runAsUser: 33030
-    runAsGroup: 1000
-    fsGroup: 1000
-  resources:
-    requests:
-      cpu: "0.25"
-      memory: "200Mi"
-    limits:
-      cpu: "2"
-      memory: "2000Mi"
-  environment:
-    scheduler.content.age.millis: "86400000"
-    scheduler.cleanup.interval: "86400000"
-    JAVA_OPTS: >-
-      -XX:MinRAMPercentage=50
-      -XX:MaxRAMPercentage=80
-  readinessProbe:
-    initialDelaySeconds: 20
-    periodSeconds: 60
-    timeoutSeconds: 10
-  livenessProbe:
-    initialDelaySeconds: 10
-    periodSeconds: 20
-    timeoutSeconds: 10
-    livenessPercent: 150
-    livenessSavePeriodSeconds: 600
-  persistence:
-    # -- Persist filestore data
-    enabled: true
-    # -- Specify a storageClass for dynamic provisioning
-    accessModes:
-      - ReadWriteOnce
-    # -- Bind PVC based on storageClass (e.g. dynamic provisionning)
-    storageClass:
-    # -- Use pre-provisioned pv through its claim (e.g. static provisionning)
-    existingClaim: null
-    data:
-      mountPath: "/tmp/Alfresco"
-      subPath: "alfresco-content-services/filestore-data"
+  enabled: false
 # -- Define the alfresco-share properties to use in the k8s cluster
 # This is the default presentation layer(UI) of Alfresco Content Services
 share: