From 8980f829da6d66fbf06e469a43fdef731bf71a7e Mon Sep 17 00:00:00 2001
From: "2i2c-token-generator-bot[bot]"
 <106546794+2i2c-token-generator-bot[bot]@users.noreply.github.com>
Date: Mon, 23 Jan 2023 00:02:19 +0000
Subject: [PATCH 1/3] Bump charts ['prometheus', 'grafana', 'ingress-nginx'] to
 versions ['19.3.1', '6.50.1', '4.4.2'], respectively

---
 helm-charts/support/Chart.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/helm-charts/support/Chart.yaml b/helm-charts/support/Chart.yaml
index b65361f57..e15e8eb88 100644
--- a/helm-charts/support/Chart.yaml
+++ b/helm-charts/support/Chart.yaml
@@ -7,20 +7,20 @@ dependencies:
   # Prometheus for collection of metrics.
   # https://github.com/prometheus-community/helm-charts/tree/main/charts/prometheus
   - name: prometheus
-    version: 15.16.1
+    version: 19.3.1
     repository: https://prometheus-community.github.io/helm-charts
 
   # Grafana for dashboarding of metrics.
   # https://github.com/grafana/helm-charts/tree/main/charts/grafana
   - name: grafana
-    version: 6.42.2
+    version: 6.50.1
     repository: https://grafana.github.io/helm-charts
 
   # ingress-nginx for a k8s Ingress resource controller that routes traffic from
   # a single IP entrypoint to various services exposed via k8s Ingress resources
   # that references this controller.
   - name: ingress-nginx
-    version: 4.1.4
+    version: 4.4.2
     repository: https://kubernetes.github.io/ingress-nginx
 
   # cluster-autoscaler for k8s clusters where it doesn't come out of the box (EKS)

From 1c600d81811858da8babdff25187b71e8f24c1f2 Mon Sep 17 00:00:00 2001
From: Erik Sundell <erik.i.sundell@gmail.com>
Date: Mon, 23 Jan 2023 12:04:39 +0100
Subject: [PATCH 2/3] support chart: add temporary prometheus upgrade patch

---
 deployer/cluster.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/deployer/cluster.py b/deployer/cluster.py
index 29d6366b6..1cafa4498 100644
--- a/deployer/cluster.py
+++ b/deployer/cluster.py
@@ -61,6 +61,19 @@ def deploy_support(self, cert_manager_version):
         )
         print_colour("Done!")
 
+        # FIXME: Revert this addition after one upgrade is made
+        print_colour("Preparing for prometheus v16 v19 migration...")
+        subprocess.check_call(
+            [
+                "kubectl",
+                "delete",
+                "daemonset",
+                "--namespace=support",
+                "support-prometheus-node-exporter",
+            ]
+        )
+        print_colour("Done!")
+
         print_colour("Provisioning support charts...")
 
         support_dir = (Path(__file__).parent.parent).joinpath("helm-charts", "support")

From a43e7c97fb96519f7187ce90186a34b20c0eb5c6 Mon Sep 17 00:00:00 2001
From: Erik Sundell <erik.i.sundell@gmail.com>
Date: Mon, 23 Jan 2023 18:31:57 +0100
Subject: [PATCH 3/3] prometheus: update chart config for a v16 to v19 upgrade

---
 helm-charts/support/values.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/helm-charts/support/values.yaml b/helm-charts/support/values.yaml
index 352bb8a84..d30775069 100644
--- a/helm-charts/support/values.yaml
+++ b/helm-charts/support/values.yaml
@@ -24,7 +24,7 @@ prometheus:
     # Grafana also has alerts, and the UI of grafana is much better than that of alertmanager
     # We also expose Grafana publicly behind auth anyway, so we can consolidate alerting with Grafana too
     enabled: false
-  nodeExporter:
+  prometheus-node-exporter:
     tolerations:
       # Tolerate tainted jupyterhub user nodes
       - key: hub.jupyter.org_dedicated
@@ -42,7 +42,7 @@ prometheus:
         effect: NoSchedule
     updateStrategy:
       type: RollingUpdate
-  pushgateway:
+  prometheus-pushgateway:
     enabled: false
   server:
     ingress: