From 207a13323375a21e8a0a38c93e029aa7916e53e1 Mon Sep 17 00:00:00 2001
From: Kemal Akkoyun <kakkoyun@gmail.com>
Date: Fri, 6 Nov 2020 15:13:37 +0100
Subject: [PATCH] Update ingress API
Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>
---
...prometheus-alertmanager-grafana-ingress.md | 8 +++++---
examples/ingress.jsonnet | 20 ++++++++++++-------
2 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/docs/exposing-prometheus-alertmanager-grafana-ingress.md b/docs/exposing-prometheus-alertmanager-grafana-ingress.md
index 4e8615ca..f05ab4ce 100644
--- a/docs/exposing-prometheus-alertmanager-grafana-ingress.md
+++ b/docs/exposing-prometheus-alertmanager-grafana-ingress.md
@@ -42,7 +42,7 @@ local kp =
},
ingress+:: {
'prometheus-k8s': {
- apiVersion: 'extensions/v1beta1',
+ apiVersion: 'networking.k8s.io/v1',
kind: 'Ingress',
metadata: {
name: $.prometheus.prometheus.metadata.name,
@@ -59,8 +59,10 @@ local kp =
http: {
paths: [{
backend: {
- serviceName: $.prometheus.service.metadata.name,
- servicePort: 'web',
+ service: {
+ name: $.prometheus.service.metadata.name,
+ port: 'web',
+ },
},
}],
},
diff --git a/examples/ingress.jsonnet b/examples/ingress.jsonnet
index 32dd2f1c..023af577 100644
--- a/examples/ingress.jsonnet
+++ b/examples/ingress.jsonnet
@@ -1,5 +1,5 @@
local ingress(name, namespace, rules) = {
- apiVersion: 'extensions/v1beta1',
+ apiVersion: 'networking.k8s.io/v1',
kind: 'Ingress',
metadata: {
name: name,
@@ -53,8 +53,10 @@ local kp =
http: {
paths: [{
backend: {
- serviceName: 'alertmanager-main',
- servicePort: 'web',
+ service: {
+ name: 'alertmanager-main',
+ port: 'web',
+ },
},
}],
},
@@ -68,8 +70,10 @@ local kp =
http: {
paths: [{
backend: {
- serviceName: 'grafana',
- servicePort: 'http',
+ service: {
+ name: 'grafana',
+ port: 'http',
+ },
},
}],
},
@@ -83,8 +87,10 @@ local kp =
http: {
paths: [{
backend: {
- serviceName: 'prometheus-k8s',
- servicePort: 'web',
+ service: {
+ name: 'prometheus-k8s',
+ port: 'web',
+ },
},
}],
},
--
GitLab