File tree Expand file tree Collapse file tree 3 files changed +12
-0
lines changed Expand file tree Collapse file tree 3 files changed +12
-0
lines changed Original file line number Diff line number Diff line change @@ -2,6 +2,8 @@ VERSION ?= $(shell git describe --tags --dirty)
2
2
UNAME := $(shell uname)
3
3
ARCH := $(shell uname -m)
4
4
APP_NAME = embedded-cluster
5
+ COREDNS_IMAGE = proxy.replicated.com/anonymous/ttl.sh/ec/coredns
6
+ COREDNS_VERSION = 1.11.3
5
7
CALICO_NODE_IMAGE = proxy.replicated.com/anonymous/ttl.sh/ec/calico-node
6
8
CALICO_NODE_VERSION = 3.28.0-r7
7
9
ADMIN_CONSOLE_CHART_REPO_OVERRIDE =
@@ -37,6 +39,8 @@ LD_FLAGS = -X github.com/replicatedhq/embedded-cluster/pkg/defaults.K0sVersion=$
37
39
-X github.com/replicatedhq/embedded-cluster/pkg/defaults.TroubleshootVersion=$(TROUBLESHOOT_VERSION ) \
38
40
-X github.com/replicatedhq/embedded-cluster/pkg/defaults.KubectlVersion=$(KUBECTL_VERSION ) \
39
41
-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 ) \
40
44
-X github.com/replicatedhq/embedded-cluster/pkg/config/images.CalicoNodeImage=$(CALICO_NODE_IMAGE ) \
41
45
-X github.com/replicatedhq/embedded-cluster/pkg/config/images.CalicoNodeVersion=$(CALICO_NODE_VERSION ) \
42
46
-X github.com/replicatedhq/embedded-cluster/pkg/addons/adminconsole.ChartRepoOverride=$(ADMIN_CONSOLE_CHART_REPO_OVERRIDE ) \
Original file line number Diff line number Diff line change @@ -9,6 +9,12 @@ func OverrideK0sImages(cfg *k0sv1beta1.ClusterConfig) error {
9
9
if cfg .Spec .Images == nil {
10
10
cfg .Spec .Images = & k0sv1beta1.ClusterImages {}
11
11
}
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
+ }
12
18
if images .CalicoNodeImage != "" {
13
19
cfg .Spec .Images .Calico .Node .Image = images .CalicoNodeImage
14
20
}
Original file line number Diff line number Diff line change @@ -2,6 +2,8 @@ package images
2
2
3
3
// Overwritten by -ldflags in Makefile
4
4
var (
5
+ CoreDNSImage = ""
6
+ CoreDNSVersion = ""
5
7
CalicoNodeImage = ""
6
8
CalicoNodeVersion = ""
7
9
)
You can’t perform that action at this time.
0 commit comments