Merge branch 'master' into jm-model-update

# Conflicts: # pkg/controller/controller.go # pkg/controller/listers.go # pkg/converters/ingress/ingress.go # pkg/converters/ingress/ingress_test.go
jcmoraisjr · Jul 20, 2020 · 886bdd3 · 886bdd3
2 parents ea8274a + 8fc9ca4
commit 886bdd3
Show file tree

Hide file tree

Showing 30 changed files with 100 additions and 97 deletions.
diff --git a/docs/content/en/docs/configuration/command-line.md b/docs/content/en/docs/configuration/command-line.md
@@ -148,7 +148,7 @@ remove old configuration files. If `0`, the default value, a single `haproxy.cfg
 Some infrastructure tools like `external-DNS` relay in the ingress status to created access routes to the services exposed with ingress object.
 
 ```
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 ...
 status:

diff --git a/docs/content/en/docs/examples/blue-green.md b/docs/content/en/docs/examples/blue-green.md
@@ -79,7 +79,7 @@ Configure the ingress resource. No need to change the host below, `bluegreen.exa
 
 ```
 $ kubectl create -f - <<EOF
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   annotations:

diff --git a/docs/content/en/docs/examples/metrics.md b/docs/content/en/docs/examples/metrics.md
@@ -79,7 +79,7 @@ Create the ingress which will expose Grafana. Change `HOST` below to a domain of
 ```
 HOST=grafana.192.168.1.1.nip.io
 kubectl create -f - <<EOF
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   name: grafana

diff --git a/docs/content/en/docs/examples/metrics/whoami-ingress.yaml b/docs/content/en/docs/examples/metrics/whoami-ingress.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   annotations:

diff --git a/docs/content/en/docs/examples/modsecurity.md b/docs/content/en/docs/examples/modsecurity.md
@@ -86,7 +86,7 @@ No need to use a valid domain, `echo.domain` below is fine:
 
 ```console
 $ kubectl create -f - <<EOF
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   annotations:

diff --git a/docs/content/en/docs/getting-started/_index.md b/docs/content/en/docs/getting-started/_index.md
@@ -104,7 +104,7 @@ Obs.: `nip.io` is a convenient service which converts a valid domain name to any
 ```shell
 $ HOST=nginx.192.168.1.1.nip.io
 $ kubectl create -f - <<EOF
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   name: nginx

diff --git a/docs/haproxy-ingress.yaml b/docs/haproxy-ingress.yaml
@@ -10,7 +10,7 @@ metadata:
   name: ingress-controller
   namespace: ingress-controller
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: ingress-controller
@@ -42,6 +42,7 @@ rules:
       - watch
   - apiGroups:
       - "extensions"
+      - "networking.k8s.io"
     resources:
       - ingresses
     verbs:
@@ -57,12 +58,13 @@ rules:
       - patch
   - apiGroups:
       - "extensions"
+      - "networking.k8s.io"
     resources:
       - ingresses/status
     verbs:
       - update
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: ingress-controller
@@ -99,7 +101,7 @@ rules:
       - create
       - update
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: ingress-controller
@@ -115,7 +117,7 @@ subjects:
     kind: User
     name: ingress-controller
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: ingress-controller

diff --git a/docs/static/resources/haproxy-ingress.yaml b/docs/static/resources/haproxy-ingress.yaml
@@ -9,7 +9,7 @@ metadata:
   name: ingress-controller
   namespace: ingress-controller
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: ingress-controller
@@ -41,6 +41,7 @@ rules:
       - watch
   - apiGroups:
       - "extensions"
+      - "networking.k8s.io"
     resources:
       - ingresses
     verbs:
@@ -56,12 +57,13 @@ rules:
       - patch
   - apiGroups:
       - "extensions"
+      - "networking.k8s.io"
     resources:
       - ingresses/status
     verbs:
       - update
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: ingress-controller
@@ -98,7 +100,7 @@ rules:
       - create
       - update
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: ingress-controller
@@ -114,7 +116,7 @@ subjects:
     kind: User
     name: ingress-controller
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: ingress-controller

diff --git a/examples/auth/oauth/README.md b/examples/auth/oauth/README.md
@@ -62,7 +62,7 @@ After editing, create the oauth2-proxy deployment and service:
 
 ```
 $ kubectl create -f oauth2-proxy.yaml
-deployment.extensions "oauth2-proxy" created
+deployment.apps "oauth2-proxy" created
 service "oauth2-proxy" exposed
 ```
 
@@ -93,7 +93,7 @@ After editing, create the ingress resource:
 
 ```
 $ kubectl create -f app.yaml
-ingress.extensions "app" created
+ingress.networking.k8s.io/app created
 ```
 
 Fire a request to your domain and an optional `/uri`. Your OAuth2

diff --git a/examples/auth/oauth/app.yaml b/examples/auth/oauth/app.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   annotations:

diff --git a/examples/blue-green/README.md b/examples/blue-green/README.md
@@ -73,7 +73,7 @@ Configure the ingress resource. No need to change the host below, `bluegreen.exa
 
 ```
 $ kubectl create -f - <<EOF
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   annotations:

diff --git a/examples/deployment/README.md b/examples/deployment/README.md
@@ -107,7 +107,7 @@ From now the optional web app should be deployed. Deploy an ingress resource to
 
 ```console
 $ kubectl --namespace=ingress-controller create -f - <<EOF
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   name: app

diff --git a/examples/deployment/haproxy-ingress.yaml b/examples/deployment/haproxy-ingress.yaml
@@ -1,5 +1,5 @@
 # see https://kubernetes.io/docs/reference/workloads-18-19
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:

diff --git a/examples/modsecurity/README.md b/examples/modsecurity/README.md
@@ -80,7 +80,7 @@ No need to use a valid domain, `echo.domain` below is fine:
 
 ```console
 $ kubectl create -f - <<EOF
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   annotations:

diff --git a/examples/multi-tls/ingress-multi-tls.yaml b/examples/multi-tls/ingress-multi-tls.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   name: app

diff --git a/examples/rbac/ingress-controller-rbac.yml b/examples/rbac/ingress-controller-rbac.yml
@@ -10,7 +10,7 @@ metadata:
   name: ingress-controller
   namespace: ingress-controller
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: ingress-controller
@@ -62,7 +62,7 @@ rules:
     verbs:
       - update
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: ingress-controller
@@ -99,7 +99,7 @@ rules:
       - create
       - update
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: ingress-controller
@@ -115,7 +115,7 @@ subjects:
     kind: User
     name: ingress-controller
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: ingress-controller

diff --git a/examples/tls-termination/ingress-tls-default.yaml b/examples/tls-termination/ingress-tls-default.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   name: app

diff --git a/examples/tls-termination/ingress-tls-foobar.yaml b/examples/tls-termination/ingress-tls-foobar.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   name: app

diff --git a/go.sum b/go.sum
@@ -200,7 +200,6 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=

diff --git a/pkg/common/ingress/controller/controller.go b/pkg/common/ingress/controller/controller.go
@@ -26,7 +26,7 @@ import (
 	"github.com/golang/glog"
 
 	apiv1 "k8s.io/api/core/v1"
-	extensions "k8s.io/api/extensions/v1beta1"
+	networking "k8s.io/api/networking/v1beta1"
 	clientset "k8s.io/client-go/kubernetes"
 	v1core "k8s.io/client-go/kubernetes/typed/core/v1"
 	"k8s.io/client-go/tools/record"
@@ -38,7 +38,7 @@ import (
 // NewCtrlIntf is a temporary interface used by this generic and now
 // deprecated controller to call functionality moved to the new controller.
 type NewCtrlIntf interface {
-	GetIngressList() ([]*extensions.Ingress, error)
+	GetIngressList() ([]*networking.Ingress, error)
 	GetSecret(name string) (*apiv1.Secret, error)
 }
 
@@ -127,7 +127,7 @@ func newIngressController(config *Configuration) *GenericController {
 const IngressClassKey = "kubernetes.io/ingress.class"
 
 // IsValidClass ...
-func (ic *GenericController) IsValidClass(ing *extensions.Ingress) bool {
+func (ic *GenericController) IsValidClass(ing *networking.Ingress) bool {
 	ann, found := ing.Annotations[IngressClassKey]
 
 	if ic.cfg.IgnoreIngressWithoutClass {

diff --git a/pkg/common/ingress/controller/launch.go b/pkg/common/ingress/controller/launch.go
@@ -234,7 +234,7 @@ func NewIngressController(backend ingress.Controller) *GenericController {
 	}
 
 	if *watchNamespace != "" {
-		_, err = kubeClient.ExtensionsV1beta1().Ingresses(*watchNamespace).List(metav1.ListOptions{Limit: 1})
+		_, err = kubeClient.NetworkingV1beta1().Ingresses(*watchNamespace).List(metav1.ListOptions{Limit: 1})
 		if err != nil {
 			glog.Fatalf("no watchNamespace with name %v found: %v", *watchNamespace, err)
 		}

diff --git a/pkg/common/ingress/controller/status.go b/pkg/common/ingress/controller/status.go
@@ -30,7 +30,7 @@ import (
 
 	pool "gopkg.in/go-playground/pool.v3"
 	apiv1 "k8s.io/api/core/v1"
-	extensions "k8s.io/api/extensions/v1beta1"
+	networking "k8s.io/api/networking/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/util/wait"
@@ -310,11 +310,11 @@ func (s *statusSync) updateStatus(newIngressPoint []apiv1.LoadBalancerIngress) e
 			continue
 		}
 
-		var callback func(*extensions.Ingress) []apiv1.LoadBalancerIngress
+		var callback func(*networking.Ingress) []apiv1.LoadBalancerIngress
 		if s.ic.cfg.Backend != nil {
 			callback = s.ic.cfg.Backend.UpdateIngressStatus
 		} else {
-			callback = func(*extensions.Ingress) []apiv1.LoadBalancerIngress { return nil }
+			callback = func(*networking.Ingress) []apiv1.LoadBalancerIngress { return nil }
 		}
 		batch.Queue(runUpdate(ing, newIngressPoint, s.ic.cfg.Client, callback))
 	}
@@ -325,9 +325,9 @@ func (s *statusSync) updateStatus(newIngressPoint []apiv1.LoadBalancerIngress) e
 	return nil
 }
 
-func runUpdate(ing *extensions.Ingress, status []apiv1.LoadBalancerIngress,
+func runUpdate(ing *networking.Ingress, status []apiv1.LoadBalancerIngress,
 	client clientset.Interface,
-	statusFunc func(*extensions.Ingress) []apiv1.LoadBalancerIngress) pool.WorkFunc {
+	statusFunc func(*networking.Ingress) []apiv1.LoadBalancerIngress) pool.WorkFunc {
 	return func(wu pool.WorkUnit) (interface{}, error) {
 		if wu.IsCancelled() {
 			return nil, nil
@@ -348,7 +348,7 @@ func runUpdate(ing *extensions.Ingress, status []apiv1.LoadBalancerIngress,
 			return true, nil
 		}
 
-		ingClient := client.ExtensionsV1beta1().Ingresses(ing.Namespace)
+		ingClient := client.NetworkingV1beta1().Ingresses(ing.Namespace)
 
 		currIng, err := ingClient.Get(ing.Name, metav1.GetOptions{})
 		if err != nil {

diff --git a/pkg/common/ingress/types.go b/pkg/common/ingress/types.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/spf13/pflag"
 	apiv1 "k8s.io/api/core/v1"
-	extensions "k8s.io/api/extensions/v1beta1"
+	networking "k8s.io/api/networking/v1beta1"
 	"k8s.io/apiserver/pkg/server/healthz"
 )
 
@@ -53,7 +53,7 @@ type Controller interface {
 	// UpdateIngressStatus custom callback used to update the status in an Ingress rule
 	// This allows custom implementations
 	// If the function returns nil the standard functions will be executed.
-	UpdateIngressStatus(*extensions.Ingress) []apiv1.LoadBalancerIngress
+	UpdateIngressStatus(*networking.Ingress) []apiv1.LoadBalancerIngress
 }
 
 // BackendInfo returns information about the backend.