From 0cb6ad3377a25730fba5abf273ef365558533dbf Mon Sep 17 00:00:00 2001 From: pmacius Date: Wed, 18 Dec 2024 11:21:29 +0100 Subject: [PATCH 1/2] OPSEXP-2950 Use bitnami/elasticsearch helm chart dependencies --- .github/workflows/release.yaml | 1 - charts/alfresco-audit-storage/Chart.lock | 10 +++---- charts/alfresco-audit-storage/Chart.yaml | 8 +++--- charts/alfresco-audit-storage/README.md | 6 ++--- .../ci/default-values.yaml | 26 ++++++++++++------- charts/alfresco-search-enterprise/Chart.lock | 10 +++---- charts/alfresco-search-enterprise/Chart.yaml | 8 +++--- charts/alfresco-search-enterprise/README.md | 6 ++--- .../ci/default-values.yaml | 26 ++++++++++++------- ct.yaml | 1 - 10 files changed, 56 insertions(+), 46 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 8c20f56de..d2d0141fd 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -51,7 +51,6 @@ jobs: run: | helm repo add self https://alfresco.github.io/alfresco-helm-charts/ helm repo add bitnami https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami/ - helm repo add elastic https://helm.elastic.co - name: Run chart-releaser uses: helm/chart-releaser-action@a917fd15b20e8b64b94d9158ad54cd6345335584 # v1.6.0 diff --git a/charts/alfresco-audit-storage/Chart.lock b/charts/alfresco-audit-storage/Chart.lock index 83b8e55dc..813d4702f 100644 --- a/charts/alfresco-audit-storage/Chart.lock +++ b/charts/alfresco-audit-storage/Chart.lock @@ -1,12 +1,12 @@ dependencies: - name: alfresco-common repository: https://alfresco.github.io/alfresco-helm-charts/ - version: 3.1.4 + version: 4.0.0-alpha.0 - name: activemq repository: https://alfresco.github.io/alfresco-helm-charts/ version: 3.6.0 - name: elasticsearch - repository: https://helm.elastic.co - version: 7.17.3 -digest: sha256:f9eaa24e368566c27c81766eab2fe37f024138dfa9b61e6080f425bb33fce9dc -generated: "2024-11-28T13:40:46.590188009Z" + repository: oci://registry-1.docker.io/bitnamicharts + version: 21.4.1 +digest: sha256:a2180835b31a2da2960e880f2c9085134ef96239b970f86bc0c8395ec3a72d59 +generated: "2024-12-18T11:21:03.05558+01:00" diff --git a/charts/alfresco-audit-storage/Chart.yaml b/charts/alfresco-audit-storage/Chart.yaml index ffea6c1d5..2ce414b53 100644 --- a/charts/alfresco-audit-storage/Chart.yaml +++ b/charts/alfresco-audit-storage/Chart.yaml @@ -2,11 +2,11 @@ apiVersion: v2 name: alfresco-audit-storage description: A Helm chart for Kubernetes to deploy Alfresco Audit Storage type: application -version: 0.1.0 +version: 0.2.0-alpha.0 appVersion: 1.0.0 dependencies: - name: alfresco-common - version: 3.1.4 + version: 4.0.0-alpha.0 repository: https://alfresco.github.io/alfresco-helm-charts/ - name: activemq version: 3.6.0 @@ -14,7 +14,7 @@ dependencies: tags: - ci - name: elasticsearch - repository: https://helm.elastic.co - version: 7.17.3 + repository: oci://registry-1.docker.io/bitnamicharts + version: 21.4.1 tags: - ci diff --git a/charts/alfresco-audit-storage/README.md b/charts/alfresco-audit-storage/README.md index 265608687..0fab7357f 100644 --- a/charts/alfresco-audit-storage/README.md +++ b/charts/alfresco-audit-storage/README.md @@ -5,7 +5,7 @@ parent: Charts Reference # alfresco-audit-storage -![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: 1.0.0](https://img.shields.io/badge/AppVersion-1.0.0-informational?style=flat-square) +![Version: 0.2.0-alpha.0](https://img.shields.io/badge/Version-0.2.0--alpha.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.0](https://img.shields.io/badge/AppVersion-1.0.0-informational?style=flat-square) A Helm chart for Kubernetes to deploy Alfresco Audit Storage @@ -16,8 +16,8 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs | Repository | Name | Version | |------------|------|---------| | https://alfresco.github.io/alfresco-helm-charts/ | activemq | 3.6.0 | -| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-common | 3.1.4 | -| https://helm.elastic.co | elasticsearch | 7.17.3 | +| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-common | 4.0.0-alpha.0 | +| oci://registry-1.docker.io/bitnamicharts | elasticsearch | 21.4.1 | ## Values diff --git a/charts/alfresco-audit-storage/ci/default-values.yaml b/charts/alfresco-audit-storage/ci/default-values.yaml index c04364e9e..2396ad044 100644 --- a/charts/alfresco-audit-storage/ci/default-values.yaml +++ b/charts/alfresco-audit-storage/ci/default-values.yaml @@ -7,16 +7,22 @@ resources: cpu: "1" memory: "1Gi" elasticsearch: - replicas: 1 - clusterHealthCheckParams: "wait_for_status=yellow&timeout=1s" - esJavaOpts: "-Xmx512m -Xms512m" - resources: - requests: - cpu: "100m" - memory: "1Gi" - limits: - cpu: "1000m" - memory: "1Gi" + master: + masterOnly: false + replicaCount: 1 + resources: + requests: + cpu: "100m" + memory: "1Gi" + limits: + cpu: "1000m" + memory: "1Gi" + data: + replicaCount: 0 + coordinating: + replicaCount: 0 + ingest: + replicaCount: 0 activemq: fullnameOverride: activemq resources: diff --git a/charts/alfresco-search-enterprise/Chart.lock b/charts/alfresco-search-enterprise/Chart.lock index b5273f976..991b36a79 100644 --- 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.1.4 + version: 4.0.0-alpha.0 - name: activemq repository: https://alfresco.github.io/alfresco-helm-charts/ version: 3.6.0 - name: elasticsearch - repository: https://helm.elastic.co - version: 7.17.3 -digest: sha256:f9eaa24e368566c27c81766eab2fe37f024138dfa9b61e6080f425bb33fce9dc -generated: "2024-11-28T13:40:54.27005502Z" + repository: oci://registry-1.docker.io/bitnamicharts + version: 21.4.1 +digest: sha256:a2180835b31a2da2960e880f2c9085134ef96239b970f86bc0c8395ec3a72d59 +generated: "2024-12-18T11:21:11.876042+01:00" diff --git a/charts/alfresco-search-enterprise/Chart.yaml b/charts/alfresco-search-enterprise/Chart.yaml index a320cdd84..c29281429 100644 --- 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: 4.2.0 +version: 4.3.0-alpha.0 appVersion: 4.2.0 dependencies: - name: alfresco-common - version: 3.1.4 + version: 4.0.0-alpha.0 repository: https://alfresco.github.io/alfresco-helm-charts/ - name: activemq version: 3.6.0 @@ -15,7 +15,7 @@ dependencies: tags: - ci - name: elasticsearch - repository: https://helm.elastic.co - version: 7.17.3 + repository: oci://registry-1.docker.io/bitnamicharts + version: 21.4.1 tags: - ci diff --git a/charts/alfresco-search-enterprise/README.md b/charts/alfresco-search-enterprise/README.md index c65b215aa..346de0405 100644 --- a/charts/alfresco-search-enterprise/README.md +++ b/charts/alfresco-search-enterprise/README.md @@ -5,7 +5,7 @@ parent: Charts Reference # alfresco-search-enterprise -![Version: 4.2.0](https://img.shields.io/badge/Version-4.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.2.0](https://img.shields.io/badge/AppVersion-4.2.0-informational?style=flat-square) +![Version: 4.3.0-alpha.0](https://img.shields.io/badge/Version-4.3.0--alpha.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.2.0](https://img.shields.io/badge/AppVersion-4.2.0-informational?style=flat-square) A Helm chart for deploying Alfresco Elasticsearch connector @@ -16,8 +16,8 @@ Checkout [alfresco-content-services chart's doc](https://github.com/Alfresco/acs | Repository | Name | Version | |------------|------|---------| | https://alfresco.github.io/alfresco-helm-charts/ | activemq | 3.6.0 | -| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-common | 3.1.4 | -| https://helm.elastic.co | elasticsearch | 7.17.3 | +| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-common | 4.0.0-alpha.0 | +| oci://registry-1.docker.io/bitnamicharts | elasticsearch | 21.4.1 | ## Values diff --git a/charts/alfresco-search-enterprise/ci/default-values.yaml b/charts/alfresco-search-enterprise/ci/default-values.yaml index e790586c2..0ba8a4b46 100644 --- a/charts/alfresco-search-enterprise/ci/default-values.yaml +++ b/charts/alfresco-search-enterprise/ci/default-values.yaml @@ -24,16 +24,22 @@ resources: search: url: http://elasticsearch-master:9200 elasticsearch: - replicas: 1 - clusterHealthCheckParams: "wait_for_status=yellow&timeout=1s" - esJavaOpts: "-Xmx512m -Xms512m" - resources: - requests: - cpu: "100m" - memory: "1Gi" - limits: - cpu: "1000m" - memory: "1Gi" + master: + masterOnly: false + replicaCount: 1 + resources: + requests: + cpu: "100m" + memory: "1Gi" + limits: + cpu: "1000m" + memory: "1Gi" + data: + replicaCount: 0 + coordinating: + replicaCount: 0 + ingest: + replicaCount: 0 activemq: fullnameOverride: activemq resources: diff --git a/ct.yaml b/ct.yaml index c9f5f0f85..9afb410a1 100644 --- a/ct.yaml +++ b/ct.yaml @@ -12,7 +12,6 @@ excluded-charts: chart-repos: - self=https://alfresco.github.io/alfresco-helm-charts/ - bitnami=https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami/ - - elastic=https://helm.elastic.co helm-extra-args: --timeout 600s From f7d2c5ae43f6487117ebf380ee77300eca10a0af Mon Sep 17 00:00:00 2001 From: pmacius Date: Wed, 18 Dec 2024 12:21:23 +0100 Subject: [PATCH 2/2] fix --- charts/alfresco-audit-storage/ci/default-values.yaml | 3 ++- charts/alfresco-search-enterprise/ci/default-values.yaml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/charts/alfresco-audit-storage/ci/default-values.yaml b/charts/alfresco-audit-storage/ci/default-values.yaml index 2396ad044..6e197b3b6 100644 --- a/charts/alfresco-audit-storage/ci/default-values.yaml +++ b/charts/alfresco-audit-storage/ci/default-values.yaml @@ -7,6 +7,7 @@ resources: cpu: "1" memory: "1Gi" elasticsearch: + fullnameOverride: elasticsearch master: masterOnly: false replicaCount: 1 @@ -33,7 +34,7 @@ activemq: cpu: "1000m" memory: "1Gi" index: - url: http://elasticsearch-master:9200 + url: http://elasticsearch:9200 messageBroker: url: nio://activemq-broker:61616 tags: diff --git a/charts/alfresco-search-enterprise/ci/default-values.yaml b/charts/alfresco-search-enterprise/ci/default-values.yaml index 0ba8a4b46..c173bda26 100644 --- a/charts/alfresco-search-enterprise/ci/default-values.yaml +++ b/charts/alfresco-search-enterprise/ci/default-values.yaml @@ -22,8 +22,9 @@ resources: cpu: "1" memory: "1Gi" search: - url: http://elasticsearch-master:9200 + url: http://elasticsearch:9200 elasticsearch: + fullnameOverride: elasticsearch master: masterOnly: false replicaCount: 1