Merge pull request #647 from yamt/remove-proxy-port

pkg/agent/config/config.go

@@ -183,10 +183,6 @@ func getHostnameAndIP(info cmds.Agent) (string, string, error) {
 	return name, ip, nil
 }
 
-func localAddress(controlConfig *config.Control) string {
-	return fmt.Sprintf("127.0.0.1:%d", controlConfig.ProxyPort)
-}
-
 func writeKubeConfig(envInfo *cmds.Agent, info clientaccess.Info, tlsCert *tls.Certificate) (string, error) {
 	os.MkdirAll(envInfo.DataDir, 0700)
 	kubeConfigPath := filepath.Join(envInfo.DataDir, "kubeconfig.yaml")
@@ -338,7 +334,6 @@ func get(envInfo *cmds.Agent) (*config.Node, error) {
 		ContainerRuntimeEndpoint: envInfo.ContainerRuntimeEndpoint,
 	}
 	nodeConfig.FlannelIface = flannelIface
-	nodeConfig.LocalAddress = localAddress(controlConfig)
 	nodeConfig.Images = filepath.Join(envInfo.DataDir, "images")
 	nodeConfig.AgentConfig.NodeIP = nodeIP
 	nodeConfig.AgentConfig.NodeName = nodeName

pkg/daemons/config/types.go

@@ -16,7 +16,6 @@ type Node struct {
 	NoFlannel                bool
 	FlannelConf              string
 	FlannelIface             *net.Interface
-	LocalAddress             string
 	Containerd               Containerd
 	Images                   string
 	AgentConfig              Agent
@@ -70,7 +69,6 @@ type Control struct {
 	AdvertiseIP           string
 	ListenPort            int
 	HTTPSPort             int
-	ProxyPort             int
 	ClusterSecret         string
 	ClusterIPRange        *net.IPNet
 	ServiceIPRange        *net.IPNet

pkg/daemons/control/server.go

@@ -222,10 +222,6 @@ func defaults(config *config.Control) {
 		config.ListenPort = 6444
 	}
 
-	if config.ProxyPort == 0 {
-		config.ProxyPort = 6445
-	}
-
 	if config.DataDir == "" {
 		config.DataDir = "./management-state"
 	}