Bundle CNI plugins (v0.8.6) in kubelet deb/rpm packages

Signed-off-by: Stephen Augustus <saugustus@vmware.com>

debian/bionic/kubelet/debian/control

@@ -10,6 +10,9 @@ Vcs-Browser: https://github.com/kubernetes/kubernetes
 
 Package: kubelet
 Architecture: {{ .DebArch }}
-Depends: iptables (>= 1.4.21), kubernetes-cni ({{ .KubeletCNIVersion }}), iproute2, socat, util-linux, mount, ebtables, ethtool, conntrack, ${misc:Depends}
+Depends: iptables (>= 1.4.21), iproute2, socat, util-linux, mount, ebtables, ethtool, conntrack, ${misc:Depends}
+Provides: kubernetes-cni
+Conflicts: kubernetes-cni
+Replaces: kubernetes-cni
 Description: Kubernetes Node Agent
  The node agent of Kubernetes, the container cluster manager

debian/bionic/kubelet/debian/kubelet.install

@@ -1,2 +1,3 @@
 usr/bin/kubelet usr/bin/
 lib/systemd/system/kubelet.service lib/systemd/system/
+bin/ opt/cni

debian/bionic/kubelet/debian/rules

@@ -12,6 +12,10 @@ binary:
 		-o usr/bin/kubelet \
 		"{{ .DownloadLinkBase }}/bin/linux/{{ .Arch }}/kubelet"
 	chmod +x usr/bin/kubelet
+	mkdir -p ./bin
+	curl -sSL --fail --retry 5 \
+		"https://storage.googleapis.com/k8s-artifacts-cni/release/v{{ .CNIVersion }}/cni-plugins-linux-{{ .Arch }}-v{{ .CNIVersion }}.tgz" \
+		| tar -C ./bin -xz
 	dh_testroot
 	dh_auto_install
 	dh_shlibdeps

debian/build.go

@@ -39,7 +39,8 @@ const (
 	ChannelUnstable ChannelType = "unstable"
 	ChannelNightly  ChannelType = "nightly"
 
-	cniVersion         = "0.7.5"
+	currentCNIVersion  = "0.8.6"
+	minimumCNIVersion  = "0.8.6"
 	criToolsVersion    = "1.13.0"
 	pre180kubeadmconf  = "pre-1.8/10-kubeadm.conf"
 	pre1110kubeadmconf = "post-1.8/10-kubeadm.conf"
@@ -63,8 +64,8 @@ type version struct {
 	Channel                             ChannelType
 	GetVersion                          func() (string, error)
 	GetDownloadLinkBase                 func(v version) (string, error)
+	CNIVersion                          string
 	KubeadmKubeletConfigFile            string
-	KubeletCNIVersion                   string
 }
 
 type cfg struct {
@@ -303,15 +304,9 @@ func getReleaseDownloadLinkBase(v version) (string, error) {
 }
 
 func getKubeadmDependencies(v version) (string, error) {
-	cniVersion, err := getKubeletCNIVersion(v)
-	if err != nil {
-		return "", err
-	}
-
 	deps := []string{
 		"kubelet (>= 1.13.0)",
 		"kubectl (>= 1.13.0)",
-		fmt.Sprintf("kubernetes-cni (%s)", cniVersion),
 		"${misc:Depends}",
 	}
 	sv, err := semver.Make(v.Version)
@@ -362,23 +357,17 @@ func getKubeadmKubeletConfigFile(v version) (string, error) {
 	return latestkubeadmconf, nil
 }
 
-// CNI get bumped in 1.9, which is incompatible for kubelet<1.9.
-// So we need to restrict the CNI version when install kubelet.
-func getKubeletCNIVersion(v version) (string, error) {
+func getCNIVersion(v version) (string, error) {
 	sv, err := semver.Make(v.Version)
 	if err != nil {
 		return "", err
 	}
 
-	v190, err := semver.Make("1.9.0-alpha.0")
-	if err != nil {
-		return "", err
+	if int(sv.Minor) == 16 {
+		return minimumCNIVersion, nil
 	}
 
-	if sv.GTE(v190) {
-		return fmt.Sprintf(">= %s", cniVersion), nil
-	}
-	return fmt.Sprint("= 0.5.1"), nil
+	return currentCNIVersion, nil
 }
 
 // getCRIToolsVersion assumes v coming in is >= 1.11.0-alpha.0
@@ -455,27 +444,6 @@ func main() {
 				},
 			},
 		},
-		{
-			Package: "kubernetes-cni",
-			Distros: distros,
-			Versions: []version{
-				{
-					Version:  cniVersion,
-					Revision: revision,
-					Channel:  ChannelStable,
-				},
-				{
-					Version:  cniVersion,
-					Revision: revision,
-					Channel:  ChannelUnstable,
-				},
-				{
-					Version:  cniVersion,
-					Revision: revision,
-					Channel:  ChannelNightly,
-				},
-			},
-		},
 		{
 			Package: "kubeadm",
 			Distros: distros,
@@ -552,17 +520,6 @@ func main() {
 					},
 				},
 			},
-			{
-				Package: "kubernetes-cni",
-				Distros: distros,
-				Versions: []version{
-					{
-						Version:  cniVersion,
-						Revision: revision,
-						Channel:  ChannelStable,
-					},
-				},
-			},
 			{
 				Package: "kubeadm",
 				Distros: distros,
@@ -615,7 +572,7 @@ func main() {
 			log.Fatalf("error getting kubeadm dependencies: %v", err)
 		}
 
-		c.KubeletCNIVersion, err = getKubeletCNIVersion(v)
+		c.CNIVersion, err = getCNIVersion(v)
 		if err != nil {
 			log.Fatalf("error getting kubelet CNI Version: %v", err)
 		}

debian/build_test.go

@@ -80,7 +80,6 @@ func TestGetKubeadmDependencies(t *testing.T) {
 			deps: []string{
 				"kubelet (>= 1.13.0)",
 				"kubectl (>= 1.13.0)",
-				"kubernetes-cni (>= 0.7.5)",
 				"${misc:Depends}",
 				"cri-tools (>= 1.13.0)",
 			},
@@ -91,7 +90,6 @@ func TestGetKubeadmDependencies(t *testing.T) {
 			deps: []string{
 				"kubelet (>= 1.13.0)",
 				"kubectl (>= 1.13.0)",
-				"kubernetes-cni (>= 0.7.5)",
 				"${misc:Depends}",
 				"cri-tools (>= 1.13.0)",
 			},

rpm/kubelet.spec

@@ -11,7 +11,7 @@
 %define semver() (%1 * 256 * 256 + %2 * 256 + %3)
 %global KUBE_SEMVER %{semver %{KUBE_MAJOR} %{KUBE_MINOR} %{KUBE_PATCH}}
 
-%global CNI_VERSION 0.7.5
+%global CNI_VERSION 0.8.6
 %global CRI_TOOLS_VERSION 1.13.0
 
 Name: kubelet
@@ -33,28 +33,19 @@ Source7: https://storage.googleapis.com/k8s-artifacts-cri-tools/release/v%{CRI_T
 BuildRequires: systemd
 BuildRequires: curl
 Requires: iptables >= 1.4.21
-Requires: kubernetes-cni >= %{CNI_VERSION}
 Requires: socat
 Requires: util-linux
 Requires: ethtool
 Requires: iproute
 Requires: ebtables
 Requires: conntrack
+Obsoletes: kubernetes-cni
+Conflicts: kubernetes-cni
 
 
 %description
 The node agent of Kubernetes, the container cluster manager.
 
-%package -n kubernetes-cni
-
-Version: %{CNI_VERSION}
-Release: %{RPM_RELEASE}
-Summary: Binaries required to provision kubernetes container networking
-Requires: kubelet
-
-%description -n kubernetes-cni
-Binaries required to provision container networking.
-
 %package -n kubectl
 
 Version: %{KUBE_VERSION}
@@ -71,7 +62,6 @@ Release: %{RPM_RELEASE}
 Summary: Command-line utility for administering a Kubernetes cluster.
 Requires: kubelet >= 1.13.0
 Requires: kubectl >= 1.13.0
-Requires: kubernetes-cni >= 0.7.5
 Requires: cri-tools >= 1.13.0
 
 %description -n kubeadm
@@ -137,12 +127,10 @@ mv cni-plugins/* %{buildroot}/opt/cni/bin/
 %{_bindir}/kubelet
 %{_unitdir}/kubelet.service
 %{_sysconfdir}/kubernetes/manifests/
+/opt/cni
 
 %config(noreplace) %{_sysconfdir}/sysconfig/kubelet
 
-%files -n kubernetes-cni
-/opt/cni
-
 %files -n kubectl
 %{_bindir}/kubectl
 
@@ -161,6 +149,9 @@ mv cni-plugins/* %{buildroot}/opt/cni/bin/
 - Source cri-tools from https://storage.googleapis.com/k8s-artifacts-cri-tools/release
   instead of https://github.com/kubernetes-sigs/cri-tools
 
+* Fri May 22 2020 Stephen Augustus <saugustus@vmware.com> - 1.18.4
+- Bundle CNI plugins (v0.8.6) in kubelet package
+
 * Fri May 22 2020 Stephen Augustus <saugustus@vmware.com> - 1.18.4
 - Source CNI plugins from https://storage.googleapis.com/k8s-artifacts-cni/release
   instead of https://dl.k8s.io/network-plugins