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

calico: support kubeadm.pod-network-cidr 

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.
pull/18233/head
Jesse Hathaway 2024-02-22 13:50:37 -06:00
parent 86f5c1483a
commit cb33a82ee1
2 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hack/update/calico_version/update_calico_version.go
View File

@ -72,9 +72,6 @@ func updateYAML(version string) {
`docker\.io\/calico\/cni:.*`: "{{ .BinaryImageName }}", `docker\.io\/calico\/cni:.*`: "{{ .BinaryImageName }}",
`docker\.io\/calico\/node:.*`: "{{ .DaemonSetImageName }}", `docker\.io\/calico\/node:.*`: "{{ .DaemonSetImageName }}",
`docker\.io\/calico\/kube-controllers:.*`: "{{ .DeploymentImageName }}", `docker\.io\/calico\/kube-controllers:.*`: "{{ .DeploymentImageName }}",
`192\.168\.0\.0\/16"`: `192.168.0.0/16"
- name: CALICO_IPV4POOL_CIDR
value: {{ .PodCIDR }}`,
} }
for re, repl := range replacements { for re, repl := range replacements {
yaml = regexp.MustCompile(re).ReplaceAll(yaml, []byte(repl)) yaml = regexp.MustCompile(re).ReplaceAll(yaml, []byte(repl))

2
pkg/minikube/cni/calico.yaml
View File

@ -4930,8 +4930,6 @@ spec:
# no effect. This should fall within `--cluster-cidr`. # no effect. This should fall within `--cluster-cidr`.
# - name: CALICO_IPV4POOL_CIDR # - name: CALICO_IPV4POOL_CIDR
# value: "192.168.0.0/16" # value: "192.168.0.0/16"
- name: CALICO_IPV4POOL_CIDR
value: {{ .PodCIDR }}
# Disable file logging so `kubectl logs` works. # Disable file logging so `kubectl logs` works.
- name: CALICO_DISABLE_FILE_LOGGING - name: CALICO_DISABLE_FILE_LOGGING
value: "true" value: "true"