From a1228677485bed87cb7b1b9ae8faca63b2e44f3e Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Wed, 27 Apr 2022 21:02:09 -0700 Subject: [PATCH] Update nginx-ingress, Prometheus, and Grafana addons * Sync addons with versions used in Poseidon --- CHANGES.md | 6 ++++++ addons/grafana/deployment.yaml | 2 +- addons/nginx-ingress/aws/deployment.yaml | 2 +- addons/nginx-ingress/azure/deployment.yaml | 2 +- addons/nginx-ingress/bare-metal/deployment.yaml | 2 +- addons/nginx-ingress/digital-ocean/daemonset.yaml | 2 +- addons/nginx-ingress/google-cloud/deployment.yaml | 2 +- addons/prometheus/deployment.yaml | 2 +- 8 files changed, 13 insertions(+), 7 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 910c09db..9000270e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -8,6 +8,12 @@ Notable changes between versions. * Add Kubelet mounts to enable relabeling workload volumes ([#1152](https://github.com/poseidon/typhoon/pull/1152)) * StorageClass no longer require explicit SELinux mount contexts +### Addons + +* Update nginx-ingress from v1.1.3 to [v1.2.0](https://github.com/kubernetes/ingress-nginx/releases/tag/controller-v1.2.0) +* Update Prometheus from v2.34.0 to [v2.35.0](https://github.com/prometheus/prometheus/releases/tag/v2.35.0) +* Update Grafana from v8.4.5 to [v8.5.0](https://github.com/grafana/grafana/releases/tag/v8.5.0) + ## v1.23.6 * Kubernetes [v1.23.6](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.23.md#v1236) diff --git a/addons/grafana/deployment.yaml b/addons/grafana/deployment.yaml index d446d26a..ed91ad45 100644 --- a/addons/grafana/deployment.yaml +++ b/addons/grafana/deployment.yaml @@ -24,7 +24,7 @@ spec: type: RuntimeDefault containers: - name: grafana - image: docker.io/grafana/grafana:8.4.5 + image: docker.io/grafana/grafana:8.5.0 env: - name: GF_PATHS_CONFIG value: "/etc/grafana/custom.ini" diff --git a/addons/nginx-ingress/aws/deployment.yaml b/addons/nginx-ingress/aws/deployment.yaml index ade4429e..141002d4 100644 --- a/addons/nginx-ingress/aws/deployment.yaml +++ b/addons/nginx-ingress/aws/deployment.yaml @@ -23,7 +23,7 @@ spec: type: RuntimeDefault containers: - name: nginx-ingress-controller - image: k8s.gcr.io/ingress-nginx/controller:v1.1.3 + image: k8s.gcr.io/ingress-nginx/controller:v1.2.0 args: - /nginx-ingress-controller - --controller-class=k8s.io/public diff --git a/addons/nginx-ingress/azure/deployment.yaml b/addons/nginx-ingress/azure/deployment.yaml index ade4429e..141002d4 100644 --- a/addons/nginx-ingress/azure/deployment.yaml +++ b/addons/nginx-ingress/azure/deployment.yaml @@ -23,7 +23,7 @@ spec: type: RuntimeDefault containers: - name: nginx-ingress-controller - image: k8s.gcr.io/ingress-nginx/controller:v1.1.3 + image: k8s.gcr.io/ingress-nginx/controller:v1.2.0 args: - /nginx-ingress-controller - --controller-class=k8s.io/public diff --git a/addons/nginx-ingress/bare-metal/deployment.yaml b/addons/nginx-ingress/bare-metal/deployment.yaml index a3cb9231..8510b6b4 100644 --- a/addons/nginx-ingress/bare-metal/deployment.yaml +++ b/addons/nginx-ingress/bare-metal/deployment.yaml @@ -23,7 +23,7 @@ spec: type: RuntimeDefault containers: - name: nginx-ingress-controller - image: k8s.gcr.io/ingress-nginx/controller:v1.1.3 + image: k8s.gcr.io/ingress-nginx/controller:v1.2.0 args: - /nginx-ingress-controller - --controller-class=k8s.io/public diff --git a/addons/nginx-ingress/digital-ocean/daemonset.yaml b/addons/nginx-ingress/digital-ocean/daemonset.yaml index 118ef4e6..f975a298 100644 --- a/addons/nginx-ingress/digital-ocean/daemonset.yaml +++ b/addons/nginx-ingress/digital-ocean/daemonset.yaml @@ -23,7 +23,7 @@ spec: type: RuntimeDefault containers: - name: nginx-ingress-controller - image: k8s.gcr.io/ingress-nginx/controller:v1.1.3 + image: k8s.gcr.io/ingress-nginx/controller:v1.2.0 args: - /nginx-ingress-controller - --controller-class=k8s.io/public diff --git a/addons/nginx-ingress/google-cloud/deployment.yaml b/addons/nginx-ingress/google-cloud/deployment.yaml index ade4429e..141002d4 100644 --- a/addons/nginx-ingress/google-cloud/deployment.yaml +++ b/addons/nginx-ingress/google-cloud/deployment.yaml @@ -23,7 +23,7 @@ spec: type: RuntimeDefault containers: - name: nginx-ingress-controller - image: k8s.gcr.io/ingress-nginx/controller:v1.1.3 + image: k8s.gcr.io/ingress-nginx/controller:v1.2.0 args: - /nginx-ingress-controller - --controller-class=k8s.io/public diff --git a/addons/prometheus/deployment.yaml b/addons/prometheus/deployment.yaml index ddc0a4b3..2861fa19 100644 --- a/addons/prometheus/deployment.yaml +++ b/addons/prometheus/deployment.yaml @@ -21,7 +21,7 @@ spec: serviceAccountName: prometheus containers: - name: prometheus - image: quay.io/prometheus/prometheus:v2.34.0 + image: quay.io/prometheus/prometheus:v2.35.0 args: - --web.listen-address=0.0.0.0:9090 - --config.file=/etc/prometheus/prometheus.yaml