Skip to content

Commit 9d72696

Browse files
MAINT: migrate galaxy onto dev worker
drop existing galaxy cluster migrate galaxy onto dev cluster no data needs to be migrated - since it wasn't in use
1 parent 28dadbc commit 9d72696

File tree

9 files changed

+92
-296
lines changed

9 files changed

+92
-296
lines changed

clusters/dev/galaxy/infra-values.yaml

Lines changed: 0 additions & 61 deletions
This file was deleted.

clusters/dev/galaxy/apps.yaml renamed to clusters/dev/worker/apps.yaml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ spec:
1010
project: default
1111
source:
1212
repoURL: https://github.com/stfc/cloud-deployed-apps.git
13-
targetRevision: galaxy-dev
14-
path: clusters/dev/galaxy
13+
targetRevision: main
14+
path: clusters/dev/worker
1515
syncPolicy:
1616
automated:
1717
prune: false
@@ -25,7 +25,7 @@ spec:
2525
apiVersion: argoproj.io/v1alpha1
2626
kind: ApplicationSet
2727
metadata:
28-
name: galaxy-apps
28+
name: worker-apps
2929
namespace: argocd
3030
spec:
3131
goTemplate: true
@@ -40,24 +40,23 @@ spec:
4040
# so create one for each chart - even if its empty
4141

4242
# argocd and all dependencies use the same file "argocd-setup-values.yaml"
43-
valuesFile: ../../../clusters/dev/galaxy/argocd-setup-values.yaml
43+
valuesFile: ../../../clusters/dev/worker/argocd-setup-values.yaml
4444
namespace: argocd
4545

4646
- name: "cert-manager"
4747
chartName: cert-manager
4848
namespace: cert-manager
49-
valuesFile: ../../../clusters/dev/galaxy/argocd-setup-values.yaml
49+
valuesFile: ../../../clusters/dev/worker/argocd-setup-values.yaml
5050

5151
- name: longhorn
5252
chartName: longhorn
5353
namespace: longhorn-system
54-
valuesFile: ../../../clusters/dev/galaxy/argocd-setup-values.yaml
54+
valuesFile: ../../../clusters/dev/worker/argocd-setup-values.yaml
5555

56-
# disable galaxy - deploying manually to diagnose duplicate job bug
57-
# - name: materials-galaxy
58-
# chartName: materials-galaxy
59-
# namespace: materials-galaxy
60-
# valuesFile: ../../../clusters/dev/galaxy/materials-galaxy-values.yaml
56+
- name: materials-galaxy
57+
chartName: materials-galaxy
58+
namespace: materials-galaxy
59+
valuesFile: ../../../clusters/dev/worker/materials-galaxy-values.yaml
6160

6261

6362
syncPolicy:
@@ -72,7 +71,7 @@ spec:
7271
project: default
7372
source:
7473
repoURL: "https://github.com/stfc/cloud-deployed-apps.git"
75-
targetRevision: galaxy-dev
74+
targetRevision: main
7675
path: "charts/dev/{{.chartName}}"
7776
helm:
7877
valueFiles:
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
argo-cd:
22
global:
3-
domain: argocd-galaxy.dev.nubes.stfc.ac.uk
3+
domain: argocd.dev-worker.nubes.stfc.ac.uk
44

55
longhorn:
66
ingress:
7-
host: "longhorn-galaxy.dev.nubes.stfc.ac.uk"
7+
host: "longhorn.dev-worker.nubes.stfc.ac.uk"
88
persistence:
99
# can't be set for RWX
1010
migratable: false

clusters/dev/galaxy/materials-galaxy-values.yaml renamed to clusters/dev/worker/materials-galaxy-values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ oauth2-proxy:
77
galaxy:
88
ingress:
99
hosts:
10-
- host: "galaxy.dev.nubes.stfc.ac.uk"
10+
- host: "galaxy.dev-worker.nubes.stfc.ac.uk"
1111
paths:
1212
- path: "/"
1313
tls:
1414
- hosts:
15-
- "galaxy.dev.nubes.stfc.ac.uk"
15+
- "galaxy.dev-worker.nubes.stfc.ac.uk"
1616
secretName: galaxy-tls

secrets/dev/galaxy/.sops.yaml

Lines changed: 0 additions & 15 deletions
This file was deleted.

secrets/dev/galaxy/api-server-fip.yaml

Lines changed: 0 additions & 59 deletions
This file was deleted.

secrets/dev/galaxy/app-creds.yaml

Lines changed: 0 additions & 68 deletions
This file was deleted.

secrets/dev/galaxy/materials-galaxy.yaml

Lines changed: 0 additions & 77 deletions
This file was deleted.

0 commit comments

Comments
 (0)