chore(K8s): migrate from CoreV1 Endpoints to DiscoveryV1 EndpointSlice (

#3997)
Kong · May 16, 2023 · 11ff796 · 11ff796
1 parent 4fa7cf0
commit 11ff796
Show file tree

Hide file tree

Showing 18 changed files with 329 additions and 385 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -115,6 +115,16 @@ Adding a new version? You'll need three changes:
   once their installation is detected, making restarting the process unnecessary.
   [#3996](https://github.com/Kong/kubernetes-ingress-controller/pull/3996)
 
+### Changed
+
+- Kong Ingress Controller no longer relies on `k8s.io.api.core.v1` `Endpoints`,
+  and instead uses `discovery.k8s.io/v1` `EndpointSlice` to discover endpoints
+  for Kubernetes Services.
+  [#3997](https://github.com/Kong/kubernetes-ingress-controller/pull/3997)
+  [#3998](https://github.com/Kong/kubernetes-ingress-controller/pull/3998)
+  [#3980](https://github.com/Kong/kubernetes-ingress-controller/pull/3980)
+  [#3977](https://github.com/Kong/kubernetes-ingress-controller/pull/3977)
+
 ### Fixed
 
 - Fix paging in `GetAdminAPIsForService` which might have caused the controller

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -4,21 +4,6 @@ kind: ClusterRole
 metadata:
   name: kong-ingress
 rules:
-- apiGroups:
-  - ""
-  resources:
-  - endpoints
-  verbs:
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - endpoints/status
-  verbs:
-  - get
-  - patch
-  - update
 - apiGroups:
   - ""
   resources:

diff --git a/deploy/single/all-in-one-dbless-enterprise.yaml b/deploy/single/all-in-one-dbless-enterprise.yaml
@@ -1167,21 +1167,6 @@ kind: ClusterRole
 metadata:
   name: kong-ingress
 rules:
-- apiGroups:
-  - ""
-  resources:
-  - endpoints
-  verbs:
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - endpoints/status
-  verbs:
-  - get
-  - patch
-  - update
 - apiGroups:
   - ""
   resources:

diff --git a/deploy/single/all-in-one-dbless-k4k8s-enterprise.yaml b/deploy/single/all-in-one-dbless-k4k8s-enterprise.yaml
@@ -1167,21 +1167,6 @@ kind: ClusterRole
 metadata:
   name: kong-ingress
 rules:
-- apiGroups:
-  - ""
-  resources:
-  - endpoints
-  verbs:
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - endpoints/status
-  verbs:
-  - get
-  - patch
-  - update
 - apiGroups:
   - ""
   resources:

diff --git a/deploy/single/all-in-one-dbless-konnect-enterprise.yaml b/deploy/single/all-in-one-dbless-konnect-enterprise.yaml
@@ -1167,21 +1167,6 @@ kind: ClusterRole
 metadata:
   name: kong-ingress
 rules:
-- apiGroups:
-  - ""
-  resources:
-  - endpoints
-  verbs:
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - endpoints/status
-  verbs:
-  - get
-  - patch
-  - update
 - apiGroups:
   - ""
   resources:

diff --git a/deploy/single/all-in-one-dbless-konnect.yaml b/deploy/single/all-in-one-dbless-konnect.yaml
@@ -1167,21 +1167,6 @@ kind: ClusterRole
 metadata:
   name: kong-ingress
 rules:
-- apiGroups:
-  - ""
-  resources:
-  - endpoints
-  verbs:
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - endpoints/status
-  verbs:
-  - get
-  - patch
-  - update
 - apiGroups:
   - ""
   resources:

diff --git a/deploy/single/all-in-one-dbless-legacy.yaml b/deploy/single/all-in-one-dbless-legacy.yaml
@@ -1167,21 +1167,6 @@ kind: ClusterRole
 metadata:
   name: kong-ingress
 rules:
-- apiGroups:
-  - ""
-  resources:
-  - endpoints
-  verbs:
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - endpoints/status
-  verbs:
-  - get
-  - patch
-  - update
 - apiGroups:
   - ""
   resources:

diff --git a/deploy/single/all-in-one-dbless.yaml b/deploy/single/all-in-one-dbless.yaml
@@ -1167,21 +1167,6 @@ kind: ClusterRole
 metadata:
   name: kong-ingress
 rules:
-- apiGroups:
-  - ""
-  resources:
-  - endpoints
-  verbs:
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - endpoints/status
-  verbs:
-  - get
-  - patch
-  - update
 - apiGroups:
   - ""
   resources:

diff --git a/deploy/single/all-in-one-postgres-enterprise.yaml b/deploy/single/all-in-one-postgres-enterprise.yaml
@@ -1167,21 +1167,6 @@ kind: ClusterRole
 metadata:
   name: kong-ingress
 rules:
-- apiGroups:
-  - ""
-  resources:
-  - endpoints
-  verbs:
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - endpoints/status
-  verbs:
-  - get
-  - patch
-  - update
 - apiGroups:
   - ""
   resources:

diff --git a/deploy/single/all-in-one-postgres.yaml b/deploy/single/all-in-one-postgres.yaml
@@ -1167,21 +1167,6 @@ kind: ClusterRole
 metadata:
   name: kong-ingress
 rules:
-- apiGroups:
-  - ""
-  resources:
-  - endpoints
-  verbs:
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - endpoints/status
-  verbs:
-  - get
-  - patch
-  - update
 - apiGroups:
   - ""
   resources:

diff --git a/hack/generators/controllers/networking/main.go b/hack/generators/controllers/networking/main.go
@@ -16,8 +16,9 @@ import (
 const (
 	outputFile = "../../internal/controllers/configuration/zz_generated_controllers.go"
 
-	corev1 = "k8s.io/api/core/v1"
-	netv1  = "k8s.io/api/networking/v1"
+	corev1      = "k8s.io/api/core/v1"
+	discoveryv1 = "k8s.io/api/discovery/v1"
+	netv1       = "k8s.io/api/networking/v1"
 
 	kongv1       = "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1"
 	kongv1beta1  = "github.com/kong/kubernetes-ingress-controller/v2/api/configuration/v1beta1"
@@ -45,15 +46,15 @@ var inputControllersNeeded = &typesNeeded{
 		RBACVerbs:                         []string{"get", "list", "watch"},
 	},
 	typeNeeded{
-		Group:                             "\"\"",
+		Group:                             "discovery.k8s.io",
 		Version:                           "v1",
-		Kind:                              "Endpoints",
-		PackageImportAlias:                "corev1",
-		PackageAlias:                      "CoreV1",
-		Package:                           corev1,
-		Plural:                            "endpoints",
-		CacheType:                         "Endpoint",
-		NeedsStatusPermissions:            true,
+		Kind:                              "EndpointSlice",
+		PackageImportAlias:                "discoveryv1",
+		PackageAlias:                      "DiscoveryV1",
+		Package:                           discoveryv1,
+		Plural:                            "endpointslices",
+		CacheType:                         "EndpointSlice",
+		NeedsStatusPermissions:            false,
 		AcceptsIngressClassNameAnnotation: false,
 		AcceptsIngressClassNameSpec:       false,
 		RBACVerbs:                         []string{"list", "watch"},
@@ -360,6 +361,7 @@ import (
 
 	"github.com/go-logr/logr"
 	corev1 "k8s.io/api/core/v1"
+	discoveryv1 "k8s.io/api/discovery/v1"
 	netv1 "k8s.io/api/networking/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -584,7 +586,7 @@ func (r *{{.PackageAlias}}{{.Kind}}Reconciler) Reconcile(ctx context.Context, re
 	// if status updates are enabled report the status for the object
 	if r.DataplaneClient.AreKubernetesObjectReportsEnabled() {
 		log.V(util.DebugLevel).Info("determining whether data-plane configuration has succeeded", "namespace", req.Namespace, "name", req.Name)
-		
+
 		if  !r.DataplaneClient.KubernetesObjectIsConfigured(obj) {
 			log.V(util.DebugLevel).Info("resource not yet configured in the data-plane", "namespace", req.Namespace, "name", req.Name)
 			return ctrl.Result{Requeue: true}, nil // requeue until the object has been properly configured

diff --git a/internal/controllers/configuration/zz_generated_controllers.go b/internal/controllers/configuration/zz_generated_controllers.go