github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Update controlplane to use EndpointSlice V1 API

Browse Source
This commit is contained in:
Swetha Repakula 2021-03-04 21:43:10 -08:00
parent d6a9061cb4
commit 6bc5796750
5 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/controlplane/controller_test.go
View File

@ -22,7 +22,7 @@ import (
"testing" "testing"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
discoveryv1beta1 "k8s.io/api/discovery/v1beta1" discoveryv1 "k8s.io/api/discovery/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/kubernetes/fake"
@ -36,7 +36,7 @@ func TestReconcileEndpoints(t *testing.T) {
o := metav1.ObjectMeta{Namespace: ns, Name: name} o := metav1.ObjectMeta{Namespace: ns, Name: name}
if skipMirrorLabel { if skipMirrorLabel {
o.Labels = map[string]string{ o.Labels = map[string]string{
discoveryv1beta1.LabelSkipMirror: "true", discoveryv1.LabelSkipMirror: "true",
} }
} }
return o return o

2
pkg/controlplane/instance.go
View File

@ -81,7 +81,7 @@ import (
"k8s.io/client-go/informers" "k8s.io/client-go/informers"
"k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes"
corev1client "k8s.io/client-go/kubernetes/typed/core/v1" corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
discoveryclient "k8s.io/client-go/kubernetes/typed/discovery/v1beta1" discoveryclient "k8s.io/client-go/kubernetes/typed/discovery/v1"
"k8s.io/component-base/version" "k8s.io/component-base/version"
"k8s.io/component-helpers/apimachinery/lease" "k8s.io/component-helpers/apimachinery/lease"
"k8s.io/klog/v2" "k8s.io/klog/v2"

7
pkg/controlplane/reconcilers/endpointsadapter.go
View File

@ -20,12 +20,12 @@ import (
"context" "context"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
discovery "k8s.io/api/discovery/v1beta1" discovery "k8s.io/api/discovery/v1"
apiequality "k8s.io/apimachinery/pkg/api/equality" apiequality "k8s.io/apimachinery/pkg/api/equality"
"k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
corev1client "k8s.io/client-go/kubernetes/typed/core/v1" corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
discoveryclient "k8s.io/client-go/kubernetes/typed/discovery/v1beta1" discoveryclient "k8s.io/client-go/kubernetes/typed/discovery/v1"
utilnet "k8s.io/utils/net" utilnet "k8s.io/utils/net"
) )
@ -174,9 +174,6 @@ func endpointFromAddress(address corev1.EndpointAddress, ready bool) discovery.E
} }
if address.NodeName != nil { if address.NodeName != nil {
ep.Topology = map[string]string{
"kubernetes.io/hostname": *address.NodeName,
}
ep.NodeName = address.NodeName ep.NodeName = address.NodeName
} }

18
pkg/controlplane/reconcilers/endpointsadapter_test.go
View File

@ -22,7 +22,7 @@ import (
"testing" "testing"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
discovery "k8s.io/api/discovery/v1beta1" discovery "k8s.io/api/discovery/v1"
apiequality "k8s.io/apimachinery/pkg/api/equality" apiequality "k8s.io/apimachinery/pkg/api/equality"
"k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@ -80,7 +80,7 @@ func TestEndpointsAdapterGet(t *testing.T) {
client := fake.NewSimpleClientset() client := fake.NewSimpleClientset()
epAdapter := EndpointsAdapter{endpointClient: client.CoreV1()} epAdapter := EndpointsAdapter{endpointClient: client.CoreV1()}
if testCase.endpointSlicesEnabled { if testCase.endpointSlicesEnabled {
epAdapter.endpointSliceClient = client.DiscoveryV1beta1() epAdapter.endpointSliceClient = client.DiscoveryV1()
} }
for _, endpoints := range testCase.endpoints { for _, endpoints := range testCase.endpoints {
@ -178,7 +178,7 @@ func TestEndpointsAdapterCreate(t *testing.T) {
client := fake.NewSimpleClientset() client := fake.NewSimpleClientset()
epAdapter := EndpointsAdapter{endpointClient: client.CoreV1()} epAdapter := EndpointsAdapter{endpointClient: client.CoreV1()}
if testCase.endpointSlicesEnabled { if testCase.endpointSlicesEnabled {
epAdapter.endpointSliceClient = client.DiscoveryV1beta1() epAdapter.endpointSliceClient = client.DiscoveryV1()
} }
for _, endpoints := range testCase.endpoints { for _, endpoints := range testCase.endpoints {
@ -198,7 +198,7 @@ func TestEndpointsAdapterCreate(t *testing.T) {
t.Errorf("Expected endpoints: %v, got: %v", testCase.expectedEndpoints, endpoints) t.Errorf("Expected endpoints: %v, got: %v", testCase.expectedEndpoints, endpoints)
} }
epSliceList, err := client.DiscoveryV1beta1().EndpointSlices(testCase.namespaceParam).List(context.TODO(), metav1.ListOptions{}) epSliceList, err := client.DiscoveryV1().EndpointSlices(testCase.namespaceParam).List(context.TODO(), metav1.ListOptions{})
if err != nil { if err != nil {
t.Fatalf("Error listing Endpoint Slices: %v", err) t.Fatalf("Error listing Endpoint Slices: %v", err)
} }
@ -290,7 +290,7 @@ func TestEndpointsAdapterUpdate(t *testing.T) {
client := fake.NewSimpleClientset() client := fake.NewSimpleClientset()
epAdapter := EndpointsAdapter{endpointClient: client.CoreV1()} epAdapter := EndpointsAdapter{endpointClient: client.CoreV1()}
if testCase.endpointSlicesEnabled { if testCase.endpointSlicesEnabled {
epAdapter.endpointSliceClient = client.DiscoveryV1beta1() epAdapter.endpointSliceClient = client.DiscoveryV1()
} }
for _, endpoints := range testCase.endpoints { for _, endpoints := range testCase.endpoints {
@ -310,7 +310,7 @@ func TestEndpointsAdapterUpdate(t *testing.T) {
t.Errorf("Expected endpoints: %v, got: %v", testCase.expectedEndpoints, endpoints) t.Errorf("Expected endpoints: %v, got: %v", testCase.expectedEndpoints, endpoints)
} }
epSliceList, err := client.DiscoveryV1beta1().EndpointSlices(testCase.namespaceParam).List(context.TODO(), metav1.ListOptions{}) epSliceList, err := client.DiscoveryV1().EndpointSlices(testCase.namespaceParam).List(context.TODO(), metav1.ListOptions{})
if err != nil { if err != nil {
t.Fatalf("Error listing Endpoint Slices: %v", err) t.Fatalf("Error listing Endpoint Slices: %v", err)
} }
@ -432,11 +432,11 @@ func TestEndpointsAdapterEnsureEndpointSliceFromEndpoints(t *testing.T) {
client := fake.NewSimpleClientset() client := fake.NewSimpleClientset()
epAdapter := EndpointsAdapter{endpointClient: client.CoreV1()} epAdapter := EndpointsAdapter{endpointClient: client.CoreV1()}
if testCase.endpointSlicesEnabled { if testCase.endpointSlicesEnabled {
epAdapter.endpointSliceClient = client.DiscoveryV1beta1() epAdapter.endpointSliceClient = client.DiscoveryV1()
} }
for _, endpointSlice := range testCase.endpointSlices { for _, endpointSlice := range testCase.endpointSlices {
_, err := client.DiscoveryV1beta1().EndpointSlices(endpointSlice.Namespace).Create(context.TODO(), endpointSlice, metav1.CreateOptions{}) _, err := client.DiscoveryV1().EndpointSlices(endpointSlice.Namespace).Create(context.TODO(), endpointSlice, metav1.CreateOptions{})
if err != nil { if err != nil {
t.Fatalf("Error creating EndpointSlice: %v", err) t.Fatalf("Error creating EndpointSlice: %v", err)
} }
@ -447,7 +447,7 @@ func TestEndpointsAdapterEnsureEndpointSliceFromEndpoints(t *testing.T) {
t.Errorf("Expected error: %v, got: %v", testCase.expectedError, err) t.Errorf("Expected error: %v, got: %v", testCase.expectedError, err)
} }
endpointSlice, err := client.DiscoveryV1beta1().EndpointSlices(testCase.namespaceParam).Get(context.TODO(), testCase.endpointsParam.Name, metav1.GetOptions{}) endpointSlice, err := client.DiscoveryV1().EndpointSlices(testCase.namespaceParam).Get(context.TODO(), testCase.endpointsParam.Name, metav1.GetOptions{})
if err != nil && !errors.IsNotFound(err) { if err != nil && !errors.IsNotFound(err) {
t.Fatalf("Error getting Endpoint Slice: %v", err) t.Fatalf("Error getting Endpoint Slice: %v", err)
} }

6
pkg/controlplane/reconcilers/lease_test.go
View File

@ -28,7 +28,7 @@ import (
"testing" "testing"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
discoveryv1beta1 "k8s.io/api/discovery/v1beta1" discoveryv1 "k8s.io/api/discovery/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/kubernetes/fake"
) )
@ -83,7 +83,7 @@ func TestLeaseEndpointReconciler(t *testing.T) {
o := metav1.ObjectMeta{Namespace: ns, Name: name} o := metav1.ObjectMeta{Namespace: ns, Name: name}
if skipMirrorLabel { if skipMirrorLabel {
o.Labels = map[string]string{ o.Labels = map[string]string{
discoveryv1beta1.LabelSkipMirror: "true", discoveryv1.LabelSkipMirror: "true",
} }
} }
return o return o
@ -586,7 +586,7 @@ func TestLeaseRemoveEndpoints(t *testing.T) {
o := metav1.ObjectMeta{Namespace: ns, Name: name} o := metav1.ObjectMeta{Namespace: ns, Name: name}
if skipMirrorLabel { if skipMirrorLabel {
o.Labels = map[string]string{ o.Labels = map[string]string{
discoveryv1beta1.LabelSkipMirror: "true", discoveryv1.LabelSkipMirror: "true",
} }
} }
return o return o