Skip to content

🐛 deduplicate machine tags prior to openstack API apply call #502

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

Merged
merged 4 commits into from
Jan 27, 2020
Merged

🐛 deduplicate machine tags prior to openstack API apply call #502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ee44879
deduplicate machine tags prior to openstack API apply call
petergardfjall Jan 27, 2020
b23cd84
rename 'filtered' -> 'unique'
petergardfjall Jan 27, 2020
5adc286
fix typo
petergardfjall Jan 27, 2020
d61c9f3
set ci deadline to four minutes
petergardfjall Jan 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,5 @@ linters:
issue:
max-same-issues: 0
max-per-linter: 0
run:
deadline: 4m
23 changes: 22 additions & 1 deletion pkg/cloud/services/compute/instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@ package compute

import (
"fmt"
"sigs.k8s.io/cluster-api-provider-openstack/pkg/record"
"time"

"sigs.k8s.io/cluster-api-provider-openstack/pkg/record"

"sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/services/networking"
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha2"
"sigs.k8s.io/cluster-api/controllers/noderefutil"
Expand Down Expand Up @@ -90,6 +91,9 @@ func (s *Service) InstanceCreate(clusterName string, machine *clusterv1.Machine,
// Append cluster scope tags
machineTags = append(machineTags, openStackCluster.Spec.Tags...)

// tags need to be unique or the "apply tags" call will fail.
machineTags = deduplicate(machineTags)

// Get security groups
securityGroups, err := getSecurityGroups(s, openStackMachine.Spec.SecurityGroups)
if err != nil {
Expand Down Expand Up @@ -537,3 +541,20 @@ func (s *Service) InstanceExists(openStackMachine *infrav1.OpenStackMachine) (in
}
return instanceList[0], nil
}

// deduplicate takes a slice of input strings and filters out any duplicate
// string occurrences, for example making ["a", "b", "a", "c"] become ["a", "b",
// "c"].
func deduplicate(sequence []string) []string {
var unique []string
set := make(map[string]bool)

for _, s := range sequence {
if _, ok := set[s]; !ok {
unique = append(unique, s)
set[s] = true
}
}

return unique
}