github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #88288 from sbezverk/endpointslice_v1beta1

Browse Source 
Switch EndpointSlice e2e test to use discovery v1beta1 api
This commit is contained in:
Kubernetes Prow Robot 2020-02-18 19:10:35 -08:00 committed by GitHub
commit cc36dda7e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/network/BUILD
View File

@ -39,7 +39,7 @@ go_library(
"//pkg/master/ports:go_default_library", "//pkg/master/ports:go_default_library",
"//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library",
"//staging/src/k8s.io/api/discovery/v1alpha1:go_default_library", "//staging/src/k8s.io/api/discovery/v1beta1:go_default_library",
"//staging/src/k8s.io/api/networking/v1:go_default_library", "//staging/src/k8s.io/api/networking/v1:go_default_library",
"//staging/src/k8s.io/api/rbac/v1:go_default_library", "//staging/src/k8s.io/api/rbac/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",

16
test/e2e/network/endpointslice.go
View File

@ -22,7 +22,7 @@ import (
"time" "time"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
discoveryv1alpha1 "k8s.io/api/discovery/v1alpha1" discoveryv1beta1 "k8s.io/api/discovery/v1beta1"
apierrors "k8s.io/apimachinery/pkg/api/errors" apierrors "k8s.io/apimachinery/pkg/api/errors"
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"
@ -192,7 +192,7 @@ var _ = SIGDescribe("EndpointSlice [Feature:EndpointSlice]", func() {
// and takes some shortcuts with the assumption that those test cases will be // and takes some shortcuts with the assumption that those test cases will be
// the only caller of this function. // the only caller of this function.
func expectEndpointsAndSlices(cs clientset.Interface, ns string, svc *v1.Service, pods []*v1.Pod, numSubsets, numSlices int, namedPort bool) { func expectEndpointsAndSlices(cs clientset.Interface, ns string, svc *v1.Service, pods []*v1.Pod, numSubsets, numSlices int, namedPort bool) {
endpointSlices := []discoveryv1alpha1.EndpointSlice{} endpointSlices := []discoveryv1beta1.EndpointSlice{}
endpoints := &v1.Endpoints{} endpoints := &v1.Endpoints{}
err := wait.Poll(5*time.Second, 1*time.Minute, func() (bool, error) { err := wait.Poll(5*time.Second, 1*time.Minute, func() (bool, error) {
@ -353,18 +353,18 @@ func expectEndpointsAndSlices(cs clientset.Interface, ns string, svc *v1.Service
// hasMatchingEndpointSlices returns any EndpointSlices that match the // hasMatchingEndpointSlices returns any EndpointSlices that match the
// conditions along with a boolean indicating if all the conditions have been // conditions along with a boolean indicating if all the conditions have been
// met. // met.
func hasMatchingEndpointSlices(cs clientset.Interface, ns, svcName string, numEndpoints, numSlices int) ([]discoveryv1alpha1.EndpointSlice, bool) { func hasMatchingEndpointSlices(cs clientset.Interface, ns, svcName string, numEndpoints, numSlices int) ([]discoveryv1beta1.EndpointSlice, bool) {
listOptions := metav1.ListOptions{LabelSelector: fmt.Sprintf("%s=%s", discoveryv1alpha1.LabelServiceName, svcName)} listOptions := metav1.ListOptions{LabelSelector: fmt.Sprintf("%s=%s", discoveryv1beta1.LabelServiceName, svcName)}
esList, err := cs.DiscoveryV1alpha1().EndpointSlices(ns).List(context.TODO(), listOptions) esList, err := cs.DiscoveryV1beta1().EndpointSlices(ns).List(context.TODO(), listOptions)
framework.ExpectNoError(err, "Error fetching EndpointSlice for %s/%s Service", ns, svcName) framework.ExpectNoError(err, "Error fetching EndpointSlice for %s/%s Service", ns, svcName)
if len(esList.Items) == 0 { if len(esList.Items) == 0 {
framework.Logf("EndpointSlice for %s/%s Service not found", ns, svcName) framework.Logf("EndpointSlice for %s/%s Service not found", ns, svcName)
return []discoveryv1alpha1.EndpointSlice{}, false return []discoveryv1beta1.EndpointSlice{}, false
} }
if len(esList.Items) != numSlices { if len(esList.Items) != numSlices {
framework.Logf("Expected %d EndpointSlices for %s/%s Service, got %d", numSlices, ns, svcName, len(esList.Items)) framework.Logf("Expected %d EndpointSlices for %s/%s Service, got %d", numSlices, ns, svcName, len(esList.Items))
return []discoveryv1alpha1.EndpointSlice{}, false return []discoveryv1beta1.EndpointSlice{}, false
} }
actualNumEndpoints := 0 actualNumEndpoints := 0
@ -373,7 +373,7 @@ func hasMatchingEndpointSlices(cs clientset.Interface, ns, svcName string, numEn
} }
if actualNumEndpoints != numEndpoints { if actualNumEndpoints != numEndpoints {
framework.Logf("EndpointSlices for %s/%s Service have %d/%d endpoints", ns, svcName, actualNumEndpoints, numEndpoints) framework.Logf("EndpointSlices for %s/%s Service have %d/%d endpoints", ns, svcName, actualNumEndpoints, numEndpoints)
return []discoveryv1alpha1.EndpointSlice{}, false return []discoveryv1beta1.EndpointSlice{}, false
} }
return esList.Items, true return esList.Items, true