Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
dc4ebd4c
Commit
dc4ebd4c
authored
Jul 17, 2019
by
YAMAMOTO Takashi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove agent proxy config which is no longer used
parent
d140911b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
11 deletions
+0
-11
config.go
pkg/agent/config/config.go
+0
-5
types.go
pkg/daemons/config/types.go
+0
-2
server.go
pkg/daemons/control/server.go
+0
-4
No files found.
pkg/agent/config/config.go
View file @
dc4ebd4c
...
...
@@ -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
View file @
dc4ebd4c
...
...
@@ -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
View file @
dc4ebd4c
...
...
@@ -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"
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment