From 7c2929228d7cc82c0c766699f671960bb10cbcc9 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Fri, 18 Oct 2024 11:22:39 +0100
Subject: [PATCH] Fix up ingressClassName setting

Setting it as an annotation was a misunderstanding.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
---
 prombench/manifests/cluster-infra/3b_prometheus-meta.yaml       | 2 +-
 .../manifests/cluster-infra/7b_commentmonitor_deployment.yaml   | 2 +-
 prombench/manifests/cluster-infra/8b_parca.yaml                 | 2 +-
 prombench/manifests/cluster-infra/grafana_deployment.yaml       | 2 +-
 .../manifests/prombench/benchmark/5_nginx-ingress-routes.yaml   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/prombench/manifests/cluster-infra/3b_prometheus-meta.yaml b/prombench/manifests/cluster-infra/3b_prometheus-meta.yaml
index 96d21e5a4..88482363c 100644
--- a/prombench/manifests/cluster-infra/3b_prometheus-meta.yaml
+++ b/prombench/manifests/cluster-infra/3b_prometheus-meta.yaml
@@ -257,9 +257,9 @@ kind: Ingress
 metadata:
   name: ingress-prometheus-meta
   annotations:
-    spec.ingressClassName: "nginx"
     nginx.ingress.kubernetes.io/ssl-redirect: "false"
 spec:
+  ingressClassName: nginx
   rules:
   - http:
       paths:
diff --git a/prombench/manifests/cluster-infra/7b_commentmonitor_deployment.yaml b/prombench/manifests/cluster-infra/7b_commentmonitor_deployment.yaml
index 595dfc259..d8429e63e 100644
--- a/prombench/manifests/cluster-infra/7b_commentmonitor_deployment.yaml
+++ b/prombench/manifests/cluster-infra/7b_commentmonitor_deployment.yaml
@@ -70,9 +70,9 @@ kind: Ingress
 metadata:
   name: ingress-comment-monitor
   annotations:
-    spec.ingressClassName: "nginx"
     nginx.ingress.kubernetes.io/ssl-redirect: "false"
 spec:
+  ingressClassName: nginx
   rules:
   - http:
       paths:
diff --git a/prombench/manifests/cluster-infra/8b_parca.yaml b/prombench/manifests/cluster-infra/8b_parca.yaml
index 52fa379ad..296184d74 100644
--- a/prombench/manifests/cluster-infra/8b_parca.yaml
+++ b/prombench/manifests/cluster-infra/8b_parca.yaml
@@ -125,9 +125,9 @@ kind: Ingress
 metadata:
   name: ingress-parca
   annotations:
-    spec.ingressClassName: "nginx"
     nginx.ingress.kubernetes.io/ssl-redirect: "false"
 spec:
+  ingressClassName: nginx
   rules:
   - http:
       paths:
diff --git a/prombench/manifests/cluster-infra/grafana_deployment.yaml b/prombench/manifests/cluster-infra/grafana_deployment.yaml
index 446cd6fda..1386b97f3 100644
--- a/prombench/manifests/cluster-infra/grafana_deployment.yaml
+++ b/prombench/manifests/cluster-infra/grafana_deployment.yaml
@@ -95,9 +95,9 @@ kind: Ingress
 metadata:
   name: ingress-grafana
   annotations:
-    spec.ingressClassName: "nginx"
     nginx.ingress.kubernetes.io/ssl-redirect: "false"
 spec:
+  ingressClassName: nginx
   rules:
   - http:
       paths:
diff --git a/prombench/manifests/prombench/benchmark/5_nginx-ingress-routes.yaml b/prombench/manifests/prombench/benchmark/5_nginx-ingress-routes.yaml
index f6bf96380..34c8e2f8d 100644
--- a/prombench/manifests/prombench/benchmark/5_nginx-ingress-routes.yaml
+++ b/prombench/manifests/prombench/benchmark/5_nginx-ingress-routes.yaml
@@ -4,12 +4,12 @@ metadata:
   name: ingress-prometheus
   namespace: prombench-{{ .PR_NUMBER }}
   annotations:
-    spec.ingressClassName: "nginx"
     nginx.ingress.kubernetes.io/ssl-redirect: "false"
     nginx.ingress.kubernetes.io/proxy-connect-timeout: '605'
     nginx.ingress.kubernetes.io/proxy-send-timeout: '605'
     nginx.ingress.kubernetes.io/proxy-read-timeout: '605'
 spec:
+  ingressClassName: nginx
   rules:
   - http:
       paths: