remove error from NodeOpt

Author: alec-rabold

node/nodeutil/controller.go

@@ -210,13 +210,17 @@ func (n *Node) Err() error {
 }
 
 // NodeOpt is used as functional options when configuring a new node in NewNodeFromClient
-type NodeOpt func(c *NodeOptions) error
+type NodeOpt func(c *NodeOptions)
 
 type NodeOptions struct {
-	NodeConfigOpts          []func(c *NodeConfig) error
-	PodControllerConfigOpts []func(c *node.PodControllerConfig) error
+	NodeConfigOpts          []NodeConfigOpt
+	PodControllerConfigOpts []PodControllerConfigOpt
 }
 
+type NodeConfigOpt func(c *NodeConfig) error
+
+type PodControllerConfigOpt func(c *node.PodControllerConfig) error
+
 // NodeConfig is used to hold configuration items for a Node.
 // It gets used in conjection with NodeOpt in NewNodeFromClient
 type NodeConfig struct {
@@ -269,33 +273,30 @@ type NodeConfig struct {
 
 // WithNodeConfig returns a NodeOpt which replaces the NodeConfig with the passed in value.
 func WithNodeConfig(c NodeConfig) NodeOpt {
-	return func(opts *NodeOptions) error {
+	return func(opts *NodeOptions) {
 		opts.NodeConfigOpts = append(opts.NodeConfigOpts, func(orig *NodeConfig) error {
 			*orig = c
 			return nil
 		})
-		return nil
 	}
 }
 
 // WithClient return a NodeOpt that sets the client that will be used to create/manage the node.
 func WithClient(c kubernetes.Interface) NodeOpt {
-	return func(opts *NodeOptions) error {
+	return func(opts *NodeOptions) {
 		opts.NodeConfigOpts = append(opts.NodeConfigOpts, func(orig *NodeConfig) error {
 			orig.Client = c
 			return nil
 		})
-		return nil
 	}
 }
 
 func WithPodControllerConfigOverrides(mutateFn func(*node.PodControllerConfig)) NodeOpt {
-	return func(opts *NodeOptions) error {
+	return func(opts *NodeOptions) {
 		opts.PodControllerConfigOpts = append(opts.PodControllerConfigOpts, func(orig *node.PodControllerConfig) error {
 			mutateFn(orig)
 			return nil
 		})
-		return nil
 	}
 }
 
@@ -339,9 +340,7 @@ func NewNode(name string, newProvider NewProviderFunc, opts ...NodeOpt) (*Node,
 
 	var options NodeOptions
 	for _, o := range opts {
-		if err := o(&options); err != nil {
-			return nil, err
-		}
+		o(&options)
 	}
 
 	for _, o := range options.NodeConfigOpts {