Skip to content

Commit

Permalink
Merge pull request #501 from galaxyproject/awake-firefly
Browse files Browse the repository at this point in the history
Update dependency charts; save outputs to working dir
  • Loading branch information
nuwang authored Nov 1, 2024
2 parents f5534df + fdf9ad8 commit d7700e1
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/test.yaml
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
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
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.1
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.25
condition: rabbitmq.deploy
alias: rabbitmq
tags:
Expand Down
1 change: 1 addition & 0 deletions galaxy/values.yaml
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

0 comments on commit d7700e1

Please sign in to comment.