v1.16: ingress under networking.k8s.io/v1beta1

pyeden · Nov 3, 2019 · 30c5c05 · 30c5c05
1 parent ca50179
commit 30c5c05
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/docs/guide/gitlab/app.yaml.md b/docs/guide/gitlab/app.yaml.md
@@ -71,7 +71,7 @@ spec:
   sessionAffinity: None
 
 ---
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1 
 kind: Ingress
 metadata:
   name: APP_NAME-ingress

diff --git a/docs/guide/ingress-tls.md b/docs/guide/ingress-tls.md
@@ -28,7 +28,7 @@ $ kubectl apply -f /etc/ansible/manifests/ingress/traefik/tls/traefik-controller
 # 创建示例应用
 $ kubectl run test-hello --image=nginx:alpine --port=80 --expose
 # hello-tls-ingress 示例
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1 
 kind: Ingress
 metadata:
   name: hello-tls-ingress
@@ -81,7 +81,7 @@ kubernetes-dashboard      NodePort    10.68.211.168   <none>        443:39308/TC
 配置 dashboard ingress：`kubectl apply -f /etc/ansible/manifests/ingress/traefik/tls/k8s-dashboard.ing.yaml` 内容如下：
 
 ```
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1 
 kind: Ingress
 metadata:
   name:  kubernetes-dashboard

diff --git a/docs/guide/ingress.md b/docs/guide/ingress.md
@@ -60,7 +60,7 @@ test-hello   ClusterIP   10.68.124.115   <none>        80/TCP    1m
 
 ``` bash
 # test-hello.ing.yaml内容
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1 
 kind: Ingress
 metadata:
   name: test-hello
@@ -84,7 +84,7 @@ spec:
 ``` bash
 # traefik-ui.ing.yaml内容
 ---
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1 
 kind: Ingress
 metadata:
   name: traefik-web-ui

diff --git a/manifests/prometheus/grafana/templates/ingress.yaml b/manifests/prometheus/grafana/templates/ingress.yaml
@@ -2,7 +2,7 @@
 {{- $fullName := include "grafana.fullname" . -}}
 {{- $servicePort := .Values.service.port -}}
 {{- $ingressPath := .Values.ingress.path -}}
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1 
 kind: Ingress
 metadata:
   name: {{ $fullName }}

diff --git a/manifests/prometheus/prometheus/templates/alertmanager-ingress.yaml b/manifests/prometheus/prometheus/templates/alertmanager-ingress.yaml
@@ -2,7 +2,7 @@
 {{- $releaseName := .Release.Name -}}
 {{- $serviceName := include "prometheus.alertmanager.fullname" . }}
 {{- $servicePort := .Values.alertmanager.service.servicePort -}}
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1 
 kind: Ingress
 metadata:
 {{- if .Values.alertmanager.ingress.annotations }}

diff --git a/manifests/prometheus/prometheus/templates/pushgateway-ingress.yaml b/manifests/prometheus/prometheus/templates/pushgateway-ingress.yaml
@@ -2,7 +2,7 @@
 {{- $releaseName := .Release.Name -}}
 {{- $serviceName := include "prometheus.pushgateway.fullname" . }}
 {{- $servicePort := .Values.pushgateway.service.servicePort -}}
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1 
 kind: Ingress
 metadata:
 {{- if .Values.pushgateway.ingress.annotations }}

diff --git a/manifests/prometheus/prometheus/templates/server-ingress.yaml b/manifests/prometheus/prometheus/templates/server-ingress.yaml
@@ -2,7 +2,7 @@
 {{- $releaseName := .Release.Name -}}
 {{- $serviceName := include "prometheus.server.fullname" . }}
 {{- $servicePort := .Values.server.service.servicePort -}}
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1 
 kind: Ingress
 metadata:
 {{- if .Values.server.ingress.annotations }}