calico: support kubeadm.pod-network-cidr

[lollipopman]

Prior to this commit the Calico CNI ignored the setting of kubeadm.pod-network-cidr, because we set CALICO_IPV4POOL_CIDR to the DefaultPodCIDR. However, this is no longer necessary as Calico's pod cidr will be set to the default when we initialize kubeadm in pkg/minikube/bootstrapper/bsutil/kubeadm.go.

[k8s-ci-robot]

Hi @lollipopman. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[minikube-bot]

Can one of the admins verify this patch?

[medyagh]

@lollipopman thank you for this PR, can you please provide a before/after this PR with minikube output with an example?

[medyagh]

/ok-to-test

[medyagh]

@lollipopman can you plz take a look at the unit tests ? and also could you plz put an output of Before / After this PR of using this new feature using minikube in action?

[lollipopman]

log files are attached, as well as the calico-node config, note how after the patch, CALICO_IPV4POOL_CIDR is removed:

-    - name: CALICO_IPV4POOL_CIDR
-      value: 10.244.0.0/16

The busybox container output shows that after the patch the pod gets the correct ip:

-3: eth0@if10: <BROADCAST,MULTICAST,UP,LOWER_UP,M-DOWN> mtu 1480 qdisc noqueue qlen 1000
-    link/ether 22:ce:10:48:b5:36 brd ff:ff:ff:ff:ff:ff
-    inet 10.244.120.67/32 scope global eth0
+3: eth0@if9: <BROADCAST,MULTICAST,UP,LOWER_UP,M-DOWN> mtu 1480 qdisc noqueue qlen 1000
+    link/ether 4e:4e:31:e7:3f:ec brd ff:ff:ff:ff:ff:ff
+    inet 10.64.120.67/32 scope global eth0

Also, I was unable to reproduce the unit test failures, perhaps a testing fluke?

logs-3e67840d02a296d807adca10af96b93dacfc918d.txt
logs-843733f3a54d29526ff29dae2be6fd1435082ac0.txt
calico-node-3e67840d02a296d807adca10af96b93dacfc918d.yaml.txt
calico-node-843733f3a54d29526ff29dae2be6fd1435082ac0.yaml.txt
busybox-ip-addr-3e67840d02a296d807adca10af96b93dacfc918d.txt
busybox-ip-addr-843733f3a54d29526ff29dae2be6fd1435082ac0.txt

[medyagh]

thanks @lollipopman do you mind pull upstream to your PR, the unit test is fixed, but there are failed test on Docker Linux that I would like to see if it goes away
https://storage.googleapis.com/minikube-builds/logs/18233/33262/Docker_Linux.html

[medyagh]

after the test are ok we could merge

[lollipopman]

@prezha & @spowelljr can you take a look at this pull request when you have a moment?

[minikube-pr-bot]

kvm2 driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 18233) |
+----------------+----------+---------------------+
| minikube start | 51.5s    | 53.1s               |
| enable ingress | 26.3s    | 24.8s               |
+----------------+----------+---------------------+

Times for minikube start: 52.1s 51.1s 50.2s 52.2s 51.8s
Times for minikube (PR 18233) start: 55.1s 53.4s 51.5s 52.2s 53.4s

Times for minikube ingress: 26.5s 24.5s 26.5s 27.1s 27.0s
Times for minikube (PR 18233) ingress: 23.1s 23.6s 25.6s 24.5s 27.1s

docker driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 18233) |
+----------------+----------+---------------------+
| minikube start | 22.8s    | 22.4s               |
| enable ingress | 21.4s    | 21.1s               |
+----------------+----------+---------------------+

Times for minikube start: 24.6s 20.9s 23.3s 22.1s 23.3s
Times for minikube (PR 18233) start: 23.3s 24.3s 20.0s 24.1s 20.5s

Times for minikube ingress: 21.2s 21.2s 21.2s 21.2s 22.2s
Times for minikube (PR 18233) ingress: 21.7s 20.7s 21.2s 21.2s 20.7s

docker driver with containerd runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 18233) |
+----------------+----------+---------------------+
| minikube start | 21.3s    | 21.5s               |
| enable ingress | 34.7s    | 31.9s               |
+----------------+----------+---------------------+

Times for minikube ingress: 31.7s 31.7s 31.7s 47.7s 30.7s
Times for minikube (PR 18233) ingress: 32.7s 31.7s 31.7s 31.7s 31.7s

Times for minikube start: 22.0s 19.6s 22.4s 22.4s 20.2s
Times for minikube (PR 18233) start: 22.3s 22.1s 19.0s 22.2s 22.0s

[minikube-pr-bot]

These are the flake rates of all failed tests.

Environment	Failed Tests	Flake Rate (%)
Docker_Windows	TestDownloadOnly/v1.30.0-rc.0/json-events (gopogh)	n/a
Docker_Windows	TestDownloadOnly/v1.30.0-rc.0/kubectl (gopogh)	n/a
Docker_Windows	TestDownloadOnly/v1.30.0-rc.0/preload-exists (gopogh)	n/a
Docker_Linux_crio	TestFunctional/parallel/ImageCommands/ImageLoadFromFile (gopogh)	1.20 (chart)
KVM_Linux_crio	TestAddons/parallel/CloudSpanner (gopogh)	1.20 (chart)
KVM_Linux_crio	TestFunctional/parallel/ImageCommands/ImageBuild (gopogh)	1.81 (chart)

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

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lollipopman, medyagh, 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,spowelljr]

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

[lollipopman]

woohoo, thanks!