Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate to networking.k8s.io/v1 #2425

Merged
merged 3 commits into from
Jul 30, 2021
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions apps/gcsweb/ingress.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: networking.k8s.io/v1beta1
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: gcsweb
Expand All @@ -10,6 +10,8 @@ metadata:
kubernetes.io/ingress.class: gce
networking.gke.io/managed-certificates: gcsweb
spec:
backend:
serviceName: gcsweb
servicePort: http
defaultBackend:
service:
name: gcsweb
port:
name: http
12 changes: 7 additions & 5 deletions apps/k8s-io/ingress-canary-v6.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: networking.k8s.io/v1beta1
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: k8s-io-v6
Expand All @@ -8,8 +8,10 @@ metadata:
annotations:
kubernetes.io/ingress.global-static-ip-name: k8s-io-ingress-canary-v6
spec:
defaultBackend:
service:
name: k8s-io
port:
name: http
tls:
- secretName: k8s-io-tls
backend:
serviceName: k8s-io
servicePort: http
- secretName: k8s-io-tls
12 changes: 7 additions & 5 deletions apps/k8s-io/ingress-canary.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: networking.k8s.io/v1beta1
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: k8s-io
Expand All @@ -8,8 +8,10 @@ metadata:
annotations:
kubernetes.io/ingress.global-static-ip-name: k8s-io-ingress-canary
spec:
defaultBackend:
service:
name: k8s-io
port:
name: http
tls:
- secretName: k8s-io-tls
backend:
serviceName: k8s-io
servicePort: http
- secretName: k8s-io-tls
10 changes: 6 additions & 4 deletions apps/k8s-io/ingress-prod-v6.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: networking.k8s.io/v1beta1
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: k8s-io-v6
Expand All @@ -10,6 +10,8 @@ metadata:
kubernetes.io/ingress.class: gce
networking.gke.io/managed-certificates: k8s-io-prod
spec:
backend:
serviceName: k8s-io
servicePort: http
defaultBackend:
service:
name: k8s-io
port:
name: http
10 changes: 6 additions & 4 deletions apps/k8s-io/ingress-prod.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: networking.k8s.io/v1beta1
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: k8s-io
Expand All @@ -10,6 +10,8 @@ metadata:
kubernetes.io/ingress.class: gce
networking.gke.io/managed-certificates: k8s-io-prod
spec:
backend:
serviceName: k8s-io
servicePort: http
defaultBackend:
service:
name: k8s-io
port:
name: http
10 changes: 6 additions & 4 deletions apps/node-perf-dash/ingress.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: networking.k8s.io/v1beta1
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: node-perf-dash
Expand All @@ -10,6 +10,8 @@ metadata:
kubernetes.io/ingress.global-static-ip-name: node-perf-dash-k8s-io-ingress-prod
networking.gke.io/managed-certificates: node-perf-dash-k8s-io
spec:
backend:
serviceName: node-perf-dash-status
servicePort: status
defaultBackend:
service:
name: node-perf-dash-status
port:
name: status
10 changes: 6 additions & 4 deletions apps/sippy/ingress.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: networking.k8s.io/v1beta1
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: sippy
Expand All @@ -10,6 +10,8 @@ metadata:
kubernetes.io/ingress.global-static-ip-name: "sippy-ingress-prod"
networking.gke.io/managed-certificates: sippy-k8s-io
spec:
backend:
serviceName: sippy
servicePort: 9080
defaultBackend:
service:
name: sippy
port:
number: 9080
69 changes: 43 additions & 26 deletions apps/slack-infra/resources/ingress.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: networking.k8s.io/v1beta1
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: slack-infra
Expand All @@ -7,29 +7,46 @@ metadata:
kubernetes.io/ingress.class: gce
networking.gke.io/managed-certificates: slack-infra
spec:
backend:
serviceName: slackin2
servicePort: 80
defaultBackend:
service:
name: slackin2
port:
number: 80
rules:
- http:
paths:
- path: /infra/event-log/*
backend:
serviceName: slack-event-log
servicePort: 80
- path: /infra/moderator/*
backend:
serviceName: slack-moderator
servicePort: 80
- path: /infra/welcomer/*
backend:
serviceName: slack-welcomer
servicePort: 80
- path: /infra/post-message/*
backend:
serviceName: slack-post-message
servicePort: 80
- path: /infra/moderator-words/*
backend:
serviceName: slack-moderator-words
servicePort: 80
- http:
paths:
- pathType: Prefix
path: "/infra/event-log/*"
backend:
service:
name: slack-event-log
port:
number: 80
- pathType: Prefix
path: "/infra/moderator/*"
backend:
service:
name: slack-moderator
port:
number: 80
- pathType: Prefix
path: "/infra/welcomer/*"
backend:
service:
name: slack-welcomer
port:
number: 80
- pathType: Prefix
path: "/infra/post-message/*"
backend:
service:
name: slack-post-message
port:
number: 80
- pathType: Prefix
path: "/infra/moderator-words/*"
backend:
service:
name: slack-moderator-words
port:
number: 80
10 changes: 6 additions & 4 deletions apps/triageparty-release/ingress.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: networking.k8s.io/v1beta1
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: triage-party-release
Expand All @@ -11,6 +11,8 @@ metadata:
kubernetes.io/ingress.global-static-ip-name: "triage-party-release-ingress-prod"
networking.gke.io/managed-certificates: "release-triage-k8s-io"
spec:
backend:
serviceName: triage-party-release
servicePort: 8080
defaultBackend:
service:
name: triage-party-release
port:
number: 8080