Skip to content

Commit 764affd

Browse files
committed
Make DefaultJobImage var instead of const
We want to be able to override the default at runtime for k3s-io/k3s#3281 Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
1 parent 9488919 commit 764affd

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

pkg/helm/controller.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@ import (
2828
)
2929

3030
var (
31-
trueVal = true
32-
commaRE = regexp.MustCompile(`\\*,`)
31+
trueVal = true
32+
commaRE = regexp.MustCompile(`\\*,`)
33+
DefaultJobImage = "rancher/klipper-helm:v0.5.0-build20210505"
3334
)
3435

3536
type Controller struct {
@@ -41,12 +42,11 @@ type Controller struct {
4142
}
4243

4344
const (
44-
DefaultJobImage = "rancher/klipper-helm:v0.5.0-build20210505"
45-
Label = "helmcharts.helm.cattle.io/chart"
46-
Annotation = "helmcharts.helm.cattle.io/configHash"
47-
CRDName = "helmcharts.helm.cattle.io"
48-
ConfigCRDName = "helmchartconfigs.helm.cattle.io"
49-
Name = "helm-controller"
45+
Label = "helmcharts.helm.cattle.io/chart"
46+
Annotation = "helmcharts.helm.cattle.io/configHash"
47+
CRDName = "helmcharts.helm.cattle.io"
48+
ConfigCRDName = "helmchartconfigs.helm.cattle.io"
49+
Name = "helm-controller"
5050
)
5151

5252
func Register(ctx context.Context, apply apply.Apply,

0 commit comments

Comments
 (0)