Skip to content

Commit

Permalink
Merge pull request #1729 from swetharepakula/update-eps1-v1
Browse files Browse the repository at this point in the history 
Use discovery/v1 EndpointSlice
  • Loading branch information
@k8s-ci-robot
k8s-ci-robot authored Jun 13, 2022
2 parents cf3b4fb + 51fa174 commit 57909b2
Show file tree
Hide file tree
Showing 16 changed files with 26 additions and 27 deletions.
2 changes: 1 addition & 1 deletion pkg/context/context.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"k8s.io/client-go/dynamic"
"k8s.io/client-go/dynamic/dynamicinformer"
informerv1 "k8s.io/client-go/informers/core/v1"
discoveryinformer "k8s.io/client-go/informers/discovery/v1beta1"
discoveryinformer "k8s.io/client-go/informers/discovery/v1"
informernetworking "k8s.io/client-go/informers/networking/v1"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/kubernetes/scheme"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/translator/translator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"k8s.io/klog"

api_v1 "k8s.io/api/core/v1"
discoveryapi "k8s.io/api/discovery/v1beta1"
discoveryapi "k8s.io/api/discovery/v1"
v1 "k8s.io/api/networking/v1"
"k8s.io/apimachinery/pkg/api/meta"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/translator/translator_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ import (
"time"

apiv1 "k8s.io/api/core/v1"
discoveryapi "k8s.io/api/discovery/v1beta1"
discoveryapi "k8s.io/api/discovery/v1"
v1 "k8s.io/api/networking/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/apimachinery/pkg/util/sets"
informerv1 "k8s.io/client-go/informers/core/v1"
discoveryinformer "k8s.io/client-go/informers/discovery/v1beta1"
discoveryinformer "k8s.io/client-go/informers/discovery/v1"
"k8s.io/client-go/kubernetes/fake"
"k8s.io/client-go/tools/cache"
"k8s.io/ingress-gce/pkg/annotations"
Expand Down
11 changes: 5 additions & 6 deletions pkg/experimental/workload/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ import (
"time"

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"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime/schema"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apimachinery/pkg/util/wait"
informerv1 "k8s.io/client-go/informers/core/v1"
disinformer "k8s.io/client-go/informers/discovery/v1beta1"
disinformer "k8s.io/client-go/informers/discovery/v1"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/cache"
"k8s.io/client-go/util/workqueue"
Expand Down Expand Up @@ -306,7 +306,7 @@ func (c *Controller) processService(key string) error {
var curEs *discovery.EndpointSlice
if exists {
if len(subsets) == 0 {
err := c.kubeClient.DiscoveryV1beta1().EndpointSlices(namespace).Delete(context.Background(), sliceName, metav1.DeleteOptions{})
err := c.kubeClient.DiscoveryV1().EndpointSlices(namespace).Delete(context.Background(), sliceName, metav1.DeleteOptions{})
if err != nil {
klog.Errorf("error deleting EndpointSlice %q: %+v", sliceName, err)
} else {
Expand All @@ -330,9 +330,9 @@ func (c *Controller) processService(key string) error {
newEs.Endpoints = subsets

if !exists {
_, err = c.kubeClient.DiscoveryV1beta1().EndpointSlices(namespace).Create(context.Background(), newEs, metav1.CreateOptions{})
_, err = c.kubeClient.DiscoveryV1().EndpointSlices(namespace).Create(context.Background(), newEs, metav1.CreateOptions{})
} else {
_, err = c.kubeClient.DiscoveryV1beta1().EndpointSlices(namespace).Update(context.Background(), newEs, metav1.UpdateOptions{})
_, err = c.kubeClient.DiscoveryV1().EndpointSlices(namespace).Update(context.Background(), newEs, metav1.UpdateOptions{})
}
if err != nil {
klog.Errorf("error updating EndpointSlice %q: %+v", sliceName, err)
Expand All @@ -350,7 +350,6 @@ func workloadToEndpoint(workload *workloadv1a1.Workload, service *corev1.Service
Conditions: discovery.EndpointConditions{
Ready: &ready,
},
Topology: nil,
TargetRef: &corev1.ObjectReference{
Kind: "Pod",
Namespace: workload.Namespace,
Expand Down
4 changes: 2 additions & 2 deletions pkg/experimental/workload/controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func deleteWorkload(wlc *Controller, wl *workloadv1a1.Workload) {

func getEndpointSliceAddr(wlc *Controller, svc *corev1.Service, t *testing.T) []string {
sliceName := endpointsliceName(svc.Name)
eps, err := wlc.ctx.KubeClient.DiscoveryV1beta1().EndpointSlices(svc.Namespace).Get(
eps, err := wlc.ctx.KubeClient.DiscoveryV1().EndpointSlices(svc.Namespace).Get(
context.Background(),
sliceName,
metav1.GetOptions{},
Expand All @@ -93,7 +93,7 @@ func getEndpointSliceAddr(wlc *Controller, svc *corev1.Service, t *testing.T) []
// addEndpointSliceToLister adds the EndpointSlice to the lister so the controller knows the existance of it.
func addEndpointSliceToLister(wlc *Controller, svc *corev1.Service, t *testing.T) {
sliceName := endpointsliceName(svc.Name)
eps, err := wlc.ctx.KubeClient.DiscoveryV1beta1().EndpointSlices(svc.Namespace).Get(
eps, err := wlc.ctx.KubeClient.DiscoveryV1().EndpointSlices(svc.Namespace).Get(
context.Background(),
sliceName,
metav1.GetOptions{},
Expand Down
2 changes: 1 addition & 1 deletion pkg/neg/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

istioV1alpha3 "istio.io/api/networking/v1alpha3"
apiv1 "k8s.io/api/core/v1"
discovery "k8s.io/api/discovery/v1beta1"
discovery "k8s.io/api/discovery/v1"
v1 "k8s.io/api/networking/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
Expand Down
4 changes: 2 additions & 2 deletions pkg/neg/controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
istioV1alpha3 "istio.io/api/networking/v1alpha3"
apiv1 "k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
discovery "k8s.io/api/discovery/v1beta1"
discovery "k8s.io/api/discovery/v1"
networkingv1 "k8s.io/api/networking/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
Expand Down Expand Up @@ -1334,7 +1334,7 @@ func TestEnqueueEndpoints(t *testing.T) {
ctx := context.Background()
var informer cache.SharedIndexInformer
if tc.useSlices {
endpointSliceClient := controller.client.DiscoveryV1beta1().EndpointSlices(namespace)
endpointSliceClient := controller.client.DiscoveryV1().EndpointSlices(namespace)
_, err := endpointSliceClient.Create(ctx, tc.endpointSlice, metav1.CreateOptions{})
if err != nil {
t.Fatalf("Failed to create test endpoint slice, error - %v", err)
Expand Down
2 changes: 1 addition & 1 deletion pkg/neg/syncers/transaction.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud"
apiv1 "k8s.io/api/core/v1"
corev1 "k8s.io/api/core/v1"
discovery "k8s.io/api/discovery/v1beta1"
discovery "k8s.io/api/discovery/v1"
"k8s.io/ingress-gce/pkg/utils/endpointslices"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/neg/syncers/utils_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud"
"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta"
v1 "k8s.io/api/core/v1"
discovery "k8s.io/api/discovery/v1beta1"
discovery "k8s.io/api/discovery/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/sets"
Expand Down
2 changes: 1 addition & 1 deletion pkg/neg/types/testing.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
apiv1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/types"
informerv1 "k8s.io/client-go/informers/core/v1"
discoveryinformer "k8s.io/client-go/informers/discovery/v1beta1"
discoveryinformer "k8s.io/client-go/informers/discovery/v1"
informernetworking "k8s.io/client-go/informers/networking/v1"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/kubernetes/fake"
Expand Down
4 changes: 2 additions & 2 deletions pkg/neg/types/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta"
istioV1alpha3 "istio.io/api/networking/v1alpha3"
apiv1 "k8s.io/api/core/v1"
discovery "k8s.io/api/discovery/v1beta1"
discovery "k8s.io/api/discovery/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/types"
Expand Down Expand Up @@ -422,7 +422,7 @@ func EndpointsDataFromEndpointSlices(slices []*discovery.EndpointSlice) []Endpoi
// which the NodeName field was not yet present.
nodeName := ep.NodeName
if nodeName == nil || len(*nodeName) == 0 {
nodeNameFromTopology := ep.Topology[apiv1.LabelHostname]
nodeNameFromTopology := ep.DeprecatedTopology[apiv1.LabelHostname]
nodeName = &nodeNameFromTopology
}
addresses = append(addresses, AddressData{TargetRef: ep.TargetRef, NodeName: nodeName, Addresses: ep.Addresses, Ready: ready})
Expand Down
6 changes: 3 additions & 3 deletions pkg/neg/types/types_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

istioV1alpha3 "istio.io/api/networking/v1alpha3"
v1 "k8s.io/api/core/v1"
discovery "k8s.io/api/discovery/v1beta1"
discovery "k8s.io/api/discovery/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/ingress-gce/pkg/annotations"
Expand Down Expand Up @@ -781,8 +781,8 @@ func TestEndpointsDataFromEndpointSlicesNodeNameFromTopology(t *testing.T) {
AddressType: "IPv4",
Endpoints: []discovery.Endpoint{
{
Addresses: []string{"10.100.1.1"},
Topology: map[string]string{v1.LabelHostname: TestInstance1},
Addresses: []string{"10.100.1.1"},
DeprecatedTopology: map[string]string{v1.LabelHostname: TestInstance1},
TargetRef: &v1.ObjectReference{
Namespace: testServiceNamespace,
Name: "pod1",
Expand Down
2 changes: 1 addition & 1 deletion pkg/utils/endpointslices/index.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package endpointslices

import (
discovery "k8s.io/api/discovery/v1beta1"
discovery "k8s.io/api/discovery/v1"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/utils/endpointslices/index_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package endpointslices
import (
"testing"

discovery "k8s.io/api/discovery/v1beta1"
discovery "k8s.io/api/discovery/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/utils/endpointslices/utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"errors"
"fmt"

discovery "k8s.io/api/discovery/v1beta1"
discovery "k8s.io/api/discovery/v1"
)

func FormatEndpointSlicesServiceKey(namespace, name string) string {
Expand Down
2 changes: 1 addition & 1 deletion pkg/utils/endpointslices/utils_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package endpointslices
import (
"testing"

discovery "k8s.io/api/discovery/v1beta1"
discovery "k8s.io/api/discovery/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down

0 comments on commit 57909b2

Please sign in to comment.