Skip to content
This repository was archived by the owner on Apr 25, 2023. It is now read-only.

Commit 4a723d2

Browse files
authored
Merge pull request #1521 from mesosphere/ingress-v1
fix: Move ingress from extensions/v1beta1 to networking.k8s.io/v1
2 parents 8620da0 + 2c0f37b commit 4a723d2

File tree

5 files changed

+36
-32
lines changed

5 files changed

+36
-32
lines changed

charts/kubefed/templates/federatedtypeconfig.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ spec:
5858
apiVersion: core.kubefed.io/v1beta1
5959
kind: FederatedTypeConfig
6060
metadata:
61-
name: ingresses.extensions
61+
name: ingresses.networking.k8s.io
6262
spec:
6363
federatedType:
6464
group: types.kubefed.io
@@ -68,11 +68,11 @@ spec:
6868
version: v1beta1
6969
propagation: Enabled
7070
targetType:
71-
group: extensions
71+
group: networking.k8s.io
7272
kind: Ingress
7373
pluralName: ingresses
7474
scope: Namespaced
75-
version: v1beta1
75+
version: v1
7676
---
7777
apiVersion: core.kubefed.io/v1beta1
7878
kind: FederatedTypeConfig
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
apiVersion: core.kubefed.io/v1beta1
22
kind: EnableTypeDirective
33
metadata:
4-
name: ingresses.extensions
4+
name: ingresses.networking.k8s.io

test/common/bindata.go

+24-22
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/common/fixtures/ingresses.extensions.yaml

-6
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
kind: fixture
2+
template:
3+
spec:
4+
defaultBackend:
5+
service:
6+
name: testsvc
7+
port:
8+
number: 80

0 commit comments

Comments
 (0)