OPSEPX-2242: initial changes (#1009)

Alfresco · Sep 19, 2023 · 8951bc9 · 8951bc9
1 parent 93c7d12
commit 8951bc9
Show file tree

Hide file tree

Showing 40 changed files with 485 additions and 1,217 deletions.
diff --git a/.github/workflows/docker-compose-community.yml b/.github/workflows/docker-compose-community.yml
@@ -6,6 +6,7 @@ on:
     branches:
       - master
       - release/**
+      - next/**
     paths:
       - docker-compose/community-docker-compose.yml
       - test/postman/docker-compose/**

diff --git a/.github/workflows/docker-compose-enterprise.yml b/.github/workflows/docker-compose-enterprise.yml
@@ -6,6 +6,7 @@ on:
     branches:
       - master
       - release/**
+      - next/**
     paths:
       - "! docker-compose/community-docker-compose.yml"
       - docker-compose/**

diff --git a/.github/workflows/helm-community.yml b/.github/workflows/helm-community.yml
@@ -5,6 +5,7 @@ on:
     branches:
       - master
       - release/**
+      - next/**
     paths:
       - helm/**
       - test/postman/helm/**
@@ -35,7 +36,9 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Setup cluster
-        uses: Alfresco/alfresco-build-tools/.github/actions/[email protected]
+        uses: Alfresco/alfresco-build-tools/.github/actions/[email protected]
+        with:
+          ingress-nginx-ref: controller-v1.8.2
 
       - name: Create registries auth secret
         if: ${{ ! github.event.repository.fork }}
@@ -44,6 +47,11 @@ jobs:
           --from-file=.dockerconfigjson=$HOME/.docker/config.json \
           --type=kubernetes.io/dockerconfigjson
 
+      - name: Set nginx ingress config
+        run: |
+          kubectl -n ingress-nginx patch cm ingress-nginx-controller \
+          -p '{"data": {"allow-snippet-annotations":"true"}}'
+
       - name: Helm install
         run: |
           helm dep up ./helm/alfresco-content-services

diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml
@@ -5,6 +5,7 @@ on:
     branches:
       - master
       - release/**
+      - next/**
     paths:
       - helm/**
       - test/postman/helm/**
@@ -96,14 +97,21 @@ jobs:
           password: ${{ secrets.QUAY_PASSWORD }}
 
       - name: Setup cluster
-        uses: Alfresco/alfresco-build-tools/.github/actions/[email protected]
+        uses: Alfresco/alfresco-build-tools/.github/actions/[email protected]
+        with:
+          ingress-nginx-ref: controller-v1.8.2
 
       - name: Create registries auth secret
         run: |
           kubectl create secret generic regcred \
           --from-file=.dockerconfigjson=$HOME/.docker/config.json \
           --type=kubernetes.io/dockerconfigjson
 
+      - name: Set nginx ingress config
+        run: |
+          kubectl -n ingress-nginx patch cm ingress-nginx-controller \
+          -p '{"data": {"allow-snippet-annotations":"true"}}'
+
       - name: Helm install
         run: |
           helm dep up ./helm/alfresco-content-services

diff --git a/.github/workflows/helm-static-checks.yml b/.github/workflows/helm-static-checks.yml
@@ -5,6 +5,7 @@ on:
     branches:
       - master
       - release/**
+      - next/**
     paths:
       - helm/**
       - test/postman/helm/**

diff --git a/.github/workflows/pre-commit-compose.yml b/.github/workflows/pre-commit-compose.yml
@@ -6,6 +6,7 @@ on:
     branches:
       - master
       - release/**
+      - next/**
     paths:
       - docker-compose/**
       - .pre-commit-config.yaml

diff --git a/.github/workflows/pre-commit-helm.yml b/.github/workflows/pre-commit-helm.yml
@@ -6,6 +6,7 @@ on:
     branches:
       - master
       - release/**
+      - next/**
     paths:
       - helm/**
       - test/postman/helm/**

diff --git a/helm/alfresco-content-services/7.0.N_values.yaml b/helm/alfresco-content-services/7.0.N_values.yaml
@@ -1,6 +1,6 @@
 # This values file can be used to install ACS 7.0.x using the latest version of
 # the chart
-repository:
+alfresco-repository:
   image:
     tag: 7.0.1.10
 alfresco-ai-transformer:
@@ -32,6 +32,8 @@ share:
   image:
     tag: 7.0.1.3
 alfresco-search:
+  repository:
+    securecomms: none
   searchServicesImage:
     tag: 2.0.2.2
 alfresco-digital-workspace:

diff --git a/helm/alfresco-content-services/7.1.N_values.yaml b/helm/alfresco-content-services/7.1.N_values.yaml
@@ -1,6 +1,6 @@
 # This values file can be used to install ACS 7.1.x using the latest version of
 # the chart
-repository:
+alfresco-repository:
   image:
     tag: 7.1.1.8
 alfresco-ai-transformer:
@@ -32,6 +32,8 @@ share:
   image:
     tag: 7.1.1.8
 alfresco-search:
+  repository:
+    securecomms: none
   searchServicesImage:
     tag: 2.0.2.2
 alfresco-search-enterprise:

diff --git a/helm/alfresco-content-services/7.2.N_values.yaml b/helm/alfresco-content-services/7.2.N_values.yaml
@@ -1,6 +1,6 @@
 # This values file can be used to install ACS 7.2.x using the latest version of
 # the chart
-repository:
+alfresco-repository:
   image:
     tag: 7.2.1.12
 alfresco-ai-transformer:

diff --git a/helm/alfresco-content-services/7.3.N_values.yaml b/helm/alfresco-content-services/7.3.N_values.yaml
@@ -1,6 +1,6 @@
 # This values file can be used to install ACS 7.3.x using the latest version of
 # the chart
-repository:
+alfresco-repository:
   image:
     tag: 7.3.1
 alfresco-ai-transformer:

diff --git a/helm/alfresco-content-services/7.4.N_values.yaml b/helm/alfresco-content-services/7.4.N_values.yaml
@@ -1,6 +1,6 @@
 # This values file can be used to install ACS 7.4.x using the latest version of
 # the chart
-repository:
+alfresco-repository:
   image:
     tag: 7.4.1
 alfresco-transform-service:

diff --git a/helm/alfresco-content-services/Chart.lock b/helm/alfresco-content-services/Chart.lock
@@ -11,6 +11,9 @@ dependencies:
 - name: common
   repository: https://activiti.github.io/activiti-cloud-helm-charts
   version: 7.11.0
+- name: alfresco-repository
+  repository: https://alfresco.github.io/alfresco-helm-charts/
+  version: 0.1.0-alpha.8
 - name: activemq
   repository: https://alfresco.github.io/alfresco-helm-charts/
   version: 3.3.0
@@ -19,7 +22,7 @@ dependencies:
   version: 0.2.0
 - name: alfresco-search-service
   repository: https://alfresco.github.io/alfresco-helm-charts/
-  version: 1.3.0
+  version: 2.0.0-alpha.2
 - name: alfresco-sync-service
   repository: https://alfresco.github.io/alfresco-helm-charts/
   version: 4.3.0
@@ -38,5 +41,5 @@ dependencies:
 - name: alfresco-ai-transformer
   repository: https://alfresco.github.io/alfresco-helm-charts/
   version: 0.3.0
-digest: sha256:6ad76091912aee0b130d5eef18bb86666eedabe0eb708d2b964c47ef5afe4fb6
-generated: "2023-08-29T09:00:00.411365+02:00"
+digest: sha256:c7e9f04977366989ad65cce34d440772066efd76fe0a1998dd6a9c4ed37e8cc9
+generated: "2023-09-18T12:59:32.145111+02:00"
diff --git a/helm/alfresco-content-services/Chart.yaml b/helm/alfresco-content-services/Chart.yaml
@@ -35,6 +35,9 @@ dependencies:
     version: 7.11.0
     condition: >-
       alfresco-digital-workspace.enabled
+  - name: alfresco-repository
+    version: 0.1.0-alpha.8
+    repository: https://alfresco.github.io/alfresco-helm-charts/
   - name: activemq
     version: 3.3.0
     repository: https://alfresco.github.io/alfresco-helm-charts/
@@ -46,7 +49,7 @@ dependencies:
   - name: alfresco-search-service
     alias: alfresco-search
     repository: https://alfresco.github.io/alfresco-helm-charts/
-    version: 1.3.0
+    version: 2.0.0-alpha.2
     condition: alfresco-search.enabled
   - name: alfresco-sync-service
     repository: https://alfresco.github.io/alfresco-helm-charts/