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

Reconcile ports and floating ips #9821

Merged
merged 3 commits into from
Aug 27, 2020
Merged

Reconcile ports and floating ips #9821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e4f3b1
Tags are never used
Aug 22, 2020
0ae88cd
Support reconsiling server ports
Aug 22, 2020
d2127d8
Reconsile floating ips to instances
Aug 22, 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
3 changes: 0 additions & 3 deletions pkg/model/openstackmodel/servergroup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ func (b *ServerGroupModelBuilder) buildInstances(c *fi.ModelBuilderContext, sg *

sshKeyName := strings.Replace(sshKeyNameFull, ":", "_", -1)

clusterTag := "KubernetesCluster:" + strings.Replace(b.ClusterName(), ".", "-", -1)

igMeta := make(map[string]string)
cloudTags, err := b.KopsModelContext.CloudTagsForInstanceGroup(ig)
if err != nil {
Expand Down Expand Up @@ -149,7 +147,6 @@ func (b *ServerGroupModelBuilder) buildInstances(c *fi.ModelBuilderContext, sg *
Image: fi.String(ig.Spec.Image),
SSHKey: fi.String(sshKeyName),
ServerGroup: sg,
Tags: []string{clusterTag},
Role: fi.String(string(ig.Spec.Role)),
Port: portTask,
UserData: startupScript,
Expand Down
42 changes: 0 additions & 42 deletions pkg/model/openstackmodel/servergroup_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Image: s("image-master"),
SSHKey: s("kubernetes.cluster-ba_d8_85_a0_5b_50_b0_01_e0_b2_b0_ae_5d_f6_7a_d1"),
ServerGroup: masterServerGroup,
Tags: []string{"KubernetesCluster:cluster"},
Role: s("Master"),
Port: masterPort,
UserData: mustUserdataForClusterInstance(cluster, instanceGroups[0]),
Expand Down Expand Up @@ -171,7 +170,6 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Image: s("image-node"),
SSHKey: s("kubernetes.cluster-ba_d8_85_a0_5b_50_b0_01_e0_b2_b0_ae_5d_f6_7a_d1"),
ServerGroup: nodeServerGroup,
Tags: []string{"KubernetesCluster:cluster"},
Role: s("Node"),
Port: nodePort,
UserData: mustUserdataForClusterInstance(cluster, instanceGroups[1]),
Expand Down Expand Up @@ -314,7 +312,6 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Image: s("image"),
SSHKey: s("kubernetes.cluster-ba_d8_85_a0_5b_50_b0_01_e0_b2_b0_ae_5d_f6_7a_d1"),
ServerGroup: masterServerGroup,
Tags: []string{"KubernetesCluster:cluster"},
Role: s("Master"),
Port: masterPort,
UserData: mustUserdataForClusterInstance(cluster, instanceGroups[0]),
Expand Down Expand Up @@ -361,7 +358,6 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Image: s("image"),
SSHKey: s("kubernetes.cluster-ba_d8_85_a0_5b_50_b0_01_e0_b2_b0_ae_5d_f6_7a_d1"),
ServerGroup: nodeServerGroup,
Tags: []string{"KubernetesCluster:cluster"},
Role: s("Node"),
Port: nodePort,
UserData: mustUserdataForClusterInstance(cluster, instanceGroups[1]),
Expand Down Expand Up @@ -404,7 +400,6 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Image: s("image"),
SSHKey: s("kubernetes.cluster-ba_d8_85_a0_5b_50_b0_01_e0_b2_b0_ae_5d_f6_7a_d1"),
ServerGroup: bastionServerGroup,
Tags: []string{"KubernetesCluster:cluster"},
Role: s("Bastion"),
Port: bastionPort,
UserData: mustUserdataForClusterInstance(cluster, instanceGroups[2]),
Expand Down Expand Up @@ -585,7 +580,6 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Image: s("image"),
SSHKey: s("kubernetes.cluster-ba_d8_85_a0_5b_50_b0_01_e0_b2_b0_ae_5d_f6_7a_d1"),
ServerGroup: masterAServerGroup,
Tags: []string{"KubernetesCluster:cluster"},
Role: s("Master"),
Port: masterAPort,
UserData: mustUserdataForClusterInstance(cluster, instanceGroups[0]),
Expand Down Expand Up @@ -633,7 +627,6 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Image: s("image"),
SSHKey: s("kubernetes.cluster-ba_d8_85_a0_5b_50_b0_01_e0_b2_b0_ae_5d_f6_7a_d1"),
ServerGroup: masterBServerGroup,
Tags: []string{"KubernetesCluster:cluster"},
Role: s("Master"),
Port: masterBPort,
UserData: mustUserdataForClusterInstance(cluster, instanceGroups[0]),
Expand Down Expand Up @@ -681,7 +674,6 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Image: s("image"),
SSHKey: s("kubernetes.cluster-ba_d8_85_a0_5b_50_b0_01_e0_b2_b0_ae_5d_f6_7a_d1"),
ServerGroup: masterCServerGroup,
Tags: []string{"KubernetesCluster:cluster"},
Role: s("Master"),
Port: masterCPort,
UserData: mustUserdataForClusterInstance(cluster, instanceGroups[0]),
Expand Down Expand Up @@ -728,7 +720,6 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Image: s("image"),
SSHKey: s("kubernetes.cluster-ba_d8_85_a0_5b_50_b0_01_e0_b2_b0_ae_5d_f6_7a_d1"),
ServerGroup: nodeAServerGroup,
Tags: []string{"KubernetesCluster:cluster"},
Role: s("Node"),
Port: nodeAPort,
UserData: mustUserdataForClusterInstance(cluster, instanceGroups[1]),
Expand Down Expand Up @@ -775,7 +766,6 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Image: s("image"),
SSHKey: s("kubernetes.cluster-ba_d8_85_a0_5b_50_b0_01_e0_b2_b0_ae_5d_f6_7a_d1"),
ServerGroup: nodeBServerGroup,
Tags: []string{"KubernetesCluster:cluster"},
Role: s("Node"),
Port: nodeBPort,
UserData: mustUserdataForClusterInstance(cluster, instanceGroups[1]),
Expand Down Expand Up @@ -822,7 +812,6 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Image: s("image"),
SSHKey: s("kubernetes.cluster-ba_d8_85_a0_5b_50_b0_01_e0_b2_b0_ae_5d_f6_7a_d1"),
ServerGroup: nodeCServerGroup,
Tags: []string{"KubernetesCluster:cluster"},
Role: s("Node"),
Port: nodeCPort,
UserData: mustUserdataForClusterInstance(cluster, instanceGroups[1]),
Expand Down Expand Up @@ -1023,7 +1012,6 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Image: s("image"),
SSHKey: s("kubernetes.cluster-ba_d8_85_a0_5b_50_b0_01_e0_b2_b0_ae_5d_f6_7a_d1"),
ServerGroup: masterAServerGroup,
Tags: []string{"KubernetesCluster:cluster"},
Role: s("Master"),
Port: masterAPort,
UserData: mustUserdataForClusterInstance(cluster, instanceGroups[0]),
Expand Down Expand Up @@ -1066,7 +1054,6 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Image: s("image"),
SSHKey: s("kubernetes.cluster-ba_d8_85_a0_5b_50_b0_01_e0_b2_b0_ae_5d_f6_7a_d1"),
ServerGroup: masterBServerGroup,
Tags: []string{"KubernetesCluster:cluster"},
Role: s("Master"),
Port: masterBPort,
UserData: mustUserdataForClusterInstance(cluster, instanceGroups[0]),
Expand Down Expand Up @@ -1109,7 +1096,6 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Image: s("image"),
SSHKey: s("kubernetes.cluster-ba_d8_85_a0_5b_50_b0_01_e0_b2_b0_ae_5d_f6_7a_d1"),
ServerGroup: masterCServerGroup,
Tags: []string{"KubernetesCluster:cluster"},
Role: s("Master"),
Port: masterCPort,
UserData: mustUserdataForClusterInstance(cluster, instanceGroups[0]),
Expand Down Expand Up @@ -1152,7 +1138,6 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Image: s("image"),
SSHKey: s("kubernetes.cluster-ba_d8_85_a0_5b_50_b0_01_e0_b2_b0_ae_5d_f6_7a_d1"),
ServerGroup: nodeAServerGroup,
Tags: []string{"KubernetesCluster:cluster"},
Role: s("Node"),
Port: nodeAPort,
UserData: mustUserdataForClusterInstance(cluster, instanceGroups[1]),
Expand Down Expand Up @@ -1199,7 +1184,6 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Image: s("image"),
SSHKey: s("kubernetes.cluster-ba_d8_85_a0_5b_50_b0_01_e0_b2_b0_ae_5d_f6_7a_d1"),
ServerGroup: nodeBServerGroup,
Tags: []string{"KubernetesCluster:cluster"},
Role: s("Node"),
Port: nodeBPort,
UserData: mustUserdataForClusterInstance(cluster, instanceGroups[1]),
Expand Down Expand Up @@ -1246,7 +1230,6 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Image: s("image"),
SSHKey: s("kubernetes.cluster-ba_d8_85_a0_5b_50_b0_01_e0_b2_b0_ae_5d_f6_7a_d1"),
ServerGroup: nodeCServerGroup,
Tags: []string{"KubernetesCluster:cluster"},
Role: s("Node"),
Port: nodeCPort,
UserData: mustUserdataForClusterInstance(cluster, instanceGroups[1]),
Expand Down Expand Up @@ -1488,7 +1471,6 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Image: s("image"),
SSHKey: s("kubernetes.cluster-ba_d8_85_a0_5b_50_b0_01_e0_b2_b0_ae_5d_f6_7a_d1"),
ServerGroup: masterAServerGroup,
Tags: []string{"KubernetesCluster:cluster"},
Role: s("Master"),
Port: masterAPort,
UserData: mustUserdataForClusterInstance(cluster, instanceGroups[0]),
Expand Down Expand Up @@ -1532,7 +1514,6 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Image: s("image"),
SSHKey: s("kubernetes.cluster-ba_d8_85_a0_5b_50_b0_01_e0_b2_b0_ae_5d_f6_7a_d1"),
ServerGroup: masterBServerGroup,
Tags: []string{"KubernetesCluster:cluster"},
Role: s("Master"),
Port: masterBPort,
UserData: mustUserdataForClusterInstance(cluster, instanceGroups[0]),
Expand Down Expand Up @@ -1576,7 +1557,6 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Image: s("image"),
SSHKey: s("kubernetes.cluster-ba_d8_85_a0_5b_50_b0_01_e0_b2_b0_ae_5d_f6_7a_d1"),
ServerGroup: masterCServerGroup,
Tags: []string{"KubernetesCluster:cluster"},
Role: s("Master"),
Port: masterCPort,
UserData: mustUserdataForClusterInstance(cluster, instanceGroups[0]),
Expand Down Expand Up @@ -1619,7 +1599,6 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Image: s("image"),
SSHKey: s("kubernetes.cluster-ba_d8_85_a0_5b_50_b0_01_e0_b2_b0_ae_5d_f6_7a_d1"),
ServerGroup: nodeAServerGroup,
Tags: []string{"KubernetesCluster:cluster"},
Role: s("Node"),
Port: nodeAPort,
UserData: mustUserdataForClusterInstance(cluster, instanceGroups[1]),
Expand Down Expand Up @@ -1662,7 +1641,6 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Image: s("image"),
SSHKey: s("kubernetes.cluster-ba_d8_85_a0_5b_50_b0_01_e0_b2_b0_ae_5d_f6_7a_d1"),
ServerGroup: nodeBServerGroup,
Tags: []string{"KubernetesCluster:cluster"},
Role: s("Node"),
Port: nodeBPort,
UserData: mustUserdataForClusterInstance(cluster, instanceGroups[1]),
Expand Down Expand Up @@ -1705,7 +1683,6 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Image: s("image"),
SSHKey: s("kubernetes.cluster-ba_d8_85_a0_5b_50_b0_01_e0_b2_b0_ae_5d_f6_7a_d1"),
ServerGroup: nodeCServerGroup,
Tags: []string{"KubernetesCluster:cluster"},
Role: s("Node"),
Port: nodeCPort,
UserData: mustUserdataForClusterInstance(cluster, instanceGroups[1]),
Expand Down Expand Up @@ -1850,7 +1827,6 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Image: s("image"),
SSHKey: s("kubernetes.cluster-ba_d8_85_a0_5b_50_b0_01_e0_b2_b0_ae_5d_f6_7a_d1"),
ServerGroup: masterServerGroup,
Tags: []string{"KubernetesCluster:cluster"},
Role: s("Master"),
Port: masterAPort,
UserData: mustUserdataForClusterInstance(cluster, instanceGroups[0]),
Expand Down Expand Up @@ -1890,7 +1866,6 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Image: s("image"),
SSHKey: s("kubernetes.cluster-ba_d8_85_a0_5b_50_b0_01_e0_b2_b0_ae_5d_f6_7a_d1"),
ServerGroup: masterServerGroup,
Tags: []string{"KubernetesCluster:cluster"},
Role: s("Master"),
Port: masterBPort,
UserData: mustUserdataForClusterInstance(cluster, instanceGroups[0]),
Expand Down Expand Up @@ -1930,7 +1905,6 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Image: s("image"),
SSHKey: s("kubernetes.cluster-ba_d8_85_a0_5b_50_b0_01_e0_b2_b0_ae_5d_f6_7a_d1"),
ServerGroup: masterServerGroup,
Tags: []string{"KubernetesCluster:cluster"},
Role: s("Master"),
Port: masterCPort,
UserData: mustUserdataForClusterInstance(cluster, instanceGroups[0]),
Expand Down Expand Up @@ -1977,7 +1951,6 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Image: s("image"),
SSHKey: s("kubernetes.cluster-ba_d8_85_a0_5b_50_b0_01_e0_b2_b0_ae_5d_f6_7a_d1"),
ServerGroup: nodeServerGroup,
Tags: []string{"KubernetesCluster:cluster"},
Role: s("Node"),
Port: nodeAPort,
UserData: mustUserdataForClusterInstance(cluster, instanceGroups[1]),
Expand Down Expand Up @@ -2016,7 +1989,6 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Image: s("image"),
SSHKey: s("kubernetes.cluster-ba_d8_85_a0_5b_50_b0_01_e0_b2_b0_ae_5d_f6_7a_d1"),
ServerGroup: nodeServerGroup,
Tags: []string{"KubernetesCluster:cluster"},
Role: s("Node"),
Port: nodeBPort,
UserData: mustUserdataForClusterInstance(cluster, instanceGroups[1]),
Expand Down Expand Up @@ -2055,7 +2027,6 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Image: s("image"),
SSHKey: s("kubernetes.cluster-ba_d8_85_a0_5b_50_b0_01_e0_b2_b0_ae_5d_f6_7a_d1"),
ServerGroup: nodeServerGroup,
Tags: []string{"KubernetesCluster:cluster"},
Role: s("Node"),
Port: nodeCPort,
UserData: mustUserdataForClusterInstance(cluster, instanceGroups[1]),
Expand Down Expand Up @@ -2184,7 +2155,6 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Image: s("image-master"),
SSHKey: s("kubernetes.cluster-ba_d8_85_a0_5b_50_b0_01_e0_b2_b0_ae_5d_f6_7a_d1"),
ServerGroup: masterServerGroup,
Tags: []string{"KubernetesCluster:cluster"},
Role: s("Master"),
Port: masterPort,
UserData: mustUserdataForClusterInstance(cluster, instanceGroups[0]),
Expand Down Expand Up @@ -2227,7 +2197,6 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Image: s("image-node"),
SSHKey: s("kubernetes.cluster-ba_d8_85_a0_5b_50_b0_01_e0_b2_b0_ae_5d_f6_7a_d1"),
ServerGroup: nodeServerGroup,
Tags: []string{"KubernetesCluster:cluster"},
Role: s("Node"),
Port: nodePort,
UserData: mustUserdataForClusterInstance(cluster, instanceGroups[1]),
Expand Down Expand Up @@ -2364,7 +2333,6 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Image: s("image"),
SSHKey: s("kubernetes.cluster-ba_d8_85_a0_5b_50_b0_01_e0_b2_b0_ae_5d_f6_7a_d1"),
ServerGroup: masterServerGroup,
Tags: []string{"KubernetesCluster:cluster"},
Role: s("Master"),
Port: masterPort,
UserData: mustUserdataForClusterInstance(cluster, instanceGroups[0]),
Expand Down Expand Up @@ -2407,7 +2375,6 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Image: s("image"),
SSHKey: s("kubernetes.cluster-ba_d8_85_a0_5b_50_b0_01_e0_b2_b0_ae_5d_f6_7a_d1"),
ServerGroup: nodeServerGroup,
Tags: []string{"KubernetesCluster:cluster"},
Role: s("Node"),
Port: nodePort,
UserData: mustUserdataForClusterInstance(cluster, instanceGroups[1]),
Expand Down Expand Up @@ -2450,7 +2417,6 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Image: s("image"),
SSHKey: s("kubernetes.cluster-ba_d8_85_a0_5b_50_b0_01_e0_b2_b0_ae_5d_f6_7a_d1"),
ServerGroup: bastionServerGroup,
Tags: []string{"KubernetesCluster:cluster"},
Role: s("Bastion"),
Port: bastionPort,
UserData: mustUserdataForClusterInstance(cluster, instanceGroups[2]),
Expand Down Expand Up @@ -2548,7 +2514,6 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Image: s("image-node"),
SSHKey: s("kubernetes.cluster-ba_d8_85_a0_5b_50_b0_01_e0_b2_b0_ae_5d_f6_7a_d1"),
ServerGroup: nodeServerGroup,
Tags: []string{"KubernetesCluster:cluster"},
Role: s("Node"),
Port: nodePort,
UserData: mustUserdataForClusterInstance(cluster, instanceGroups[0]),
Expand Down Expand Up @@ -2646,7 +2611,6 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Image: s("image-node"),
SSHKey: s("kubernetes.cluster-ba_d8_85_a0_5b_50_b0_01_e0_b2_b0_ae_5d_f6_7a_d1"),
ServerGroup: nodeServerGroup,
Tags: []string{"KubernetesCluster:cluster"},
Role: s("Node"),
Port: nodePort,
UserData: mustUserdataForClusterInstance(cluster, instanceGroups[0]),
Expand Down Expand Up @@ -2742,7 +2706,6 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Image: s("image-node"),
SSHKey: s("kubernetes.cluster-ba_d8_85_a0_5b_50_b0_01_e0_b2_b0_ae_5d_f6_7a_d1"),
ServerGroup: nodeServerGroup,
Tags: []string{"KubernetesCluster:cluster"},
Role: s("Node"),
Port: nodePort,
UserData: mustUserdataForClusterInstance(cluster, instanceGroups[0]),
Expand Down Expand Up @@ -2835,7 +2798,6 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Image: s("image-node"),
SSHKey: s("kubernetes.cluster-ba_d8_85_a0_5b_50_b0_01_e0_b2_b0_ae_5d_f6_7a_d1"),
ServerGroup: nodeServerGroup,
Tags: []string{"KubernetesCluster:cluster"},
Role: s("Node"),
Port: nodePort,
UserData: mustUserdataForClusterInstance(cluster, instanceGroups[0]),
Expand Down Expand Up @@ -2926,7 +2888,6 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Image: s("image-node"),
SSHKey: s("kubernetes.cluster-ba_d8_85_a0_5b_50_b0_01_e0_b2_b0_ae_5d_f6_7a_d1"),
ServerGroup: nodeServerGroup,
Tags: []string{"KubernetesCluster:cluster"},
Role: s("Node"),
Port: nodePort,
UserData: mustUserdataForClusterInstance(cluster, instanceGroups[0]),
Expand Down Expand Up @@ -3178,9 +3139,6 @@ func compareInstances(t *testing.T, actualTask fi.Task, expected *openstacktasks
compareStrings(t, "AvailabilityZone", actual.AvailabilityZone, expected.AvailabilityZone)
comparePorts(t, actual.Port, expected.Port)
compareServerGroups(t, actual.ServerGroup, expected.ServerGroup)
if !reflect.DeepEqual(actual.Tags, expected.Tags) {
t.Errorf("Tags differ:\n%v\n\tinstead of\n%v", actual.Tags, expected.Tags)
}
if !reflect.DeepEqual(actual.Metadata, expected.Metadata) {
t.Errorf("Metadata differ:\n%v\n\tinstead of\n%v", actual.Metadata, expected.Metadata)
}
Expand Down
4 changes: 3 additions & 1 deletion upup/pkg/fi/cloudup/openstacktasks/floatingip.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,9 @@ func (e *FloatingIP) Find(c *fi.Context) (*FloatingIP, error) {
e.ID = actual.ID
return actual, nil
}
fips, err := cloud.ListL3FloatingIPs(l3floatingip.ListOpts{})
fips, err := cloud.ListL3FloatingIPs(l3floatingip.ListOpts{
Description: fi.StringValue(e.Name),
})
if err != nil {
return nil, fmt.Errorf("failed to list layer 3 floating ip's: %v", err)
}
Expand Down
Loading