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
ef90da5c
Commit
ef90da5c
authored
Dec 05, 2023
by
Brad Davidson
Committed by
Brad Davidson
Jan 09, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add server CLI flag and config fields for embedded registry
Signed-off-by:
Brad Davidson
<
brad.davidson@rancher.com
>
parent
b8f3967a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
0 deletions
+10
-0
config.go
pkg/agent/config/config.go
+1
-0
server.go
pkg/cli/cmds/server.go
+6
-0
server.go
pkg/cli/server/server.go
+1
-0
types.go
pkg/daemons/config/types.go
+2
-0
No files found.
pkg/agent/config/config.go
View file @
ef90da5c
...
...
@@ -502,6 +502,7 @@ func get(ctx context.Context, envInfo *cmds.Agent, proxy proxy.Proxy) (*config.N
SELinux
:
envInfo
.
EnableSELinux
,
ContainerRuntimeEndpoint
:
envInfo
.
ContainerRuntimeEndpoint
,
ImageServiceEndpoint
:
envInfo
.
ImageServiceEndpoint
,
EmbeddedRegistry
:
controlConfig
.
EmbeddedRegistry
,
FlannelBackend
:
controlConfig
.
FlannelBackend
,
FlannelIPv6Masq
:
controlConfig
.
FlannelIPv6Masq
,
FlannelExternalIP
:
controlConfig
.
FlannelExternalIP
,
...
...
pkg/cli/cmds/server.go
View file @
ef90da5c
...
...
@@ -76,6 +76,7 @@ type Server struct {
DisableAPIServer
bool
DisableControllerManager
bool
DisableETCD
bool
EmbeddedRegistry
bool
ClusterInit
bool
ClusterReset
bool
ClusterResetRestorePath
string
...
...
@@ -483,6 +484,11 @@ var ServerFlags = []cli.Flag{
Usage
:
"(experimental/components) Disable running etcd"
,
Destination
:
&
ServerConfig
.
DisableETCD
,
},
&
cli
.
BoolFlag
{
Name
:
"embedded-registry"
,
Usage
:
"(experimental/components) Enable embedded distributed container registry; requires use of embedded containerd"
,
Destination
:
&
ServerConfig
.
EmbeddedRegistry
,
},
NodeNameFlag
,
WithNodeIDFlag
,
NodeLabels
,
...
...
pkg/cli/server/server.go
View file @
ef90da5c
...
...
@@ -165,6 +165,7 @@ func run(app *cli.Context, cfg *cmds.Server, leaderControllers server.CustomCont
serverConfig
.
ControlConfig
.
DisableAPIServer
=
cfg
.
DisableAPIServer
serverConfig
.
ControlConfig
.
DisableScheduler
=
cfg
.
DisableScheduler
serverConfig
.
ControlConfig
.
DisableControllerManager
=
cfg
.
DisableControllerManager
serverConfig
.
ControlConfig
.
EmbeddedRegistry
=
cfg
.
EmbeddedRegistry
serverConfig
.
ControlConfig
.
ClusterInit
=
cfg
.
ClusterInit
serverConfig
.
ControlConfig
.
EncryptSecrets
=
cfg
.
EncryptSecrets
serverConfig
.
ControlConfig
.
EtcdExposeMetrics
=
cfg
.
EtcdExposeMetrics
...
...
pkg/daemons/config/types.go
View file @
ef90da5c
...
...
@@ -41,6 +41,7 @@ type Node struct {
ImageServiceEndpoint
string
NoFlannel
bool
SELinux
bool
EmbeddedRegistry
bool
FlannelBackend
string
FlannelConfFile
string
FlannelConfOverride
bool
...
...
@@ -185,6 +186,7 @@ type Control struct {
DisableKubeProxy
bool
DisableScheduler
bool
DisableServiceLB
bool
EmbeddedRegistry
bool
Rootless
bool
ServiceLBNamespace
string
EnablePProf
bool
...
...
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