Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "feat(openstack): propagate cloud labels to machines" #9087

Merged
merged 1 commit into from May 7, 2020
Merged

Revert "feat(openstack): propagate cloud labels to machines" #9087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 1 addition & 7 deletions pkg/model/openstackmodel/servergroup.go
View file
Open in desktop
Expand Up @@ -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.

Expand Down