Commit 8ab374de authored by Brad Davidson's avatar Brad Davidson Committed by Brad Davidson

Add server CLI flag and config fields for embedded registry

Signed-off-by: 's avatarBrad Davidson <brad.davidson@rancher.com> (cherry picked from commit ef90da5c) Signed-off-by: 's avatarBrad Davidson <brad.davidson@rancher.com>
parent 7731127e
...@@ -503,6 +503,7 @@ func get(ctx context.Context, envInfo *cmds.Agent, proxy proxy.Proxy) (*config.N ...@@ -503,6 +503,7 @@ func get(ctx context.Context, envInfo *cmds.Agent, proxy proxy.Proxy) (*config.N
ContainerRuntimeEndpoint: envInfo.ContainerRuntimeEndpoint, ContainerRuntimeEndpoint: envInfo.ContainerRuntimeEndpoint,
ImageServiceEndpoint: envInfo.ImageServiceEndpoint, ImageServiceEndpoint: envInfo.ImageServiceEndpoint,
MultiClusterCIDR: controlConfig.MultiClusterCIDR, MultiClusterCIDR: controlConfig.MultiClusterCIDR,
EmbeddedRegistry: controlConfig.EmbeddedRegistry,
FlannelBackend: controlConfig.FlannelBackend, FlannelBackend: controlConfig.FlannelBackend,
FlannelIPv6Masq: controlConfig.FlannelIPv6Masq, FlannelIPv6Masq: controlConfig.FlannelIPv6Masq,
FlannelExternalIP: controlConfig.FlannelExternalIP, FlannelExternalIP: controlConfig.FlannelExternalIP,
......
...@@ -77,6 +77,7 @@ type Server struct { ...@@ -77,6 +77,7 @@ type Server struct {
DisableAPIServer bool DisableAPIServer bool
DisableControllerManager bool DisableControllerManager bool
DisableETCD bool DisableETCD bool
EmbeddedRegistry bool
ClusterInit bool ClusterInit bool
ClusterReset bool ClusterReset bool
ClusterResetRestorePath string ClusterResetRestorePath string
...@@ -489,6 +490,11 @@ var ServerFlags = []cli.Flag{ ...@@ -489,6 +490,11 @@ var ServerFlags = []cli.Flag{
Usage: "(experimental/components) Disable running etcd", Usage: "(experimental/components) Disable running etcd",
Destination: &ServerConfig.DisableETCD, 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, NodeNameFlag,
WithNodeIDFlag, WithNodeIDFlag,
NodeLabels, NodeLabels,
......
...@@ -166,6 +166,7 @@ func run(app *cli.Context, cfg *cmds.Server, leaderControllers server.CustomCont ...@@ -166,6 +166,7 @@ func run(app *cli.Context, cfg *cmds.Server, leaderControllers server.CustomCont
serverConfig.ControlConfig.DisableAPIServer = cfg.DisableAPIServer serverConfig.ControlConfig.DisableAPIServer = cfg.DisableAPIServer
serverConfig.ControlConfig.DisableScheduler = cfg.DisableScheduler serverConfig.ControlConfig.DisableScheduler = cfg.DisableScheduler
serverConfig.ControlConfig.DisableControllerManager = cfg.DisableControllerManager serverConfig.ControlConfig.DisableControllerManager = cfg.DisableControllerManager
serverConfig.ControlConfig.EmbeddedRegistry = cfg.EmbeddedRegistry
serverConfig.ControlConfig.ClusterInit = cfg.ClusterInit serverConfig.ControlConfig.ClusterInit = cfg.ClusterInit
serverConfig.ControlConfig.EncryptSecrets = cfg.EncryptSecrets serverConfig.ControlConfig.EncryptSecrets = cfg.EncryptSecrets
serverConfig.ControlConfig.EtcdExposeMetrics = cfg.EtcdExposeMetrics serverConfig.ControlConfig.EtcdExposeMetrics = cfg.EtcdExposeMetrics
......
...@@ -43,6 +43,7 @@ type Node struct { ...@@ -43,6 +43,7 @@ type Node struct {
NoFlannel bool NoFlannel bool
SELinux bool SELinux bool
MultiClusterCIDR bool MultiClusterCIDR bool
EmbeddedRegistry bool
FlannelBackend string FlannelBackend string
FlannelConfFile string FlannelConfFile string
FlannelConfOverride bool FlannelConfOverride bool
...@@ -184,6 +185,7 @@ type Control struct { ...@@ -184,6 +185,7 @@ type Control struct {
DisableKubeProxy bool DisableKubeProxy bool
DisableScheduler bool DisableScheduler bool
DisableServiceLB bool DisableServiceLB bool
EmbeddedRegistry bool
Rootless bool Rootless bool
ServiceLBNamespace string ServiceLBNamespace string
EnablePProf bool EnablePProf bool
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment