Skip to content

Commit 54e931c

Browse files
authored
allow overriding kotsadm-migrations image (#207)
1 parent eda95c7 commit 54e931c

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ ADMIN_CONSOLE_CHART_URL = oci://registry.replicated.com/library
66
ADMIN_CONSOLE_CHART_NAME = admin-console
77
ADMIN_CONSOLE_CHART_VERSION = 1.104.4
88
ADMIN_CONSOLE_IMAGE_OVERRIDE =
9+
ADMIN_CONSOLE_MIGRATIONS_IMAGE_OVERRIDE =
910
EMBEDDED_OPERATOR_CHART_URL = oci://registry.replicated.com/library
1011
EMBEDDED_OPERATOR_CHART_NAME = embedded-cluster-operator
1112
EMBEDDED_OPERATOR_CHART_VERSION = 0.6.0
@@ -24,6 +25,7 @@ LD_FLAGS = -X github.com/replicatedhq/embedded-cluster/pkg/defaults.K0sVersion=$
2425
-X github.com/replicatedhq/embedded-cluster/pkg/addons/adminconsole.ChartName=$(ADMIN_CONSOLE_CHART_NAME) \
2526
-X github.com/replicatedhq/embedded-cluster/pkg/addons/adminconsole.Version=$(ADMIN_CONSOLE_CHART_VERSION) \
2627
-X github.com/replicatedhq/embedded-cluster/pkg/addons/adminconsole.ImageOverride=$(ADMIN_CONSOLE_IMAGE_OVERRIDE) \
28+
-X github.com/replicatedhq/embedded-cluster/pkg/addons/adminconsole.MigrationsImageOverride=$(ADMIN_CONSOLE_MIGRATIONS_IMAGE_OVERRIDE) \
2729
-X github.com/replicatedhq/embedded-cluster/pkg/addons/embeddedclusteroperator.ChartURL=$(EMBEDDED_OPERATOR_CHART_URL) \
2830
-X github.com/replicatedhq/embedded-cluster/pkg/addons/embeddedclusteroperator.ChartName=$(EMBEDDED_OPERATOR_CHART_NAME) \
2931
-X github.com/replicatedhq/embedded-cluster/pkg/addons/embeddedclusteroperator.Version=$(EMBEDDED_OPERATOR_CHART_VERSION) \

pkg/addons/adminconsole/adminconsole.go

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,11 @@ const (
2828

2929
// Overwritten by -ldflags in Makefile
3030
var (
31-
ChartURL = "https://url"
32-
ChartName = "name"
33-
Version = "v0.0.0"
34-
ImageOverride = ""
31+
ChartURL = "https://url"
32+
ChartName = "name"
33+
Version = "v0.0.0"
34+
ImageOverride = ""
35+
MigrationsImageOverride = ""
3536
)
3637

3738
var helmValues = map[string]interface{}{
@@ -50,6 +51,12 @@ func init() {
5051
"kotsadm": ImageOverride,
5152
}
5253
}
54+
if MigrationsImageOverride != "" {
55+
if helmValues["images"] == nil {
56+
helmValues["images"] = map[string]interface{}{}
57+
}
58+
helmValues["images"].(map[string]interface{})["migrations"] = MigrationsImageOverride
59+
}
5360
}
5461

5562
// AdminConsole manages the admin console helm chart installation.

0 commit comments

Comments
 (0)