address linter issues

dhcp/dhcp.go

@@ -362,9 +362,6 @@ func (c *DHCP) receiveDHCPResponse(ctx context.Context, reader io.ReadCloser, xi
 
 	select {
 	case err := <-recvErrors:
-		if err == unix.EAGAIN {
-			return errors.Wrap(err, "timed out while listening for replies")
-		}
 		if err != nil {
 			return errors.Wrap(err, "error during receiving")
 		}
@@ -411,7 +408,7 @@ func (c *DHCP) DiscoverRequest(ctx context.Context, mac net.HardwareAddr, ifname
 
 	defer func() {
 		// Ensure the file descriptor is closed when done
-		if err := writer.Close(); err != nil {
+		if err = writer.Close(); err != nil {
 			c.logger.Error("Error closing dhcp writer socket:", zap.Error(err))
 		}
 	}()
@@ -429,7 +426,7 @@ func (c *DHCP) DiscoverRequest(ctx context.Context, mac net.HardwareAddr, ifname
 	}
 	defer func() {
 		// Ensure the file descriptor is closed when done
-		if err := reader.Close(); err != nil {
+		if err = reader.Close(); err != nil {
 			c.logger.Error("Error closing dhcp reader socket:", zap.Error(err))
 		}
 	}()

network/secondary_endpoint_client_linux.go

@@ -139,7 +139,8 @@ func (client *SecondaryEndpointClient) ConfigureContainerInterfacesAndRoutes(epI
 
 	// issue dhcp discover packet to ensure mapping created for dns via wireserver to work
 	// we do not use the response for anything
-	timeout := 3 * time.Second
+	numSecs := 3
+	timeout := time.Duration(numSecs) * time.Second
 	ctx, cancel := context.WithDeadline(context.Background(), time.Now().Add(timeout))
 	defer cancel()
 	logger.Info("Sending DHCP packet", zap.Any("macAddress", epInfo.MacAddress), zap.String("ifName", epInfo.IfName))