Skip to content

Commit 543b630

Browse files
authored
Define DefaultHelmJobImage in K3s, overriding what helm-controller defaults to. (#13258)
Signed-off-by: Derek Nola <derek.nola@suse.com>
1 parent 0d39c86 commit 543b630

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

pkg/server/server.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ import (
4040
clientset "k8s.io/client-go/kubernetes"
4141
)
4242

43+
var DefaultHelmJobImage = "rancher/klipper-helm:v0.9.10-build20251111"
44+
4345
func ResolveDataDir(dataDir string) (string, error) {
4446
dataDir, err := datadir.Resolve(dataDir)
4547
return filepath.Join(dataDir, "server"), err
@@ -217,11 +219,12 @@ func coreControllers(ctx context.Context, sc *Context, config *Config) error {
217219
return err
218220
}
219221

220-
// apply SystemDefaultRegistry setting to Helm before starting controllers
222+
// Apply SystemDefaultRegistry setting to Helm before starting controllers.
223+
// Additionally, set the helm job image to the immutable default image, internally helm-controller default to latest.
221224
if config.ControlConfig.HelmJobImage != "" {
222225
helmchart.DefaultJobImage = config.ControlConfig.HelmJobImage
223226
} else if config.ControlConfig.SystemDefaultRegistry != "" {
224-
helmchart.DefaultJobImage = config.ControlConfig.SystemDefaultRegistry + "/" + helmchart.DefaultJobImage
227+
helmchart.DefaultJobImage = config.ControlConfig.SystemDefaultRegistry + "/" + DefaultHelmJobImage
225228
}
226229

227230
if sc.Helm != nil {

0 commit comments

Comments
 (0)