Skip to content

Commit 5dec746

Browse files
authored
Build k0s calico-cni and calico-kube-controllers images with Chainguard (#797)
Build k0s images with Chainguard - second batch
1 parent ed4ee90 commit 5dec746

File tree

6 files changed

+89
-6
lines changed

6 files changed

+89
-6
lines changed

Makefile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ COREDNS_IMAGE = proxy.replicated.com/anonymous/replicated/ec-coredns
66
COREDNS_VERSION = 1.11.3-r3@sha256:7996a7ee8e1b7fec9a6dc216b01f0047cafbd551562bde44a2c6615ef8f3dbfc
77
CALICO_NODE_IMAGE = proxy.replicated.com/anonymous/replicated/ec-calico-node
88
CALICO_NODE_VERSION = 3.26.1-r16@sha256:f2d58c94a900bf33174d81cb270dfdf070350954fd2e4e7edeccc2dad2f855b6
9+
CALICO_CNI_IMAGE = proxy.replicated.com/anonymous/replicated/ec-calico-cni
10+
CALICO_CNI_VERSION = 3.26.1-r16@sha256:11d5bf25611ffc578e632e23e09767ca5a964f81ff311c47d2e98b686c2d0365
11+
CALICO_KUBE_CONTROLLERS_IMAGE = proxy.replicated.com/anonymous/replicated/ec-calico-kube-controllers
12+
CALICO_KUBE_CONTROLLERS_VERSION = 3.26.1-r16@sha256:50703dc3f6b17188dda3dc445f5b1f41ab4473d8f7dbed0ac39a3685ac8e916d
913
METRICS_SERVER_IMAGE = proxy.replicated.com/anonymous/replicated/ec-metrics-server
1014
METRICS_SERVER_VERSION = 0.6.4-r9@sha256:bd7d9ada28e299979174b2094d1eec7d653f793730b320dc7e90763c92452268
1115
ADMIN_CONSOLE_CHART_REPO_OVERRIDE =
@@ -48,6 +52,10 @@ LD_FLAGS = -X github.com/replicatedhq/embedded-cluster/pkg/defaults.K0sVersion=$
4852
-X github.com/replicatedhq/embedded-cluster/pkg/config/images.CoreDNSVersion=$(COREDNS_VERSION) \
4953
-X github.com/replicatedhq/embedded-cluster/pkg/config/images.CalicoNodeImage=$(CALICO_NODE_IMAGE) \
5054
-X github.com/replicatedhq/embedded-cluster/pkg/config/images.CalicoNodeVersion=$(CALICO_NODE_VERSION) \
55+
-X github.com/replicatedhq/embedded-cluster/pkg/config/images.CalicoCNIImage=$(CALICO_CNI_IMAGE) \
56+
-X github.com/replicatedhq/embedded-cluster/pkg/config/images.CalicoCNIVersion=$(CALICO_CNI_VERSION) \
57+
-X github.com/replicatedhq/embedded-cluster/pkg/config/images.CalicoKubeControllersImage=$(CALICO_KUBE_CONTROLLERS_IMAGE) \
58+
-X github.com/replicatedhq/embedded-cluster/pkg/config/images.CalicoKubeControllersVersion=$(CALICO_KUBE_CONTROLLERS_VERSION) \
5159
-X github.com/replicatedhq/embedded-cluster/pkg/config/images.MetricsServerImage=$(METRICS_SERVER_IMAGE) \
5260
-X github.com/replicatedhq/embedded-cluster/pkg/config/images.MetricsServerVersion=$(METRICS_SERVER_VERSION) \
5361
-X github.com/replicatedhq/embedded-cluster/pkg/addons/adminconsole.ChartRepoOverride=$(ADMIN_CONSOLE_CHART_REPO_OVERRIDE) \

cmd/buildtools/k0s.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,14 @@ var k0sComponents = []struct {
2525
name: "calico-node",
2626
makefileVar: "CALICO_NODE_VERSION",
2727
},
28+
{
29+
name: "calico-cni",
30+
makefileVar: "CALICO_CNI_VERSION",
31+
},
32+
{
33+
name: "calico-kube-controllers",
34+
makefileVar: "CALICO_KUBE_CONTROLLERS_VERSION",
35+
},
2836
{
2937
name: "metrics-server",
3038
makefileVar: "METRICS_SERVER_VERSION",
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# source: https://github.com/chainguard-images/images/blob/387659a22a0d41a04801e3507a2238d2f1622906/images/calico/configs/latest.cni.apko.yaml
2+
contents:
3+
repositories:
4+
- https://packages.wolfi.dev/os
5+
keyring:
6+
- https://packages.wolfi.dev/os/wolfi-signing.rsa.pub
7+
packages:
8+
- calico-cni=${PACKAGE_VERSION}
9+
- calico-cni-compat=${PACKAGE_VERSION}
10+
11+
accounts:
12+
groups:
13+
- groupname: nonroot
14+
gid: 65532
15+
users:
16+
- username: nonroot
17+
uid: 65532
18+
gid: 65532
19+
run-as: 0
20+
21+
entrypoint:
22+
command: /opt/cni/bin/install
23+
24+
environment:
25+
PATH: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/cni/bin
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# source: https://github.com/chainguard-images/images/blob/387659a22a0d41a04801e3507a2238d2f1622906/images/calico/configs/latest.kube-controllers.apko.yaml
2+
contents:
3+
repositories:
4+
- https://packages.wolfi.dev/os
5+
keyring:
6+
- https://packages.wolfi.dev/os/wolfi-signing.rsa.pub
7+
packages:
8+
- calico-kube-controllers=${PACKAGE_VERSION}
9+
10+
accounts:
11+
groups:
12+
- groupname: nonroot
13+
gid: 65532
14+
users:
15+
- username: nonroot
16+
uid: 65532
17+
gid: 65532
18+
run-as: 65532
19+
20+
paths:
21+
- path: /status
22+
type: directory
23+
permissions: 0o777
24+
25+
entrypoint:
26+
command: /usr/bin/calico-kube-controllers

pkg/config/images.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,18 @@ func OverrideK0sImages(cfg *k0sv1beta1.ClusterConfig) error {
2121
if images.CalicoNodeVersion != "" {
2222
cfg.Spec.Images.Calico.Node.Version = images.CalicoNodeVersion
2323
}
24+
if images.CalicoCNIImage != "" {
25+
cfg.Spec.Images.Calico.CNI.Image = images.CalicoCNIImage
26+
}
27+
if images.CalicoCNIVersion != "" {
28+
cfg.Spec.Images.Calico.CNI.Version = images.CalicoCNIVersion
29+
}
30+
if images.CalicoKubeControllersImage != "" {
31+
cfg.Spec.Images.Calico.KubeControllers.Image = images.CalicoKubeControllersImage
32+
}
33+
if images.CalicoKubeControllersVersion != "" {
34+
cfg.Spec.Images.Calico.KubeControllers.Version = images.CalicoKubeControllersVersion
35+
}
2436
if images.MetricsServerImage != "" {
2537
cfg.Spec.Images.MetricsServer.Image = images.MetricsServerImage
2638
}

pkg/config/images/images.go

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

33
// Overwritten by -ldflags in Makefile
44
var (
5-
CoreDNSImage = ""
6-
CoreDNSVersion = ""
7-
CalicoNodeImage = ""
8-
CalicoNodeVersion = ""
9-
MetricsServerImage = ""
10-
MetricsServerVersion = ""
5+
CoreDNSImage = ""
6+
CoreDNSVersion = ""
7+
CalicoNodeImage = ""
8+
CalicoNodeVersion = ""
9+
CalicoCNIImage = ""
10+
CalicoCNIVersion = ""
11+
CalicoKubeControllersImage = ""
12+
CalicoKubeControllersVersion = ""
13+
MetricsServerImage = ""
14+
MetricsServerVersion = ""
1115
)

0 commit comments

Comments
 (0)