support to setting tags in which the manifest file

Author: xiaozhu36

src/bosh-alicloud-cpi/action/create_vm.go

@@ -224,21 +224,6 @@ func (a CreateVMMethod) createVM(
 			Value: fmt.Sprint(v),
 		})
 	}
-	// 如果没有拿到系统tag，那么为了支持CR，此处需要显示设置上系统Tag
-	if len(tags) < 1 {
-		preDefineTags := map[string]string{
-			"deployment": "bosh",
-			"director":"bosh-init",
-			"instance_group":"bosh",
-			"job":"bosh",
-		}
-		for key, value := range preDefineTags {
-			tags = append(tags, ecs.CreateInstanceTag{
-				Key: key,
-				Value: value,
-			})
-		}
-	}
 	// 接下来获取manifest中的tag
 	for k, v := range instProps.Tags {
 		tags = append(tags, ecs.CreateInstanceTag{

src/bosh-alicloud-cpi/action/set_disk_metadata.go

@@ -30,11 +30,15 @@ func (a SetDiskMetadataMethod) SetDiskMetadata(diskCID apiv1.DiskCID, meta apiv1
 
 	tags := make(map[string]string)
 	for k, v := range md {
-		if k == "deployment" || k == "director" || k == "index" || k == "instance_group" || k == "job" {
-			tk := normalizeTag(k)
-			if tk != "" {
-				tags[tk] = normalizeTag(v.(string))
-			}
+		// There should support manifest tags feature: https://bosh.io/docs/manifest-v2/#tags
+		//if k == "deployment" || k == "director" || k == "index" || k == "instance_group" || k == "job" {
+		//	tk := normalizeTag(k)
+		//	if tk != "" {
+		//		tags[tk] = normalizeTag(v.(string))
+		//	}
+		//}
+		if normalizeTag(k) != "" {
+			tags[normalizeTag(k)] = normalizeTag(v.(string))
 		}
 	}
 

src/bosh-alicloud-cpi/action/set_vm_metadata.go

@@ -35,11 +35,15 @@ func (a SetVMMetadataMethod) SetVMMetadata(vmCID apiv1.VMCID, meta apiv1.VMMeta)
 	for k, v := range md {
 		if k == "name" {
 			name = normalizeName(v.(string), "i_")
-		} else if k == "deployment" || k == "director" || k == "index" || k == "instance_group" || k == "job" {
-			tk := normalizeTag(k)
-			if tk != "" {
-				tags[tk] = normalizeTag(v.(string))
-			}
+		}
+		// There should support manifest tags feature: https://bosh.io/docs/manifest-v2/#tags
+		//} else if k == "deployment" || k == "director" || k == "index" || k == "instance_group" || k == "job" {
+		//	tk := normalizeTag(k)
+		//	if tk != "" {
+		//		tags[tk] = normalizeTag(v.(string))
+		//	}
+		if normalizeTag(k) != "" {
+			tags[normalizeTag(k)] = normalizeTag(v.(string))
 		}
 	}