mirror of
https://github.com/k3s-io/k3s.git
synced 2024-06-07 19:41:36 +00:00
Adding cli to custom klipper helm image (#7682)
Adding cli to custom klipper helm image Signed-off-by: Vitor Savian <vitor.savian@suse.com>
This commit is contained in:
parent
c7dec8ed24
commit
0809187cff
@ -45,6 +45,7 @@ type Server struct {
|
||||
DisableAgent bool
|
||||
KubeConfigOutput string
|
||||
KubeConfigMode string
|
||||
HelmJobImage string
|
||||
TLSSan cli.StringSlice
|
||||
BindAddress string
|
||||
EnablePProf bool
|
||||
@ -252,6 +253,11 @@ var ServerFlags = []cli.Flag{
|
||||
Destination: &ServerConfig.KubeConfigMode,
|
||||
EnvVar: version.ProgramUpper + "_KUBECONFIG_MODE",
|
||||
},
|
||||
&cli.StringFlag{
|
||||
Name: "helm-job-image",
|
||||
Usage: "(helm) Default image to use for helm jobs",
|
||||
Destination: &ServerConfig.HelmJobImage,
|
||||
},
|
||||
ServerToken,
|
||||
&cli.StringFlag{
|
||||
Name: "token-file",
|
||||
|
@ -128,6 +128,7 @@ func run(app *cli.Context, cfg *cmds.Server, leaderControllers server.CustomCont
|
||||
serverConfig.ControlConfig.DataDir = cfg.DataDir
|
||||
serverConfig.ControlConfig.KubeConfigOutput = cfg.KubeConfigOutput
|
||||
serverConfig.ControlConfig.KubeConfigMode = cfg.KubeConfigMode
|
||||
serverConfig.ControlConfig.HelmJobImage = cfg.HelmJobImage
|
||||
serverConfig.ControlConfig.Rootless = cfg.Rootless
|
||||
serverConfig.ControlConfig.ServiceLBNamespace = cfg.ServiceLBNamespace
|
||||
serverConfig.ControlConfig.SANs = util.SplitStringSlice(cfg.TLSSan)
|
||||
|
@ -167,6 +167,7 @@ type Control struct {
|
||||
ServiceNodePortRange *utilnet.PortRange
|
||||
KubeConfigOutput string
|
||||
KubeConfigMode string
|
||||
HelmJobImage string
|
||||
DataDir string
|
||||
Datastore endpoint.Config `json:"-"`
|
||||
Disables map[string]bool
|
||||
|
@ -207,7 +207,9 @@ func coreControllers(ctx context.Context, sc *Context, config *Config) error {
|
||||
}
|
||||
|
||||
// apply SystemDefaultRegistry setting to Helm before starting controllers
|
||||
if config.ControlConfig.SystemDefaultRegistry != "" {
|
||||
if config.ControlConfig.HelmJobImage != "" {
|
||||
helmchart.DefaultJobImage = config.ControlConfig.HelmJobImage
|
||||
} else if config.ControlConfig.SystemDefaultRegistry != "" {
|
||||
helmchart.DefaultJobImage = config.ControlConfig.SystemDefaultRegistry + "/" + helmchart.DefaultJobImage
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user