Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update dependency charts; save outputs to working dir #501

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Update dependency charts; save outputs to working dir #501

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2dcaa1f
Update dependency chart versions
afgane Sep 11, 2024
00802d5
Save job outputs to working dir
afgane Sep 11, 2024
b4f9278
Correct RabbitMQ chart version would help
afgane Sep 11, 2024
7db1695
Add .vscode to gitignore
afgane Sep 11, 2024
8742556
Update psql operator to 1.13.0; run tests on K8s 1.30
afgane Sep 12, 2024
fdf9ad8
Bump deps to latest
afgane Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Start k8s locally
uses: jupyterhub/action-k3s-helm@v3
with:
k3s-version: v1.28.7+k3s1 # releases: https://github.com/k3s-io/k3s/tags
k3s-version: v1.30.4+k3s1 # releases: https://github.com/k3s-io/k3s/tags
metrics-enabled: false
traefik-enabled: false
- name: Verify function of k8s, kubectl, and helm
Expand Down Expand Up @@ -73,8 +73,8 @@ jobs:
address=$(kubectl get svc -n galaxy galaxy-nginx -o jsonpath="http://{.spec.clusterIP}:{.spec.ports[0].port}/galaxy/api/version")
echo "Address is $address"
apiVersion=$(curl $address | jq -r '"\(.version_major).\(.version_minor)"')
echo "appVersion: $appVersion"
echo "appVersion: $appVersion"
echo "apiVersion: $apiVersion"
if [ "$appVersion" != "$apiVersion" ]; then
exit 1
fi
fi
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,5 +96,6 @@ galaxy/charts/

# IDEs
.idea
.vscode

Chart.lock
6 changes: 3 additions & 3 deletions galaxy/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ icon: https://galaxyproject.org/images/galaxy-logos/galaxy_project_logo_square.p
dependencies:
- name: postgres-operator
repository: https://raw.githubusercontent.com/zalando/postgres-operator/master/charts/postgres-operator/
version: 1.9.0
version: 1.13.0
condition: postgresql.deploy
alias: postgresql
tags:
Expand All @@ -22,14 +22,14 @@ dependencies:
- deploy-s3csi
- name: galaxy-cvmfs-csi
repository: https://raw.githubusercontent.com/cloudve/helm-charts/master/
version: 2.4.0
version: 2.5.0
condition: cvmfs.deploy
alias: cvmfs
tags:
- deploy-cvmfs
- name: rabbitmq-cluster-operator
repository: https://charts.bitnami.com/bitnami
version: 2.6.12
version: 4.3.22
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like there have been two major version changes. Have these changed the yaml configs in anyway?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think so. These are the only notes I was able to find re. the release/upgrade process and nothing there seems to conflict with our setup: https://github.com/bitnami/charts/tree/main/bitnami/rabbitmq-cluster-operator#to-400

I launched 3 clusters with this version and ran a few IWC workflows, all of which worked as expected.

condition: rabbitmq.deploy
alias: rabbitmq
tags:
Expand Down
1 change: 1 addition & 0 deletions galaxy/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,7 @@ configs:
{{- end }}
tool_dependency_dir: "{{.Values.persistence.mountPath}}/deps"
job_config_file: "/galaxy/server/config/job_conf.yml"
outputs_to_working_directory: true
builds_file_path: |-
{{ if .Values.refdata.enabled }}
/cvmfs/data.galaxyproject.org/managed/location/builds.txt
Expand Down
Loading