Update for new split master/node SDN NewPlugin calls

Author: danwinship

pkg/cmd/server/kubernetes/node_config.go

@@ -257,7 +257,7 @@ func BuildKubernetesNodeConfig(options configapi.NodeConfig) (*NodeConfig, error
 	}
 	cfg.Cloud = cloud
 
-	sdnPlugin, endpointFilter, err := factory.NewPlugin(options.NetworkConfig.NetworkPluginName, originClient, kubeClient, options.NodeName, options.NodeIP)
+	sdnPlugin, endpointFilter, err := factory.NewClientPlugin(options.NetworkConfig.NetworkPluginName, originClient, kubeClient, options.NodeName, options.NodeIP)
 	if err != nil {
 		return nil, fmt.Errorf("SDN initialization failed: %v", err)
 	} else if sdnPlugin != nil {

pkg/cmd/server/origin/run_components.go

@@ -329,7 +329,7 @@ func (c *MasterConfig) RunDeploymentImageChangeTriggerController() {
 // RunSDNController runs openshift-sdn if the said network plugin is provided
 func (c *MasterConfig) RunSDNController() {
 	oClient, kClient := c.SDNControllerClients()
-	controller, _, err := factory.NewPlugin(c.Options.NetworkConfig.NetworkPluginName, oClient, kClient, "", "")
+	controller, _, err := factory.NewMasterPlugin(c.Options.NetworkConfig.NetworkPluginName, oClient, kClient)
 	if err != nil {
 		glog.Fatalf("SDN initialization failed: %v", err)
 	}