Skip to content
This repository has been archived by the owner on Apr 7, 2020. It is now read-only.

Commit

Permalink
Preserve previous alicloud machine class naming
Browse files Browse the repository at this point in the history
```improvement user
The previous naming scheme for Alicloud machine classes is now preserved (`<namespace>-<pool-name>-<zone-name>` instead of `<namespace>-<pool-name>-z<zone-index>`).
```
  • Loading branch information
rfranzke committed May 31, 2019
1 parent 334ec0d commit 20af1d2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ func (w *workerDelegate) generateMachineConfig(ctx context.Context) error {

var (
machineClassSpecHash = worker.MachineClassHash(machineClassSpec, shootVersionMajorMinor)
deploymentName = fmt.Sprintf("%s-%s-z%d", w.worker.Namespace, pool.Name, zoneIndex+1)
deploymentName = fmt.Sprintf("%s-%s-%s", w.worker.Namespace, pool.Name, zone)
className = fmt.Sprintf("%s-%s", deploymentName, machineClassSpecHash)
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -314,10 +314,10 @@ var _ = Describe("Machines", func() {
machineClassPool2Zone1 = useDefaultMachineClass(defaultMachineClass, "vSwitchID", vswitchZone1, "zoneID", zone1)
machineClassPool2Zone2 = useDefaultMachineClass(defaultMachineClass, "vSwitchID", vswitchZone2, "zoneID", zone2)

machineClassNamePool1Zone1 = fmt.Sprintf("%s-%s-z1", namespace, namePool1)
machineClassNamePool1Zone2 = fmt.Sprintf("%s-%s-z2", namespace, namePool1)
machineClassNamePool2Zone1 = fmt.Sprintf("%s-%s-z1", namespace, namePool2)
machineClassNamePool2Zone2 = fmt.Sprintf("%s-%s-z2", namespace, namePool2)
machineClassNamePool1Zone1 = fmt.Sprintf("%s-%s-%s", namespace, namePool1, zone1)
machineClassNamePool1Zone2 = fmt.Sprintf("%s-%s-%s", namespace, namePool1, zone2)
machineClassNamePool2Zone1 = fmt.Sprintf("%s-%s-%s", namespace, namePool2, zone1)
machineClassNamePool2Zone2 = fmt.Sprintf("%s-%s-%s", namespace, namePool2, zone2)

machineClassHashPool1Zone1 = worker.MachineClassHash(machineClassPool1Zone1, shootVersionMajorMinor)
machineClassHashPool1Zone2 = worker.MachineClassHash(machineClassPool1Zone2, shootVersionMajorMinor)
Expand Down

0 comments on commit 20af1d2

Please sign in to comment.