From 07fb54e7b85db0d53d31feb1813e85b66adc7440 Mon Sep 17 00:00:00 2001 From: Chen Wang Date: Fri, 14 Nov 2025 14:51:01 -0600 Subject: [PATCH 1/7] update image backed by the helm chart --- .../kubernetes/charts/clowder2/Chart.lock | 18 -------------- .../kubernetes/charts/clowder2/Chart.yaml | 2 +- .../kubernetes/charts/clowder2/values.yaml | 24 +++++++++++++++++++ 3 files changed, 25 insertions(+), 19 deletions(-) delete mode 100644 deployments/kubernetes/charts/clowder2/Chart.lock diff --git a/deployments/kubernetes/charts/clowder2/Chart.lock b/deployments/kubernetes/charts/clowder2/Chart.lock deleted file mode 100644 index d675f46bd..000000000 --- a/deployments/kubernetes/charts/clowder2/Chart.lock +++ /dev/null @@ -1,18 +0,0 @@ -dependencies: -- name: mongodb - repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami/ - version: 12.1.31 -- name: minio - repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami/ - version: 12.13.2 -- name: rabbitmq - repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami/ - version: 10.3.9 -- name: elasticsearch - repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami/ - version: 19.21.2 -- name: keycloak - repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami/ - version: 13.4.1 -digest: sha256:21d18d2cca8db612841c7d9ee1bade697171d353524ed5cab6f24c91cc774e2f -generated: "2025-11-13T15:27:27.006227-06:00" diff --git a/deployments/kubernetes/charts/clowder2/Chart.yaml b/deployments/kubernetes/charts/clowder2/Chart.yaml index bf986de82..752589de7 100644 --- a/deployments/kubernetes/charts/clowder2/Chart.yaml +++ b/deployments/kubernetes/charts/clowder2/Chart.yaml @@ -13,7 +13,7 @@ description: > # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.9.3 +version: 1.9.4 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/deployments/kubernetes/charts/clowder2/values.yaml b/deployments/kubernetes/charts/clowder2/values.yaml index ba4a709b5..27cb065b4 100644 --- a/deployments/kubernetes/charts/clowder2/values.yaml +++ b/deployments/kubernetes/charts/clowder2/values.yaml @@ -80,6 +80,10 @@ geoserver: # MINIO # ---------------------------------------------------------------------- minio: + image: + registry: docker.io + repository: bitnamilegacy/minio + tag: "2023.12.23" enabled: true # login to minio @@ -130,6 +134,10 @@ minio: mongodb: # either mongodb is installed as part of this chart, or you need to # specify the mongodb uri + image: + registry: docker.io + repository: bitnamilegacy/mongodb + tag: "5.0.10" enabled: true #uri: mongobd://server:27017/database database: clowder2 @@ -150,6 +158,10 @@ mongodb: # RABBITMQ # ---------------------------------------------------------------------- rabbitmq: + image: + registry: docker.io + repository: bitnamilegacy/rabbitmq + tag: "3.10.8" # either rabbitmq is installed as part of this chart, or you need to # specify the rabbitmq uri. If neither is specified rabbitmq will not # be used by clowder. @@ -219,6 +231,10 @@ extractors: # ELASTICSEARCH # ---------------------------------------------------------------------- elasticsearch: + image: + registry: docker.io + repository: bitnamilegacy/elasticsearch + tag: "8.12.2" clusterName: clowder2 master: @@ -235,6 +251,10 @@ elasticsearch: # ---------------------------------------------------------------------- keycloak: httpRelativePath: /keycloak/ + image: + registry: docker.io + repository: bitnamilegacy/keycloak + tag: "20.0.5" auth: adminUser: admin @@ -249,6 +269,10 @@ keycloak: type: ClusterIP postgresql: + image: + registry: docker.io + repository: bitnamilegacy/postgresql + tag: "16.4.0" auth: username: keycloak password: password From 8e3440309700f8b18154c05e40554a672b4bf5e6 Mon Sep 17 00:00:00 2001 From: Chen Wang Date: Fri, 14 Nov 2025 15:13:12 -0600 Subject: [PATCH 2/7] rebuild chart lock --- .github/workflows/helm-release.yaml | 1 - .../kubernetes/charts/clowder2/Chart.lock | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 deployments/kubernetes/charts/clowder2/Chart.lock diff --git a/.github/workflows/helm-release.yaml b/.github/workflows/helm-release.yaml index e1cc696dd..0e60888fd 100644 --- a/.github/workflows/helm-release.yaml +++ b/.github/workflows/helm-release.yaml @@ -23,7 +23,6 @@ jobs: - name: Get dependencies run: | helm repo add bitnami-legacy https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami - helm repo add bitnami https://charts.bitnami.com/bitnami helm repo add ncsa https://opensource.ncsa.illinois.edu/charts helm dep update diff --git a/deployments/kubernetes/charts/clowder2/Chart.lock b/deployments/kubernetes/charts/clowder2/Chart.lock new file mode 100644 index 000000000..f1ba6cf72 --- /dev/null +++ b/deployments/kubernetes/charts/clowder2/Chart.lock @@ -0,0 +1,18 @@ +dependencies: +- name: mongodb + repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami/ + version: 12.1.31 +- name: minio + repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami/ + version: 12.13.2 +- name: rabbitmq + repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami/ + version: 10.3.9 +- name: elasticsearch + repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami/ + version: 19.21.2 +- name: keycloak + repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami/ + version: 13.4.1 +digest: sha256:21d18d2cca8db612841c7d9ee1bade697171d353524ed5cab6f24c91cc774e2f +generated: "2025-11-14T15:11:06.914559-06:00" From 28452ee1e4ec0e4ea01ac032ffeb50381d57cbab Mon Sep 17 00:00:00 2001 From: Chen Wang Date: Fri, 14 Nov 2025 15:25:56 -0600 Subject: [PATCH 3/7] add a manual action to publish the chart --- .github/workflows/helm-release-manual.yaml | 65 ++++++++++++++++++++++ .github/workflows/helm-release.yaml | 3 +- 2 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/helm-release-manual.yaml diff --git a/.github/workflows/helm-release-manual.yaml b/.github/workflows/helm-release-manual.yaml new file mode 100644 index 000000000..215437205 --- /dev/null +++ b/.github/workflows/helm-release-manual.yaml @@ -0,0 +1,65 @@ +name: Manual Publish Helm Chart + +defaults: + run: + working-directory: deployments/kubernetes/charts/clowder2 + +on: + workflow_dispatch: + inputs: + force: + description: "Force push the chart even if it already exists (true/false)" + type: boolean + default: true + +env: + MAIN_REPO: clowder-framework/clowder2 + +jobs: + publish: + runs-on: ubuntu-latest + + steps: + - name: Checkout Repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Setup Helm Repositories + run: | + helm repo add bitnami-legacy https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami + helm repo add ncsa https://opensource.ncsa.illinois.edu/charts + helm repo update + helm dep update + + - name: Determine Chart Version & Changelog + id: release_info + run: | + version="$(awk '/^version:/ { print $2 }' Chart.yaml)" + changelog="$(sed -e "1,/^### ${version}/d" -e "/^###/,\$d" -e '/^$/d' README.md)" + changelog="${changelog//'%'/'%25'}" + changelog="${changelog//$'\n'/'%0A'}" + changelog="${changelog//$'\r'/'%0D'}" + echo "version=${version}" >> $GITHUB_ENV + echo "changelog=${changelog}" >> $GITHUB_ENV + echo "version: ${version}" + echo "changelog: ${changelog}" + + - name: Debug GitHub Metadata + run: | + echo "Manual dispatch workflow triggered" + echo "github.repository: ${{ github.repository }}" + echo "chart version: ${{ env.version }}" + + - name: Validate Helm Template + run: helm template . + + - name: Publish Helm Chart to NCSA OpenSource + if: github.repository == env.MAIN_REPO + uses: bsord/helm-push@v4.1.0 + with: + username: ${{ secrets.HELM_USERNAME }} + password: ${{ secrets.HELM_PASSWORD }} + registry-url: "https://opensource.ncsa.illinois.edu/charts" + chart-folder: "deployments/kubernetes/charts/clowder2" + force: ${{ github.event.inputs.force }} diff --git a/.github/workflows/helm-release.yaml b/.github/workflows/helm-release.yaml index 0e60888fd..d6804e1ce 100644 --- a/.github/workflows/helm-release.yaml +++ b/.github/workflows/helm-release.yaml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 @@ -24,6 +24,7 @@ jobs: run: | helm repo add bitnami-legacy https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami helm repo add ncsa https://opensource.ncsa.illinois.edu/charts + helm repo update helm dep update - name: Get release info From 208e3dffc033096dab240536f6d02b22826109b8 Mon Sep 17 00:00:00 2001 From: Chen Wang Date: Fri, 14 Nov 2025 17:19:57 -0600 Subject: [PATCH 4/7] add overwrite to the system image --- deployments/kubernetes/charts/clowder2/values.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/deployments/kubernetes/charts/clowder2/values.yaml b/deployments/kubernetes/charts/clowder2/values.yaml index 27cb065b4..737371b12 100644 --- a/deployments/kubernetes/charts/clowder2/values.yaml +++ b/deployments/kubernetes/charts/clowder2/values.yaml @@ -246,6 +246,11 @@ elasticsearch: storageClass: csi-cinder-sc-retain size: 8Gi + sysctlImage: + registry: docker.io + repository: bitnamilegacy/os-shell + tag: 12-debian-12-r16 + # ---------------------------------------------------------------------- # KEYCLOAK # ---------------------------------------------------------------------- From 53d36d9e762de6195890e1381bf8dc63e62e65c8 Mon Sep 17 00:00:00 2001 From: Chen Wang Date: Fri, 14 Nov 2025 17:30:54 -0600 Subject: [PATCH 5/7] update chart version --- deployments/kubernetes/charts/clowder2/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/kubernetes/charts/clowder2/Chart.yaml b/deployments/kubernetes/charts/clowder2/Chart.yaml index 752589de7..282fe248d 100644 --- a/deployments/kubernetes/charts/clowder2/Chart.yaml +++ b/deployments/kubernetes/charts/clowder2/Chart.yaml @@ -13,7 +13,7 @@ description: > # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.9.4 +version: 1.9.5 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to From 3fcf16de67d52a1386ecae42745dc8472f76356e Mon Sep 17 00:00:00 2001 From: Chen Wang Date: Fri, 14 Nov 2025 22:25:11 -0600 Subject: [PATCH 6/7] need to explicitly enable the system init container --- deployments/kubernetes/charts/clowder2/Chart.yaml | 2 +- deployments/kubernetes/charts/clowder2/values.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/deployments/kubernetes/charts/clowder2/Chart.yaml b/deployments/kubernetes/charts/clowder2/Chart.yaml index 282fe248d..c56f544a3 100644 --- a/deployments/kubernetes/charts/clowder2/Chart.yaml +++ b/deployments/kubernetes/charts/clowder2/Chart.yaml @@ -13,7 +13,7 @@ description: > # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.9.5 +version: 1.9.6 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/deployments/kubernetes/charts/clowder2/values.yaml b/deployments/kubernetes/charts/clowder2/values.yaml index 737371b12..fef623319 100644 --- a/deployments/kubernetes/charts/clowder2/values.yaml +++ b/deployments/kubernetes/charts/clowder2/values.yaml @@ -247,6 +247,7 @@ elasticsearch: size: 8Gi sysctlImage: + enabled: true registry: docker.io repository: bitnamilegacy/os-shell tag: 12-debian-12-r16 From 1d8bd998303677e62d354f960ab5532e07e86521 Mon Sep 17 00:00:00 2001 From: Chen Wang Date: Fri, 14 Nov 2025 23:44:11 -0600 Subject: [PATCH 7/7] postgresql doesn't match keycloak version --- deployments/kubernetes/charts/clowder2/Chart.yaml | 2 +- deployments/kubernetes/charts/clowder2/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deployments/kubernetes/charts/clowder2/Chart.yaml b/deployments/kubernetes/charts/clowder2/Chart.yaml index c56f544a3..71901ebd7 100644 --- a/deployments/kubernetes/charts/clowder2/Chart.yaml +++ b/deployments/kubernetes/charts/clowder2/Chart.yaml @@ -13,7 +13,7 @@ description: > # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.9.6 +version: 1.9.7 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/deployments/kubernetes/charts/clowder2/values.yaml b/deployments/kubernetes/charts/clowder2/values.yaml index fef623319..d02adf3da 100644 --- a/deployments/kubernetes/charts/clowder2/values.yaml +++ b/deployments/kubernetes/charts/clowder2/values.yaml @@ -278,7 +278,7 @@ keycloak: image: registry: docker.io repository: bitnamilegacy/postgresql - tag: "16.4.0" + tag: "15.5.0" auth: username: keycloak password: password