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

e2e/endpointslice: add ready conditions

Browse Source 
Add ready conditions to the Endpoints of the self-generated
EndpointSlice tests so that the readiness is not ambiguous and it will
work across CNIs that filter for ready endpoints.
This commit is contained in:
Aaron U'Ren 2024-01-07 16:01:43 -06:00
parent 60dcf7fd8d
commit 683f7f43af
No known key found for this signature in database
GPG Key ID: 3A160440911786EE
1 changed files with 14 additions and 3 deletions
Show Stats 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"),