Promote dev capi changes to staging

promote all dev changes to capi-infra chart to staging
stfc · Jan 16, 2025 · e3e5043 · e3e5043
1 parent 1b073cc
commit e3e5043
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 18 deletions.
diff --git a/charts/staging/capi-infra/Chart.yaml b/charts/staging/capi-infra/Chart.yaml
@@ -4,4 +4,4 @@ version: 1.3.0
 dependencies:
   - repository: https://azimuth-cloud.github.io/capi-helm-charts
     name: openstack-cluster
-    version: 0.11.2
+    version: 0.12.2
diff --git a/charts/staging/capi-infra/values.yaml b/charts/staging/capi-infra/values.yaml
@@ -1,6 +1,6 @@
-openstack-cluster:
-  kubernetesVersion: "1.30.6"
-  machineImage: "capi-ubuntu-2204-kube-v1.30.6-2024-11-15"
+33openstack-cluster:
+  kubernetesVersion: "1.31.4"
+  machineImage: "capi-ubuntu-2204-kube-v1.31.4-2025-01-07"
 
   # The PEM-encoded CA certificate for openstack.stfc.ac.uk
   # this expires 2023-12-05T23:59:59Z (UTC)

diff --git a/clusters/dev/worker/infra-values.yaml b/clusters/dev/worker/infra-values.yaml
@@ -9,7 +9,6 @@ openstack-cluster:
       machineFlavor: l3.micro
 
   nodeGroupDefaults:
-    machineFlavor: l3.nano
     nodeLabels:	
       # we're running longhorn on this cluster
       # set label so worker nodes can host longhorn volumes

diff --git a/clusters/staging/management/infra-values.yaml b/clusters/staging/management/infra-values.yaml
@@ -24,25 +24,25 @@ openstack-cluster:
                   env: staging
               ingress:
                 hosts:
-                  - prometheus-mgmt.staging.nubes.stfc.ac.uk
+                  - prometheus.staging-mgmt.nubes.stfc.ac.uk
                 tls:
                   - hosts:
-                      - prometheus-mgmt.staging.nubes.stfc.ac.uk
+                      - prometheus.staging-mgmt.nubes.stfc.ac.uk
                     secretName: tls-keypair
             grafana:
               ingress:
                 hosts:
-                  - grafana-mgmt.staging.nubes.stfc.ac.uk
+                  - grafana.staging-mgmt.nubes.stfc.ac.uk
                 tls:
                   - hosts:
-                      - grafana-mgmt.staging.nubes.stfc.ac.uk
+                      - grafana.staging-mgmt.nubes.stfc.ac.uk
                     secretName: tls-keypair
             alertmanager:
               enabled: true
               ingress:
                 hosts:
-                  - alertmanager-mgmt.staging.nubes.stfc.ac.uk
+                  - alertmanager.staging-mgmt.nubes.stfc.ac.uk
                 tls:
                   - hosts:
-                      - alertmanager-mgmt.staging.nubes.stfc.ac.uk
+                      - alertmanager.staging-mgmt.nubes.stfc.ac.uk
                     secretName: tls-keypair
diff --git a/clusters/staging/worker/infra-values.yaml b/clusters/staging/worker/infra-values.yaml
@@ -1,8 +1,12 @@
 openstack-cluster:
 
+  controlPlane:
+    machineCount: 3
+
   nodeGroups:
     - name: default-md-0
-      machineCount: 5
+      machineCount: 3
+      machineFlavor: l3.micro
 
   nodeGroupDefaults:
     machineFlavor: l3.nano
@@ -22,6 +26,7 @@ openstack-cluster:
                 loadBalancerIP: "130.246.81.242"
 
     monitoring:
+      enabled: true
       # no need to send alerts around certs/openstack API endpoints for dev/staging clusters 
       # ends up with too many messages in the ticket queue
       blackBoxExporter: 
@@ -36,25 +41,25 @@ openstack-cluster:
                   env: staging
               ingress:
                 hosts:
-                  - prometheus-worker.staging.nubes.stfc.ac.uk
+                  - prometheus.staging-worker.nubes.stfc.ac.uk
                 tls:
                   - hosts:
-                      - prometheus-worker.staging.nubes.stfc.ac.uk
+                      - prometheus.staging-worker.nubes.stfc.ac.uk
                     secretName: tls-keypair
             grafana:
               ingress:
                 hosts:
-                  - grafana-worker.staging.nubes.stfc.ac.uk
+                  - grafana.staging-worker.nubes.stfc.ac.uk
                 tls:
                   - hosts:
-                      - grafana-worker.staging.nubes.stfc.ac.uk
+                      - grafana.staging-worker.nubes.stfc.ac.uk
                     secretName: tls-keypair
             alertmanager:
               enabled: true
               ingress:
                 hosts:
-                  - alertmanager-worker.staging.nubes.stfc.ac.uk
+                  - alertmanager.staging-worker.nubes.stfc.ac.uk
                 tls:
                   - hosts:
-                      - alertmanager-worker.staging.nubes.stfc.ac.uk
+                      - alertmanager.staging-worker.nubes.stfc.ac.uk
                     secretName: tls-keypair