chore: Update Ingress apiVersion to networking.k8s.io/v1beta1 (argopr…

…oj#7188) * chore: Update Ingress apiVersion to networking.k8s.io/v1beta1 Signed-off-by: Yuan Tang <[email protected]> * Revert changes in controller/cache/info_test.go Signed-off-by: Yuan Tang <[email protected]>
dajudge · Sep 10, 2021 · 49378a9 · 49378a9
1 parent a38f317
commit 49378a9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/controller/cache/info_test.go b/controller/cache/info_test.go
@@ -441,7 +441,7 @@ func TestGetIngressInfoNoHost(t *testing.T) {
 }
 func TestExternalUrlWithSubPath(t *testing.T) {
  ingress := strToUnstructured(`
- apiVersion: extensions/v1beta1
+ apiVersion: networking.k8s.io/v1
  kind: Ingress
  metadata:
  name: helm-guestbook
@@ -469,7 +469,7 @@ func TestExternalUrlWithSubPath(t *testing.T) {
 }
 func TestExternalUrlWithMultipleSubPaths(t *testing.T) {
  ingress := strToUnstructured(`
- apiVersion: extensions/v1beta1
+ apiVersion: networking.k8s.io/v1
  kind: Ingress
  metadata:
  name: helm-guestbook
@@ -508,7 +508,7 @@ func TestExternalUrlWithMultipleSubPaths(t *testing.T) {
 }
 func TestExternalUrlWithNoSubPath(t *testing.T) {
  ingress := strToUnstructured(`
- apiVersion: extensions/v1beta1
+ apiVersion: networking.k8s.io/v1
  kind: Ingress
  metadata:
  name: helm-guestbook

diff --git a/docs/operator-manual/ingress.md b/docs/operator-manual/ingress.md
@@ -79,7 +79,7 @@ Since Contour Ingress supports only a single protocol per Ingress object, define
 
 Internal HTTP/HTTPS Ingress:
 ```yaml
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
  name: argocd-server-http
@@ -102,7 +102,7 @@ spec:
 
 Internal gRPC Ingress:
 ```yaml
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
  name: argocd-server-grpc
@@ -124,7 +124,7 @@ spec:
 
 External HTTPS SSO Callback Ingress:
 ```yaml
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
  name: argocd-server-external-callback-http
@@ -178,7 +178,7 @@ In order to expose the Argo CD API server with a single ingress rule and hostnam
 must be used to passthrough TLS connections and terminate TLS at the Argo CD API server.
 
 ```yaml
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
  name: argocd-server-ingress
@@ -244,7 +244,7 @@ way would be to define two Ingress objects. One for HTTP/HTTPS, and the other fo
 
 HTTP/HTTPS Ingress:
 ```yaml
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
  name: argocd-server-http-ingress
@@ -269,7 +269,7 @@ spec:
 
 gRPC Ingress:
 ```yaml
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
  name: argocd-server-grpc-ingress
@@ -379,7 +379,7 @@ spec:
 Once we create this service, we can configure the Ingress to conditionally route all `application/grpc` traffic to the new HTTP2 backend, using the `alb.ingress.kubernetes.io/conditions` annotation, as seen below. Note: The value after the . in the condition annotation _must_ be the same name as the service that you want traffic to route to - and will be applied on any path with a matching serviceName. 
 
 ```yaml
- apiVersion: networking.k8s.io/v1 # Use extensions/v1beta1 for Kubernetes 1.18 and older
+ apiVersion: networking.k8s.io/v1
  kind: Ingress
  metadata:
  annotations:

diff --git a/test/e2e/testdata/deprecated-extensions/ingress.yaml b/test/e2e/testdata/deprecated-extensions/ingress.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
  name: extensions-ingress

diff --git a/test/e2e/testdata/networking/guestbook-ui-svc-ingress.yaml b/test/e2e/testdata/networking/guestbook-ui-svc-ingress.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
  name: guestbook-ui
@@ -17,7 +17,7 @@ spec:
  serviceName: guestbook-ui-internal
  servicePort: 80
 ---
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
  name: guestbook-ui-2