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.

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

podman: Fix network not getting deleted #12627

Merged
merged 2 commits into from
Sep 30, 2021

Conversation

spowelljr
Copy link
Member

@spowelljr spowelljr commented Sep 29, 2021

Fixes #12585

Problem:

$ sudo podman network ls
NAME      VERSION  PLUGINS
podman    0.4.0    bridge,portmap,firewall,tuning

$ minikube start --driver=podman
...

$ sudo podman network ls
NAME      VERSION  PLUGINS
podman    0.4.0    bridge,portmap,firewall,tuning
minikube  0.4.0    bridge,portmap,firewall,tuning,dnsname

$ minikube delete
...

$ sudo podman network ls
NAME      VERSION  PLUGINS
podman    0.4.0    bridge,portmap,firewall,tuning
minikube  0.4.0    bridge,portmap,firewall,tuning,dnsname

The root of the issue is when we delete the KIC networks we search for ones with the label created_by.minikube.sigs.k8s.io, however the line to append the label to the network on creation was nested within a Docker if statement and wasn't being added to Podman networks.

Solution:
Just moved the label append outside the if, also added a test to catch this in the future.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Sep 29, 2021
@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 29, 2021
@medyagh
Copy link
Member

medyagh commented Sep 29, 2021

/ok-to-test

@k8s-ci-robot k8s-ci-robot added the ok-to-test Indicates a non-member PR verified by an org member that is safe to test. label Sep 29, 2021
@minikube-pr-bot
Copy link

kvm2 driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 12627) |
+----------------+----------+---------------------+
| minikube start | 47.3s    | 47.4s               |
| enable ingress | 32.7s    | 32.6s               |
+----------------+----------+---------------------+

Times for minikube start: 48.8s 46.6s 47.2s 47.2s 46.9s
Times for minikube (PR 12627) start: 47.8s 47.2s 48.1s 46.4s 47.4s

Times for minikube ingress: 31.7s 34.3s 32.8s 32.4s 32.4s
Times for minikube (PR 12627) ingress: 33.7s 32.3s 31.3s 33.7s 31.9s

docker driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 12627) |
+----------------+----------+---------------------+
| minikube start | 21.9s    | 21.0s               |
| enable ingress | 33.9s    | 34.9s               |
+----------------+----------+---------------------+

Times for minikube ingress: 33.9s 26.4s 36.9s 35.9s 36.4s
Times for minikube (PR 12627) ingress: 35.4s 26.9s 34.9s 34.5s 42.9s

Times for minikube start: 23.2s 22.5s 20.9s 21.7s 21.0s
Times for minikube (PR 12627) start: 21.3s 21.3s 21.0s 20.6s 20.6s

docker driver with containerd runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 12627) |
+----------------+----------+---------------------+
| minikube start | 39.1s    | 43.3s               |
| enable ingress | 36.7s    | 33.5s               |
+----------------+----------+---------------------+

Times for minikube start: 30.7s 43.1s 41.6s 36.5s 43.6s
Times for minikube (PR 12627) start: 43.6s 43.4s 43.5s 43.4s 42.7s

Times for minikube ingress: 43.4s 52.9s 36.4s 26.9s 23.9s
Times for minikube (PR 12627) ingress: 24.9s 32.5s 36.9s 36.9s 36.5s

@minikube-pr-bot
Copy link

These are the flake rates of all failed tests.

Environment Failed Tests Flake Rate (%)
Docker_Windows TestPause/serial/VerifyDeletedResources (gopogh) 0.00 (chart)
Docker_Linux TestStartStop/group/default-k8s-different-port/serial/Pause (gopogh) 0.78 (chart)
Docker_Windows TestStartStop/group/newest-cni/serial/SecondStart (gopogh) 9.80 (chart)
Docker_Windows TestStartStop/group/newest-cni/serial/VerifyKubernetesImages (gopogh) 9.80 (chart)
Docker_Windows TestStartStop/group/newest-cni/serial/Pause (gopogh) 23.53 (chart)
Docker_Windows TestStoppedBinaryUpgrade/MinikubeLogs (gopogh) 30.83 (chart)
Docker_Windows TestAddons/Setup (gopogh) 43.33 (chart)
Docker_Windows TestNetworkPlugins/group/enable-default-cni/DNS (gopogh) 52.46 (chart)
Docker_Windows TestNetworkPlugins/group/kindnet/Start (gopogh) 71.82 (chart)
Docker_Windows TestNetworkPlugins/group/cilium/Start (gopogh) 72.73 (chart)
Docker_Windows TestNetworkPlugins/group/bridge/DNS (gopogh) 77.78 (chart)
Docker_Windows TestNetworkPlugins/group/kubenet/DNS (gopogh) 84.21 (chart)
Docker_Windows TestNetworkPlugins/group/calico/Start (gopogh) 90.00 (chart)
Docker_Windows TestCertOptions (gopogh) 99.17 (chart)
Docker_Linux_containerd TestScheduledStopUnix (gopogh) 100.00 (chart)

To see the flake rates of all tests by environment, click here.

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: medyagh, sharifelgamal, spowelljr

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [medyagh,sharifelgamal,spowelljr]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@spowelljr spowelljr merged commit 7544e72 into kubernetes:master Sep 30, 2021
@spowelljr spowelljr deleted the deletePodmanNetwork branch September 30, 2021 21:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

minikube delete not removing podman network
5 participants