Modify error handling on loadbalancer task of ALICloud and resolve the conflict with the upstream branch

Gopkg.lock

@@ -1706,6 +1706,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "b95fc289fe7e03db1bec2d6df9aebe32671415696e260086f5ce1f4f14be9920"
+  inputs-digest = "33c4809d9ffb5425549fab80b4edb6a9fa84726ca461e8caa314b12b27f61a8d"
   solver-name = "gps-cdcl"
   solver-version = 1

pkg/model/alimodel/api_loadbalancer.go

@@ -19,6 +19,7 @@ package alimodel
 import (
 	"errors"
 	"fmt"
+	"strings"
 
 	"k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/pkg/dns"
@@ -104,11 +105,13 @@ func (b *APILoadBalancerModelBuilder) Build(c *fi.ModelBuilderContext) error {
 	{
 
 		sourceItems := ""
+		var cidrs []string
 		for _, cidr := range b.Cluster.Spec.KubernetesAPIAccess {
 			if cidr != "0.0.0.0" && cidr != "0.0.0.0/0" {
-				sourceItems = sourceItems + cidr + ","
+				cidrs = append(cidrs, cidr)
 			}
 		}
+		sourceItems = strings.Join(cidrs, ",")
 
 		loadbalancerwhiteList = &alitasks.LoadBalancerWhiteList{
 			Name:                 s("api." + b.ClusterName()),

upup/pkg/fi/cloudup/alitasks/loadbalancer.go

@@ -85,8 +85,9 @@ func (l *LoadBalancer) Find(c *fi.Context) (*LoadBalancer, error) {
 	}
 	tags, _, err := cloud.SlbClient().DescribeTags(describeTagsArgs)
 	if err != nil {
-		glog.V(4).Info("Error getting tags on loadbalancerID:%q", *actual.LoadbalancerId)
+		return nil, fmt.Errorf("error getting tags on loadbalancer: %v", err)
 	}
+
 	if len(tags) != 0 {
 		actual.Tags = make(map[string]string)
 		for _, tag := range tags {