Skip to content

Commit 935f5dc

Browse files
authored
Install kubernetes-cni for kubelet (#14163)
Why I did it Find a new bug on kubelet side. The kubernetes-cni plug-in was removed in #12997, the reason is that the plug-in will be auto installed when install kubeadm, and will report error if we don't remove the install code. But after removal, the version auto installed is different from what we installed before. This will affect the kubelet action in some scenarios we don't find before. Need to install it by another way. How I did it Install kubernetes-cni==0.8.7-00 before install kubeadm How to verify it Flannel binary will be installed under /opt/cni/bin/ folder
1 parent f30fb6e commit 935f5dc

File tree

3 files changed

+3
-0
lines changed

3 files changed

+3
-0
lines changed

Makefile.work

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -505,6 +505,7 @@ SONIC_BUILD_INSTRUCTION := $(MAKE) \
505505
SHUTDOWN_BGP_ON_START=$(SHUTDOWN_BGP_ON_START) \
506506
INCLUDE_KUBERNETES=$(INCLUDE_KUBERNETES) \
507507
KUBERNETES_VERSION=$(KUBERNETES_VERSION) \
508+
KUBERNETES_CNI_VERSION=$(KUBERNETES_CNI_VERSION) \
508509
K8s_GCR_IO_PAUSE_VERSION=$(K8s_GCR_IO_PAUSE_VERSION) \
509510
INCLUDE_KUBERNETES_MASTER=$(INCLUDE_KUBERNETES_MASTER) \
510511
SONIC_ENABLE_PFCWD_ON_START=$(ENABLE_PFCWD_ON_START) \

build_debian.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,7 @@ install_kubernetes () {
274274
## Check out the sources list update matches current Debian version
275275
sudo cp files/image_config/kubernetes/kubernetes.list $FILESYSTEM_ROOT/etc/apt/sources.list.d/
276276
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get update
277+
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install kubernetes-cni=${KUBERNETES_CNI_VERSION}
277278
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install kubelet=${ver}
278279
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install kubectl=${ver}
279280
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install kubeadm=${ver}

rules/config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ KUBE_DOCKER_PROXY = http://172.16.1.1:3128/
188188
# NOTE: As a worker node it has to run version compatible to kubernetes master.
189189
#
190190
KUBERNETES_VERSION = 1.22.2-00
191+
KUBERNETES_CNI_VERSION = 0.8.7-00
191192
K8s_GCR_IO_PAUSE_VERSION = 3.5
192193

193194
# INCLUDE_KUBERNETES_MASTER - if set to y kubernetes packages are installed o be able

0 commit comments

Comments
 (0)