5.4.0 m3 nfs

.checkov/helm_vars.yaml

@@ -1,21 +1,24 @@
 ---
+# General rule here is to skip charts dependencies for checkov analysis
 alfresco-search:
   alfresco-insight-zeppelin:
     insightzeppelin:
       enabled: true
 global:
   tracking:
     sharedsecret: dummy
-alfresco-elasticsearch-connector:
+alfresco-search-enterprise:
   enabled: true
-# Do not render dependency charts for static analysis
+  elasticsearch:
+    enabled: false
 alfresco-digital-workspace:
   enabled: false
 alfresco-admin-app:
   enabled: false
 postgresql:
   enabled: false
-postgresql-syncservice:
-  enabled: false
+alfresco-sync-service:
+  postgresql:
+    enabled: false
 database:
   external: true

.github/workflows/docker-compose-community.yml

@@ -17,6 +17,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: >-
-          Alfresco/alfresco-build-tools/.github/actions/dbp-charts/verify-compose@v1.33.0
+          Alfresco/alfresco-build-tools/.github/actions/dbp-charts/verify-compose@v1.36.0
         with:
           compose_file_path: docker-compose/community-docker-compose.yml

.github/workflows/docker-compose-enterprise.yml

@@ -32,7 +32,7 @@ jobs:
       )
     steps:
       - uses: >-
-          Alfresco/alfresco-build-tools/.github/actions/dbp-charts/verify-compose@v1.33.0
+          Alfresco/alfresco-build-tools/.github/actions/dbp-charts/verify-compose@v1.36.0
         with:
           compose_file_path: docker-compose/${{ matrix.compose_file }}
           quay_username: ${{ secrets.QUAY_USERNAME }}

.github/workflows/helm-community.yml

@@ -17,12 +17,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Setup cluster
-        uses: Alfresco/alfresco-build-tools/.github/actions/[email protected]
-      - name: Use local dependencies
-        uses: ./.github/actions/use-local-deps
-        with:
-          charts-root: helm
-          chart-name: alfresco-content-services
+        uses: Alfresco/alfresco-build-tools/.github/actions/setup-kind@b93f01d21bfdf630dc850aedfdb17fdd43221fd8
       - name: Community local deployment
         run: |
           helm dep up ./helm/alfresco-content-services

.github/workflows/helm-enterprise.yml

@@ -80,13 +80,8 @@ jobs:
           echo "Release prefix to $SANITIZED_V"
           echo "app_version=$V" >> $GITHUB_OUTPUT
           echo "app_prefix=${SANITIZED_V}" >> $GITHUB_OUTPUT
-      - name: Use local dependencies
-        uses: ./.github/actions/use-local-deps
-        with:
-          charts-root: helm
-          chart-name: ${{ matrix.name }}
       - uses: >-
-          Alfresco/alfresco-build-tools/.github/actions/dbp-charts/verify-helm@v1.33.0
+          Alfresco/alfresco-build-tools/.github/actions/dbp-charts/verify-helm@v1.36.0
         with:
           skip_checkout: 'true'
           test_newman: 'true'

.github/workflows/helm-release.yml

@@ -42,7 +42,7 @@ jobs:
           fetch-depth: 0
       - name: Publish chart
         uses: >-
-          Alfresco/alfresco-build-tools/.github/actions/dbp-charts/publish-chart@v1.33.0
+          Alfresco/alfresco-build-tools/.github/actions/dbp-charts/publish-chart@v1.36.0
         with:
           chart_name: ${{ matrix.charts }}
           github_token: ${{ secrets.BOT_GITHUB_TOKEN }}

.github/workflows/helm-static-checks.yml

@@ -35,20 +35,16 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Use local dependencies
-        uses: ./.github/actions/use-local-deps
-        with:
-          charts-root: helm
-          chart-name: alfresco-content-services
       - uses: >-
-          Alfresco/alfresco-build-tools/.github/actions/helm-build-chart@v1.33.0
+          Alfresco/alfresco-build-tools/.github/actions/helm-build-chart@v1.36.0
         with:
           chart-dir: helm/${{ matrix.charts.name }}
       - uses: >-
-          Alfresco/alfresco-build-tools/.github/actions/helm-unit-tests@v1.33.0
+          Alfresco/alfresco-build-tools/.github/actions/helm-plugin@v1.36.0
         with:
-          chart-dir: helm/${{ matrix.charts.name }}
-          chart-type: ${{ matrix.charts.type }}
+          plugin_url: https://github.com/helm-unittest/helm-unittest
+      - run: |
+          helm unittest helm/${{ matrix.charts.name }}
   helm_yaml_lint:
     needs:
       - build_vars
@@ -58,17 +54,12 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Use local dependencies
-        uses: ./.github/actions/use-local-deps
-        with:
-          charts-root: helm
-          chart-name: alfresco-content-services
       - uses: >-
-          Alfresco/alfresco-build-tools/.github/actions/helm-build-chart@v1.33.0
+          Alfresco/alfresco-build-tools/.github/actions/helm-build-chart@v1.36.0
         with:
           chart-dir: helm/${{ matrix.charts.name }}
       - uses: >-
-          Alfresco/alfresco-build-tools/.github/actions/helm-template-yamllint@v1.33.0
+          Alfresco/alfresco-build-tools/.github/actions/helm-template-yamllint@v1.36.0
         with:
           chart-dir: helm/${{ matrix.charts.name }}
           helm-options: --values tests/values/test_values.yaml

.github/workflows/pre-commit-compose.yml

@@ -21,4 +21,4 @@ jobs:
     name: Run pre-commit
     runs-on: ubuntu-latest
     steps:
-      - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v1.36.0

.github/workflows/pre-commit-helm.yml

@@ -8,7 +8,7 @@ on:
     paths:
       - "helm/**"
       - "test/postman/helm/**"
-      - ".github/workflows/helm*"
+      - ".github/workflows/pre-commit-helm.yml"
       - "**.md"
       - ".pre-commit-config.yaml"
   push:
@@ -17,17 +17,13 @@ on:
 
 env:
   # https://pre-commit.com/#temporarily-disabling-hooks
-  SKIP: docker-compose-check,helm-docs
+  SKIP: docker-compose-check
 
 jobs:
   pre_commit:
     name: Run pre-commit
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Use local dependencies
-        uses: ./.github/actions/use-local-deps
-        with:
-          charts-root: helm
-          chart-name: alfresco-content-services
+      - uses: Alfresco/alfresco-build-tools/.github/actions/[email protected]
       - uses: pre-commit/[email protected]

.vscode/tasks.json

@@ -11,8 +11,21 @@
                 "isDefault": true
             },
             "options": {
-              "cwd": "helm/alfresco-content-services"
+                "cwd": "helm/alfresco-content-services"
+            }
+        },
+        {
+            "label": "helm install Default chart Local",
+            "type": "shell",
+            "command": "helm upgrade --install acs -f values.yaml -f 7.2.N_values.yaml -f local_values.yaml .",
+            "problemMatcher": [],
+            "group": {
+                "kind": "test",
+                "isDefault": true
+            },
+            "options": {
+                "cwd": "helm/alfresco-content-services"
             }
         }
     ]
-}
+}

README.md

@@ -46,6 +46,7 @@ The table below shows the exact version of ACS deployed with each chart version/
 | 5.3.0             | 7.3.0     |         | 7.2.1   | 7.1.1.5 | 7.0.1.3  | 7.3.0     |
 | 5.4.0-M1          | 7.4.0-M1  | 7.3.0.1 | 7.2.1.5 | 7.1.1.7 | 7.0.1.9  | 7.4.0-M1  |
 | 5.4.0-M2          | 7.4.0-M2  | 7.3.1   | 7.2.1.7 | 7.1.1.8 | 7.0.1.10 | 7.4.0-M2  |
+| 5.4.0-M3          | 7.4.0-M3  | 7.3.1   | 7.2.1.7 | 7.1.1.8 | 7.0.1.10 | 7.4.0-M3  |
 
 ### End of Life'ed versions
 
@@ -99,8 +100,10 @@ Please use [this guide](CONTRIBUTING.md) to make a contribution to the project a
 
 Open a PR that will:
 
-* In [alfresco-common](helm/alfresco-common/Chart.yaml), bump chart version to
-  the next stable release (usually by removing the `-SNAPSHOT` suffix)
+* Update the [versioning table](#versioning)
+* If any updates to the updatecli pipelines is required then make the changes and raise the PR.
+* Once the PR merge then run the manually [updatecli-workflow](https://github.com/Alfresco/acs-deployment/actions/workflows/bumpVersions.yml)
+* That will create the bump version PR automatically.
 * In [alfresco-content-services](helm/alfresco-content-services/Chart.yaml),
   bump chart version to the next stable release (usually by removing the
   `-SNAPSHOT` suffix and adding `-Mx` suffix if it's a prerelease)
@@ -109,6 +112,8 @@ Open a PR that will:
   every [subchart](/helm/alfresco-content-services/charts/)) which has it as a dependency:
   * Bump version to the new `alfresco-common` stable version
   * Switch `repository` to `https://kubernetes-charts.alfresco.com/stable`
+* Bump each subchart version to the next stable release (usually by removing the
+  `-SNAPSHOT` suffix)
 * Run `pre-commit run --all-files helm-docs` to update docs
 
 Once the PR has been merged, create and push the signed tag with:
@@ -120,7 +125,10 @@ git push origin vx.x.x
 
 where `vx.x.x` is the `alfresco-content-services` version.
 
-Once the tagged workflow is successful, open a PR to move back to development version:
+Once the tagged workflow is successful, publish the [new release on
+GitHub](https://github.com/Alfresco/acs-deployment/releases/new).
+
+Now proceed and open a PR to move back to development version:
 
 * In [alfresco-common](helm/alfresco-common/Chart.yaml), bump chart version to
   the next development release (usually by increasing the minor version and adding
@@ -133,6 +141,8 @@ Once the tagged workflow is successful, open a PR to move back to development ve
   every [subchart](/helm/alfresco-content-services/charts/)) which has it as a dependency:
   * Bump version to the new `alfresco-common` development version
   * Switch `repository` back to `https://kubernetes-charts.alfresco.com/incubator`
+* Bump each subchart version to the next development release (usually by
+  increasing the minor version and adding the `-SNAPSHOT` suffix)
 * Run `pre-commit run --all-files helm-docs` to update docs
 
 Once the PR has been merged, overwrite and push the signed mutable tag with:

docker-compose/7.2.N-docker-compose.yml

@@ -19,7 +19,7 @@
 version: "2"
 services:
   alfresco:
-    image: quay.io/alfresco/alfresco-content-repository:7.2.1.7
+    image: quay.io/alfresco/alfresco-content-repository:7.2.1.10
     mem_limit: 1900m
     environment:
       JAVA_TOOL_OPTIONS: >-
@@ -36,8 +36,7 @@ services:
         -Ddb.username=alfresco
         -Ddb.password=alfresco
         -Ddb.url=jdbc:postgresql://postgres:5432/alfresco
-        -Dsolr.host=solr6
-        -Dsolr.port=8983
+        -Dsolr.host=solr6 -Dsolr.port=8983
         -Dsolr.secureComms=secret
         -Dsolr.sharedSecret=secret
         -Dsolr.base.url=/solr
@@ -100,7 +99,7 @@ services:
     volumes:
       - shared-file-store-volume:/tmp/Alfresco/sfs
   share:
-    image: quay.io/alfresco/alfresco-share:7.2.1.7
+    image: quay.io/alfresco/alfresco-share:7.2.1.10
     mem_limit: 1g
     environment:
       REPO_HOST: "alfresco"
@@ -157,7 +156,7 @@ services:
       BASE_PATH: ./
       APP_BASE_SHARE_URL: "http://localhost:8080/workspace/#/preview/s"
   control-center:
-    image: quay.io/alfresco/alfresco-admin-app:7.6.1
+    image: quay.io/alfresco/alfresco-admin-app:7.8.1
     mem_limit: 128m
     environment:
       APP_CONFIG_PROVIDER: "ECM"

docker-compose/7.3.N-docker-compose.yml

@@ -157,7 +157,7 @@ services:
       BASE_PATH: ./
       APP_BASE_SHARE_URL: "http://localhost:8080/workspace/#/preview/s"
   control-center:
-    image: quay.io/alfresco/alfresco-admin-app:7.6.1
+    image: quay.io/alfresco/alfresco-admin-app:7.8.1
     mem_limit: 128m
     environment:
       APP_CONFIG_PROVIDER: "ECM"