github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2026-05-14 18:57:03 +00:00
Code Issues Projects Releases Wiki Activity

Address PR review nits from pliurh

Browse Source 
- Check os.OpenFile error in STATUS/GC test
- Document that k8sArgs may be nil for STATUS/GC in HandleCNIRequest

Made-with: Cursor
This commit is contained in:
Igal Tsoiref
2026-03-16 16:50:51 -04:00
parent ec08b5fa8b
commit caedfea615
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/server/server.go
View File

@@ -84,6 +84,7 @@ func printCmdArgs(args *skel.CmdArgs) string {
// HandleCNIRequest is the CNI server handler function; it is invoked whenever
// a CNI request is processed.
// Note: k8sArgs may be nil for plugin-level commands (STATUS, GC) that have no pod context.
func (s *Server) HandleCNIRequest(cmd string, k8sArgs *types.K8sArgs, cniCmdArgs *skel.CmdArgs) ([]byte, error) {
var result []byte
var err error
@@ -664,12 +665,12 @@ func (s *Server) cmdCheck(cmdArgs *skel.CmdArgs, k8sArgs *types.K8sArgs) error {
return multus.CmdCheck(cmdArgs, s.exec, s.kubeclient)
}
func (s *Server) cmdGC(cmdArgs *skel.CmdArgs, k8sArgs *types.K8sArgs) error {
func (s *Server) cmdGC(cmdArgs *skel.CmdArgs, _ *types.K8sArgs) error {
logging.Debugf("CmdGC. CNI conf: %+v", *cmdArgs)
return multus.CmdGC(cmdArgs, s.exec, s.kubeclient)
}
func (s *Server) cmdStatus(cmdArgs *skel.CmdArgs, k8sArgs *types.K8sArgs) error {
func (s *Server) cmdStatus(cmdArgs *skel.CmdArgs, _ *types.K8sArgs) error {
logging.Debugf("CmdStatus. CNI conf: %+v", *cmdArgs)
return multus.CmdStatus(cmdArgs, s.exec, s.kubeclient)
}

3
pkg/server/thick_cni_test.go
View File

@@ -105,7 +105,8 @@ var _ = Describe(suiteName, func() {
var err error
K8sClient = fakeK8sClient()
// Touch the default network file.
os.OpenFile(configPath, os.O_RDONLY|os.O_CREATE, 0755)
_, err = os.OpenFile(configPath, os.O_RDONLY|os.O_CREATE, 0755)
Expect(err).NotTo(HaveOccurred())
Expect(FilesystemPreRequirements(thickPluginRunDir)).To(Succeed())