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

[OpenStack] Use new hash format in instance names #10557

Merged
merged 4 commits into from
Jan 13, 2021
Merged

[OpenStack] Use new hash format in instance names #10557

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
185ccba
Use random instance names in OpenStack
zetaab Jan 11, 2021
38831ff
fix test
zetaab Jan 12, 2021
1bc330b
nameprefix -> groupname
zetaab Jan 13, 2021
6439973
fix comment
zetaab Jan 13, 2021
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: 1 addition & 1 deletion cloudmock/openstack/mockcompute/servers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ func (m *MockClient) listServers(w http.ResponseWriter, vals url.Values) {
serverName := strings.Trim(vals.Get("name"), "^$")
matched := make([]servers.Server, 0)
for _, server := range m.servers {
if server.Name == serverName {
if strings.HasPrefix(server.Name, serverName) {
matched = append(matched, server)
}
}
Expand Down
10 changes: 9 additions & 1 deletion pkg/model/openstackmodel/servergroup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,8 @@ func (b *ServerGroupModelBuilder) buildInstances(c *fi.ModelBuilderContext, sg *
securityGroups = append(securityGroups, b.LinkToSecurityGroup(b.Cluster.Spec.MasterPublicName))
}

r := strings.NewReplacer("_", "-", ".", "-")
groupName := r.Replace(strings.ToLower(ig.Name))
// In the future, OpenStack will use Machine API to manage groups,
// for now create d.InstanceGroups.Spec.MinSize amount of servers
for i := int32(0); i < *ig.Spec.MinSize; i++ {
Expand Down Expand Up @@ -141,8 +143,14 @@ func (b *ServerGroupModelBuilder) buildInstances(c *fi.ModelBuilderContext, sg *
}
c.AddTask(portTask)

metaWithName := make(map[string]string)
for k, v := range igMeta {
metaWithName[k] = v
}
metaWithName[openstack.TagKopsName] = fi.StringValue(instanceName)
instanceTask := &openstacktasks.Instance{
Name: instanceName,
GroupName: s(groupName),
Region: fi.String(b.Cluster.Spec.Subnets[0].Region),
Flavor: fi.String(ig.Spec.MachineType),
Image: fi.String(ig.Spec.Image),
Expand All @@ -151,7 +159,7 @@ func (b *ServerGroupModelBuilder) buildInstances(c *fi.ModelBuilderContext, sg *
Role: fi.String(string(ig.Spec.Role)),
Port: portTask,
UserData: startupScript,
Metadata: igMeta,
Metadata: metaWithName,
SecurityGroups: ig.Spec.AdditionalSecurityGroups,
AvailabilityZone: az,
}
Expand Down
2 changes: 2 additions & 0 deletions pkg/model/openstackmodel/tests/servergroup/adds-additional-security-groups.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ AvailabilityZone: zone-1
Flavor: blc.2-4
FloatingIP: null
ForAPIServer: false
GroupName: node
ID: null
Image: image-node
Lifecycle: null
Metadata:
KopsInstanceGroup: node
KopsName: node-1-cluster
KopsNetwork: cluster
KopsRole: Node
KubernetesCluster: cluster
Expand Down
2 changes: 2 additions & 0 deletions pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-ClusterSpec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ AvailabilityZone: zone-1
Flavor: blc.2-4
FloatingIP: null
ForAPIServer: false
GroupName: node
ID: null
Image: image-node
Lifecycle: null
Metadata:
KopsInstanceGroup: node
KopsName: node-1-cluster
KopsNetwork: cluster
KopsRole: Node
KubernetesCluster: cluster
Expand Down
2 changes: 2 additions & 0 deletions pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-InstanceGroupSpec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ AvailabilityZone: zone-1
Flavor: blc.2-4
FloatingIP: null
ForAPIServer: false
GroupName: node
ID: null
Image: image-node
Lifecycle: null
Metadata:
KopsInstanceGroup: node
KopsName: node-1-cluster
KopsNetwork: cluster
KopsRole: Node
KubernetesCluster: cluster
Expand Down
12 changes: 12 additions & 0 deletions ...servergroup/multizone-setup-3-masters-3-nodes-without-bastion-auto-zone-distribution.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,13 @@ FloatingIP:
Lifecycle: Sync
Name: fip-master-1-cluster
ForAPIServer: false
GroupName: master
ID: null
Image: image
Lifecycle: null
Metadata:
KopsInstanceGroup: master
KopsName: master-1-cluster
KopsNetwork: cluster
KopsRole: Master
KubernetesCluster: cluster
Expand Down Expand Up @@ -130,11 +132,13 @@ FloatingIP:
Lifecycle: Sync
Name: fip-master-2-cluster
ForAPIServer: false
GroupName: master
ID: null
Image: image
Lifecycle: null
Metadata:
KopsInstanceGroup: master
KopsName: master-2-cluster
KopsNetwork: cluster
KopsRole: Master
KubernetesCluster: cluster
Expand Down Expand Up @@ -206,11 +210,13 @@ FloatingIP:
Lifecycle: Sync
Name: fip-master-3-cluster
ForAPIServer: false
GroupName: master
ID: null
Image: image
Lifecycle: null
Metadata:
KopsInstanceGroup: master
KopsName: master-3-cluster
KopsNetwork: cluster
KopsRole: Master
KubernetesCluster: cluster
Expand Down Expand Up @@ -282,11 +288,13 @@ FloatingIP:
Lifecycle: Sync
Name: fip-node-1-cluster
ForAPIServer: false
GroupName: node
ID: null
Image: image
Lifecycle: null
Metadata:
KopsInstanceGroup: node
KopsName: node-1-cluster
KopsNetwork: cluster
KopsRole: Node
KubernetesCluster: cluster
Expand Down Expand Up @@ -351,11 +359,13 @@ FloatingIP:
Lifecycle: Sync
Name: fip-node-2-cluster
ForAPIServer: false
GroupName: node
ID: null
Image: image
Lifecycle: null
Metadata:
KopsInstanceGroup: node
KopsName: node-2-cluster
KopsNetwork: cluster
KopsRole: Node
KubernetesCluster: cluster
Expand Down Expand Up @@ -420,11 +430,13 @@ FloatingIP:
Lifecycle: Sync
Name: fip-node-3-cluster
ForAPIServer: false
GroupName: node
ID: null
Image: image
Lifecycle: null
Metadata:
KopsInstanceGroup: node
KopsName: node-3-cluster
KopsNetwork: cluster
KopsRole: Node
KubernetesCluster: cluster
Expand Down
12 changes: 12 additions & 0 deletions .../servergroup/multizone-setup-3-masters-3-nodes-without-bastion-with-API-loadbalancer.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,13 @@ AvailabilityZone: zone-1
Flavor: blc.1-2
FloatingIP: null
ForAPIServer: false
GroupName: master-a
ID: null
Image: image
Lifecycle: null
Metadata:
KopsInstanceGroup: master-a
KopsName: master-a-1-cluster
KopsNetwork: cluster
KopsRole: Master
KubernetesCluster: cluster
Expand Down Expand Up @@ -119,11 +121,13 @@ AvailabilityZone: zone-2
Flavor: blc.1-2
FloatingIP: null
ForAPIServer: false
GroupName: master-b
ID: null
Image: image
Lifecycle: null
Metadata:
KopsInstanceGroup: master-b
KopsName: master-b-1-cluster
KopsNetwork: cluster
KopsRole: Master
KubernetesCluster: cluster
Expand Down Expand Up @@ -183,11 +187,13 @@ AvailabilityZone: zone-3
Flavor: blc.1-2
FloatingIP: null
ForAPIServer: false
GroupName: master-c
ID: null
Image: image
Lifecycle: null
Metadata:
KopsInstanceGroup: master-c
KopsName: master-c-1-cluster
KopsNetwork: cluster
KopsRole: Master
KubernetesCluster: cluster
Expand Down Expand Up @@ -253,11 +259,13 @@ FloatingIP:
Lifecycle: Sync
Name: fip-node-a-1-cluster
ForAPIServer: false
GroupName: node-a
ID: null
Image: image
Lifecycle: null
Metadata:
KopsInstanceGroup: node-a
KopsName: node-a-1-cluster
KopsNetwork: cluster
KopsRole: Node
KubernetesCluster: cluster
Expand Down Expand Up @@ -322,11 +330,13 @@ FloatingIP:
Lifecycle: Sync
Name: fip-node-b-1-cluster
ForAPIServer: false
GroupName: node-b
ID: null
Image: image
Lifecycle: null
Metadata:
KopsInstanceGroup: node-b
KopsName: node-b-1-cluster
KopsNetwork: cluster
KopsRole: Node
KubernetesCluster: cluster
Expand Down Expand Up @@ -391,11 +401,13 @@ FloatingIP:
Lifecycle: Sync
Name: fip-node-c-1-cluster
ForAPIServer: false
GroupName: node-c
ID: null
Image: image
Lifecycle: null
Metadata:
KopsInstanceGroup: node-c
KopsName: node-c-1-cluster
KopsNetwork: cluster
KopsRole: Node
KubernetesCluster: cluster
Expand Down
12 changes: 12 additions & 0 deletions ...l/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,13 @@ FloatingIP:
Lifecycle: Sync
Name: fip-master-a-1-cluster
ForAPIServer: false
GroupName: master-a
ID: null
Image: image
Lifecycle: null
Metadata:
KopsInstanceGroup: master-a
KopsName: master-a-1-cluster
KopsNetwork: cluster
KopsRole: Master
KubernetesCluster: cluster
Expand Down Expand Up @@ -138,11 +140,13 @@ FloatingIP:
Lifecycle: Sync
Name: fip-master-b-1-cluster
ForAPIServer: false
GroupName: master-b
ID: null
Image: image
Lifecycle: null
Metadata:
KopsInstanceGroup: master-b
KopsName: master-b-1-cluster
KopsNetwork: cluster
KopsRole: Master
KubernetesCluster: cluster
Expand Down Expand Up @@ -214,11 +218,13 @@ FloatingIP:
Lifecycle: Sync
Name: fip-master-c-1-cluster
ForAPIServer: false
GroupName: master-c
ID: null
Image: image
Lifecycle: null
Metadata:
KopsInstanceGroup: master-c
KopsName: master-c-1-cluster
KopsNetwork: cluster
KopsRole: Master
KubernetesCluster: cluster
Expand Down Expand Up @@ -290,11 +296,13 @@ FloatingIP:
Lifecycle: Sync
Name: fip-node-a-1-cluster
ForAPIServer: false
GroupName: node-a
ID: null
Image: image
Lifecycle: null
Metadata:
KopsInstanceGroup: node-a
KopsName: node-a-1-cluster
KopsNetwork: cluster
KopsRole: Node
KubernetesCluster: cluster
Expand Down Expand Up @@ -359,11 +367,13 @@ FloatingIP:
Lifecycle: Sync
Name: fip-node-b-1-cluster
ForAPIServer: false
GroupName: node-b
ID: null
Image: image
Lifecycle: null
Metadata:
KopsInstanceGroup: node-b
KopsName: node-b-1-cluster
KopsNetwork: cluster
KopsRole: Node
KubernetesCluster: cluster
Expand Down Expand Up @@ -428,11 +438,13 @@ FloatingIP:
Lifecycle: Sync
Name: fip-node-c-1-cluster
ForAPIServer: false
GroupName: node-c
ID: null
Image: image
Lifecycle: null
Metadata:
KopsInstanceGroup: node-c
KopsName: node-c-1-cluster
KopsNetwork: cluster
KopsRole: Node
KubernetesCluster: cluster
Expand Down
Loading