Skip to content

Commit 36d94a2

Browse files
daehyeokdaehyeok
committed
Migrate MachineName function.
Migrate MachineName function from driver package to config package.
1 parent 857e0a2 commit 36d94a2

38 files changed

+122
-125
lines changed

Diff for: ‎cmd/minikube/cmd/config/profile_list.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ func profileStatus(p *config.Profile, api libmachine.API) string {
9292
exit.Error(reason.GuestCpConfig, "error getting primary control plane", err)
9393
}
9494

95-
host, err := machine.LoadHost(api, driver.MachineName(*p.Config, cp))
95+
host, err := machine.LoadHost(api, config.MachineName(*p.Config, cp))
9696
if err != nil {
9797
klog.Warningf("error loading profiles: %v", err)
9898
return "Unknown"

Diff for: ‎cmd/minikube/cmd/delete.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ func deleteProfile(profile *config.Profile) error {
288288
if driver.IsKIC(profile.Config.Driver) {
289289
out.Step(style.DeletingHost, `Deleting "{{.profile_name}}" in {{.driver_name}} ...`, out.V{"profile_name": profile.Name, "driver_name": profile.Config.Driver})
290290
for _, n := range profile.Config.Nodes {
291-
machineName := driver.MachineName(*profile.Config, n)
291+
machineName := config.MachineName(*profile.Config, n)
292292
deletePossibleKicLeftOver(machineName, profile.Config.Driver)
293293
}
294294
}
@@ -347,7 +347,7 @@ func deleteHosts(api libmachine.API, cc *config.ClusterConfig) {
347347

348348
if cc != nil {
349349
for _, n := range cc.Nodes {
350-
machineName := driver.MachineName(*cc, n)
350+
machineName := config.MachineName(*cc, n)
351351
if err := machine.DeleteHost(api, machineName); err != nil {
352352
switch errors.Cause(err).(type) {
353353
case mcnerror.ErrHostDoesNotExist:
@@ -412,7 +412,7 @@ func profileDeletionErr(cname string, additionalInfo string) error {
412412

413413
func uninstallKubernetes(api libmachine.API, cc config.ClusterConfig, n config.Node, bsName string) error {
414414
out.Step(style.Resetting, "Uninstalling Kubernetes {{.kubernetes_version}} using {{.bootstrapper_name}} ...", out.V{"kubernetes_version": cc.KubernetesConfig.KubernetesVersion, "bootstrapper_name": bsName})
415-
host, err := machine.LoadHost(api, driver.MachineName(cc, n))
415+
host, err := machine.LoadHost(api, config.MachineName(cc, n))
416416
if err != nil {
417417
return DeletionError{Err: fmt.Errorf("unable to load host: %v", err), Errtype: MissingCluster}
418418
}
@@ -500,7 +500,7 @@ func deleteProfileDirectory(profile string) {
500500
func deleteMachineDirectories(cc *config.ClusterConfig) {
501501
if cc != nil {
502502
for _, n := range cc.Nodes {
503-
machineName := driver.MachineName(*cc, n)
503+
machineName := config.MachineName(*cc, n)
504504
deleteProfileDirectory(machineName)
505505
}
506506
}

Diff for: ‎cmd/minikube/cmd/node_delete.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package cmd
1818

1919
import (
2020
"github.com/spf13/cobra"
21+
"k8s.io/minikube/pkg/minikube/config"
2122
"k8s.io/minikube/pkg/minikube/driver"
2223
"k8s.io/minikube/pkg/minikube/exit"
2324
"k8s.io/minikube/pkg/minikube/mustload"
@@ -46,7 +47,7 @@ var nodeDeleteCmd = &cobra.Command{
4647
}
4748

4849
if driver.IsKIC(co.Config.Driver) {
49-
machineName := driver.MachineName(*co.Config, *n)
50+
machineName := config.MachineName(*co.Config, *n)
5051
deletePossibleKicLeftOver(machineName, co.Config.Driver)
5152
}
5253

Diff for: ‎cmd/minikube/cmd/node_list.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222

2323
"github.com/spf13/cobra"
2424
"k8s.io/klog/v2"
25-
"k8s.io/minikube/pkg/minikube/driver"
25+
"k8s.io/minikube/pkg/minikube/config"
2626
"k8s.io/minikube/pkg/minikube/exit"
2727
"k8s.io/minikube/pkg/minikube/mustload"
2828
"k8s.io/minikube/pkg/minikube/reason"
@@ -47,7 +47,7 @@ var nodeListCmd = &cobra.Command{
4747
}
4848

4949
for _, n := range cc.Nodes {
50-
machineName := driver.MachineName(*cc, n)
50+
machineName := config.MachineName(*cc, n)
5151
fmt.Printf("%s\t%s\n", machineName, n.IP)
5252
}
5353
os.Exit(0)

Diff for: ‎cmd/minikube/cmd/node_start.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121

2222
"github.com/spf13/cobra"
2323
"github.com/spf13/viper"
24-
"k8s.io/minikube/pkg/minikube/driver"
24+
"k8s.io/minikube/pkg/minikube/config"
2525
"k8s.io/minikube/pkg/minikube/exit"
2626
"k8s.io/minikube/pkg/minikube/machine"
2727
"k8s.io/minikube/pkg/minikube/mustload"
@@ -49,7 +49,7 @@ var nodeStartCmd = &cobra.Command{
4949
exit.Error(reason.GuestNodeRetrieve, "retrieving node", err)
5050
}
5151

52-
machineName := driver.MachineName(*cc, *n)
52+
machineName := config.MachineName(*cc, *n)
5353
if machine.IsRunning(api, machineName) {
5454
out.Step(style.Check, "{{.name}} is already running", out.V{"name": name})
5555
os.Exit(0)

Diff for: ‎cmd/minikube/cmd/node_stop.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package cmd
1818

1919
import (
2020
"github.com/spf13/cobra"
21-
"k8s.io/minikube/pkg/minikube/driver"
21+
"k8s.io/minikube/pkg/minikube/config"
2222
"k8s.io/minikube/pkg/minikube/exit"
2323
"k8s.io/minikube/pkg/minikube/machine"
2424
"k8s.io/minikube/pkg/minikube/mustload"
@@ -45,7 +45,7 @@ var nodeStopCmd = &cobra.Command{
4545
exit.Error(reason.GuestNodeRetrieve, "retrieving node", err)
4646
}
4747

48-
machineName := driver.MachineName(*cc, *n)
48+
machineName := config.MachineName(*cc, *n)
4949

5050
err = machine.StopHost(api, machineName)
5151
if err != nil {

Diff for: ‎cmd/minikube/cmd/pause.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import (
2424

2525
"k8s.io/klog/v2"
2626
"k8s.io/minikube/pkg/minikube/cluster"
27+
"k8s.io/minikube/pkg/minikube/config"
2728
"k8s.io/minikube/pkg/minikube/constants"
2829
"k8s.io/minikube/pkg/minikube/cruntime"
29-
"k8s.io/minikube/pkg/minikube/driver"
3030
"k8s.io/minikube/pkg/minikube/exit"
3131
"k8s.io/minikube/pkg/minikube/localpath"
3232
"k8s.io/minikube/pkg/minikube/machine"
@@ -73,7 +73,7 @@ func runPause(cmd *cobra.Command, args []string) {
7373

7474
out.Step(style.Pause, "Pausing node {{.name}} ... ", out.V{"name": name})
7575

76-
host, err := machine.LoadHost(co.API, driver.MachineName(*co.Config, n))
76+
host, err := machine.LoadHost(co.API, config.MachineName(*co.Config, n))
7777
if err != nil {
7878
exit.Error(reason.GuestLoadHost, "Error getting host", err)
7979
}

Diff for: ‎cmd/minikube/cmd/ssh-key.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"path/filepath"
2121

2222
"github.com/spf13/cobra"
23-
"k8s.io/minikube/pkg/minikube/driver"
23+
"k8s.io/minikube/pkg/minikube/config"
2424
"k8s.io/minikube/pkg/minikube/exit"
2525
"k8s.io/minikube/pkg/minikube/localpath"
2626
"k8s.io/minikube/pkg/minikube/mustload"
@@ -41,7 +41,7 @@ var sshKeyCmd = &cobra.Command{
4141
exit.Error(reason.GuestNodeRetrieve, "retrieving node", err)
4242
}
4343

44-
out.Ln(filepath.Join(localpath.MiniPath(), "machines", driver.MachineName(*cc, *n), "id_rsa"))
44+
out.Ln(filepath.Join(localpath.MiniPath(), "machines", config.MachineName(*cc, *n), "id_rsa"))
4545
},
4646
}
4747

Diff for: ‎cmd/minikube/cmd/start.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,7 @@ func hostDriver(existing *config.ClusterConfig) string {
625625
klog.Warningf("Unable to get control plane from existing config: %v", err)
626626
return existing.Driver
627627
}
628-
machineName := driver.MachineName(*existing, cp)
628+
machineName := config.MachineName(*existing, cp)
629629
h, err := api.Load(machineName)
630630
if err != nil {
631631
klog.Warningf("api.Load failed for %s: %v", machineName, err)

Diff for: ‎cmd/minikube/cmd/status.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ func writeStatusesAtInterval(duration time.Duration, api libmachine.API, cc *con
237237
statuses = append(statuses, st)
238238
} else {
239239
for _, n := range cc.Nodes {
240-
machineName := driver.MachineName(*cc, n)
240+
machineName := config.MachineName(*cc, n)
241241
klog.Infof("checking status of %s ...", machineName)
242242
st, err := nodeStatus(api, *cc, n)
243243
klog.Infof("%s status: %+v", machineName, st)
@@ -301,7 +301,7 @@ func exitCode(statuses []*Status) int {
301301
// nodeStatus looks up the status of a node
302302
func nodeStatus(api libmachine.API, cc config.ClusterConfig, n config.Node) (*Status, error) {
303303
controlPlane := n.ControlPlane
304-
name := driver.MachineName(cc, n)
304+
name := config.MachineName(cc, n)
305305

306306
st := &Status{
307307
Name: name,

Diff for: ‎cmd/minikube/cmd/stop.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import (
2828
"github.com/spf13/viper"
2929
"k8s.io/klog/v2"
3030
"k8s.io/minikube/pkg/minikube/config"
31-
"k8s.io/minikube/pkg/minikube/driver"
3231
"k8s.io/minikube/pkg/minikube/exit"
3332
"k8s.io/minikube/pkg/minikube/kubeconfig"
3433
"k8s.io/minikube/pkg/minikube/localpath"
@@ -138,7 +137,7 @@ func stopProfile(profile string) int {
138137
defer api.Close()
139138

140139
for _, n := range cc.Nodes {
141-
machineName := driver.MachineName(*cc, n)
140+
machineName := config.MachineName(*cc, n)
142141

143142
nonexistent := stop(api, machineName)
144143
if !nonexistent {

Diff for: ‎cmd/minikube/cmd/unpause.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import (
2424

2525
"k8s.io/klog/v2"
2626
"k8s.io/minikube/pkg/minikube/cluster"
27+
"k8s.io/minikube/pkg/minikube/config"
2728
"k8s.io/minikube/pkg/minikube/constants"
2829
"k8s.io/minikube/pkg/minikube/cruntime"
29-
"k8s.io/minikube/pkg/minikube/driver"
3030
"k8s.io/minikube/pkg/minikube/exit"
3131
"k8s.io/minikube/pkg/minikube/localpath"
3232
"k8s.io/minikube/pkg/minikube/machine"
@@ -71,7 +71,7 @@ var unpauseCmd = &cobra.Command{
7171

7272
out.Step(style.Pause, "Unpausing node {{.name}} ... ", out.V{"name": name})
7373

74-
machineName := driver.MachineName(*co.Config, n)
74+
machineName := config.MachineName(*co.Config, n)
7575
host, err := machine.LoadHost(co.API, machineName)
7676
if err != nil {
7777
exit.Error(reason.GuestLoadHost, "Error getting host", err)

Diff for: ‎pkg/addons/addons.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ https://github.com/kubernetes/minikube/issues/7332`, out.V{"driver_name": cc.Dri
186186
exit.Error(reason.GuestCpConfig, "Error getting primary control plane", err)
187187
}
188188

189-
mName := driver.MachineName(*cc, cp)
189+
mName := config.MachineName(*cc, cp)
190190
host, err := machine.LoadHost(api, mName)
191191
if err != nil || !machine.IsRunning(api, mName) {
192192
klog.Warningf("%q is not running, setting %s=%v and skipping enablement (err=%v)", mName, addon.Name(), enable, err)
@@ -296,8 +296,8 @@ func enableOrDisableStorageClasses(cc *config.ClusterConfig, name string, val st
296296
if err != nil {
297297
return errors.Wrap(err, "getting control plane")
298298
}
299-
if !machine.IsRunning(api, driver.MachineName(*cc, cp)) {
300-
klog.Warningf("%q is not running, writing %s=%v to disk and skipping enablement", driver.MachineName(*cc, cp), name, val)
299+
if !machine.IsRunning(api, config.MachineName(*cc, cp)) {
300+
klog.Warningf("%q is not running, writing %s=%v to disk and skipping enablement", config.MachineName(*cc, cp), name, val)
301301
return enableOrDisableAddon(cc, name, val)
302302
}
303303

Diff for: ‎pkg/minikube/bootstrapper/bsutil/kubelet.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,5 +123,5 @@ func KubeNodeName(cc config.ClusterConfig, n config.Node) string {
123123
hostname, _ := os.Hostname()
124124
return hostname
125125
}
126-
return driver.MachineName(cc, n)
126+
return config.MachineName(cc, n)
127127
}

Diff for: ‎pkg/minikube/bootstrapper/kubeadm/kubeadm.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,7 @@ func (k *Bootstrapper) JoinCluster(cc config.ClusterConfig, n config.Node, joinC
709709
}()
710710

711711
// Join the master by specifying its token
712-
joinCmd = fmt.Sprintf("%s --node-name=%s", joinCmd, driver.MachineName(cc, n))
712+
joinCmd = fmt.Sprintf("%s --node-name=%s", joinCmd, config.MachineName(cc, n))
713713

714714
join := func() error {
715715
// reset first to clear any possibly existing state

Diff for: ‎pkg/minikube/cluster/cluster.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import (
2727
"k8s.io/minikube/pkg/minikube/bootstrapper/kubeadm"
2828
"k8s.io/minikube/pkg/minikube/command"
2929
"k8s.io/minikube/pkg/minikube/config"
30-
"k8s.io/minikube/pkg/minikube/driver"
3130
"k8s.io/minikube/pkg/minikube/machine"
3231
)
3332

@@ -61,7 +60,7 @@ func ControlPlaneBootstrapper(mAPI libmachine.API, cc *config.ClusterConfig, boo
6160
if err != nil {
6261
return nil, nil, errors.Wrap(err, "getting primary control plane")
6362
}
64-
h, err := machine.LoadHost(mAPI, driver.MachineName(*cc, cp))
63+
h, err := machine.LoadHost(mAPI, config.MachineName(*cc, cp))
6564
if err != nil {
6665
return nil, nil, errors.Wrap(err, "getting control plane host")
6766
}

Diff for: ‎pkg/minikube/config/config_test.go

+54
Original file line numberDiff line numberDiff line change
@@ -188,3 +188,57 @@ func TestEncode(t *testing.T) {
188188
b.Reset()
189189
}
190190
}
191+
192+
func TestMachineName(t *testing.T) {
193+
testsCases := []struct {
194+
ClusterConfig ClusterConfig
195+
Want string
196+
}{
197+
{
198+
ClusterConfig: ClusterConfig{Name: "minikube",
199+
Nodes: []Node{
200+
{
201+
Name: "",
202+
IP: "172.17.0.3",
203+
Port: 8443,
204+
KubernetesVersion: "v1.19.2",
205+
ControlPlane: true,
206+
Worker: true,
207+
},
208+
},
209+
},
210+
Want: "minikube",
211+
},
212+
213+
{
214+
ClusterConfig: ClusterConfig{Name: "p2",
215+
Nodes: []Node{
216+
{
217+
Name: "",
218+
IP: "172.17.0.3",
219+
Port: 8443,
220+
KubernetesVersion: "v1.19.2",
221+
ControlPlane: true,
222+
Worker: true,
223+
},
224+
{
225+
Name: "m2",
226+
IP: "172.17.0.4",
227+
Port: 0,
228+
KubernetesVersion: "v1.19.2",
229+
ControlPlane: false,
230+
Worker: true,
231+
},
232+
},
233+
},
234+
Want: "p2-m2",
235+
},
236+
}
237+
238+
for _, tc := range testsCases {
239+
got := MachineName(tc.ClusterConfig, tc.ClusterConfig.Nodes[len(tc.ClusterConfig.Nodes)-1])
240+
if got != tc.Want {
241+
t.Errorf("Expected MachineName to be %q but got %q", tc.Want, got)
242+
}
243+
}
244+
}

Diff for: ‎pkg/minikube/config/profile.go

+10
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package config
1818

1919
import (
2020
"encoding/json"
21+
"fmt"
2122
"io/ioutil"
2223
"os"
2324
"path/filepath"
@@ -286,3 +287,12 @@ func ProfileFolderPath(profile string, miniHome ...string) string {
286287
}
287288
return filepath.Join(miniPath, "profiles", profile)
288289
}
290+
291+
// MachineName returns the name of the machine, as seen by the hypervisor given the cluster and node names
292+
func MachineName(cc ClusterConfig, n Node) string {
293+
// For single node cluster, default to back to old naming
294+
if len(cc.Nodes) == 1 || n.ControlPlane {
295+
return cc.Name
296+
}
297+
return fmt.Sprintf("%s-%s", cc.Name, n.Name)
298+
}

Diff for: ‎pkg/minikube/driver/driver.go

-10
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import (
2626

2727
"k8s.io/klog/v2"
2828
"k8s.io/minikube/pkg/drivers/kic/oci"
29-
"k8s.io/minikube/pkg/minikube/config"
3029
"k8s.io/minikube/pkg/minikube/registry"
3130
)
3231

@@ -305,15 +304,6 @@ func SetLibvirtURI(v string) {
305304

306305
}
307306

308-
// MachineName returns the name of the machine, as seen by the hypervisor given the cluster and node names
309-
func MachineName(cc config.ClusterConfig, n config.Node) string {
310-
// For single node cluster, default to back to old naming
311-
if len(cc.Nodes) == 1 || n.ControlPlane {
312-
return cc.Name
313-
}
314-
return fmt.Sprintf("%s-%s", cc.Name, n.Name)
315-
}
316-
317307
// IndexFromMachineName returns the order of the container based on it is name
318308
func IndexFromMachineName(machineName string) int {
319309
// minikube-m02

0 commit comments

Comments
 (0)