Skip to content

Commit add572c

Browse files
authored
Merge pull request #8216 from sharifelgamal/volume-del
multinode: delete worker volumes for docker driver
2 parents 327ba9e + 6eb0200 commit add572c

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,10 @@ func deleteProfile(profile *config.Profile) error {
271271
// if driver is oci driver, delete containers and volumes
272272
if driver.IsKIC(profile.Config.Driver) {
273273
out.T(out.DeletingHost, `Deleting "{{.profile_name}}" in {{.driver_name}} ...`, out.V{"profile_name": profile.Name, "driver_name": profile.Config.Driver})
274-
deletePossibleKicLeftOver(profile.Name, profile.Config.Driver)
274+
for _, n := range profile.Config.Nodes {
275+
machineName := driver.MachineName(*profile.Config, n)
276+
deletePossibleKicLeftOver(machineName, profile.Config.Driver)
277+
}
275278
}
276279
} else {
277280
glog.Infof("%s has no configuration, will try to make it work anyways", profile.Name)

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,8 @@ func startWithDriver(starter node.Starter, existing *config.ClusterConfig) (*kub
316316
}
317317

318318
func warnAboutMultiNode() {
319-
out.WarningT("Multi-node clusters are currently experimental and might exhibit unintended behavior.\nTo track progress on multi-node clusters, see https://github.com/kubernetes/minikube/issues/7538.")
319+
out.WarningT("Multi-node clusters are currently experimental and might exhibit unintended behavior.")
320+
out.T(out.Documentation, "To track progress on multi-node clusters, see https://github.com/kubernetes/minikube/issues/7538.")
320321
}
321322

322323
func updateDriver(driverName string) {

Diff for: pkg/minikube/machine/delete.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ func DeleteHost(api libmachine.API, machineName string, deleteAbandoned ...bool)
9999
return delete(api, host, machineName)
100100
}
101101

102-
// delete removes a host and it's local data files
102+
// delete removes a host and its local data files
103103
func delete(api libmachine.API, h *host.Host, machineName string) error {
104104
if err := h.Driver.Remove(); err != nil {
105105
glog.Warningf("remove failed, will retry: %v", err)

0 commit comments

Comments
 (0)