Merge pull request #155 from chengxiangdong/fix_class

add shared load balancer and deprecated union
kubernetes-sigs · Dec 22, 2022 · 746da43 · 746da43
2 parents 9015c57 + 7ca1237
commit 746da43
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/cloudprovider/huaweicloud/huaweicloud.go b/pkg/cloudprovider/huaweicloud/huaweicloud.go
@@ -279,8 +279,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
@@ -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}`