mirror of
https://git.vectorsigma.ru/public/k3s.git
synced 2026-08-07 09:39:42 +00:00
Add server CLI flag and config fields for embedded registry
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit ef90da5c6e)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
This commit is contained in:
committed by
Brad Davidson
parent
394eb441aa
commit
d15bd074f4
@@ -503,6 +503,7 @@ func get(ctx context.Context, envInfo *cmds.Agent, proxy proxy.Proxy) (*config.N
|
||||
ContainerRuntimeEndpoint: envInfo.ContainerRuntimeEndpoint,
|
||||
ImageServiceEndpoint: envInfo.ImageServiceEndpoint,
|
||||
MultiClusterCIDR: controlConfig.MultiClusterCIDR,
|
||||
EmbeddedRegistry: controlConfig.EmbeddedRegistry,
|
||||
FlannelBackend: controlConfig.FlannelBackend,
|
||||
FlannelIPv6Masq: controlConfig.FlannelIPv6Masq,
|
||||
FlannelExternalIP: controlConfig.FlannelExternalIP,
|
||||
|
||||
@@ -77,6 +77,7 @@ type Server struct {
|
||||
DisableAPIServer bool
|
||||
DisableControllerManager bool
|
||||
DisableETCD bool
|
||||
EmbeddedRegistry bool
|
||||
ClusterInit bool
|
||||
ClusterReset bool
|
||||
ClusterResetRestorePath string
|
||||
@@ -489,6 +490,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,
|
||||
|
||||
@@ -166,6 +166,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
|
||||
|
||||
@@ -44,6 +44,7 @@ type Node struct {
|
||||
NoFlannel bool
|
||||
SELinux bool
|
||||
MultiClusterCIDR 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
|
||||
|
||||
Reference in New Issue
Block a user