Merge pull request #9320 from hakman/install-all-cni-binaries

Install all CNI plugin binaries for all network plugins

nodeup/pkg/model/networking/calico.go

@@ -38,10 +38,6 @@ func (b *CalicoBuilder) Build(c *fi.ModelBuilderContext) error {
 		return nil
 	}
 
-	if err := b.AddCNIBinAssets(c, []string{"flannel"}); err != nil {
-		return err
-	}
-
 	// @check if tls is enabled and if so, we need to download the client certificates
 	if !b.UseEtcdManager() && b.UseEtcdTLS() {
 		name := "calico-client"

nodeup/pkg/model/networking/canal.go

@@ -36,10 +36,6 @@ func (b *CanalBuilder) Build(c *fi.ModelBuilderContext) error {
 		return nil
 	}
 
-	if err := b.AddCNIBinAssets(c, []string{"flannel"}); err != nil {
-		return err
-	}
-
 	buildFlannelTxChecksumOffloadDisableService(c)
 
 	return nil

nodeup/pkg/model/networking/common.go

@@ -30,14 +30,28 @@ var _ fi.ModelBuilder = &CommonBuilder{}
 
 // Build is responsible for copying the common CNI binaries
 func (b *CommonBuilder) Build(c *fi.ModelBuilderContext) error {
+	// Based on https://github.com/containernetworking/plugins/releases/tag/v0.7.5
 	assets := []string{
-		"bandwidth",
 		"bridge",
+		"dhcp",
+		"flannel",
+		"host-device",
 		"host-local",
+		"ipvlan",
 		"loopback",
+		"macvlan",
 		"portmap",
 		"ptp",
 		"tuning",
+		"vlan",
+	}
+
+	// Additions in https://github.com/containernetworking/plugins/releases/tag/v0.8.6
+	if b.IsKubernetesGTE("1.15") {
+		assets = append(assets, "bandwidth")
+		assets = append(assets, "firewall")
+		assets = append(assets, "sbr")
+		assets = append(assets, "static")
 	}
 
 	if err := b.AddCNIBinAssets(c, assets); err != nil {

nodeup/pkg/model/networking/flannel.go

@@ -39,10 +39,6 @@ func (b *FlannelBuilder) Build(c *fi.ModelBuilderContext) error {
 		return nil
 	}
 
-	if err := b.AddCNIBinAssets(c, []string{"flannel"}); err != nil {
-		return err
-	}
-
 	if networking.Flannel.Backend == "vxlan" {
 		buildFlannelTxChecksumOffloadDisableService(c)
 	}