Skip to content

Commit caedfea

Browse files
committed
Address PR review nits from pliurh
- Check os.OpenFile error in STATUS/GC test - Document that k8sArgs may be nil for STATUS/GC in HandleCNIRequest Made-with: Cursor
1 parent ec08b5f commit caedfea

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

pkg/server/server.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ func printCmdArgs(args *skel.CmdArgs) string {
8484

8585
// HandleCNIRequest is the CNI server handler function; it is invoked whenever
8686
// a CNI request is processed.
87+
// Note: k8sArgs may be nil for plugin-level commands (STATUS, GC) that have no pod context.
8788
func (s *Server) HandleCNIRequest(cmd string, k8sArgs *types.K8sArgs, cniCmdArgs *skel.CmdArgs) ([]byte, error) {
8889
var result []byte
8990
var err error
@@ -664,12 +665,12 @@ func (s *Server) cmdCheck(cmdArgs *skel.CmdArgs, k8sArgs *types.K8sArgs) error {
664665
return multus.CmdCheck(cmdArgs, s.exec, s.kubeclient)
665666
}
666667

667-
func (s *Server) cmdGC(cmdArgs *skel.CmdArgs, k8sArgs *types.K8sArgs) error {
668+
func (s *Server) cmdGC(cmdArgs *skel.CmdArgs, _ *types.K8sArgs) error {
668669
logging.Debugf("CmdGC. CNI conf: %+v", *cmdArgs)
669670
return multus.CmdGC(cmdArgs, s.exec, s.kubeclient)
670671
}
671672

672-
func (s *Server) cmdStatus(cmdArgs *skel.CmdArgs, k8sArgs *types.K8sArgs) error {
673+
func (s *Server) cmdStatus(cmdArgs *skel.CmdArgs, _ *types.K8sArgs) error {
673674
logging.Debugf("CmdStatus. CNI conf: %+v", *cmdArgs)
674675
return multus.CmdStatus(cmdArgs, s.exec, s.kubeclient)
675676
}

pkg/server/thick_cni_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,8 @@ var _ = Describe(suiteName, func() {
105105
var err error
106106
K8sClient = fakeK8sClient()
107107
// Touch the default network file.
108-
os.OpenFile(configPath, os.O_RDONLY|os.O_CREATE, 0755)
108+
_, err = os.OpenFile(configPath, os.O_RDONLY|os.O_CREATE, 0755)
109+
Expect(err).NotTo(HaveOccurred())
109110

110111
Expect(FilesystemPreRequirements(thickPluginRunDir)).To(Succeed())
111112

0 commit comments

Comments
 (0)