From 52a7bf23657ea2827a42bfcef96c251717f47db2 Mon Sep 17 00:00:00 2001 From: Johann Hoffmann Date: Wed, 15 Jun 2022 18:04:15 +0200 Subject: [PATCH 1/2] Switch deprecated apiVersion to networking.k8s.io/v1 Signed-off-by: Johann Hoffmann --- .../charts/standalone-monitoring/templates/grafana.yaml | 2 +- .../charts/standalone-monitoring/templates/k8s-dashboard.yaml | 2 +- .../charts/standalone-monitoring/templates/kibana.yaml | 2 +- .../charts/standalone-monitoring/templates/prometheus.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/helmfile/cloud-sdk/charts/standalone-monitoring/templates/grafana.yaml b/helmfile/cloud-sdk/charts/standalone-monitoring/templates/grafana.yaml index ced18d2..867c175 100644 --- a/helmfile/cloud-sdk/charts/standalone-monitoring/templates/grafana.yaml +++ b/helmfile/cloud-sdk/charts/standalone-monitoring/templates/grafana.yaml @@ -1,5 +1,5 @@ --- -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: prometheus-operator-grafana-oauth diff --git a/helmfile/cloud-sdk/charts/standalone-monitoring/templates/k8s-dashboard.yaml b/helmfile/cloud-sdk/charts/standalone-monitoring/templates/k8s-dashboard.yaml index 2db6b92..e08b985 100644 --- a/helmfile/cloud-sdk/charts/standalone-monitoring/templates/k8s-dashboard.yaml +++ b/helmfile/cloud-sdk/charts/standalone-monitoring/templates/k8s-dashboard.yaml @@ -1,5 +1,5 @@ --- -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: k8s-dashboard-kubernetes-dashboard-oauth diff --git a/helmfile/cloud-sdk/charts/standalone-monitoring/templates/kibana.yaml b/helmfile/cloud-sdk/charts/standalone-monitoring/templates/kibana.yaml index a624303..ceb377e 100644 --- a/helmfile/cloud-sdk/charts/standalone-monitoring/templates/kibana.yaml +++ b/helmfile/cloud-sdk/charts/standalone-monitoring/templates/kibana.yaml @@ -1,5 +1,5 @@ --- -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: kibana-oauth diff --git a/helmfile/cloud-sdk/charts/standalone-monitoring/templates/prometheus.yaml b/helmfile/cloud-sdk/charts/standalone-monitoring/templates/prometheus.yaml index d321d12..5fccba3 100644 --- a/helmfile/cloud-sdk/charts/standalone-monitoring/templates/prometheus.yaml +++ b/helmfile/cloud-sdk/charts/standalone-monitoring/templates/prometheus.yaml @@ -1,5 +1,5 @@ --- -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: prometheus-operator-prometheus-oauth From 0015e8b1b7abadcec5a452a460e8b42ba53b150f Mon Sep 17 00:00:00 2001 From: Johann Hoffmann Date: Wed, 15 Jun 2022 18:42:58 +0200 Subject: [PATCH 2/2] Switch to correct apiVersion for ingress resource Signed-off-by: Johann Hoffmann --- .../charts/standalone-monitoring/templates/grafana.yaml | 2 +- .../charts/standalone-monitoring/templates/k8s-dashboard.yaml | 2 +- .../charts/standalone-monitoring/templates/kibana.yaml | 2 +- .../charts/standalone-monitoring/templates/prometheus.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/helmfile/cloud-sdk/charts/standalone-monitoring/templates/grafana.yaml b/helmfile/cloud-sdk/charts/standalone-monitoring/templates/grafana.yaml index 867c175..48dbf31 100644 --- a/helmfile/cloud-sdk/charts/standalone-monitoring/templates/grafana.yaml +++ b/helmfile/cloud-sdk/charts/standalone-monitoring/templates/grafana.yaml @@ -1,5 +1,5 @@ --- -apiVersion: networking.k8s.io/v1 +apiVersion: networking.k8s.io/v1beta1 kind: Ingress metadata: name: prometheus-operator-grafana-oauth diff --git a/helmfile/cloud-sdk/charts/standalone-monitoring/templates/k8s-dashboard.yaml b/helmfile/cloud-sdk/charts/standalone-monitoring/templates/k8s-dashboard.yaml index e08b985..e951abc 100644 --- a/helmfile/cloud-sdk/charts/standalone-monitoring/templates/k8s-dashboard.yaml +++ b/helmfile/cloud-sdk/charts/standalone-monitoring/templates/k8s-dashboard.yaml @@ -1,5 +1,5 @@ --- -apiVersion: networking.k8s.io/v1 +apiVersion: networking.k8s.io/v1beta1 kind: Ingress metadata: name: k8s-dashboard-kubernetes-dashboard-oauth diff --git a/helmfile/cloud-sdk/charts/standalone-monitoring/templates/kibana.yaml b/helmfile/cloud-sdk/charts/standalone-monitoring/templates/kibana.yaml index ceb377e..b54ec8a 100644 --- a/helmfile/cloud-sdk/charts/standalone-monitoring/templates/kibana.yaml +++ b/helmfile/cloud-sdk/charts/standalone-monitoring/templates/kibana.yaml @@ -1,5 +1,5 @@ --- -apiVersion: networking.k8s.io/v1 +apiVersion: networking.k8s.io/v1beta1 kind: Ingress metadata: name: kibana-oauth diff --git a/helmfile/cloud-sdk/charts/standalone-monitoring/templates/prometheus.yaml b/helmfile/cloud-sdk/charts/standalone-monitoring/templates/prometheus.yaml index 5fccba3..ed886c2 100644 --- a/helmfile/cloud-sdk/charts/standalone-monitoring/templates/prometheus.yaml +++ b/helmfile/cloud-sdk/charts/standalone-monitoring/templates/prometheus.yaml @@ -1,5 +1,5 @@ --- -apiVersion: networking.k8s.io/v1 +apiVersion: networking.k8s.io/v1beta1 kind: Ingress metadata: name: prometheus-operator-prometheus-oauth