From f17813717e4e60fa2907a5759f00f2e93f18bb5f Mon Sep 17 00:00:00 2001 From: Kalibh Halford Date: Wed, 18 Dec 2024 14:19:02 +0000 Subject: [PATCH 1/4] MAINT: Add setup values for cloud-chatops cluster --- clusters/dev/cloud-chatops/argocd-setup-values.yaml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 clusters/dev/cloud-chatops/argocd-setup-values.yaml diff --git a/clusters/dev/cloud-chatops/argocd-setup-values.yaml b/clusters/dev/cloud-chatops/argocd-setup-values.yaml new file mode 100644 index 00000000..6e34509c --- /dev/null +++ b/clusters/dev/cloud-chatops/argocd-setup-values.yaml @@ -0,0 +1,3 @@ +argo-cd: + global: + domain: argocd.dev-cloud-chatops.nubes.stfc.ac.uk From fd9e87ae1c6a78f597640d1d6e7443323bae22db Mon Sep 17 00:00:00 2001 From: Kalibh Halford Date: Wed, 18 Dec 2024 14:19:19 +0000 Subject: [PATCH 2/4] MIANT: Fix values for cluster applications in wrong path --- clusters/dev/cloud-chatops/apps.yaml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/clusters/dev/cloud-chatops/apps.yaml b/clusters/dev/cloud-chatops/apps.yaml index 54edb30e..600b6ad0 100644 --- a/clusters/dev/cloud-chatops/apps.yaml +++ b/clusters/dev/cloud-chatops/apps.yaml @@ -40,23 +40,18 @@ spec: # so create one for each chart - even if its empty # argocd and all dependencies use the same file "argocd-setup-values.yaml" - valuesFile: ../../../clusters/dev/worker/argocd-setup-values.yaml + valuesFile: ../../../clusters/dev/cloud-chatops/argocd-setup-values.yaml namespace: argocd - name: "cert-manager" chartName: cert-manager namespace: cert-manager - valuesFile: ../../../clusters/dev/worker/argocd-setup-values.yaml - - - name: longhorn - chartName: longhorn - namespace: longhorn-system - valuesFile: ../../../clusters/dev/worker/argocd-setup-values.yaml + valuesFile: ../../../clusters/dev/cloud-chatops/argocd-setup-values.yaml - name: chatops chartName: chatops namespace: chatops - secretsFile: ../../../secrets/dev/worker/apps/chatops.yaml + secretsFile: ../../../secrets/dev/cloud-chatops/apps/chatops.yaml syncPolicy: # Don't remove everything if we remove the appset From f49770ec9bc9ff09f20399fb2963dda9dc8d1ead Mon Sep 17 00:00:00 2001 From: Kalibh Halford Date: Mon, 6 Jan 2025 12:00:44 +0000 Subject: [PATCH 3/4] BUG: Add Nginx ingress to access argocd --- clusters/dev/cloud-chatops/infra-values.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/clusters/dev/cloud-chatops/infra-values.yaml b/clusters/dev/cloud-chatops/infra-values.yaml index 3e64d10c..f52341d2 100644 --- a/clusters/dev/cloud-chatops/infra-values.yaml +++ b/clusters/dev/cloud-chatops/infra-values.yaml @@ -17,4 +17,10 @@ openstack-cluster: # here we define an nginx ingress controller service addons: ingress: - enabled: false + enabled: true + nginx: + release: + values: + controller: + service: + loadBalancerIP: "130.246.211.56" From 2e318ea3e96e0d56c11e4c43c50f9de420c1f9e8 Mon Sep 17 00:00:00 2001 From: Kalibh Halford Date: Mon, 6 Jan 2025 12:01:31 +0000 Subject: [PATCH 4/4] MAINT: Move to feature branch Moving to feature branch so I can make changes without needing a PR each time --- clusters/dev/cloud-chatops/apps.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clusters/dev/cloud-chatops/apps.yaml b/clusters/dev/cloud-chatops/apps.yaml index 600b6ad0..4ca5576b 100644 --- a/clusters/dev/cloud-chatops/apps.yaml +++ b/clusters/dev/cloud-chatops/apps.yaml @@ -10,7 +10,7 @@ spec: project: default source: repoURL: https://github.com/stfc/cloud-deployed-apps.git - targetRevision: main + targetRevision: dev-cloud-chatops path: clusters/dev/cloud-chatops syncPolicy: automated: