From 7ca12378f0234cb594b1a69309077d0f8ba2a801 Mon Sep 17 00:00:00 2001 From: ChengXiangdong Date: Tue, 20 Dec 2022 16:39:41 +0800 Subject: [PATCH] add shared load balancer and deprecated union --- pkg/cloudprovider/huaweicloud/huaweicloud.go | 4 ++-- test/e2e/loadbalancerservice_test.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/cloudprovider/huaweicloud/huaweicloud.go b/pkg/cloudprovider/huaweicloud/huaweicloud.go index 5b0f9e5dd..7555b8583 100644 --- a/pkg/cloudprovider/huaweicloud/huaweicloud.go +++ b/pkg/cloudprovider/huaweicloud/huaweicloud.go @@ -280,8 +280,8 @@ func getLoadBalancerVersion(service *v1.Service) (LoadBalanceVersion, error) { case "elasticity": klog.Infof("Load balancer Version I for service %v", service.Name) return VersionELB, nil - case "union", "": - klog.Infof("Load balancer Version II for service %v", service.Name) + case "shared", "": + klog.Infof("Shared load balancer for service %v", service.Name) return VersionShared, nil case "performance": klog.Infof("Load balancer Version III for service %v", service.Name) diff --git a/test/e2e/loadbalancerservice_test.go b/test/e2e/loadbalancerservice_test.go index 33fecba96..2db0a16ad 100644 --- a/test/e2e/loadbalancerservice_test.go +++ b/test/e2e/loadbalancerservice_test.go @@ -69,7 +69,7 @@ var _ = ginkgo.Describe("loadbalancer service testing", func() { serviceName := serviceNamePrefix + rand.String(RandomStrLength) annotations := map[string]string{} - annotations[huaweicloud.ElbClass] = "union" + annotations[huaweicloud.ElbClass] = "shared" annotations[huaweicloud.ElbAlgorithm] = "ROUND_ROBIN" annotations[huaweicloud.ElbSessionAffinityMode] = "SOURCE_IP" annotations[huaweicloud.ElbSessionAffinityOption] = `{"persistence_timeout": 1}` @@ -162,7 +162,7 @@ var _ = ginkgo.Describe("load balancing service test with the specified ID", fun serviceName := serviceNamePrefix + rand.String(RandomStrLength) annotations := map[string]string{} - annotations[huaweicloud.ElbClass] = "union" + annotations[huaweicloud.ElbClass] = "shared" annotations[huaweicloud.ElbAlgorithm] = "ROUND_ROBIN" annotations[huaweicloud.ElbSessionAffinityMode] = "SOURCE_IP" annotations[huaweicloud.ElbSessionAffinityOption] = `{"persistence_timeout": 1}`