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
fa2c1422
Commit
fa2c1422
authored
Aug 19, 2020
by
Brian Downs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
change name of variable
Signed-off-by:
Brian Downs
<
brian.downs@gmail.com
>
parent
a4b29530
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
4 deletions
+4
-4
server.go
pkg/cli/cmds/server.go
+1
-1
server.go
pkg/cli/server/server.go
+1
-1
server.go
pkg/server/server.go
+1
-1
types.go
pkg/server/types.go
+1
-1
No files found.
pkg/cli/cmds/server.go
View file @
fa2c1422
...
@@ -55,7 +55,7 @@ type Server struct {
...
@@ -55,7 +55,7 @@ type Server struct {
ClusterInit
bool
ClusterInit
bool
ClusterReset
bool
ClusterReset
bool
EncryptSecrets
bool
EncryptSecrets
bool
S
etupHooks
[]
func
(
config
.
Control
)
error
S
tartupHooks
[]
func
(
config
.
Control
)
error
}
}
var
ServerConfig
Server
var
ServerConfig
Server
...
...
pkg/cli/server/server.go
View file @
fa2c1422
...
@@ -193,7 +193,7 @@ func run(app *cli.Context, cfg *cmds.Server) error {
...
@@ -193,7 +193,7 @@ func run(app *cli.Context, cfg *cmds.Server) error {
return
errors
.
Wrap
(
err
,
"Invalid tls-min-version"
)
return
errors
.
Wrap
(
err
,
"Invalid tls-min-version"
)
}
}
serverConfig
.
S
etupHooks
=
append
(
serverConfig
.
SetupHooks
,
cfg
.
Se
tupHooks
...
)
serverConfig
.
S
tartupHooks
=
append
(
serverConfig
.
StartupHooks
,
cfg
.
Star
tupHooks
...
)
// TLS config based on mozilla ssl-config generator
// TLS config based on mozilla ssl-config generator
// https://ssl-config.mozilla.org/#server=golang&version=1.13.6&config=intermediate&guideline=5.4
// https://ssl-config.mozilla.org/#server=golang&version=1.13.6&config=intermediate&guideline=5.4
...
...
pkg/server/server.go
View file @
fa2c1422
...
@@ -60,7 +60,7 @@ func StartServer(ctx context.Context, config *Config) error {
...
@@ -60,7 +60,7 @@ func StartServer(ctx context.Context, config *Config) error {
return
errors
.
Wrap
(
err
,
"starting tls server"
)
return
errors
.
Wrap
(
err
,
"starting tls server"
)
}
}
for
_
,
hook
:=
range
config
.
S
e
tupHooks
{
for
_
,
hook
:=
range
config
.
S
tar
tupHooks
{
hook
(
config
.
ControlConfig
)
hook
(
config
.
ControlConfig
)
}
}
...
...
pkg/server/types.go
View file @
fa2c1422
...
@@ -10,5 +10,5 @@ type Config struct {
...
@@ -10,5 +10,5 @@ type Config struct {
ControlConfig
config
.
Control
ControlConfig
config
.
Control
Rootless
bool
Rootless
bool
SupervisorPort
int
SupervisorPort
int
S
etupHooks
[]
func
(
config
.
Control
)
error
S
tartupHooks
[]
func
(
config
.
Control
)
error
}
}
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