Merge branch 'main' into search-pod-annotations

Alfresco · Dec 11, 2023 · c40cd55 · c40cd55
2 parents 60a1f58 + ffc3253
commit c40cd55
Show file tree

Hide file tree

Showing 25 changed files with 97 additions and 93 deletions.
diff --git a/.github/workflows/pre-commit.yaml b/.github/workflows/pre-commit.yaml
@@ -16,10 +16,10 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@v3.6.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@v5.2.0
       - name: Install kubeconform helm plugin
         run: |
           helm plugin install https://github.com/jtyr/kubeconform-helm --version v0.1.12
-      - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v3.6.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v5.2.0
         with:
           auto-commit: "true"
diff --git a/.github/workflows/updatecli.yaml b/.github/workflows/updatecli.yaml
@@ -28,7 +28,7 @@ jobs:
           token: ${{ secrets.BOT_GITHUB_TOKEN }}
 
       - uses: >-
-          Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v3.6.0
+          Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v5.2.0
 
       - name: Login to quay.io
         uses: docker/login-action@v3
@@ -46,9 +46,9 @@ jobs:
         env:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
 
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@v3.6.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@v5.2.0
       - name: Regenerate helm docs if necessary
-        uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v3.6.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v5.2.0
         with:
           pre-commit-args: helm-docs || true
           skip_checkout: "true"
@@ -74,7 +74,7 @@ jobs:
           token: ${{ secrets.BOT_GITHUB_TOKEN }}
 
       - uses: >-
-          Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v3.6.0
+          Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v5.2.0
 
       - name: Login to quay.io
         uses: docker/login-action@v3
@@ -106,9 +106,9 @@ jobs:
           QUAY_PASSWORD: ${{ secrets.QUAY_PASSWORD }}
           UPDATECLI_GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }}
 
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@v3.6.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@v5.2.0
       - name: Regenerate helm docs if necessary
-        uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v3.6.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v5.2.0
         with:
           pre-commit-args: helm-docs || true
           skip_checkout: "true"

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,27 +1,32 @@
+default_language_version:
+    python: python3.9
+
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
       - id: mixed-line-ending
         args: ["--fix=lf"]
       - id: end-of-file-fixer
         exclude: README.md
       - id: trailing-whitespace
   - repo: https://github.com/norwoodj/helm-docs
-    rev: v1.11.0
+    rev: v1.11.3
     hooks:
       - id: helm-docs
   - repo: https://github.com/bridgecrewio/checkov.git
-    rev: 3.0.21
+    rev: 3.1.29
     hooks:
       - id: checkov
+        additional_dependencies:
+          - "cyclonedx-python-lib==5.2.0" # https://github.com/bridgecrewio/checkov/issues/5841
         files: charts/.*\.yaml$
         verbose: true
         args:
           - --quiet
           - --compact
   - repo: https://github.com/jtyr/kubeconform-helm
-    rev: v0.1.15
+    rev: v0.1.16
     hooks:
       - id: kubeconform-helm
         alias: kubeconform-helm-min
@@ -32,7 +37,7 @@ repos:
           - --exclude-charts=alfresco-common,alfresco-sync-service
           - --values-dir=ci
   - repo: https://github.com/jtyr/kubeconform-helm
-    rev: v0.1.15
+    rev: v0.1.16
     hooks:
       - id: kubeconform-helm
         name: "Kubeconform Helm - current k8s version"
@@ -46,3 +51,4 @@ repos:
         name: Check Chart dependencies
         entry: ./scripts/charts.sh
         language: script
+        pass_filenames: false
diff --git a/charts/activemq/Chart.yaml b/charts/activemq/Chart.yaml
@@ -7,8 +7,8 @@ keywords:
 name: activemq
 sources:
   - https://github.com/Alfresco/alfresco-helm-charts
-version: 3.4.0
-appVersion: 5.17.5
+version: 3.4.1
+appVersion: 5.18.3
 dependencies:
   - name: alfresco-common
     version: 3.0.0

diff --git a/charts/activemq/README.md b/charts/activemq/README.md
@@ -1,6 +1,6 @@
 # activemq
 
-![Version: 3.4.0](https://img.shields.io/badge/Version-3.4.0-informational?style=flat-square) ![AppVersion: 5.17.5](https://img.shields.io/badge/AppVersion-5.17.5-informational?style=flat-square)
+![Version: 3.4.1](https://img.shields.io/badge/Version-3.4.1-informational?style=flat-square) ![AppVersion: 5.18.3](https://img.shields.io/badge/AppVersion-5.18.3-informational?style=flat-square)
 
 A Helm chart providing a basic Apache ActiveMQ deployment required to evaluate ACS (not meant to be used in production).
 

diff --git a/charts/alfresco-ai-transformer/Chart.yaml b/charts/alfresco-ai-transformer/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: alfresco-ai-transformer
 description: A Helm chart for deploying Alfresco ai transformer service
 type: application
-version: 0.3.0
-appVersion: "2.0.0"
+version: 0.4.1
+appVersion: 3.0.1
 dependencies:
   - name: alfresco-common
     version: 2.1.0

diff --git a/charts/alfresco-ai-transformer/README.md b/charts/alfresco-ai-transformer/README.md
@@ -1,6 +1,6 @@
 # alfresco-ai-transformer
 
-![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0](https://img.shields.io/badge/AppVersion-2.0.0-informational?style=flat-square)
+![Version: 0.4.1](https://img.shields.io/badge/Version-0.4.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.1](https://img.shields.io/badge/AppVersion-3.0.1-informational?style=flat-square)
 
 A Helm chart for deploying Alfresco ai transformer service
 
@@ -26,7 +26,7 @@ A Helm chart for deploying Alfresco ai transformer service
 | image.internalPort | int | `8090` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.repository | string | `"quay.io/alfresco/alfresco-ai-docker-engine"` |  |
-| image.tag | string | `"2.0.0"` |  |
+| image.tag | string | `"3.0.1"` |  |
 | livenessProbe.initialDelaySeconds | int | `10` |  |
 | livenessProbe.livenessPercent | int | `400` |  |
 | livenessProbe.livenessTransformPeriodSeconds | int | `600` |  |

diff --git a/charts/alfresco-ai-transformer/values.yaml b/charts/alfresco-ai-transformer/values.yaml
@@ -8,7 +8,7 @@ replicaCount: 2
 nodeSelector: {}
 image:
   repository: quay.io/alfresco/alfresco-ai-docker-engine
-  tag: 2.0.0
+  tag: 3.0.1
   pullPolicy: IfNotPresent
   internalPort: 8090
 service:

diff --git a/charts/alfresco-repository/Chart.yaml b/charts/alfresco-repository/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: alfresco-repository
 description: Alfresco content repository Helm chart
 type: application
-version: 0.1.0
-appVersion: 23.1.0
+version: 0.1.1
+appVersion: 23.1.1
 dependencies:
   - name: alfresco-common
     version: 3.0.0

diff --git a/charts/alfresco-repository/README.md b/charts/alfresco-repository/README.md
@@ -1,6 +1,6 @@
 # alfresco-repository
 
-![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 23.1.0](https://img.shields.io/badge/AppVersion-23.1.0-informational?style=flat-square)
+![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 23.1.1](https://img.shields.io/badge/AppVersion-23.1.1-informational?style=flat-square)
 
 Alfresco content repository Helm chart
 
@@ -77,7 +77,7 @@ Alfresco content repository Helm chart
 | image.port | int | `8080` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.repository | string | `"quay.io/alfresco/alfresco-content-repository"` |  |
-| image.tag | string | `"23.1.0"` |  |
+| image.tag | string | `"23.1.1"` |  |
 | imagePullSecrets | list | `[]` |  |
 | ingress.annotations | object | `{"nginx.ingress.kubernetes.io/affinity":"cookie","nginx.ingress.kubernetes.io/proxy-body-size":"5g","nginx.ingress.kubernetes.io/session-cookie-hash":"sha1","nginx.ingress.kubernetes.io/session-cookie-name":"alfrescoRepo"}` | provide annotations for nginx ingress (no toher ingress is supported at that point) |
 | ingress.enabled | bool | `true` | Toggle ingress |

diff --git a/charts/alfresco-repository/values.yaml b/charts/alfresco-repository/values.yaml
@@ -1,24 +1,19 @@
 # Default values for alfresco-repository.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
-
 replicaCount: 1
-
 image:
   repository: quay.io/alfresco/alfresco-content-repository
   pullPolicy: IfNotPresent
-  tag: 23.1.0
+  tag: 23.1.1
   port: 8080
-
 strategy:
   type: RollingUpdate
   rollingUpdate:
     maxSurge: 1
     maxUnavailable: 0
-
 # -- How long to wait for tomcat to complete shutdown before killing it
 terminationGracePeriod: 60
-
 configuration:
   repository:
     # -- a configmap containing the "alfresco-global.properties" key populated
@@ -178,7 +173,6 @@ environment:
   # -- Set JVM options
   JAVA_OPTS: >-
     -XX:MaxRAMPercentage=80
-
 persistence:
   # -- Persist Contentsotre data
   enabled: false
@@ -193,11 +187,9 @@ persistence:
   data:
     mountPath: /usr/local/tomcat/alf_data
     subPath: alfresco-content-services/repository-data
-
 imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
-
 serviceAccount:
   # Specifies whether a service account should be created
   create: true
@@ -206,22 +198,17 @@ serviceAccount:
   # The name of the service account to use.
   # If not set and create is true, a name is generated using the fullname template
   name: "alfresco-repo-sa"
-
 podAnnotations: {}
-
 podSecurityContext:
   runAsNonRoot: true
   runAsUser: 33000
   runAsGroup: 1000
   fsGroup: 1000
-
 securityContext: {}
-
 service:
   name: repository
   type: ClusterIP
   port: 80
-
 ingress:
   # -- Toggle ingress
   enabled: true
@@ -242,15 +229,13 @@ ingress:
   #  - secretName: chart-example-tls
   #    hosts:
   #      - chart-example.local
-
 resources:
   requests:
     cpu: "250m"
     memory: "2Gi"
   limits:
     cpu: "4"
     memory: "8Gi"
-
 startupProbe:
   periodSeconds: 20
   failureThreshold: 9
@@ -270,28 +255,22 @@ livenessProbe:
   httpGet:
     path: /alfresco/api/-default-/public/alfresco/versions/1/probes/-live-
     port: http
-
 extraVolumes: []
 extraVolumeMounts: []
 extraSideContainers: []
 extraInitContainers: []
 command: []
 args: []
-
 nodeSelector: {}
-
 tolerations: []
-
 affinity: {}
-
 global:
   # -- If a private image registry a secret can be defined and passed to
   # kubernetes, see:
   # https://github.com/Alfresco/acs-deployment/blob/a924ad6670911f64f1bba680682d266dd4ea27fb/docs/helm/eks-deployment.md#docker-registry-secret
   alfrescoRegistryPullSecrets: quay-registry-secret
   # -- a fallback for .Values.known_urls that can be shared between charts
-  known_urls:
-
+  known_urls: null
 tags:
   # -- A chart tag used for Hyland's CI purpose. Do not set it to true.
   ci: false
diff --git a/charts/alfresco-search-enterprise/Chart.lock b/charts/alfresco-search-enterprise/Chart.lock
@@ -1,12 +1,12 @@
 dependencies:
 - name: alfresco-common
   repository: https://alfresco.github.io/alfresco-helm-charts/
-  version: 3.0.0-alpha.3
+  version: 3.0.0
 - name: activemq
   repository: https://alfresco.github.io/alfresco-helm-charts/
   version: 3.3.0
 - name: elasticsearch
   repository: https://helm.elastic.co
   version: 7.17.3
-digest: sha256:add38efb79f9791c5d302b13ed108b74adb77fdbffac66a7d6ce7fa9df05fa21
-generated: "2023-10-20T18:43:51.870175+02:00"
+digest: sha256:7735156b1a0223a5cf10a4aeadeef49947b6ba7a9dd7406a72d69ca879663217
+generated: "2023-11-09T16:04:07.735524+01:00"
diff --git a/charts/alfresco-search-enterprise/Chart.yaml b/charts/alfresco-search-enterprise/Chart.yaml
@@ -3,11 +3,11 @@ apiVersion: v2
 name: alfresco-search-enterprise
 description: A Helm chart for deploying Alfresco Elasticsearch connector
 type: application
-version: 3.0.0
-appVersion: 4.0.0
+version: 3.0.2
+appVersion: 4.0.0.1
 dependencies:
   - name: alfresco-common
-    version: 3.0.0-alpha.3
+    version: 3.0.0
     repository: https://alfresco.github.io/alfresco-helm-charts/
   - name: activemq
     version: 3.3.0

diff --git a/charts/alfresco-search-enterprise/README.md b/charts/alfresco-search-enterprise/README.md
@@ -1,6 +1,6 @@
 # alfresco-search-enterprise
 
-![Version: 3.0.0](https://img.shields.io/badge/Version-3.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.0.0](https://img.shields.io/badge/AppVersion-4.0.0-informational?style=flat-square)
+![Version: 3.0.2](https://img.shields.io/badge/Version-3.0.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.0.0.1](https://img.shields.io/badge/AppVersion-4.0.0.1-informational?style=flat-square)
 
 A Helm chart for deploying Alfresco Elasticsearch connector
 
@@ -11,7 +11,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | Repository | Name | Version |
 |------------|------|---------|
 | https://alfresco.github.io/alfresco-helm-charts/ | activemq | 3.3.0 |
-| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-common | 3.0.0-alpha.3 |
+| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-common | 3.0.0 |
 | https://helm.elastic.co | elasticsearch | 7.17.3 |
 
 ## Values
@@ -32,18 +32,18 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | indexName | string | `"alfresco"` | Name of the existing search index, usually created by repo |
 | liveIndexing.content.image.pullPolicy | string | `"IfNotPresent"` |  |
 | liveIndexing.content.image.repository | string | `"quay.io/alfresco/alfresco-elasticsearch-live-indexing-content"` |  |
-| liveIndexing.content.image.tag | string | `"4.0.0"` |  |
+| liveIndexing.content.image.tag | string | `"4.0.0.1"` |  |
 | liveIndexing.content.replicaCount | int | `1` |  |
 | liveIndexing.mediation.image.pullPolicy | string | `"IfNotPresent"` |  |
 | liveIndexing.mediation.image.repository | string | `"quay.io/alfresco/alfresco-elasticsearch-live-indexing-mediation"` |  |
-| liveIndexing.mediation.image.tag | string | `"4.0.0"` |  |
+| liveIndexing.mediation.image.tag | string | `"4.0.0.1"` |  |
 | liveIndexing.metadata.image.pullPolicy | string | `"IfNotPresent"` |  |
 | liveIndexing.metadata.image.repository | string | `"quay.io/alfresco/alfresco-elasticsearch-live-indexing-metadata"` |  |
-| liveIndexing.metadata.image.tag | string | `"4.0.0"` |  |
+| liveIndexing.metadata.image.tag | string | `"4.0.0.1"` |  |
 | liveIndexing.metadata.replicaCount | int | `1` |  |
 | liveIndexing.path.image.pullPolicy | string | `"IfNotPresent"` |  |
 | liveIndexing.path.image.repository | string | `"quay.io/alfresco/alfresco-elasticsearch-live-indexing-path"` |  |
-| liveIndexing.path.image.tag | string | `"4.0.0"` |  |
+| liveIndexing.path.image.tag | string | `"4.0.0.1"` |  |
 | liveIndexing.path.replicaCount | int | `1` |  |
 | messageBroker.existingConfigMap.keys.url | string | `"BROKER_URL"` | Key within the configmap holding the URL of the message broker |
 | messageBroker.existingConfigMap.name | string | `nil` | Alternatively, provide message broker connection details via an existing configmap |
@@ -67,7 +67,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | reindexing.enabled | bool | `true` | Create the one-shot job to trigger the reindexing of repo contents |
 | reindexing.image.pullPolicy | string | `"IfNotPresent"` |  |
 | reindexing.image.repository | string | `"quay.io/alfresco/alfresco-elasticsearch-reindexing"` |  |
-| reindexing.image.tag | string | `"4.0.0"` |  |
+| reindexing.image.tag | string | `"4.0.0.1"` |  |
 | reindexing.initcontainers.waitForRepository.resources.limits.cpu | string | `"0.25"` |  |
 | reindexing.initcontainers.waitForRepository.resources.limits.memory | string | `"10Mi"` |  |
 | reindexing.pathIndexingEnabled | bool | `true` |  |