Merge pull request #1521 from mesosphere/ingress-v1

fix: Move ingress from extensions/v1beta1 to networking.k8s.io/v1
kubernetes-retired · Aug 10, 2022 · 4a723d2 · 4a723d2
2 parents 8620da0 + 2c0f37b
commit 4a723d2
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 32 deletions.
diff --git a/charts/kubefed/templates/federatedtypeconfig.yaml b/charts/kubefed/templates/federatedtypeconfig.yaml
@@ -58,7 +58,7 @@ spec:
 apiVersion: core.kubefed.io/v1beta1
 kind: FederatedTypeConfig
 metadata:
-  name: ingresses.extensions
+  name: ingresses.networking.k8s.io
 spec:
   federatedType:
     group: types.kubefed.io
@@ -68,11 +68,11 @@ spec:
     version: v1beta1
   propagation: Enabled
   targetType:
-    group: extensions
+    group: networking.k8s.io
     kind: Ingress
     pluralName: ingresses
     scope: Namespaced
-    version: v1beta1
+    version: v1
 ---
 apiVersion: core.kubefed.io/v1beta1
 kind: FederatedTypeConfig

diff --git a/...etypedirectives/ingresses.extensions.yaml → ...rectives/ingresses.networking.k8s.io.yaml b/...etypedirectives/ingresses.extensions.yaml → ...rectives/ingresses.networking.k8s.io.yaml
@@ -1,4 +1,4 @@
 apiVersion: core.kubefed.io/v1beta1
 kind: EnableTypeDirective
 metadata:
-  name: ingresses.extensions
+  name: ingresses.networking.k8s.io
diff --git a/test/common/bindata.go b/test/common/bindata.go
diff --git a/test/common/fixtures/ingresses.extensions.yaml b/test/common/fixtures/ingresses.extensions.yaml
diff --git a/test/common/fixtures/ingresses.networking.k8s.io.yaml b/test/common/fixtures/ingresses.networking.k8s.io.yaml
@@ -0,0 +1,8 @@
+kind: fixture
+template:
+  spec:
+    defaultBackend:
+      service:
+        name: testsvc
+        port:
+          number: 80