From 5eed20cc6ad57a5a15f4b643b68f118c7cce324a Mon Sep 17 00:00:00 2001 From: nuwang <2070605+nuwang@users.noreply.github.com> Date: Tue, 26 Nov 2024 21:48:21 +0530 Subject: [PATCH 1/3] Switch to cloudnative-pg --- README.md | 4 ++-- galaxy-deps/Chart.yaml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index bda9e21..35acbb1 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ and `Helm` ([instructions](https://helm.sh/docs/intro/install/)) installed. ## Dependency charts This chart relies on the features of other charts for common functionality: -- [postgres-operator](https://github.com/zalando/postgres-operator) for the +- [postgres-operator](https://cloudnative-pg.io/documentation/current/) for the database; - [galaxy-cvmfs-csi](https://github.com/CloudVE/galaxy-cvmfs-csi-helm) for linking the reference data to Galaxy and jobs based on CVMFS (default). @@ -83,7 +83,7 @@ current default values can be found in `values.yaml` file. | `cvmfs.deploy` | Whether to deploy the CVMFS sub chart. Default is true. | | `cvmfs.{}` | Refer to the [galaxy cvmfs chart](https://github.com/CloudVE/galaxy-cvmfs-csi-helm) for possible configuration values. | | `postgresql.deploy` | Whether to deploy the postgres sub chart. Default is true. | -| `postgresql.{}` | Refer to the [postgres-operator chart](https://github.com/zalando/postgres-operator) for possible configuration values. | +| `postgresql.{}` | Refer to the [postgres-operator chart](https://cloudnative-pg.io/documentation/current/) for possible configuration values. | | `rabbitmq.deploy` | Whether to deploy the rabbitmq sub chart. Default is true. | | `rabbitmq.{}` | Refer to the [rabbitmq-cluster-operator chart](https://github.com/rabbitmq/cluster-operator) for possible configuration values. | | `s3csi.deploy` | Whether to deploy the csi-s3 sub chart as an alternative to cvmfs. Default is false. | diff --git a/galaxy-deps/Chart.yaml b/galaxy-deps/Chart.yaml index 0fcd3d7..a400f6e 100644 --- a/galaxy-deps/Chart.yaml +++ b/galaxy-deps/Chart.yaml @@ -6,9 +6,9 @@ appVersion: "23.1" description: Chart containing environmental dependencies needed by Galaxy. Galaxy is an open, web-based platform for accessible, reproducible, and transparent computational biomedical research. icon: https://galaxyproject.org/images/galaxy-logos/galaxy_project_logo_square.png dependencies: - - name: postgres-operator - repository: https://raw.githubusercontent.com/zalando/postgres-operator/master/charts/postgres-operator/ - version: 1.9.0 + - name: cloudnative-pg + repository: https://cloudnative-pg.github.io/charts/ + version: 0.22.1 condition: postgresql.deploy alias: postgresql tags: From 53449fec6f81c046af562e887e6a0246478980b6 Mon Sep 17 00:00:00 2001 From: nuwang <2070605+nuwang@users.noreply.github.com> Date: Tue, 26 Nov 2024 21:48:56 +0530 Subject: [PATCH 2/3] Update appversion to match galaxy --- galaxy-deps/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galaxy-deps/Chart.yaml b/galaxy-deps/Chart.yaml index a400f6e..d2645ba 100644 --- a/galaxy-deps/Chart.yaml +++ b/galaxy-deps/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: galaxy-deps type: application version: 1.0.0 -appVersion: "23.1" +appVersion: "24.1.3" description: Chart containing environmental dependencies needed by Galaxy. Galaxy is an open, web-based platform for accessible, reproducible, and transparent computational biomedical research. icon: https://galaxyproject.org/images/galaxy-logos/galaxy_project_logo_square.png dependencies: From 8e559c7a422ba1c117602ede0d288baa4dc7484d Mon Sep 17 00:00:00 2001 From: nuwang <2070605+nuwang@users.noreply.github.com> Date: Tue, 26 Nov 2024 23:04:23 +0530 Subject: [PATCH 3/3] Remove alias due to https://github.com/cloudnative-pg/charts/issues/351 --- galaxy-deps/Chart.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/galaxy-deps/Chart.yaml b/galaxy-deps/Chart.yaml index d2645ba..32562c4 100644 --- a/galaxy-deps/Chart.yaml +++ b/galaxy-deps/Chart.yaml @@ -10,7 +10,8 @@ dependencies: repository: https://cloudnative-pg.github.io/charts/ version: 0.22.1 condition: postgresql.deploy - alias: postgresql + # cannot alias due to: https://github.com/cloudnative-pg/charts/issues/351 + # alias: postgresql tags: - deploy-postgres - name: csi-s3