Skip to content

Commit bbb905c

Browse files
committed
remove gce healthcheck interval e2e lb test
Change-Id: Idcd8c4c6b39cbd419ca58b7354508ebe81501e91
1 parent 0241da3 commit bbb905c

File tree

1 file changed

+0
-77
lines changed

1 file changed

+0
-77
lines changed

test/e2e/network/loadbalancer.go

Lines changed: 0 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ import (
4545
"k8s.io/kubernetes/test/e2e/framework"
4646
e2edaemonset "k8s.io/kubernetes/test/e2e/framework/daemonset"
4747
e2edeployment "k8s.io/kubernetes/test/e2e/framework/deployment"
48-
e2ekubesystem "k8s.io/kubernetes/test/e2e/framework/kubesystem"
4948
e2enetwork "k8s.io/kubernetes/test/e2e/framework/network"
5049
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
5150
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
@@ -55,7 +54,6 @@ import (
5554
e2eservice "k8s.io/kubernetes/test/e2e/framework/service"
5655
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
5756
"k8s.io/kubernetes/test/e2e/network/common"
58-
gcecloud "k8s.io/legacy-cloud-providers/gce"
5957
admissionapi "k8s.io/pod-security-admission/api"
6058
netutils "k8s.io/utils/net"
6159
utilpointer "k8s.io/utils/pointer"
@@ -739,81 +737,6 @@ var _ = common.SIGDescribe("LoadBalancers", func() {
739737
}
740738
})
741739

742-
// This test creates a load balancer, make sure its health check interval
743-
// equals to gceHcCheckIntervalSeconds. Then the interval is manipulated
744-
// to be something else, see if the interval will be reconciled.
745-
ginkgo.It("should reconcile LB health check interval [Slow][Serial][Disruptive]", func(ctx context.Context) {
746-
const gceHcCheckIntervalSeconds = int64(8)
747-
// This test is for clusters on GCE.
748-
// (It restarts kube-controller-manager, which we don't support on GKE)
749-
e2eskipper.SkipUnlessProviderIs("gce")
750-
e2eskipper.SkipUnlessSSHKeyPresent()
751-
752-
clusterID, err := gce.GetClusterID(ctx, cs)
753-
if err != nil {
754-
framework.Failf("framework.GetClusterID(cs) = _, %v; want nil", err)
755-
}
756-
gceCloud, err := gce.GetGCECloud()
757-
if err != nil {
758-
framework.Failf("framework.GetGCECloud() = _, %v; want nil", err)
759-
}
760-
761-
namespace := f.Namespace.Name
762-
serviceName := "lb-hc-int"
763-
jig := e2eservice.NewTestJig(cs, namespace, serviceName)
764-
765-
ginkgo.By("create load balancer service")
766-
// Create loadbalancer service with source range from node[0] and podAccept
767-
svc, err := jig.CreateTCPService(ctx, func(svc *v1.Service) {
768-
svc.Spec.Type = v1.ServiceTypeLoadBalancer
769-
})
770-
framework.ExpectNoError(err)
771-
772-
ginkgo.DeferCleanup(func(ctx context.Context) {
773-
ginkgo.By("Clean up loadbalancer service")
774-
e2eservice.WaitForServiceDeletedWithFinalizer(ctx, cs, svc.Namespace, svc.Name)
775-
})
776-
777-
svc, err = jig.WaitForLoadBalancer(ctx, e2eservice.GetServiceLoadBalancerCreationTimeout(ctx, cs))
778-
framework.ExpectNoError(err)
779-
780-
hcName := gcecloud.MakeNodesHealthCheckName(clusterID)
781-
hc, err := gceCloud.GetHTTPHealthCheck(hcName)
782-
if err != nil {
783-
framework.Failf("gceCloud.GetHttpHealthCheck(%q) = _, %v; want nil", hcName, err)
784-
}
785-
gomega.Expect(hc.CheckIntervalSec).To(gomega.Equal(gceHcCheckIntervalSeconds))
786-
787-
ginkgo.By("modify the health check interval")
788-
hc.CheckIntervalSec = gceHcCheckIntervalSeconds - 1
789-
if err = gceCloud.UpdateHTTPHealthCheck(hc); err != nil {
790-
framework.Failf("gcecloud.UpdateHttpHealthCheck(%#v) = %v; want nil", hc, err)
791-
}
792-
793-
ginkgo.By("restart kube-controller-manager")
794-
if err := e2ekubesystem.RestartControllerManager(ctx); err != nil {
795-
framework.Failf("e2ekubesystem.RestartControllerManager() = %v; want nil", err)
796-
}
797-
if err := e2ekubesystem.WaitForControllerManagerUp(ctx); err != nil {
798-
framework.Failf("e2ekubesystem.WaitForControllerManagerUp() = %v; want nil", err)
799-
}
800-
801-
ginkgo.By("health check should be reconciled")
802-
pollInterval := framework.Poll * 10
803-
loadBalancerPropagationTimeout := e2eservice.GetServiceLoadBalancerPropagationTimeout(ctx, cs)
804-
if pollErr := wait.PollImmediate(pollInterval, loadBalancerPropagationTimeout, func() (bool, error) {
805-
hc, err := gceCloud.GetHTTPHealthCheck(hcName)
806-
if err != nil {
807-
framework.Logf("ginkgo.Failed to get HttpHealthCheck(%q): %v", hcName, err)
808-
return false, err
809-
}
810-
framework.Logf("hc.CheckIntervalSec = %v", hc.CheckIntervalSec)
811-
return hc.CheckIntervalSec == gceHcCheckIntervalSeconds, nil
812-
}); pollErr != nil {
813-
framework.Failf("Health check %q does not reconcile its check interval to %d.", hcName, gceHcCheckIntervalSeconds)
814-
}
815-
})
816-
817740
// [LinuxOnly]: Windows does not support session affinity.
818741
ginkgo.It("should have session affinity work for LoadBalancer service with ESIPP on [Slow] [LinuxOnly]", func(ctx context.Context) {
819742
// L4 load balancer affinity `ClientIP` is not supported on AWS ELB.

0 commit comments

Comments
 (0)