@@ -95,7 +95,7 @@ func NewCommandNodeConfig(commandName string, fullName string, out io.Writer) *c

 	flags.StringVar(&options.NodeClientCAFile, "node-client-certificate-authority", options.NodeClientCAFile, "The file containing signing authorities to use to verify requests to the node. If empty, all requests will be allowed.")

 	flags.StringVar(&options.APIServerURL, "master", options.APIServerURL, "The API server's URL.")

 	flags.StringSliceVar(&options.APIServerCAFiles, "certificate-authority", options.APIServerCAFiles, "Files containing signing authorities to use to verify the API server's serving certificate.")

-	flags.StringVar(&options.NetworkPluginName, "network-plugin", options.NetworkPluginName, "Name of the network plugin to hook to for pod networking. Optional for OpenShift network plugin, node will auto detect network plugin configured by OpenShift master.")

+	flags.StringVar(&options.NetworkPluginName, "network-plugin", options.NetworkPluginName, "Name of the network plugin to hook to for pod networking.")

 	// autocompletion hints

 	cmd.MarkFlagFilename("node-dir")

@@ -174,7 +174,6 @@ type LocalQuota struct {

 // NodeNetworkConfig provides network options for the node

 type NodeNetworkConfig struct {

 	// NetworkPluginName is a string specifying the networking plugin

-	// Optional for OpenShift network plugin, node will auto detect network plugin configured by OpenShift master.

 	NetworkPluginName string

 	// Maximum transmission unit for the network packets

 	MTU uint32

@@ -120,8 +120,7 @@ type NodeAuthConfig struct {

 // NodeNetworkConfig provides network options for the node

 type NodeNetworkConfig struct {

 	// NetworkPluginName is a string specifying the networking plugin

-	// Optional for OpenShift network plugin, node will auto detect network plugin configured by OpenShift master.

-	NetworkPluginName string `json:"networkPluginName,omitempty"`

+	NetworkPluginName string `json:"networkPluginName"`

 	// Maximum transmission unit for the network packets

 	MTU uint32 `json:"mtu"`

 }

@@ -45,6 +45,7 @@ masterClientConnectionOverrides: null

 masterKubeConfig: ""

 networkConfig:

   mtu: 0

+  networkPluginName: ""

 nodeIP: ""

 nodeName: ""

 podManifestConfig:

@@ -135,8 +135,7 @@ func BuildKubernetesNodeConfig(options configapi.NodeConfig, enableProxy, enable

 		return nil, fmt.Errorf("cannot parse node port: %v", err)

 	}

-	options.NetworkConfig.NetworkPluginName, err = validateAndGetNetworkPluginName(originClient, options.NetworkConfig.NetworkPluginName)

-	if err != nil {

+	if err = validateNetworkPluginName(originClient, options.NetworkConfig.NetworkPluginName); err != nil {

 		return nil, err

 	}

@@ -419,31 +418,24 @@ func buildKubeProxyConfig(options configapi.NodeConfig) (*proxyoptions.ProxyServ

 	return proxyconfig, nil

 }

-func validateAndGetNetworkPluginName(originClient *osclient.Client, pluginName string) (string, error) {

+func validateNetworkPluginName(originClient *osclient.Client, pluginName string) error {

 	if sdnplugin.IsOpenShiftNetworkPlugin(pluginName) {

 		// Detect any plugin mismatches between node and master

 		clusterNetwork, err := originClient.ClusterNetwork().Get(sdnapi.ClusterNetworkDefault)

 		if kerrs.IsNotFound(err) {

-			return "", fmt.Errorf("master has not created a default cluster network, network plugin %q can not start", pluginName)

+			return fmt.Errorf("master has not created a default cluster network, network plugin %q can not start", pluginName)

 		} else if err != nil {

-			return "", fmt.Errorf("cannot fetch %q cluster network: %v", sdnapi.ClusterNetworkDefault, err)

+			return fmt.Errorf("cannot fetch %q cluster network: %v", sdnapi.ClusterNetworkDefault, err)

 		}

 		if clusterNetwork.PluginName != strings.ToLower(pluginName) {

 			if len(clusterNetwork.PluginName) != 0 {

-				return "", fmt.Errorf("detected network plugin mismatch between OpenShift node(%q) and master(%q)", pluginName, clusterNetwork.PluginName)

+				return fmt.Errorf("detected network plugin mismatch between OpenShift node(%q) and master(%q)", pluginName, clusterNetwork.PluginName)

 			} else {

 				// Do not return error in this case

 				glog.Warningf(`either there is network plugin mismatch between OpenShift node(%q) and master or OpenShift master is running an older version where we did not persist plugin name`, pluginName)

 			}

 		}

-	} else if pluginName == "" {

-		// Auto detect network plugin configured by master

-		clusterNetwork, err := originClient.ClusterNetwork().Get(sdnapi.ClusterNetworkDefault)

-		if err == nil {

-			return clusterNetwork.PluginName, nil

-		}

 	}

-

-	return pluginName, nil

+	return nil

 }

@@ -80,7 +80,7 @@ func BindNodeArgs(args *NodeArgs, flags *pflag.FlagSet, prefix string, component

 		args.Components.Bind(flags, prefix+"%s", "The set of node components to")

 	}

-	flags.StringVar(&args.NetworkPluginName, prefix+"network-plugin", args.NetworkPluginName, "The network plugin to be called for configuring networking for pods. Optional for OpenShift network plugin, node will auto detect network plugin configured by OpenShift master.")

+	flags.StringVar(&args.NetworkPluginName, prefix+"network-plugin", args.NetworkPluginName, "The network plugin to be called for configuring networking for pods.")

 	flags.StringVar(&args.VolumeDir, prefix+"volume-dir", "openshift.local.volumes", "The volume storage directory.")

 	// TODO rename this node-name and recommend uname -n

@@ -97,7 +97,7 @@ func BindNodeArgs(args *NodeArgs, flags *pflag.FlagSet, prefix string, component

 func BindNodeNetworkArgs(args *NodeArgs, flags *pflag.FlagSet, prefix string) {

 	args.Components.Bind(flags, "%s", "The set of network components to")

-	flags.StringVar(&args.NetworkPluginName, prefix+"network-plugin", args.NetworkPluginName, "The network plugin to be called for configuring networking for pods. Optional for OpenShift network plugin, node will auto detect network plugin configured by OpenShift master.")

+	flags.StringVar(&args.NetworkPluginName, prefix+"network-plugin", args.NetworkPluginName, "The network plugin to be called for configuring networking for pods.")

 }

 // NewDefaultNodeArgs creates NodeArgs with sub-objects created and default values set.

@@ -286,8 +286,6 @@ func StartNode(nodeConfig configapi.NodeConfig, components *utilflags.ComponentF

 		return err

 	}

-	// In case of openshift network plugin, nodeConfig.networkPluginName is optional and is auto detected/finalized

-	// once we build kubernetes node config. So perform plugin name related check here.

 	if sdnplugin.IsOpenShiftNetworkPlugin(config.KubeletServer.NetworkPluginName) {

 		// TODO: SDN plugin depends on the Kubelet registering as a Node and doesn't retry cleanly,

 		// and Kubelet also can't start the PodSync loop until the SDN plugin has loaded.