cleanup unused code

kubeovn · Apr 22, 2019 · b7d0f59 · b7d0f59
1 parent e815751
commit b7d0f59
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 71 deletions.
diff --git a/dist/images/start-cniserver.sh b/dist/images/start-cniserver.sh
@@ -9,4 +9,4 @@ then
 	rm ${SOCK}
 fi
 
-./kube-ovn-daemon --ovs-socket=/run/openvswitch/db.sock --bind-socket=${SOCK} --ovn-nb-host=$OVN_NB_SERVICE_HOST --ovn-sb-host=$OVN_SB_SERVICE_HOST $@
+./kube-ovn-daemon --ovs-socket=/run/openvswitch/db.sock --bind-socket=${SOCK} $@
diff --git a/pkg/daemon/config.go b/pkg/daemon/config.go
@@ -18,12 +18,6 @@ type Configuration struct {
 	KubeConfigFile        string
 	KubeClient            kubernetes.Interface
 	NodeName              string
-	OvnNbHost             string
-	OvnNbPort             int
-	OvnSbHost             string
-	OvnSbPort             int
-	ClusterRouter         string
-	NodeSwitch            string
 	ServiceClusterIPRange string
 }
 
@@ -33,12 +27,6 @@ func ParseFlags() (*Configuration, error) {
 		argBindSocket            = pflag.String("bind-socket", "/var/run/cniserver.sock", "The socket daemon bind to.")
 		argOvsSocket             = pflag.String("ovs-socket", "", "The socket to local ovs-server")
 		argKubeConfigFile        = pflag.String("kubeconfig", "", "Path to kubeconfig file with authorization and master location information. If not set use the inCluster token.")
-		argOvnNbHost             = pflag.String("ovn-nb-host", "", "")
-		argOvnNbPort             = pflag.Int("ovn-nb-port", 6641, "")
-		argOvnSbHost             = pflag.String("ovn-sb-host", "", "")
-		argOvnSbPort             = pflag.Int("ovn-sb-port", 6642, "")
-		argClusterRouter         = pflag.String("cluster-router", "ovn-cluster", "The router name for cluster router.Default: cluster-router")
-		argNodeSwitch            = pflag.String("node-switch", "join", "The name of node gateway switch which help node to access pod network. Default: join")
 		argServiceClusterIPRange = pflag.String("service-cluster-ip-range", "10.96.0.0/12", "The kubernetes service cluster ip range")
 	)
 
@@ -68,12 +56,6 @@ func ParseFlags() (*Configuration, error) {
 		OvsSocket:             *argOvsSocket,
 		KubeConfigFile:        *argKubeConfigFile,
 		NodeName:              nodeName,
-		OvnNbHost:             *argOvnNbHost,
-		OvnNbPort:             *argOvnNbPort,
-		OvnSbHost:             *argOvnSbHost,
-		OvnSbPort:             *argOvnSbPort,
-		ClusterRouter:         *argClusterRouter,
-		NodeSwitch:            *argNodeSwitch,
 		ServiceClusterIPRange: *argServiceClusterIPRange,
 	}
 	err := config.initKubeClient()

diff --git a/pkg/daemon/controller.go b/pkg/daemon/controller.go
@@ -37,15 +37,13 @@ type Controller struct {
 	podsSynced cache.InformerSynced
 	podQueue   workqueue.RateLimitingInterface
 
-	ovnClient   *ovs.Client
 	ipSetsMgr   *ipsets.IPSets
 	iptablesMgr *iptables.IPTables
 }
 
 func NewController(config *Configuration, informerFactory informers.SharedInformerFactory) (*Controller, error) {
 	namespaceInformer := informerFactory.Core().V1().Namespaces()
 	podInformer := informerFactory.Core().V1().Pods()
-	ovnClient := ovs.NewClient(config.OvnNbHost, config.OvnNbPort, config.OvnSbHost, config.OvnSbPort, "", "", "", "", "")
 	iptablesMgr, err := iptables.New()
 	if err != nil {
 		return nil, err
@@ -63,7 +61,6 @@ func NewController(config *Configuration, informerFactory informers.SharedInform
 		podsSynced: podInformer.Informer().HasSynced,
 		podQueue:   workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "Pod"),
 
-		ovnClient:   ovnClient,
 		ipSetsMgr:   ipsetsMgr,
 		iptablesMgr: iptablesMgr,
 	}

diff --git a/pkg/ovs/ovn-sbctl.go b/pkg/ovs/ovn-sbctl.go