Merge pull request #9087 from zetaab/revert-8999-openstack-cloud-labels

Revert "feat(openstack): propagate cloud labels to machines"
kubernetes · May 7, 2020 · 3df14f2 · 3df14f2
2 parents 3e9cdb0 + facd12d
commit 3df14f2
Show file tree

Hide file tree

Showing 2 changed files with 258 additions and 520 deletions.
diff --git a/pkg/model/openstackmodel/servergroup.go b/pkg/model/openstackmodel/servergroup.go
@@ -52,13 +52,7 @@ func (b *ServerGroupModelBuilder) buildInstances(c *fi.ModelBuilderContext, sg *
 
 	var igUserData *string
 	igMeta := make(map[string]string)
-	cloudTags, err := b.KopsModelContext.CloudTagsForInstanceGroup(ig)
-	if err != nil {
-		return fmt.Errorf("could not get cloud tags for instance group %s: %v", ig.Name, err)
-	}
-	for label, labelVal := range cloudTags {
-		igMeta[label] = labelVal
-	}
+
 	if ig.Spec.Role != kops.InstanceGroupRoleBastion {
 		// Bastion does not belong to the cluster and will not be running protokube.