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

fix: minikube delete exclude networks from other profiles 

Fixes: 12635
pull/14279/head
Pablo Caderno 2022-06-06 16:59:41 +10:00
parent 5fb961c517
commit f6d639182d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/drivers/kic/oci/network_create.go
View File

@ -133,7 +133,7 @@ func tryCreateDockerNetwork(ociBin string, subnet *network.Parameters, mtu int,
args = append(args, fmt.Sprintf("com.docker.network.driver.mtu=%d", mtu))
}
}
args = append(args, fmt.Sprintf("--label=%s=%s", CreatedByLabelKey, "true"), name)
args = append(args, fmt.Sprintf("--label=%s=%s", CreatedByLabelKey, "true"), fmt.Sprintf("--label=%s=%s", ProfileLabelKey, name), name)
rr, err := runCmd(exec.Command(ociBin, args...))
if err != nil {
@ -320,10 +320,10 @@ func networkNamesByLabel(ociBin string, label string) ([]string, error) {
return lines, nil
}
// DeleteKICNetworks deletes all networks created by kic
func DeleteKICNetworks(ociBin string) []error {
// DeleteAllKICKNetworksByLabel deletes all networks that have a specific label
func DeleteKICNetworksByLabel(ociBin string, label string) []error {
var errs []error
ns, err := networkNamesByLabel(ociBin, CreatedByLabelKey)
ns, err := networkNamesByLabel(ociBin, label)
if err != nil {
return []error{errors.Wrap(err, "list all volume")}
}

2
pkg/minikube/delete/delete.go
View File

@ -64,7 +64,7 @@ func PossibleLeftOvers(ctx context.Context, cname string, driverName string) {
klog.Warningf("error deleting volumes (might be okay).\nTo see the list of volumes run: 'docker volume ls'\n:%v", errs)
}
errs = oci.DeleteKICNetworks(bin)
errs = oci.DeleteKICNetworksByLabel(bin, delLabel)
if errs != nil {
klog.Warningf("error deleting leftover networks (might be okay).\nTo see the list of networks: 'docker network ls'\n:%v", errs)
}

2
test/integration/kic_custom_network_test.go
View File

@ -78,7 +78,7 @@ func TestKicExistingNetwork(t *testing.T) {
t.Fatalf("error creating network: %v", err)
}
defer func() {
if err := oci.DeleteKICNetworks(oci.Docker); err != nil {
if err := oci.DeleteKICNetworksByLabel(oci.Docker, networkName); err != nil {
t.Logf("error deleting kic network, may need to delete manually: %v", err)
}
}()