Update nginx-ingress, Prometheus, and Grafana addons

* Align `nginx-ingress` `--controller-class` with `IngressClass`
to provide a better example (e.g. if extended to multiple ingress
controllers)

CHANGES.md

@@ -7,6 +7,13 @@ Notable changes between versions.
 * Update etcd from v3.5.1 to [v3.5.2](https://github.com/etcd-io/etcd/releases/tag/v3.5.2)
 * Change default CNI `networking` provider from `calico` to `cilium` ([#1114](https://github.com/poseidon/typhoon/pull/1114))
 
+### Addons
+
+* Align nginx-ingress `--controller-class` with `IngressClass`
+  * Watch only `public` IngressClass objects, better [example](https://kubernetes.github.io/ingress-nginx/user-guide/multiple-ingress/)
+* Update Prometheus from v2.32.1 to [v2.33.3](https://github.com/prometheus/prometheus/releases/tag/v2.33.3)
+* Update Grafana from v8.3.4 to [v8.3.6](https://github.com/grafana/grafana/releases/tag/v8.3.6)
+
 ## V1.23.3
 
 * Kubernetes [v1.23.3](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.23.md#v1233)

addons/grafana/deployment.yaml

@@ -24,7 +24,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: grafana
-          image: docker.io/grafana/grafana:8.3.4
+          image: docker.io/grafana/grafana:8.3.6
           env:
             - name: GF_PATHS_CONFIG
               value: "/etc/grafana/custom.ini"

addons/nginx-ingress/aws/class.yaml

@@ -3,4 +3,4 @@ kind: IngressClass
 metadata:
   name: public
 spec:
-  controller: k8s.io/ingress-nginx
+  controller: k8s.io/public

addons/nginx-ingress/aws/deployment.yaml

@@ -26,6 +26,7 @@ spec:
           image: k8s.gcr.io/ingress-nginx/controller:v1.1.1
           args:
             - /nginx-ingress-controller
+            - --controller-class=k8s.io/public
             - --ingress-class=public
           # use downward API
           env:

addons/nginx-ingress/azure/class.yaml

@@ -3,4 +3,4 @@ kind: IngressClass
 metadata:
   name: public
 spec:
-  controller: k8s.io/ingress-nginx
+  controller: k8s.io/public

addons/nginx-ingress/azure/deployment.yaml

@@ -26,6 +26,7 @@ spec:
           image: k8s.gcr.io/ingress-nginx/controller:v1.1.1
           args:
             - /nginx-ingress-controller
+            - --controller-class=k8s.io/public
             - --ingress-class=public
           # use downward API
           env:

addons/nginx-ingress/bare-metal/class.yaml

@@ -3,4 +3,4 @@ kind: IngressClass
 metadata:
   name: public
 spec:
-  controller: k8s.io/ingress-nginx
+  controller: k8s.io/public

addons/nginx-ingress/bare-metal/deployment.yaml

@@ -26,6 +26,7 @@ spec:
           image: k8s.gcr.io/ingress-nginx/controller:v1.1.1
           args:
             - /nginx-ingress-controller
+            - --controller-class=k8s.io/public
             - --ingress-class=public
           # use downward API
           env:

addons/nginx-ingress/digital-ocean/class.yaml

@@ -3,4 +3,4 @@ kind: IngressClass
 metadata:
   name: public
 spec:
-  controller: k8s.io/ingress-nginx
+  controller: k8s.io/public

addons/nginx-ingress/digital-ocean/daemonset.yaml

@@ -26,6 +26,7 @@ spec:
           image: k8s.gcr.io/ingress-nginx/controller:v1.1.1
           args:
             - /nginx-ingress-controller
+            - --controller-class=k8s.io/public
             - --ingress-class=public
           # use downward API
           env:

addons/nginx-ingress/google-cloud/class.yaml

@@ -3,4 +3,4 @@ kind: IngressClass
 metadata:
   name: public
 spec:
-  controller: k8s.io/ingress-nginx
+  controller: k8s.io/public

addons/nginx-ingress/google-cloud/deployment.yaml

@@ -26,6 +26,7 @@ spec:
           image: k8s.gcr.io/ingress-nginx/controller:v1.1.1
           args:
             - /nginx-ingress-controller
+            - --controller-class=k8s.io/public
             - --ingress-class=public
           # use downward API
           env:

addons/prometheus/deployment.yaml

@@ -21,7 +21,7 @@ spec:
       serviceAccountName: prometheus
       containers:
         - name: prometheus
-          image: quay.io/prometheus/prometheus:v2.32.1
+          image: quay.io/prometheus/prometheus:v2.33.3
           args:
             - --web.listen-address=0.0.0.0:9090
             - --config.file=/etc/prometheus/prometheus.yaml