Split up SDN master/node/proxy/CNI code

hack/lib/build/constants.sh

@@ -19,7 +19,7 @@ readonly OS_OUTPUT_PKGDIR="${OS_OUTPUT}/pkgdir"
 readonly OS_GO_PACKAGE=github.com/openshift/origin
 
 readonly OS_SDN_COMPILE_TARGETS_LINUX=(
-  pkg/sdn/plugin/sdn-cni-plugin
+  pkg/sdn/sdn-cni-plugin
   vendor/github.com/containernetworking/cni/plugins/ipam/host-local
   vendor/github.com/containernetworking/cni/plugins/main/loopback
 )

pkg/cmd/server/kubernetes/node/node.go

@@ -301,12 +301,12 @@ func SetFakeContainerManagerInterfaceForIntegrationTest() {
 	defaultContainerManagerInterface = cm.NewStubContainerManager()
 }
 
-// RunPlugin starts the local SDN plugin, if enabled in configuration.
-func (c *NodeConfig) RunPlugin() {
-	if c.SDNPlugin == nil {
+// RunSDN starts the SDN, if the OpenShift SDN network plugin is enabled in configuration.
+func (c *NodeConfig) RunSDN() {
+	if c.SDNNode == nil {
 		return
 	}
-	if err := c.SDNPlugin.Start(); err != nil {
+	if err := c.SDNNode.Start(); err != nil {
 		glog.Fatalf("error: SDN node startup failed: %v", err)
 	}
 }

pkg/cmd/server/kubernetes/node/node_config.go

@@ -79,8 +79,8 @@ type NodeConfig struct {
 	// DNSConfig controls the DNS configuration.
 	DNSServer *dns.Server
 
-	// SDNPlugin is an optional SDN plugin
-	SDNPlugin sdn.NodeInterface
+	// SDNNode is an optional SDN node interface
+	SDNNode sdn.NodeInterface
 	// SDNProxy is an optional service endpoints filterer
 	SDNProxy sdn.ProxyInterface
 }
@@ -234,10 +234,10 @@ func BuildKubernetesNodeConfig(options configapi.NodeConfig, enableProxy, enable
 	internalKubeInformers := kinternalinformers.NewSharedInformerFactory(kubeClient, proxyconfig.ConfigSyncPeriod.Duration)
 
 	// Initialize SDN before building kubelet config so it can modify option
-	var sdnPlugin sdn.NodeInterface
+	var sdnNode sdn.NodeInterface
 	var sdnProxy sdn.ProxyInterface
 	if sdn.IsOpenShiftNetworkPlugin(options.NetworkConfig.NetworkPluginName) {
-		sdnPlugin, sdnProxy, err = NewSDNInterfaces(options, originClient, kubeClient, internalKubeInformers, proxyconfig)
+		sdnNode, sdnProxy, err = NewSDNInterfaces(options, originClient, kubeClient, internalKubeInformers, proxyconfig)
 		if err != nil {
 			return nil, fmt.Errorf("SDN initialization failed: %v", err)
 		}
@@ -312,8 +312,8 @@ func BuildKubernetesNodeConfig(options configapi.NodeConfig, enableProxy, enable
 		ProxyConfig:    proxyconfig,
 		EnableUnidling: options.EnableUnidling,
 
-		SDNPlugin: sdnPlugin,
-		SDNProxy:  sdnProxy,
+		SDNNode:  sdnNode,
+		SDNProxy: sdnProxy,
 	}
 
 	if enableDNS {

pkg/cmd/server/kubernetes/node/sdn_linux.go

@@ -8,11 +8,12 @@ import (
 	osclient "github.com/openshift/origin/pkg/client"
 	configapi "github.com/openshift/origin/pkg/cmd/server/api"
 	"github.com/openshift/origin/pkg/sdn"
-	sdnplugin "github.com/openshift/origin/pkg/sdn/plugin"
+	sdnnode "github.com/openshift/origin/pkg/sdn/node"
+	sdnproxy "github.com/openshift/origin/pkg/sdn/proxy"
 )
 
 func NewSDNInterfaces(options configapi.NodeConfig, originClient *osclient.Client, kubeClient kclientset.Interface, internalKubeInformers kinternalinformers.SharedInformerFactory, proxyconfig *componentconfig.KubeProxyConfiguration) (sdn.NodeInterface, sdn.ProxyInterface, error) {
-	node, err := sdnplugin.NewNodePlugin(&sdnplugin.OsdnNodeConfig{
+	node, err := sdnnode.New(&sdnnode.OsdnNodeConfig{
 		PluginName:         options.NetworkConfig.NetworkPluginName,
 		Hostname:           options.NodeName,
 		SelfIP:             options.NodeIP,
@@ -28,7 +29,7 @@ func NewSDNInterfaces(options configapi.NodeConfig, originClient *osclient.Clien
 		return nil, nil, err
 	}
 
-	proxy, err := sdnplugin.NewProxyPlugin(options.NetworkConfig.NetworkPluginName, originClient, kubeClient)
+	proxy, err := sdnproxy.New(options.NetworkConfig.NetworkPluginName, originClient, kubeClient)
 	if err != nil {
 		return nil, nil, err
 	}

pkg/cmd/server/origin/controller/network_linux.go

@@ -8,7 +8,7 @@ import (
 	osclient "github.com/openshift/origin/pkg/client"
 	configapi "github.com/openshift/origin/pkg/cmd/server/api"
 	"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"
-	sdnplugin "github.com/openshift/origin/pkg/sdn/plugin"
+	sdnmaster "github.com/openshift/origin/pkg/sdn/master"
 )
 
 type SDNControllerConfig struct {
@@ -29,7 +29,7 @@ func (c *SDNControllerConfig) RunController(ctx ControllerContext) (bool, error)
 	if err != nil {
 		return false, err
 	}
-	err = sdnplugin.StartMaster(
+	err = sdnmaster.Start(
 		c.NetworkConfig,
 		osClient,
 		kClient,

pkg/cmd/server/start/start_node.go

@@ -365,7 +365,7 @@ func StartNode(nodeConfig configapi.NodeConfig, components *utilflags.ComponentF
 		config.RunKubelet()
 	}
 	if components.Enabled(ComponentPlugins) {
-		config.RunPlugin()
+		config.RunSDN()
 	}
 	if components.Enabled(ComponentProxy) {
 		config.RunProxy()

pkg/sdn/plugin/common.go → pkg/sdn/common/common.go

@@ -1,4 +1,4 @@
-package plugin
+package common
 
 import (
 	"fmt"
@@ -23,11 +23,11 @@ import (
 	kinternalinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion"
 )
 
-func hostSubnetToString(subnet *osapi.HostSubnet) string {
+func HostSubnetToString(subnet *osapi.HostSubnet) string {
 	return fmt.Sprintf("%s (host: %q, ip: %q, subnet: %q)", subnet.Name, subnet.Host, subnet.HostIP, subnet.Subnet)
 }
 
-func clusterNetworkToString(n *osapi.ClusterNetwork) string {
+func ClusterNetworkToString(n *osapi.ClusterNetwork) string {
 	return fmt.Sprintf("%s (network: %q, hostSubnetBits: %d, serviceNetwork: %q, pluginName: %q)", n.Name, n.Network, n.HostSubnetLength, n.ServiceNetwork, n.PluginName)
 }
 
@@ -36,7 +36,7 @@ type NetworkInfo struct {
 	ServiceNetwork *net.IPNet
 }
 
-func parseNetworkInfo(clusterNetwork string, serviceNetwork string) (*NetworkInfo, error) {
+func ParseNetworkInfo(clusterNetwork string, serviceNetwork string) (*NetworkInfo, error) {
 	cn, err := netutils.ParseCIDRMask(clusterNetwork)
 	if err != nil {
 		_, cn, err := net.ParseCIDR(clusterNetwork)
@@ -60,7 +60,7 @@ func parseNetworkInfo(clusterNetwork string, serviceNetwork string) (*NetworkInf
 	}, nil
 }
 
-func (ni *NetworkInfo) validateNodeIP(nodeIP string) error {
+func (ni *NetworkInfo) ValidateNodeIP(nodeIP string) error {
 	if nodeIP == "" || nodeIP == "127.0.0.1" {
 		return fmt.Errorf("invalid node IP %q", nodeIP)
 	}
@@ -82,7 +82,7 @@ func (ni *NetworkInfo) validateNodeIP(nodeIP string) error {
 	return nil
 }
 
-func (ni *NetworkInfo) checkHostNetworks(hostIPNets []*net.IPNet) error {
+func (ni *NetworkInfo) CheckHostNetworks(hostIPNets []*net.IPNet) error {
 	errList := []error{}
 	for _, ipNet := range hostIPNets {
 		if ipNet.Contains(ni.ClusterNetwork.IP) {
@@ -101,7 +101,7 @@ func (ni *NetworkInfo) checkHostNetworks(hostIPNets []*net.IPNet) error {
 	return kerrors.NewAggregate(errList)
 }
 
-func (ni *NetworkInfo) checkClusterObjects(subnets []osapi.HostSubnet, pods []kapi.Pod, services []kapi.Service) error {
+func (ni *NetworkInfo) CheckClusterObjects(subnets []osapi.HostSubnet, pods []kapi.Pod, services []kapi.Service) error {
 	var errList []error
 
 	for _, subnet := range subnets {
@@ -142,13 +142,13 @@ func (ni *NetworkInfo) checkClusterObjects(subnets []osapi.HostSubnet, pods []ka
 	return kerrors.NewAggregate(errList)
 }
 
-func getNetworkInfo(osClient *osclient.Client) (*NetworkInfo, error) {
+func GetNetworkInfo(osClient *osclient.Client) (*NetworkInfo, error) {
 	cn, err := osClient.ClusterNetwork().Get(osapi.ClusterNetworkDefault, metav1.GetOptions{})
 	if err != nil {
 		return nil, err
 	}
 
-	return parseNetworkInfo(cn.Network, cn.ServiceNetwork)
+	return ParseNetworkInfo(cn.Network, cn.ServiceNetwork)
 }
 
 type ResourceName string

pkg/sdn/plugin/common_test.go → pkg/sdn/common/common_test.go

@@ -1,4 +1,4 @@
-package plugin
+package common
 
 import (
 	"net"
@@ -73,7 +73,7 @@ func Test_checkHostNetworks(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		err := test.networkInfo.checkHostNetworks(hostIPNets)
+		err := test.networkInfo.CheckHostNetworks(hostIPNets)
 		if test.expectError {
 			if err == nil {
 				t.Fatalf("unexpected lack of error checking %q", test.name)
@@ -162,7 +162,7 @@ func Test_checkClusterObjects(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		err := test.ni.checkClusterObjects(subnets, pods, services)
+		err := test.ni.CheckClusterObjects(subnets, pods, services)
 		if err == nil {
 			if len(test.errs) > 0 {
 				t.Fatalf("test %q unexpectedly did not get an error", test.name)

pkg/sdn/plugin/dns.go → pkg/sdn/common/dns.go

@@ -1,4 +1,4 @@
-package plugin
+package common
 
 import (
 	"fmt"

pkg/sdn/plugin/dns_test.go → pkg/sdn/common/dns_test.go

@@ -1,4 +1,4 @@
-package plugin
+package common
 
 import (
 	"fmt"

pkg/sdn/common/doc.go

@@ -0,0 +1,2 @@
+// Package common contains the OpenShift SDN code that is shared between master, node, and proxy
+package common

pkg/sdn/plugin/egress_dns.go → pkg/sdn/common/egress_dns.go

@@ -1,4 +1,4 @@
-package plugin
+package common
 
 import (
 	"net"
@@ -30,15 +30,15 @@ type EgressDNS struct {
 	added chan bool
 
 	// Report changes when there are dns updates
-	updates chan EgressDNSUpdate
+	Updates chan EgressDNSUpdate
 }
 
 func NewEgressDNS() *EgressDNS {
 	return &EgressDNS{
 		pdMap:      map[ktypes.UID]*DNS{},
 		namespaces: map[ktypes.UID]string{},
 		added:      make(chan bool),
-		updates:    make(chan EgressDNSUpdate),
+		Updates:    make(chan EgressDNSUpdate),
 	}
 }
 
@@ -100,7 +100,7 @@ func (e *EgressDNS) Sync() {
 				}
 
 				if changed {
-					e.updates <- EgressDNSUpdate{policyUID, policyNamespace}
+					e.Updates <- EgressDNSUpdate{policyUID, policyNamespace}
 				}
 				continue
 			}

pkg/sdn/plugin/eventqueue.go → pkg/sdn/common/eventqueue.go

@@ -1,4 +1,4 @@
-package plugin
+package common
 
 import (
 	"fmt"

pkg/sdn/plugin/eventqueue_test.go → pkg/sdn/common/eventqueue_test.go

@@ -1,4 +1,4 @@
-package plugin
+package common
 
 import (
 	"fmt"

pkg/sdn/master/doc.go

@@ -0,0 +1,2 @@
+// Package master contains the OpenShift SDN code that runs on the master
+package master

pkg/sdn/plugin/master.go → pkg/sdn/master/master.go

@@ -1,4 +1,4 @@
-package plugin
+package master
 
 import (
 	"fmt"
@@ -12,6 +12,8 @@ import (
 	"github.com/openshift/origin/pkg/sdn"
 	osapi "github.com/openshift/origin/pkg/sdn/apis/network"
 	osapivalidation "github.com/openshift/origin/pkg/sdn/apis/network/validation"
+	"github.com/openshift/origin/pkg/sdn/common"
+	"github.com/openshift/origin/pkg/sdn/node"
 	"github.com/openshift/origin/pkg/util/netutils"
 
 	kapierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -26,7 +28,7 @@ import (
 type OsdnMaster struct {
 	kClient         kclientset.Interface
 	osClient        *osclient.Client
-	networkInfo     *NetworkInfo
+	networkInfo     *common.NetworkInfo
 	subnetAllocator *netutils.SubnetAllocator
 	vnids           *masterVNIDMap
 	informers       kinternalinformers.SharedInformerFactory
@@ -35,7 +37,7 @@ type OsdnMaster struct {
 	hostSubnetNodeIPs map[ktypes.UID]string
 }
 
-func StartMaster(networkConfig osconfigapi.MasterNetworkConfig, osClient *osclient.Client, kClient kclientset.Interface, informers kinternalinformers.SharedInformerFactory) error {
+func Start(networkConfig osconfigapi.MasterNetworkConfig, osClient *osclient.Client, kClient kclientset.Interface, informers kinternalinformers.SharedInformerFactory) error {
 	if !sdn.IsOpenShiftNetworkPlugin(networkConfig.NetworkPluginName) {
 		return nil
 	}
@@ -50,7 +52,7 @@ func StartMaster(networkConfig osconfigapi.MasterNetworkConfig, osClient *osclie
 	}
 
 	var err error
-	master.networkInfo, err = parseNetworkInfo(networkConfig.ClusterNetworkCIDR, networkConfig.ServiceNetworkCIDR)
+	master.networkInfo, err = common.ParseNetworkInfo(networkConfig.ClusterNetworkCIDR, networkConfig.ServiceNetworkCIDR)
 	if err != nil {
 		return err
 	}
@@ -85,7 +87,7 @@ func StartMaster(networkConfig osconfigapi.MasterNetworkConfig, osClient *osclie
 			if _, err = master.osClient.ClusterNetwork().Create(configCN); err != nil {
 				return false, err
 			}
-			log.Infof("Created ClusterNetwork %s", clusterNetworkToString(configCN))
+			log.Infof("Created ClusterNetwork %s", common.ClusterNetworkToString(configCN))
 
 			if err = master.checkClusterNetworkAgainstClusterObjects(); err != nil {
 				log.Errorf("WARNING: cluster contains objects incompatible with new ClusterNetwork: %v", err)
@@ -101,9 +103,9 @@ func StartMaster(networkConfig osconfigapi.MasterNetworkConfig, osClient *osclie
 				if _, err = master.osClient.ClusterNetwork().Update(configCN); err != nil {
 					return false, err
 				}
-				log.Infof("Updated ClusterNetwork %s", clusterNetworkToString(configCN))
+				log.Infof("Updated ClusterNetwork %s", common.ClusterNetworkToString(configCN))
 			} else {
-				log.V(5).Infof("No change to ClusterNetwork %s", clusterNetworkToString(configCN))
+				log.V(5).Infof("No change to ClusterNetwork %s", common.ClusterNetworkToString(configCN))
 			}
 		}
 
@@ -137,11 +139,11 @@ func StartMaster(networkConfig osconfigapi.MasterNetworkConfig, osClient *osclie
 }
 
 func (master *OsdnMaster) checkClusterNetworkAgainstLocalNetworks() error {
-	hostIPNets, _, err := netutils.GetHostIPNetworks([]string{Tun0})
+	hostIPNets, _, err := netutils.GetHostIPNetworks([]string{node.Tun0})
 	if err != nil {
 		return err
 	}
-	return master.networkInfo.checkHostNetworks(hostIPNets)
+	return master.networkInfo.CheckHostNetworks(hostIPNets)
 }
 
 func (master *OsdnMaster) checkClusterNetworkAgainstClusterObjects() error {
@@ -158,7 +160,7 @@ func (master *OsdnMaster) checkClusterNetworkAgainstClusterObjects() error {
 		services = serviceList.Items
 	}
 
-	return master.networkInfo.checkClusterObjects(subnets, pods, services)
+	return master.networkInfo.CheckClusterObjects(subnets, pods, services)
 }
 
 func clusterNetworkChanged(obj *osapi.ClusterNetwork, old *osapi.ClusterNetwork) (bool, error) {

pkg/sdn/plugin/master_test.go → pkg/sdn/master/master_test.go

@@ -1,9 +1,10 @@
-package plugin
+package master
 
 import (
 	"testing"
 
 	osapi "github.com/openshift/origin/pkg/sdn/apis/network"
+	"github.com/openshift/origin/pkg/sdn/common"
 )
 
 func Test_clusterNetworkChanged(t *testing.T) {
@@ -118,10 +119,10 @@ func Test_clusterNetworkChanged(t *testing.T) {
 
 		changed, err := clusterNetworkChanged(&newCN, &origCN)
 		if changed != expectChanged {
-			t.Fatalf("unexpected result (%t instead of %t) on %q: %s -> %s", changed, expectChanged, test.name, clusterNetworkToString(&origCN), clusterNetworkToString(&newCN))
+			t.Fatalf("unexpected result (%t instead of %t) on %q: %s -> %s", changed, expectChanged, test.name, common.ClusterNetworkToString(&origCN), common.ClusterNetworkToString(&newCN))
 		}
 		if (err != nil) != test.expectError {
-			t.Fatalf("unexpected error on %q: %s -> %s: %v", test.name, clusterNetworkToString(&origCN), clusterNetworkToString(&newCN), err)
+			t.Fatalf("unexpected error on %q: %s -> %s: %v", test.name, common.ClusterNetworkToString(&origCN), common.ClusterNetworkToString(&newCN), err)
 		}
 	}
 }