[CORE-10974] Remove bandwidth plugin chaining (#3784)

tigera · Mar 7, 2025 · 4ff8794 · 4ff8794
1 parent 22a16b7
commit 4ff8794
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 76 deletions.
diff --git a/pkg/controller/migration/cni/cni_test.go b/pkg/controller/migration/cni/cni_test.go
@@ -1,3 +1,17 @@
+// Copyright (c) 2020-2025 Tigera, Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package cni
 
 import (
@@ -29,10 +43,6 @@ const cniTemplate = `{
 		"type": "portmap",
 		"snat": true,
 		"capabilities": {"portMappings": true}
-	  },
-	  {
-		"type": "bandwidth",
-		"capabilities": {"bandwidth": true}
 	  }
 	]
 }`

diff --git a/pkg/controller/migration/convert/calico_default_config_test.go b/pkg/controller/migration/convert/calico_default_config_test.go
@@ -1,5 +1,5 @@
-// Copyright (c) 2020-2024 Tigera, Inc. All rights reserved.
-
+// Copyright (c) 2020-2025 Tigera, Inc. All rights reserved.
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -67,10 +67,6 @@ func calicoDefaultConfig() []runtime.Object {
       "type": "portmap",
       "snat": true,
       "capabilities": {"portMappings": true}
-    },
-    {
-      "type": "bandwidth",
-      "capabilities": {"bandwidth": true}
     }
   ]
 }`,

diff --git a/pkg/render/node.go b/pkg/render/node.go
@@ -699,16 +699,6 @@ func (c *nodeComponent) createCalicoPluginConfig() map[string]interface{} {
 	return calicoPluginConfig
 }
 
-func (c *nodeComponent) createBandwidthPlugin() map[string]interface{} {
-	// bandwidth plugin
-	bandwidthPlugin := map[string]interface{}{
-		"type":         "bandwidth",
-		"capabilities": map[string]bool{"bandwidth": true},
-	}
-
-	return bandwidthPlugin
-}
-
 func (c *nodeComponent) createPortmapPlugin() map[string]interface{} {
 	// Determine portmap configuration to use.
 	portmapPlugin := map[string]interface{}{
@@ -749,7 +739,6 @@ func (c *nodeComponent) nodeCNIConfigMap() *corev1.ConfigMap {
 
 	plugins := make([]interface{}, 0)
 	plugins = append(plugins, c.createCalicoPluginConfig())
-	plugins = append(plugins, c.createBandwidthPlugin())
 
 	// optional portmap plugin
 	if c.cfg.Installation.CalicoNetwork.HostPorts != nil &&

diff --git a/pkg/render/node_test.go b/pkg/render/node_test.go
@@ -1,5 +1,5 @@
-// Copyright (c) 2019-2024 Tigera, Inc. All rights reserved.
-
+// Copyright (c) 2019-2025 Tigera, Inc. All rights reserved.
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -225,10 +225,6 @@ var _ = Describe("Node rendering tests", func() {
           "kubeconfig": "__KUBECONFIG_FILEPATH__"
       }
     },
-    {
-      "type": "bandwidth",
-      "capabilities": {"bandwidth": true}
-    },
     {"type": "portmap", "snat": true, "capabilities": {"portMappings": true}}
   ]
 }`, enableIPv4, enableIPv6)))
@@ -490,12 +486,6 @@ var _ = Describe("Node rendering tests", func() {
         "kubeconfig": "__KUBECONFIG_FILEPATH__"
       }
     },
-    {
-      "type": "bandwidth",
-      "capabilities": {
-        "bandwidth": true
-      }
-    },
     {
       "type": "portmap",
       "snat": true,
@@ -717,10 +707,6 @@ var _ = Describe("Node rendering tests", func() {
           "kubeconfig": "__KUBECONFIG_FILEPATH__"
       }
     },
-    {
-      "type": "bandwidth",
-      "capabilities": {"bandwidth": true}
-    },
     {"type": "portmap", "snat": true, "capabilities": {"portMappings": true}}
   ]
 }`, enableIPv4, enableIPv6)))
@@ -1107,10 +1093,6 @@ var _ = Describe("Node rendering tests", func() {
           "kubeconfig": "__KUBECONFIG_FILEPATH__"
       }
     },
-    {
-      "type": "bandwidth",
-      "capabilities": {"bandwidth": true}
-    },
     {"type": "portmap", "snat": true, "capabilities": {"portMappings": true}}
   ]
 }`, enableIPv4, enableIPv6)))
@@ -1527,10 +1509,6 @@ var _ = Describe("Node rendering tests", func() {
           "kubeconfig": "__KUBECONFIG_FILEPATH__"
       }
     },
-    {
-      "type": "bandwidth",
-      "capabilities": {"bandwidth": true}
-    },
     {"type": "portmap", "snat": true, "capabilities": {"portMappings": true}}
   ]
 }`, enableIPv4, enableIPv6)))
@@ -2542,10 +2520,6 @@ var _ = Describe("Node rendering tests", func() {
       "kubernetes": {
           "kubeconfig": "__KUBECONFIG_FILEPATH__"
       }
-    },
-    {
-      "type": "bandwidth",
-      "capabilities": {"bandwidth": true}
     }
   ]
 }`, enableIPv4, enableIPv6)))
@@ -2646,12 +2620,6 @@ var _ = Describe("Node rendering tests", func() {
       "endpoint_status_dir": "/var/run/calico/endpoint-status",
       "type": "calico"
     },
-    {
-      "capabilities": {
-        "bandwidth": true
-      },
-      "type": "bandwidth"
-    },
     {
       "capabilities": {
         "portMappings": true
@@ -2715,10 +2683,6 @@ var _ = Describe("Node rendering tests", func() {
           "kubeconfig": "__KUBECONFIG_FILEPATH__"
       }
     },
-    {
-      "type": "bandwidth",
-      "capabilities": {"bandwidth": true}
-    },
     {"type": "portmap", "snat": true, "capabilities": {"portMappings": true}}
   ]
 }`, enableIPv4, enableIPv6)))
@@ -2767,10 +2731,6 @@ var _ = Describe("Node rendering tests", func() {
           "kubeconfig": "__KUBECONFIG_FILEPATH__"
       }
     },
-    {
-      "type": "bandwidth",
-      "capabilities": {"bandwidth": true}
-    },
     {"type": "portmap", "snat": true, "capabilities": {"portMappings": true}}
   ]
 }`, enableIPv4, enableIPv6)))
@@ -2833,7 +2793,6 @@ var _ = Describe("Node rendering tests", func() {
       "policy": { "type": "k8s" },
       "kubernetes": { "kubeconfig": "__KUBECONFIG_FILEPATH__" }
     },
-    {"type": "bandwidth", "capabilities": {"bandwidth": true}},
     {"type": "portmap", "snat": true, "capabilities": {"portMappings": true}}
   ]
 }`, subnetStr)))
@@ -2890,7 +2849,6 @@ var _ = Describe("Node rendering tests", func() {
       "policy": { "type": "k8s" },
       "kubernetes": { "kubeconfig": "__KUBECONFIG_FILEPATH__" }
     },
-    {"type": "bandwidth", "capabilities": {"bandwidth": true}},
     {"type": "portmap", "snat": true, "capabilities": {"portMappings": true}}
   ]
 }`))
@@ -2941,7 +2899,6 @@ var _ = Describe("Node rendering tests", func() {
       "policy": { "type": "k8s" },
       "kubernetes": { "kubeconfig": "__KUBECONFIG_FILEPATH__" }
     },
-    {"type": "bandwidth", "capabilities": {"bandwidth": true}},
     {"type": "portmap", "snat": true, "capabilities": {"portMappings": true}}
   ]
 }`))
@@ -2992,12 +2949,6 @@ var _ = Describe("Node rendering tests", func() {
         "kubeconfig": "__KUBECONFIG_FILEPATH__"
       }
     },
-    {
-      "type": "bandwidth",
-      "capabilities": {
-        "bandwidth": true
-      }
-    },
     {
       "type": "portmap",
       "snat": true,
@@ -3134,10 +3085,6 @@ var _ = Describe("Node rendering tests", func() {
           "kubeconfig": "__KUBECONFIG_FILEPATH__"
       }
     },
-    {
-      "type": "bandwidth",
-      "capabilities": {"bandwidth": true}
-    },
     {"type": "portmap", "snat": true, "capabilities": {"portMappings": true}}
   ]
 }`))