kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Revert "feat(openstack): propagate cloud labels to machines"
This commit is contained in:
Kubernetes Prow Robot 2020-05-07 02:39:10 -07:00 committed by GitHub
parent 3e9cdb03df facd12dd32
commit 3df14f2bea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 258 additions and 520 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/model/openstackmodel/servergroup.go
View File

@ -52,13 +52,7 @@ func (b *ServerGroupModelBuilder) buildInstances(c *fi.ModelBuilderContext, sg *
var igUserData *string var igUserData *string
igMeta := make(map[string]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 { if ig.Spec.Role != kops.InstanceGroupRoleBastion {
// Bastion does not belong to the cluster and will not be running protokube. // Bastion does not belong to the cluster and will not be running protokube.

770
pkg/model/openstackmodel/servergroup_test.go
View File

@ -127,15 +127,13 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Port: masterPort, Port: masterPort,
UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[0])), UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[0])),
Metadata: map[string]string{ Metadata: map[string]string{
"KubernetesCluster": "cluster", "KubernetesCluster": "cluster",
"k8s": "cluster", "k8s": "cluster",
"KopsNetwork": "cluster", "KopsNetwork": "cluster",
"KopsInstanceGroup": "master", "KopsInstanceGroup": "master",
"KopsRole": "Master", "KopsRole": "Master",
"ig_generation": "0", "ig_generation": "0",
"cluster_generation": "0", "cluster_generation": "0",
"k8s.io/role/master": "1",
"kops.k8s.io/instancegroup": "master",
}, },
AvailabilityZone: s("zone-1"), AvailabilityZone: s("zone-1"),
} }
@ -175,15 +173,13 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Port: nodePort, Port: nodePort,
UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[1])), UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[1])),
Metadata: map[string]string{ Metadata: map[string]string{
"KubernetesCluster": "cluster", "KubernetesCluster": "cluster",
"k8s": "cluster", "k8s": "cluster",
"KopsNetwork": "cluster", "KopsNetwork": "cluster",
"KopsInstanceGroup": "node", "KopsInstanceGroup": "node",
"KopsRole": "Node", "KopsRole": "Node",
"ig_generation": "0", "ig_generation": "0",
"cluster_generation": "0", "cluster_generation": "0",
"k8s.io/role/node": "1",
"kops.k8s.io/instancegroup": "node",
}, },
AvailabilityZone: s("zone-1"), AvailabilityZone: s("zone-1"),
} }
@ -316,15 +312,13 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Port: masterPort, Port: masterPort,
UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[0])), UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[0])),
Metadata: map[string]string{ Metadata: map[string]string{
"KubernetesCluster": "cluster", "KubernetesCluster": "cluster",
"k8s": "cluster", "k8s": "cluster",
"KopsNetwork": "cluster", "KopsNetwork": "cluster",
"KopsInstanceGroup": "master", "KopsInstanceGroup": "master",
"KopsRole": "Master", "KopsRole": "Master",
"ig_generation": "0", "ig_generation": "0",
"cluster_generation": "0", "cluster_generation": "0",
"k8s.io/role/master": "1",
"kops.k8s.io/instancegroup": "master",
}, },
AvailabilityZone: s("zone-1"), AvailabilityZone: s("zone-1"),
} }
@ -364,15 +358,13 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Port: nodePort, Port: nodePort,
UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[1])), UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[1])),
Metadata: map[string]string{ Metadata: map[string]string{
"KubernetesCluster": "cluster", "KubernetesCluster": "cluster",
"k8s": "cluster", "k8s": "cluster",
"KopsNetwork": "cluster", "KopsNetwork": "cluster",
"KopsInstanceGroup": "node", "KopsInstanceGroup": "node",
"KopsRole": "Node", "KopsRole": "Node",
"ig_generation": "0", "ig_generation": "0",
"cluster_generation": "0", "cluster_generation": "0",
"k8s.io/role/node": "1",
"kops.k8s.io/instancegroup": "node",
}, },
AvailabilityZone: s("zone-1"), AvailabilityZone: s("zone-1"),
} }
@ -407,14 +399,12 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Port: bastionPort, Port: bastionPort,
UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[2])), UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[2])),
Metadata: map[string]string{ Metadata: map[string]string{
"k8s": "cluster", "k8s": "cluster",
"KopsInstanceGroup": "bastion", "KopsInstanceGroup": "bastion",
"KopsNetwork": "cluster", "KopsNetwork": "cluster",
"KopsRole": "Bastion", "KopsRole": "Bastion",
"ig_generation": "0", "ig_generation": "0",
"cluster_generation": "0", "cluster_generation": "0",
"k8s.io/role/bastion": "1",
"kops.k8s.io/instancegroup": "bastion",
}, },
AvailabilityZone: s("zone-1"), AvailabilityZone: s("zone-1"),
} }
@ -589,15 +579,13 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Port: masterAPort, Port: masterAPort,
UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[0])), UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[0])),
Metadata: map[string]string{ Metadata: map[string]string{
"KubernetesCluster": "cluster", "KubernetesCluster": "cluster",
"k8s": "cluster", "k8s": "cluster",
"KopsNetwork": "cluster", "KopsNetwork": "cluster",
"KopsInstanceGroup": "master-a", "KopsInstanceGroup": "master-a",
"KopsRole": "Master", "KopsRole": "Master",
"ig_generation": "0", "ig_generation": "0",
"cluster_generation": "0", "cluster_generation": "0",
"k8s.io/role/master": "1",
"kops.k8s.io/instancegroup": "master-a",
}, },
AvailabilityZone: s("zone-1"), AvailabilityZone: s("zone-1"),
} }
@ -638,15 +626,13 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Port: masterBPort, Port: masterBPort,
UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[0])), UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[0])),
Metadata: map[string]string{ Metadata: map[string]string{
"KubernetesCluster": "cluster", "KubernetesCluster": "cluster",
"k8s": "cluster", "k8s": "cluster",
"KopsNetwork": "cluster", "KopsNetwork": "cluster",
"KopsInstanceGroup": "master-b", "KopsInstanceGroup": "master-b",
"KopsRole": "Master", "KopsRole": "Master",
"ig_generation": "0", "ig_generation": "0",
"cluster_generation": "0", "cluster_generation": "0",
"k8s.io/role/master": "1",
"kops.k8s.io/instancegroup": "master-b",
}, },
AvailabilityZone: s("zone-2"), AvailabilityZone: s("zone-2"),
} }
@ -687,15 +673,13 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Port: masterCPort, Port: masterCPort,
UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[0])), UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[0])),
Metadata: map[string]string{ Metadata: map[string]string{
"KubernetesCluster": "cluster", "KubernetesCluster": "cluster",
"k8s": "cluster", "k8s": "cluster",
"KopsNetwork": "cluster", "KopsNetwork": "cluster",
"KopsInstanceGroup": "master-c", "KopsInstanceGroup": "master-c",
"KopsRole": "Master", "KopsRole": "Master",
"ig_generation": "0", "ig_generation": "0",
"cluster_generation": "0", "cluster_generation": "0",
"k8s.io/role/master": "1",
"kops.k8s.io/instancegroup": "master-c",
}, },
AvailabilityZone: s("zone-3"), AvailabilityZone: s("zone-3"),
} }
@ -735,15 +719,13 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Port: nodeAPort, Port: nodeAPort,
UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[1])), UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[1])),
Metadata: map[string]string{ Metadata: map[string]string{
"KubernetesCluster": "cluster", "KubernetesCluster": "cluster",
"k8s": "cluster", "k8s": "cluster",
"KopsNetwork": "cluster", "KopsNetwork": "cluster",
"KopsInstanceGroup": "node-a", "KopsInstanceGroup": "node-a",
"KopsRole": "Node", "KopsRole": "Node",
"ig_generation": "0", "ig_generation": "0",
"cluster_generation": "0", "cluster_generation": "0",
"k8s.io/role/node": "1",
"kops.k8s.io/instancegroup": "node-a",
}, },
AvailabilityZone: s("zone-1"), AvailabilityZone: s("zone-1"),
} }
@ -783,15 +765,13 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Port: nodeBPort, Port: nodeBPort,
UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[1])), UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[1])),
Metadata: map[string]string{ Metadata: map[string]string{
"KubernetesCluster": "cluster", "KubernetesCluster": "cluster",
"k8s": "cluster", "k8s": "cluster",
"KopsNetwork": "cluster", "KopsNetwork": "cluster",
"KopsInstanceGroup": "node-b", "KopsInstanceGroup": "node-b",
"KopsRole": "Node", "KopsRole": "Node",
"ig_generation": "0", "ig_generation": "0",
"cluster_generation": "0", "cluster_generation": "0",
"k8s.io/role/node": "1",
"kops.k8s.io/instancegroup": "node-b",
}, },
AvailabilityZone: s("zone-2"), AvailabilityZone: s("zone-2"),
} }
@ -831,15 +811,13 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Port: nodeCPort, Port: nodeCPort,
UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[1])), UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[1])),
Metadata: map[string]string{ Metadata: map[string]string{
"KubernetesCluster": "cluster", "KubernetesCluster": "cluster",
"k8s": "cluster", "k8s": "cluster",
"KopsNetwork": "cluster", "KopsNetwork": "cluster",
"KopsInstanceGroup": "node-c", "KopsInstanceGroup": "node-c",
"KopsRole": "Node", "KopsRole": "Node",
"ig_generation": "0", "ig_generation": "0",
"cluster_generation": "0", "cluster_generation": "0",
"k8s.io/role/node": "1",
"kops.k8s.io/instancegroup": "node-c",
}, },
AvailabilityZone: s("zone-3"), AvailabilityZone: s("zone-3"),
} }
@ -1030,15 +1008,13 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Port: masterAPort, Port: masterAPort,
UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[0])), UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[0])),
Metadata: map[string]string{ Metadata: map[string]string{
"KubernetesCluster": "cluster", "KubernetesCluster": "cluster",
"k8s": "cluster", "k8s": "cluster",
"KopsNetwork": "cluster", "KopsNetwork": "cluster",
"KopsInstanceGroup": "master-a", "KopsInstanceGroup": "master-a",
"KopsRole": "Master", "KopsRole": "Master",
"ig_generation": "0", "ig_generation": "0",
"cluster_generation": "0", "cluster_generation": "0",
"k8s.io/role/master": "1",
"kops.k8s.io/instancegroup": "master-a",
}, },
AvailabilityZone: s("zone-1"), AvailabilityZone: s("zone-1"),
} }
@ -1073,15 +1049,13 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Port: masterBPort, Port: masterBPort,
UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[0])), UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[0])),
Metadata: map[string]string{ Metadata: map[string]string{
"KubernetesCluster": "cluster", "KubernetesCluster": "cluster",
"k8s": "cluster", "k8s": "cluster",
"KopsNetwork": "cluster", "KopsNetwork": "cluster",
"KopsInstanceGroup": "master-b", "KopsInstanceGroup": "master-b",
"KopsRole": "Master", "KopsRole": "Master",
"ig_generation": "0", "ig_generation": "0",
"cluster_generation": "0", "cluster_generation": "0",
"k8s.io/role/master": "1",
"kops.k8s.io/instancegroup": "master-b",
}, },
AvailabilityZone: s("zone-2"), AvailabilityZone: s("zone-2"),
} }
@ -1116,15 +1090,13 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Port: masterCPort, Port: masterCPort,
UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[0])), UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[0])),
Metadata: map[string]string{ Metadata: map[string]string{
"KubernetesCluster": "cluster", "KubernetesCluster": "cluster",
"k8s": "cluster", "k8s": "cluster",
"KopsNetwork": "cluster", "KopsNetwork": "cluster",
"KopsInstanceGroup": "master-c", "KopsInstanceGroup": "master-c",
"KopsRole": "Master", "KopsRole": "Master",
"ig_generation": "0", "ig_generation": "0",
"cluster_generation": "0", "cluster_generation": "0",
"k8s.io/role/master": "1",
"kops.k8s.io/instancegroup": "master-c",
}, },
AvailabilityZone: s("zone-3"), AvailabilityZone: s("zone-3"),
} }
@ -1159,15 +1131,13 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Port: nodeAPort, Port: nodeAPort,
UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[1])), UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[1])),
Metadata: map[string]string{ Metadata: map[string]string{
"KubernetesCluster": "cluster", "KubernetesCluster": "cluster",
"k8s": "cluster", "k8s": "cluster",
"KopsNetwork": "cluster", "KopsNetwork": "cluster",
"KopsInstanceGroup": "node-a", "KopsInstanceGroup": "node-a",
"KopsRole": "Node", "KopsRole": "Node",
"ig_generation": "0", "ig_generation": "0",
"cluster_generation": "0", "cluster_generation": "0",
"k8s.io/role/node": "1",
"kops.k8s.io/instancegroup": "node-a",
}, },
AvailabilityZone: s("zone-1"), AvailabilityZone: s("zone-1"),
} }
@ -1207,15 +1177,13 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Port: nodeBPort, Port: nodeBPort,
UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[1])), UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[1])),
Metadata: map[string]string{ Metadata: map[string]string{
"KubernetesCluster": "cluster", "KubernetesCluster": "cluster",
"k8s": "cluster", "k8s": "cluster",
"KopsNetwork": "cluster", "KopsNetwork": "cluster",
"KopsInstanceGroup": "node-b", "KopsInstanceGroup": "node-b",
"KopsRole": "Node", "KopsRole": "Node",
"ig_generation": "0", "ig_generation": "0",
"cluster_generation": "0", "cluster_generation": "0",
"k8s.io/role/node": "1",
"kops.k8s.io/instancegroup": "node-b",
}, },
AvailabilityZone: s("zone-2"), AvailabilityZone: s("zone-2"),
} }
@ -1255,15 +1223,13 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Port: nodeCPort, Port: nodeCPort,
UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[1])), UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[1])),
Metadata: map[string]string{ Metadata: map[string]string{
"KubernetesCluster": "cluster", "KubernetesCluster": "cluster",
"k8s": "cluster", "k8s": "cluster",
"KopsNetwork": "cluster", "KopsNetwork": "cluster",
"KopsInstanceGroup": "node-c", "KopsInstanceGroup": "node-c",
"KopsRole": "Node", "KopsRole": "Node",
"ig_generation": "0", "ig_generation": "0",
"cluster_generation": "0", "cluster_generation": "0",
"k8s.io/role/node": "1",
"kops.k8s.io/instancegroup": "node-c",
}, },
AvailabilityZone: s("zone-3"), AvailabilityZone: s("zone-3"),
} }
@ -1498,15 +1464,13 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Port: masterAPort, Port: masterAPort,
UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[0])), UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[0])),
Metadata: map[string]string{ Metadata: map[string]string{
"KubernetesCluster": "cluster", "KubernetesCluster": "cluster",
"k8s": "cluster", "k8s": "cluster",
"KopsNetwork": "cluster", "KopsNetwork": "cluster",
"KopsInstanceGroup": "master-a", "KopsInstanceGroup": "master-a",
"KopsRole": "Master", "KopsRole": "Master",
"ig_generation": "0", "ig_generation": "0",
"cluster_generation": "0", "cluster_generation": "0",
"k8s.io/role/master": "1",
"kops.k8s.io/instancegroup": "master-a",
}, },
AvailabilityZone: s("zone-1"), AvailabilityZone: s("zone-1"),
} }
@ -1542,15 +1506,13 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Port: masterBPort, Port: masterBPort,
UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[0])), UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[0])),
Metadata: map[string]string{ Metadata: map[string]string{
"KubernetesCluster": "cluster", "KubernetesCluster": "cluster",
"k8s": "cluster", "k8s": "cluster",
"KopsNetwork": "cluster", "KopsNetwork": "cluster",
"KopsInstanceGroup": "master-b", "KopsInstanceGroup": "master-b",
"KopsRole": "Master", "KopsRole": "Master",
"ig_generation": "0", "ig_generation": "0",
"cluster_generation": "0", "cluster_generation": "0",
"k8s.io/role/master": "1",
"kops.k8s.io/instancegroup": "master-b",
}, },
AvailabilityZone: s("zone-2"), AvailabilityZone: s("zone-2"),
} }
@ -1586,15 +1548,13 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Port: masterCPort, Port: masterCPort,
UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[0])), UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[0])),
Metadata: map[string]string{ Metadata: map[string]string{
"KubernetesCluster": "cluster", "KubernetesCluster": "cluster",
"k8s": "cluster", "k8s": "cluster",
"KopsNetwork": "cluster", "KopsNetwork": "cluster",
"KopsInstanceGroup": "master-c", "KopsInstanceGroup": "master-c",
"KopsRole": "Master", "KopsRole": "Master",
"ig_generation": "0", "ig_generation": "0",
"cluster_generation": "0", "cluster_generation": "0",
"k8s.io/role/master": "1",
"kops.k8s.io/instancegroup": "master-c",
}, },
AvailabilityZone: s("zone-3"), AvailabilityZone: s("zone-3"),
} }
@ -1629,15 +1589,13 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Port: nodeAPort, Port: nodeAPort,
UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[1])), UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[1])),
Metadata: map[string]string{ Metadata: map[string]string{
"KubernetesCluster": "cluster", "KubernetesCluster": "cluster",
"k8s": "cluster", "k8s": "cluster",
"KopsNetwork": "cluster", "KopsNetwork": "cluster",
"KopsInstanceGroup": "node-a", "KopsInstanceGroup": "node-a",
"KopsRole": "Node", "KopsRole": "Node",
"ig_generation": "0", "ig_generation": "0",
"cluster_generation": "0", "cluster_generation": "0",
"k8s.io/role/node": "1",
"kops.k8s.io/instancegroup": "node-a",
}, },
AvailabilityZone: s("zone-1"), AvailabilityZone: s("zone-1"),
} }
@ -1672,15 +1630,13 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Port: nodeBPort, Port: nodeBPort,
UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[1])), UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[1])),
Metadata: map[string]string{ Metadata: map[string]string{
"KubernetesCluster": "cluster", "KubernetesCluster": "cluster",
"k8s": "cluster", "k8s": "cluster",
"KopsNetwork": "cluster", "KopsNetwork": "cluster",
"KopsInstanceGroup": "node-b", "KopsInstanceGroup": "node-b",
"KopsRole": "Node", "KopsRole": "Node",
"ig_generation": "0", "ig_generation": "0",
"cluster_generation": "0", "cluster_generation": "0",
"k8s.io/role/node": "1",
"kops.k8s.io/instancegroup": "node-b",
}, },
AvailabilityZone: s("zone-2"), AvailabilityZone: s("zone-2"),
} }
@ -1715,15 +1671,13 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Port: nodeCPort, Port: nodeCPort,
UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[1])), UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[1])),
Metadata: map[string]string{ Metadata: map[string]string{
"KubernetesCluster": "cluster", "KubernetesCluster": "cluster",
"k8s": "cluster", "k8s": "cluster",
"KopsInstanceGroup": "node-c", "KopsInstanceGroup": "node-c",
"KopsRole": "Node", "KopsRole": "Node",
"ig_generation": "0", "ig_generation": "0",
"cluster_generation": "0", "cluster_generation": "0",
"KopsNetwork": "cluster", "KopsNetwork": "cluster",
"k8s.io/role/node": "1",
"kops.k8s.io/instancegroup": "node-c",
}, },
AvailabilityZone: s("zone-3"), AvailabilityZone: s("zone-3"),
} }
@ -1860,15 +1814,13 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Port: masterAPort, Port: masterAPort,
UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[0])), UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[0])),
Metadata: map[string]string{ Metadata: map[string]string{
"KubernetesCluster": "cluster", "KubernetesCluster": "cluster",
"k8s": "cluster", "k8s": "cluster",
"KopsNetwork": "cluster", "KopsNetwork": "cluster",
"KopsInstanceGroup": "master", "KopsInstanceGroup": "master",
"KopsRole": "Master", "KopsRole": "Master",
"ig_generation": "0", "ig_generation": "0",
"cluster_generation": "0", "cluster_generation": "0",
"k8s.io/role/master": "1",
"kops.k8s.io/instancegroup": "master",
}, },
AvailabilityZone: s("zone-1"), AvailabilityZone: s("zone-1"),
} }
@ -1901,15 +1853,13 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Port: masterBPort, Port: masterBPort,
UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[0])), UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[0])),
Metadata: map[string]string{ Metadata: map[string]string{
"KubernetesCluster": "cluster", "KubernetesCluster": "cluster",
"k8s": "cluster", "k8s": "cluster",
"KopsNetwork": "cluster", "KopsNetwork": "cluster",
"KopsInstanceGroup": "master", "KopsInstanceGroup": "master",
"KopsRole": "Master", "KopsRole": "Master",
"ig_generation": "0", "ig_generation": "0",
"cluster_generation": "0", "cluster_generation": "0",
"k8s.io/role/master": "1",
"kops.k8s.io/instancegroup": "master",
}, },
AvailabilityZone: s("zone-2"), AvailabilityZone: s("zone-2"),
} }
@ -1942,15 +1892,13 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Port: masterCPort, Port: masterCPort,
UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[0])), UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[0])),
Metadata: map[string]string{ Metadata: map[string]string{
"KubernetesCluster": "cluster", "KubernetesCluster": "cluster",
"k8s": "cluster", "k8s": "cluster",
"KopsNetwork": "cluster", "KopsNetwork": "cluster",
"KopsInstanceGroup": "master", "KopsInstanceGroup": "master",
"KopsRole": "Master", "KopsRole": "Master",
"ig_generation": "0", "ig_generation": "0",
"cluster_generation": "0", "cluster_generation": "0",
"k8s.io/role/master": "1",
"kops.k8s.io/instancegroup": "master",
}, },
AvailabilityZone: s("zone-3"), AvailabilityZone: s("zone-3"),
} }
@ -1990,15 +1938,13 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Port: nodeAPort, Port: nodeAPort,
UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[1])), UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[1])),
Metadata: map[string]string{ Metadata: map[string]string{
"KubernetesCluster": "cluster", "KubernetesCluster": "cluster",
"k8s": "cluster", "k8s": "cluster",
"KopsNetwork": "cluster", "KopsNetwork": "cluster",
"KopsInstanceGroup": "node", "KopsInstanceGroup": "node",
"KopsRole": "Node", "KopsRole": "Node",
"ig_generation": "0", "ig_generation": "0",
"cluster_generation": "0", "cluster_generation": "0",
"k8s.io/role/node": "1",
"kops.k8s.io/instancegroup": "node",
}, },
AvailabilityZone: s("zone-1"), AvailabilityZone: s("zone-1"),
} }
@ -2030,15 +1976,13 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Port: nodeBPort, Port: nodeBPort,
UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[1])), UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[1])),
Metadata: map[string]string{ Metadata: map[string]string{
"KubernetesCluster": "cluster", "KubernetesCluster": "cluster",
"k8s": "cluster", "k8s": "cluster",
"KopsNetwork": "cluster", "KopsNetwork": "cluster",
"KopsInstanceGroup": "node", "KopsInstanceGroup": "node",
"KopsRole": "Node", "KopsRole": "Node",
"ig_generation": "0", "ig_generation": "0",
"cluster_generation": "0", "cluster_generation": "0",
"k8s.io/role/node": "1",
"kops.k8s.io/instancegroup": "node",
}, },
AvailabilityZone: s("zone-2"), AvailabilityZone: s("zone-2"),
} }
@ -2070,15 +2014,13 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Port: nodeCPort, Port: nodeCPort,
UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[1])), UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[1])),
Metadata: map[string]string{ Metadata: map[string]string{
"KubernetesCluster": "cluster", "KubernetesCluster": "cluster",
"k8s": "cluster", "k8s": "cluster",
"KopsNetwork": "cluster", "KopsNetwork": "cluster",
"KopsInstanceGroup": "node", "KopsInstanceGroup": "node",
"KopsRole": "Node", "KopsRole": "Node",
"ig_generation": "0", "ig_generation": "0",
"cluster_generation": "0", "cluster_generation": "0",
"k8s.io/role/node": "1",
"kops.k8s.io/instancegroup": "node",
}, },
AvailabilityZone: s("zone-3"), AvailabilityZone: s("zone-3"),
} }
@ -2200,15 +2142,13 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Port: masterPort, Port: masterPort,
UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[0])), UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[0])),
Metadata: map[string]string{ Metadata: map[string]string{
"KubernetesCluster": "cluster", "KubernetesCluster": "cluster",
"k8s": "cluster", "k8s": "cluster",
"KopsInstanceGroup": "master", "KopsInstanceGroup": "master",
"KopsRole": "Master", "KopsRole": "Master",
"ig_generation": "0", "ig_generation": "0",
"cluster_generation": "0", "cluster_generation": "0",
"KopsNetwork": "cluster", "KopsNetwork": "cluster",
"k8s.io/role/master": "1",
"kops.k8s.io/instancegroup": "master",
}, },
AvailabilityZone: s("zone-1"), AvailabilityZone: s("zone-1"),
} }
@ -2243,15 +2183,13 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Port: nodePort, Port: nodePort,
UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[1])), UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[1])),
Metadata: map[string]string{ Metadata: map[string]string{
"KubernetesCluster": "cluster", "KubernetesCluster": "cluster",
"k8s": "cluster", "k8s": "cluster",
"KopsInstanceGroup": "node", "KopsInstanceGroup": "node",
"KopsRole": "Node", "KopsRole": "Node",
"ig_generation": "0", "ig_generation": "0",
"cluster_generation": "0", "cluster_generation": "0",
"KopsNetwork": "cluster", "KopsNetwork": "cluster",
"k8s.io/role/node": "1",
"kops.k8s.io/instancegroup": "node",
}, },
AvailabilityZone: s("zone-1"), AvailabilityZone: s("zone-1"),
} }
@ -2380,15 +2318,13 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Port: masterPort, Port: masterPort,
UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[0])), UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[0])),
Metadata: map[string]string{ Metadata: map[string]string{
"KubernetesCluster": "cluster", "KubernetesCluster": "cluster",
"k8s": "cluster", "k8s": "cluster",
"KopsInstanceGroup": "master", "KopsInstanceGroup": "master",
"KopsRole": "Master", "KopsRole": "Master",
"ig_generation": "0", "ig_generation": "0",
"cluster_generation": "0", "cluster_generation": "0",
"KopsNetwork": "cluster", "KopsNetwork": "cluster",
"k8s.io/role/master": "1",
"kops.k8s.io/instancegroup": "master",
}, },
AvailabilityZone: s("zone-1"), AvailabilityZone: s("zone-1"),
} }
@ -2423,15 +2359,13 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Port: nodePort, Port: nodePort,
UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[1])), UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[1])),
Metadata: map[string]string{ Metadata: map[string]string{
"KubernetesCluster": "cluster", "KubernetesCluster": "cluster",
"k8s": "cluster", "k8s": "cluster",
"KopsInstanceGroup": "node", "KopsInstanceGroup": "node",
"KopsRole": "Node", "KopsRole": "Node",
"ig_generation": "0", "ig_generation": "0",
"cluster_generation": "0", "cluster_generation": "0",
"KopsNetwork": "cluster", "KopsNetwork": "cluster",
"k8s.io/role/node": "1",
"kops.k8s.io/instancegroup": "node",
}, },
AvailabilityZone: s("zone-1"), AvailabilityZone: s("zone-1"),
} }
@ -2466,14 +2400,12 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Port: bastionPort, Port: bastionPort,
UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[2])), UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[2])),
Metadata: map[string]string{ Metadata: map[string]string{
"k8s": "cluster", "k8s": "cluster",
"KopsInstanceGroup": "bastion", "KopsInstanceGroup": "bastion",
"KopsNetwork": "cluster", "KopsNetwork": "cluster",
"KopsRole": "Bastion", "KopsRole": "Bastion",
"ig_generation": "0", "ig_generation": "0",
"cluster_generation": "0", "cluster_generation": "0",
"k8s.io/role/bastion": "1",
"kops.k8s.io/instancegroup": "bastion",
}, },
AvailabilityZone: s("zone-1"), AvailabilityZone: s("zone-1"),
} }
@ -2564,15 +2496,13 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Port: nodePort, Port: nodePort,
UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[0])), UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[0])),
Metadata: map[string]string{ Metadata: map[string]string{
"KubernetesCluster": "cluster", "KubernetesCluster": "cluster",
"k8s": "cluster", "k8s": "cluster",
"KopsNetwork": "cluster", "KopsNetwork": "cluster",
"KopsInstanceGroup": "node", "KopsInstanceGroup": "node",
"KopsRole": "Node", "KopsRole": "Node",
"ig_generation": "0", "ig_generation": "0",
"cluster_generation": "0", "cluster_generation": "0",
"k8s.io/role/node": "1",
"kops.k8s.io/instancegroup": "node",
}, },
AvailabilityZone: s("zone-1"), AvailabilityZone: s("zone-1"),
SecurityGroups: []string{ SecurityGroups: []string{
@ -2662,15 +2592,13 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Port: nodePort, Port: nodePort,
UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[0])), UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[0])),
Metadata: map[string]string{ Metadata: map[string]string{
"KubernetesCluster": "cluster", "KubernetesCluster": "cluster",
"k8s": "cluster", "k8s": "cluster",
"KopsNetwork": "cluster", "KopsNetwork": "cluster",
"KopsInstanceGroup": "node", "KopsInstanceGroup": "node",
"KopsRole": "Node", "KopsRole": "Node",
"ig_generation": "0", "ig_generation": "0",
"cluster_generation": "0", "cluster_generation": "0",
"k8s.io/role/node": "1",
"kops.k8s.io/instancegroup": "node",
}, },
AvailabilityZone: s("zone-a"), AvailabilityZone: s("zone-a"),
SecurityGroups: []string{ SecurityGroups: []string{
@ -2758,15 +2686,13 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
Port: nodePort, Port: nodePort,
UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[0])), UserData: s(mustUserdataForClusterInstance(cluster, instanceGroups[0])),
Metadata: map[string]string{ Metadata: map[string]string{
"KubernetesCluster": "cluster", "KubernetesCluster": "cluster",
"k8s": "cluster", "k8s": "cluster",
"KopsInstanceGroup": "node", "KopsInstanceGroup": "node",
"KopsRole": "Node", "KopsRole": "Node",
"ig_generation": "0", "ig_generation": "0",
"cluster_generation": "0", "cluster_generation": "0",
"KopsNetwork": "cluster", "KopsNetwork": "cluster",
"k8s.io/role/node": "1",
"kops.k8s.io/instancegroup": "node",
}, },
AvailabilityZone: s("subnet"), AvailabilityZone: s("subnet"),
SecurityGroups: []string{ SecurityGroups: []string{
@ -2780,188 +2706,6 @@ func Test_ServerGroupModelBuilder(t *testing.T) {
} }
}, },
}, },
{
desc: "adds cloud labels from ClusterSpec",
cluster: &kops.Cluster{
ObjectMeta: metav1.ObjectMeta{
Name: "cluster",
},
Spec: kops.ClusterSpec{
MasterPublicName: "master-public-name",
CloudConfig: &kops.CloudConfiguration{
Openstack: &kops.OpenstackConfiguration{},
},
Subnets: []kops.ClusterSubnetSpec{
{
Name: "subnet",
Region: "region",
},
},
CloudLabels: map[string]string{
"some": "label",
},
},
},
instanceGroups: []*kops.InstanceGroup{
{
ObjectMeta: metav1.ObjectMeta{
Name: "node",
},
Spec: kops.InstanceGroupSpec{
Role: kops.InstanceGroupRoleNode,
Image: "image-node",
MinSize: i32(1),
MaxSize: i32(1),
MachineType: "blc.2-4",
Subnets: []string{"subnet"},
Zones: []string{"zone-1"},
},
},
},
expectedTasksBuilder: func(cluster *kops.Cluster, instanceGroups []*kops.InstanceGroup) map[string]fi.Task {
clusterLifecycle := fi.LifecycleSync
nodeServerGroup := &openstacktasks.ServerGroup{
Name: s("cluster-node"),
ClusterName: s("cluster"),
IGName: s("node"),
Policies: []string{"anti-affinity"},
Lifecycle: &clusterLifecycle,
MaxSize: i32(1),
}
nodePort := &openstacktasks.Port{
Name: s("port-node-1-cluster"),
Network: &openstacktasks.Network{Name: s("cluster")},
SecurityGroups: []*openstacktasks.SecurityGroup{
{Name: s("nodes.cluster")},
},
Subnets: []*openstacktasks.Subnet{
{Name: s("subnet.cluster")},
},
Lifecycle: &clusterLifecycle,
}
nodeInstance := &openstacktasks.Instance{
Name: s("node-1-cluster"),
Region: s("region"),
Flavor: s("blc.2-4"),
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: s(mustUserdataForClusterInstance(cluster, instanceGroups[0])),
Metadata: map[string]string{
"KubernetesCluster": "cluster",
"k8s": "cluster",
"KopsNetwork": "cluster",
"KopsInstanceGroup": "node",
"KopsRole": "Node",
"ig_generation": "0",
"cluster_generation": "0",
"k8s.io/role/node": "1",
"kops.k8s.io/instancegroup": "node",
"some": "label",
},
AvailabilityZone: s("zone-1"),
}
return map[string]fi.Task{
"ServerGroup/cluster-node": nodeServerGroup,
"Instance/node-1-cluster": nodeInstance,
"Port/port-node-1-cluster": nodePort,
}
},
},
{
desc: "adds cloud labels from InstanceGroupSpec",
cluster: &kops.Cluster{
ObjectMeta: metav1.ObjectMeta{
Name: "cluster",
},
Spec: kops.ClusterSpec{
MasterPublicName: "master-public-name",
CloudConfig: &kops.CloudConfiguration{
Openstack: &kops.OpenstackConfiguration{},
},
Subnets: []kops.ClusterSubnetSpec{
{
Name: "subnet",
Region: "region",
},
},
},
},
instanceGroups: []*kops.InstanceGroup{
{
ObjectMeta: metav1.ObjectMeta{
Name: "node",
},
Spec: kops.InstanceGroupSpec{
Role: kops.InstanceGroupRoleNode,
CloudLabels: map[string]string{
"some": "label",
},
Image: "image-node",
MinSize: i32(1),
MaxSize: i32(1),
MachineType: "blc.2-4",
Subnets: []string{"subnet"},
Zones: []string{"zone-1"},
},
},
},
expectedTasksBuilder: func(cluster *kops.Cluster, instanceGroups []*kops.InstanceGroup) map[string]fi.Task {
clusterLifecycle := fi.LifecycleSync
nodeServerGroup := &openstacktasks.ServerGroup{
Name: s("cluster-node"),
ClusterName: s("cluster"),
IGName: s("node"),
Policies: []string{"anti-affinity"},
Lifecycle: &clusterLifecycle,
MaxSize: i32(1),
}
nodePort := &openstacktasks.Port{
Name: s("port-node-1-cluster"),
Network: &openstacktasks.Network{Name: s("cluster")},
SecurityGroups: []*openstacktasks.SecurityGroup{
{Name: s("nodes.cluster")},
},
Subnets: []*openstacktasks.Subnet{
{Name: s("subnet.cluster")},
},
Lifecycle: &clusterLifecycle,
}
nodeInstance := &openstacktasks.Instance{
Name: s("node-1-cluster"),
Region: s("region"),
Flavor: s("blc.2-4"),
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: s(mustUserdataForClusterInstance(cluster, instanceGroups[0])),
Metadata: map[string]string{
"KubernetesCluster": "cluster",
"k8s": "cluster",
"KopsNetwork": "cluster",
"KopsInstanceGroup": "node",
"KopsRole": "Node",
"ig_generation": "0",
"cluster_generation": "0",
"k8s.io/role/node": "1",
"kops.k8s.io/instancegroup": "node",
"some": "label",
},
AvailabilityZone: s("zone-1"),
}
return map[string]fi.Task{
"ServerGroup/cluster-node": nodeServerGroup,
"Instance/node-1-cluster": nodeInstance,
"Port/port-node-1-cluster": nodePort,
}
},
},
} }
for _, testCase := range tests { for _, testCase := range tests {