Skip to content

Commit 354a812

Browse files
authored
Merge pull request kubernetes#82171 from mgdevstack/linuxOnly-sessionAffinity
Add LinuxOnly tag to e2e testing session affinity
2 parents 478c26c + f5c6eba commit 354a812

File tree

2 files changed

+20
-10
lines changed

2 files changed

+20
-10
lines changed

test/e2e/network/networking.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,8 @@ var _ = SIGDescribe("Networking", func() {
205205
config.DialFromNode("udp", config.NodeIP, config.NodeUDPPort, config.MaxTries, config.MaxTries, sets.NewString())
206206
})
207207

208-
ginkgo.It("should function for client IP based session affinity: http", func() {
208+
// [LinuxOnly]: Windows does not support session affinity.
209+
ginkgo.It("should function for client IP based session affinity: http [LinuxOnly]", func() {
209210
config := framework.NewNetworkingTestConfig(f)
210211
ginkgo.By(fmt.Sprintf("dialing(http) %v --> %v:%v", config.TestContainerPod.Name, config.SessionAffinityService.Spec.ClusterIP, framework.ClusterHTTPPort))
211212

@@ -222,7 +223,8 @@ var _ = SIGDescribe("Networking", func() {
222223
}
223224
})
224225

225-
ginkgo.It("should function for client IP based session affinity: udp", func() {
226+
// [LinuxOnly]: Windows does not support session affinity.
227+
ginkgo.It("should function for client IP based session affinity: udp [LinuxOnly]", func() {
226228
config := framework.NewNetworkingTestConfig(f)
227229
ginkgo.By(fmt.Sprintf("dialing(udp) %v --> %v:%v", config.TestContainerPod.Name, config.SessionAffinityService.Spec.ClusterIP, framework.ClusterUDPPort))
228230

test/e2e/network/service.go

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1792,32 +1792,37 @@ var _ = SIGDescribe("Services", func() {
17921792
}
17931793
})
17941794

1795-
ginkgo.It("should have session affinity work for service with type clusterIP", func() {
1795+
// [LinuxOnly]: Windows does not support session affinity.
1796+
ginkgo.It("should have session affinity work for service with type clusterIP [LinuxOnly]", func() {
17961797
svc := getServeHostnameService("affinity-clusterip")
17971798
svc.Spec.Type = v1.ServiceTypeClusterIP
17981799
execAffinityTestForNonLBService(f, cs, svc)
17991800
})
18001801

1801-
ginkgo.It("should be able to switch session affinity for service with type clusterIP", func() {
1802+
// [LinuxOnly]: Windows does not support session affinity.
1803+
ginkgo.It("should be able to switch session affinity for service with type clusterIP [LinuxOnly]", func() {
18021804
svc := getServeHostnameService("affinity-clusterip-transition")
18031805
svc.Spec.Type = v1.ServiceTypeClusterIP
18041806
execAffinityTestForNonLBServiceWithTransition(f, cs, svc)
18051807
})
18061808

1807-
ginkgo.It("should have session affinity work for NodePort service", func() {
1809+
// [LinuxOnly]: Windows does not support session affinity.
1810+
ginkgo.It("should have session affinity work for NodePort service [LinuxOnly]", func() {
18081811
svc := getServeHostnameService("affinity-nodeport")
18091812
svc.Spec.Type = v1.ServiceTypeNodePort
18101813
execAffinityTestForNonLBService(f, cs, svc)
18111814
})
18121815

1813-
ginkgo.It("should be able to switch session affinity for NodePort service", func() {
1816+
// [LinuxOnly]: Windows does not support session affinity.
1817+
ginkgo.It("should be able to switch session affinity for NodePort service [LinuxOnly]", func() {
18141818
svc := getServeHostnameService("affinity-nodeport-transition")
18151819
svc.Spec.Type = v1.ServiceTypeNodePort
18161820
execAffinityTestForNonLBServiceWithTransition(f, cs, svc)
18171821
})
18181822

18191823
// TODO: Get rid of [DisabledForLargeClusters] tag when issue #56138 is fixed.
1820-
ginkgo.It("should have session affinity work for LoadBalancer service with ESIPP on [Slow] [DisabledForLargeClusters]", func() {
1824+
// [LinuxOnly]: Windows does not support session affinity.
1825+
ginkgo.It("should have session affinity work for LoadBalancer service with ESIPP on [Slow] [DisabledForLargeClusters] [LinuxOnly]", func() {
18211826
// L4 load balancer affinity `ClientIP` is not supported on AWS ELB.
18221827
framework.SkipIfProviderIs("aws")
18231828

@@ -1828,7 +1833,8 @@ var _ = SIGDescribe("Services", func() {
18281833
})
18291834

18301835
// TODO: Get rid of [DisabledForLargeClusters] tag when issue #56138 is fixed.
1831-
ginkgo.It("should be able to switch session affinity for LoadBalancer service with ESIPP on [Slow] [DisabledForLargeClusters]", func() {
1836+
// [LinuxOnly]: Windows does not support session affinity.
1837+
ginkgo.It("should be able to switch session affinity for LoadBalancer service with ESIPP on [Slow] [DisabledForLargeClusters] [LinuxOnly]", func() {
18321838
// L4 load balancer affinity `ClientIP` is not supported on AWS ELB.
18331839
framework.SkipIfProviderIs("aws")
18341840

@@ -1839,7 +1845,8 @@ var _ = SIGDescribe("Services", func() {
18391845
})
18401846

18411847
// TODO: Get rid of [DisabledForLargeClusters] tag when issue #56138 is fixed.
1842-
ginkgo.It("should have session affinity work for LoadBalancer service with ESIPP off [Slow] [DisabledForLargeClusters]", func() {
1848+
// [LinuxOnly]: Windows does not support session affinity.
1849+
ginkgo.It("should have session affinity work for LoadBalancer service with ESIPP off [Slow] [DisabledForLargeClusters] [LinuxOnly]", func() {
18431850
// L4 load balancer affinity `ClientIP` is not supported on AWS ELB.
18441851
framework.SkipIfProviderIs("aws")
18451852

@@ -1850,7 +1857,8 @@ var _ = SIGDescribe("Services", func() {
18501857
})
18511858

18521859
// TODO: Get rid of [DisabledForLargeClusters] tag when issue #56138 is fixed.
1853-
ginkgo.It("should be able to switch session affinity for LoadBalancer service with ESIPP off [Slow] [DisabledForLargeClusters]", func() {
1860+
// [LinuxOnly]: Windows does not support session affinity.
1861+
ginkgo.It("should be able to switch session affinity for LoadBalancer service with ESIPP off [Slow] [DisabledForLargeClusters] [LinuxOnly]", func() {
18541862
// L4 load balancer affinity `ClientIP` is not supported on AWS ELB.
18551863
framework.SkipIfProviderIs("aws")
18561864

0 commit comments

Comments
 (0)