fix(dhcp): Check for nil cni args

coreweave · May 25, 2022 · 2353add · 2353add
1 parent f734678
commit 2353add
Showing 1 changed file with 15 additions and 8 deletions.
diff --git a/plugins/ipam/dhcp/daemon.go b/plugins/ipam/dhcp/daemon.go
@@ -82,19 +82,24 @@ func (d *DHCP) Allocate(args *skel.CmdArgs, result *current.Result) error {
 		return fmt.Errorf("error parsing netconf: %v", err)
 	}
 
-	cniArgs := combineCNIArgs(args.Args, conf.Args.A)
+	netconfCniArgs := GenericIPAMArgs{}
+	if conf.Args != nil {
+		netconfCniArgs = conf.Args.A
+	}
+	cniArgs := combineCNIArgs(args.Args, netconfCniArgs)
 
 	optsRequesting, optsProviding, err := prepareOptions(cniArgs, conf.IPAM.ProvideOptions, conf.IPAM.RequestOptions)
 	if err != nil {
 		return err
 	}
 
 	ipamArgs := IPAMArgs{}
-	ipamArgsJson, _ := json.Marshal(conf.Args.A)
-	if err := json.Unmarshal(ipamArgsJson, &ipamArgs); err != nil {
-		return fmt.Errorf("error parsing ipamArgs: %v", err)
+	if conf.Args != nil {
+		ipamArgsJson, _ := json.Marshal(conf.Args.A)
+		if err := json.Unmarshal(ipamArgsJson, &ipamArgs); err != nil {
+			return fmt.Errorf("error parsing ipamArgs: %v", err)
+		}
 	}
-
 	clientID := generateClientID(args.ContainerID, conf.Name, args.IfName)
 	leaseKey := clientID
 	if ipamArgs.ClientID != "" {
@@ -134,9 +139,11 @@ func (d *DHCP) Release(args *skel.CmdArgs, reply *struct{}) error {
 	}
 
 	ipamArgs := IPAMArgs{}
-	ipamArgsJson, _ := json.Marshal(conf.Args.A)
-	if err := json.Unmarshal(ipamArgsJson, &ipamArgs); err != nil {
-		return fmt.Errorf("error parsing ipamArgs: %v", err)
+	if conf.Args != nil {
+		ipamArgsJson, _ := json.Marshal(conf.Args.A)
+		if err := json.Unmarshal(ipamArgsJson, &ipamArgs); err != nil {
+			return fmt.Errorf("error parsing ipamArgs: %v", err)
+		}
 	}
 
 	clientID := generateClientID(args.ContainerID, conf.Name, args.IfName)