Skip to content

Commit f3ffd15

Browse files
authored
allow compiling embedded-cluster with overridden operator image (#487)
1 parent 6c581e9 commit f3ffd15

File tree

2 files changed

+22
-4
lines changed

2 files changed

+22
-4
lines changed

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ EMBEDDED_OPERATOR_CHART_URL = oci://registry.replicated.com/library
1111
EMBEDDED_OPERATOR_CHART_NAME = embedded-cluster-operator
1212
EMBEDDED_OPERATOR_CHART_VERSION = 0.27.0
1313
EMBEDDED_OPERATOR_UTILS_IMAGE = busybox:1.36.1
14+
EMBEDDED_CLUSTER_OPERATOR_IMAGE_OVERRIDE =
1415
OPENEBS_CHART_URL = https://openebs.github.io/charts
1516
OPENEBS_CHART_NAME = openebs/openebs
1617
OPENEBS_CHART_VERSION = 3.10.0
@@ -38,6 +39,7 @@ LD_FLAGS = -X github.com/replicatedhq/embedded-cluster/pkg/defaults.K0sVersion=$
3839
-X github.com/replicatedhq/embedded-cluster/pkg/addons/embeddedclusteroperator.ChartName=$(EMBEDDED_OPERATOR_CHART_NAME) \
3940
-X github.com/replicatedhq/embedded-cluster/pkg/addons/embeddedclusteroperator.Version=$(EMBEDDED_OPERATOR_CHART_VERSION) \
4041
-X github.com/replicatedhq/embedded-cluster/pkg/addons/embeddedclusteroperator.UtilsImage=$(EMBEDDED_OPERATOR_UTILS_IMAGE) \
42+
-X github.com/replicatedhq/embedded-cluster/pkg/addons/embeddedclusteroperator.ImageOverride=$(EMBEDDED_CLUSTER_OPERATOR_IMAGE_OVERRIDE) \
4143
-X github.com/replicatedhq/embedded-cluster/pkg/addons/openebs.ChartURL=$(OPENEBS_CHART_URL) \
4244
-X github.com/replicatedhq/embedded-cluster/pkg/addons/openebs.ChartName=$(OPENEBS_CHART_NAME) \
4345
-X github.com/replicatedhq/embedded-cluster/pkg/addons/openebs.Version=$(OPENEBS_CHART_VERSION) \

pkg/addons/embeddedclusteroperator/embeddedclusteroperator.go

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

3636
// Overwritten by -ldflags in Makefile
3737
var (
38-
ChartURL = "https://url"
39-
ChartName = "name"
40-
Version = "v0.0.0"
41-
UtilsImage = "busybox:latest"
38+
ChartURL = "https://url"
39+
ChartName = "name"
40+
Version = "v0.0.0"
41+
UtilsImage = "busybox:latest"
42+
ImageOverride = ""
4243
)
4344

4445
var helmValues = map[string]interface{}{
@@ -48,6 +49,21 @@ var helmValues = map[string]interface{}{
4849
"utilsImage": UtilsImage,
4950
}
5051

52+
func init() {
53+
if ImageOverride != "" {
54+
// split ImageOverride into the image and tag
55+
parts := strings.Split(ImageOverride, ":")
56+
if len(parts) != 2 {
57+
panic(fmt.Sprintf("invalid image override: %s", ImageOverride))
58+
}
59+
60+
helmValues["image"] = map[string]interface{}{
61+
"repository": parts[0],
62+
"tag": parts[1],
63+
}
64+
}
65+
}
66+
5167
// EmbeddedClusterOperator manages the installation of the embedded cluster operator
5268
// helm chart.
5369
type EmbeddedClusterOperator struct {

0 commit comments

Comments
 (0)