Skip to content

Commit 9839619

Browse files
committed
f
1 parent ac4d179 commit 9839619

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ VERSION ?= $(shell git describe --tags --dirty)
22
UNAME := $(shell uname)
33
ARCH := $(shell uname -m)
44
APP_NAME = embedded-cluster
5+
COREDNS_IMAGE = proxy.replicated.com/anonymous/ttl.sh/ec/coredns
6+
COREDNS_VERSION = 1.11.3
57
CALICO_NODE_IMAGE = proxy.replicated.com/anonymous/ttl.sh/ec/calico-node
68
CALICO_NODE_VERSION = 3.28.0-r7
79
ADMIN_CONSOLE_CHART_REPO_OVERRIDE =
@@ -37,6 +39,8 @@ LD_FLAGS = -X github.com/replicatedhq/embedded-cluster/pkg/defaults.K0sVersion=$
3739
-X github.com/replicatedhq/embedded-cluster/pkg/defaults.TroubleshootVersion=$(TROUBLESHOOT_VERSION) \
3840
-X github.com/replicatedhq/embedded-cluster/pkg/defaults.KubectlVersion=$(KUBECTL_VERSION) \
3941
-X github.com/replicatedhq/embedded-cluster/pkg/defaults.LocalArtifactMirrorImage=$(LOCAL_ARTIFACT_MIRROR_IMAGE_LOCATION) \
42+
-X github.com/replicatedhq/embedded-cluster/pkg/config/images.CoreDNSImage=$(COREDNS_IMAGE) \
43+
-X github.com/replicatedhq/embedded-cluster/pkg/config/images.CoreDNSVersion=$(COREDNS_VERSION) \
4044
-X github.com/replicatedhq/embedded-cluster/pkg/config/images.CalicoNodeImage=$(CALICO_NODE_IMAGE) \
4145
-X github.com/replicatedhq/embedded-cluster/pkg/config/images.CalicoNodeVersion=$(CALICO_NODE_VERSION) \
4246
-X github.com/replicatedhq/embedded-cluster/pkg/addons/adminconsole.ChartRepoOverride=$(ADMIN_CONSOLE_CHART_REPO_OVERRIDE) \

pkg/config/images.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ func OverrideK0sImages(cfg *k0sv1beta1.ClusterConfig) error {
99
if cfg.Spec.Images == nil {
1010
cfg.Spec.Images = &k0sv1beta1.ClusterImages{}
1111
}
12+
if images.CoreDNSImage != "" {
13+
cfg.Spec.Images.CoreDNS.Image = images.CoreDNSImage
14+
}
15+
if images.CoreDNSVersion != "" {
16+
cfg.Spec.Images.CoreDNS.Version = images.CoreDNSVersion
17+
}
1218
if images.CalicoNodeImage != "" {
1319
cfg.Spec.Images.Calico.Node.Image = images.CalicoNodeImage
1420
}

pkg/config/images/images.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ package images
22

33
// Overwritten by -ldflags in Makefile
44
var (
5+
CoreDNSImage = ""
6+
CoreDNSVersion = ""
57
CalicoNodeImage = ""
68
CalicoNodeVersion = ""
79
)

0 commit comments

Comments
 (0)