github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #122633 from aauren/fix/e2e_endpointslice_add_ready_conditions

Browse Source 
e2e/endpointslice: Add Ready Conditions
This commit is contained in:
Kubernetes Prow Robot
2024-01-08 07:08:50 +01:00
committed by GitHub
parent 60dcf7fd8d 683f7f43af
commit 242b41b36a
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -583,6 +583,7 @@ var _ = common.SIGDescribe("EndpointSlice", func() {
// create custom endpoint slices // create custom endpoint slices
tcpProtocol := v1.ProtocolTCP tcpProtocol := v1.ProtocolTCP
readyCondTrue := true
epsTemplate := &discoveryv1.EndpointSlice{ epsTemplate := &discoveryv1.EndpointSlice{
ObjectMeta: metav1.ObjectMeta{GenerateName: "e2e-custom-slice", ObjectMeta: metav1.ObjectMeta{GenerateName: "e2e-custom-slice",
Labels: map[string]string{ Labels: map[string]string{
@@ -591,7 +592,10 @@ var _ = common.SIGDescribe("EndpointSlice", func() {
}}, }},
AddressType: addressType, AddressType: addressType,
Endpoints: []discoveryv1.Endpoint{ Endpoints: []discoveryv1.Endpoint{
{Addresses: []string{pod.Status.PodIP}}, {
Addresses: []string{pod.Status.PodIP},
Conditions: discoveryv1.EndpointConditions{Ready: &readyCondTrue},
},
}, },
} }
@@ -684,6 +688,7 @@ var _ = common.SIGDescribe("EndpointSlice", func() {
// create custom endpoint slices // create custom endpoint slices
tcpProtocol := v1.ProtocolTCP tcpProtocol := v1.ProtocolTCP
readyCondTrue := true
epsTemplate := &discoveryv1.EndpointSlice{ epsTemplate := &discoveryv1.EndpointSlice{
ObjectMeta: metav1.ObjectMeta{GenerateName: "e2e-custom-slice", ObjectMeta: metav1.ObjectMeta{GenerateName: "e2e-custom-slice",
Labels: map[string]string{ Labels: map[string]string{
@@ -696,7 +701,10 @@ var _ = common.SIGDescribe("EndpointSlice", func() {
ginkgo.By("creating") ginkgo.By("creating")
eps1 := epsTemplate.DeepCopy() eps1 := epsTemplate.DeepCopy()
eps1.Endpoints = []discoveryv1.Endpoint{ eps1.Endpoints = []discoveryv1.Endpoint{
{Addresses: []string{pod1.Status.PodIP}}, {
Addresses: []string{pod1.Status.PodIP},
Conditions: discoveryv1.EndpointConditions{Ready: &readyCondTrue},
},
} }
eps1.Ports = []discoveryv1.EndpointPort{{ eps1.Ports = []discoveryv1.EndpointPort{{
Name: pointer.String("port80"), Name: pointer.String("port80"),
@@ -708,7 +716,10 @@ var _ = common.SIGDescribe("EndpointSlice", func() {
framework.ExpectNoError(err) framework.ExpectNoError(err)
eps2 := epsTemplate.DeepCopy() eps2 := epsTemplate.DeepCopy()
eps2.Endpoints = []discoveryv1.Endpoint{ eps2.Endpoints = []discoveryv1.Endpoint{
{Addresses: []string{pod2.Status.PodIP}}, {
Addresses: []string{pod2.Status.PodIP},
Conditions: discoveryv1.EndpointConditions{Ready: &readyCondTrue},
},
} }
eps2.Ports = []discoveryv1.EndpointPort{{ eps2.Ports = []discoveryv1.EndpointPort{{
Name: pointer.String("port81"), Name: pointer.String("port81"),