Dev annotations null deal 20200702 (#4)

* annotations null deal * update deploy.yaml
capitalonline · Jul 2, 2020 · 5b0fcd1 · 5b0fcd1
1 parent 3b111dd
commit 5b0fcd1
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/deploy/base/cloud-controller-manager.yaml b/deploy/base/cloud-controller-manager.yaml
@@ -31,7 +31,7 @@ spec:
       - key: "node-role.kubernetes.io/master"
         effect: NoSchedule
       containers:
-      - image: registry-bj.capitalonline.net/cck/cdscloud-controller-manager:v1.0.1
+      - image: registry-bj.capitalonline.net/cck/cdscloud-controller-manager:v1.0.3
         name: cds-cloud-controller-manager
         imagePullPolicy: Always
         args:

diff --git a/pkg/ccm/loadbalancer.go b/pkg/ccm/loadbalancer.go
@@ -271,9 +271,14 @@ func updateClassicLoadBalancer(ctx context.Context, service *v1.Service, nodes [
 
 	// get service annotations
 	var annotationsSliceTmp []string
-	for key, value := range service.ObjectMeta.Annotations {
-		stringTmp := key + ":" + value
-		annotationsSliceTmp = append(annotationsSliceTmp, stringTmp)
+	if len(service.ObjectMeta.Annotations) != 0 {
+		for key, value := range service.ObjectMeta.Annotations {
+			stringTmp := key + ":" + value
+			annotationsSliceTmp = append(annotationsSliceTmp, stringTmp)
+		}
+
+	} else {
+		annotationsSliceTmp = append(annotationsSliceTmp, "")
 	}
 	log.Infof("updateClassicLoadBalancer:: annotationsSliceTmp is: %s", annotationsSliceTmp)
 
@@ -331,11 +336,17 @@ func createClassicLoadBalancer(ctx context.Context, service *v1.Service, nodes [
 
 	// get service annotations
 	var annotationsSliceTmp []string
-	for key, value := range service.ObjectMeta.Annotations {
-		stringTmp := key + ":" + value
-		annotationsSliceTmp = append(annotationsSliceTmp, stringTmp)
+
+	if len(service.ObjectMeta.Annotations) != 0 {
+		for key, value := range service.ObjectMeta.Annotations {
+			stringTmp := key + ":" + value
+			annotationsSliceTmp = append(annotationsSliceTmp, stringTmp)
+		}
+
+	} else {
+		annotationsSliceTmp = append(annotationsSliceTmp, "")
 	}
-	log.Infof("createClassicLoadBalancer:: annotationsSliceTmp is: %s", annotationsSliceTmp)
+	log.Infof("updateClassicLoadBalancer:: annotationsSliceTmp is: %s", annotationsSliceTmp)
 
 	// to create loadBalancer
 	res, err := clb.CreateLoadBalancers(&clb.CreateLoadBalancersArgs{