From 636c039a2eb6b17f5800efe89dfefa4e24dd478e Mon Sep 17 00:00:00 2001 From: Medhakulam <30567613+Medhakulam@users.noreply.github.com> Date: Tue, 3 Sep 2024 19:39:31 +0530 Subject: [PATCH 01/10] PE-4944 add rc-44c k8s versions (#267) --- Earthfile | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Earthfile b/Earthfile index 131381d..1197776 100644 --- a/Earthfile +++ b/Earthfile @@ -161,9 +161,12 @@ build-provider-images: BUILD +$TARGET --K8S_VERSION=1.28.9 BUILD +$TARGET --K8S_VERSION=1.28.11 BUILD +$TARGET --K8S_VERSION=1.28.12 + BUILD +$TARGET --K8S_VERSION=1.28.13 BUILD +$TARGET --K8S_VERSION=1.29.0 BUILD +$TARGET --K8S_VERSION=1.29.6 BUILD +$TARGET --K8S_VERSION=1.29.7 + BUILD +$TARGET --K8S_VERSION=1.29.8 + BUILD +$TARGET --K8S_VERSION=1.30.4 ELSE IF [ "$K8S_DISTRIBUTION" = "rke2" ] BUILD +$TARGET --K8S_VERSION=1.24.6 BUILD +$TARGET --K8S_VERSION=1.25.2 @@ -189,10 +192,13 @@ build-provider-images: BUILD +$TARGET --K8S_VERSION=1.28.9 BUILD +$TARGET --K8S_VERSION=1.28.10 BUILD +$TARGET --K8S_VERSION=1.28.11 + BUILD +$TARGET --K8S_VERSION=1.28.12 BUILD +$TARGET --K8S_VERSION=1.29.3 BUILD +$TARGET --K8S_VERSION=1.29.4 BUILD +$TARGET --K8S_VERSION=1.29.5 BUILD +$TARGET --K8S_VERSION=1.29.6 + BUILD +$TARGET --K8S_VERSION=1.29.7 + BUILD +$TARGET --K8S_VERSION=1.30.3 ELSE IF [ "$K8S_DISTRIBUTION" = "k3s" ] BUILD +$TARGET --K8S_VERSION=1.24.6 BUILD +$TARGET --K8S_VERSION=1.25.2 @@ -210,8 +216,11 @@ build-provider-images: BUILD +$TARGET --K8S_VERSION=1.28.2 BUILD +$TARGET --K8S_VERSION=1.28.7 BUILD +$TARGET --K8S_VERSION=1.28.11 + BUILD +$TARGET --K8S_VERSION=1.28.13 BUILD +$TARGET --K8S_VERSION=1.29.2 BUILD +$TARGET --K8S_VERSION=1.29.6 + BUILD +$TARGET --K8S_VERSION=1.29.8 + BUILD +$TARGET --K8S_VERSION=1.30.4 END ELSE BUILD +$TARGET --K8S_VERSION="$K8S_VERSION" @@ -234,10 +243,13 @@ build-provider-images-fips: BUILD +provider-image --K8S_VERSION=1.28.10 BUILD +provider-image --K8S_VERSION=1.28.11 BUILD +provider-image --K8S_VERSION=1.28.12 + BUILD +provider-image --K8S_VERSION=1.28.13 BUILD +provider-image --K8S_VERSION=1.29.0 BUILD +provider-image --K8S_VERSION=1.29.5 BUILD +provider-image --K8S_VERSION=1.29.6 BUILD +provider-image --K8S_VERSION=1.29.7 + BUILD +provider-image --K8S_VERSION=1.29.8 + BUILD +provider-image --K8S_VERSION=1.30.4 ELSE IF [ "$K8S_DISTRIBUTION" = "rke2" ] BUILD +provider-image --K8S_VERSION=1.24.6 BUILD +provider-image --K8S_VERSION=1.25.0 @@ -254,10 +266,13 @@ build-provider-images-fips: BUILD +provider-image --K8S_VERSION=1.28.7 BUILD +provider-image --K8S_VERSION=1.28.10 BUILD +provider-image --K8S_VERSION=1.28.11 + BUILD +provider-image --K8S_VERSION=1.28.12 BUILD +provider-image --K8S_VERSION=1.29.0 BUILD +provider-image --K8S_VERSION=1.29.3 BUILD +provider-image --K8S_VERSION=1.29.5 BUILD +provider-image --K8S_VERSION=1.29.6 + BUILD +provider-image --K8S_VERSION=1.29.7 + BUILD +provider-image --K8S_VERSION=1.30.4 ELSE BUILD +provider-image --K8S_VERSION=1.24.6 BUILD +provider-image --K8S_VERSION=1.25.2 @@ -274,6 +289,9 @@ build-provider-images-fips: BUILD +provider-image --K8S_VERSION=1.29.0 BUILD +provider-image --K8S_VERSION=1.29.2 BUILD +provider-image --K8S_VERSION=1.29.6 + BUILD +provider-image --K8S_VERSION=1.28.13 + BUILD +provider-image --K8S_VERSION=1.29.8 + BUILD +provider-image --K8S_VERSION=1.30.4 END ELSE BUILD +provider-image --K8S_VERSION="$K8S_VERSION" From 30e1bb7ddc7d4f3f86c84262fec2d1c449631b4b Mon Sep 17 00:00:00 2001 From: Nianyu Shen Date: Tue, 3 Sep 2024 11:10:03 -0700 Subject: [PATCH 02/10] PE-4942 define k8s version json (#266) * define k8s version json Signed-off-by: Nianyu Shen * add K8S_DISTRIBUTION check Signed-off-by: Nianyu Shen * fix merge Signed-off-by: Nianyu Shen --------- Signed-off-by: Nianyu Shen --- Earthfile | 188 ++++++++--------------------------------------- k8s_version.json | 106 ++++++++++++++++++++++++++ 2 files changed, 137 insertions(+), 157 deletions(-) create mode 100644 k8s_version.json diff --git a/Earthfile b/Earthfile index 1197776..0703804 100644 --- a/Earthfile +++ b/Earthfile @@ -4,12 +4,13 @@ ARG TARGETARCH # Default image repositories used in the builds. ARG SPECTRO_PUB_REPO=gcr.io/spectro-images-public -ARG ALPINE_IMG=$SPECTRO_PUB_REPO/alpine:3.20.2 ARG SPECTRO_LUET_REPO=gcr.io/spectro-dev-public ARG KAIROS_BASE_IMAGE_URL=gcr.io/spectro-images-public ARG ETCD_REPO=https://github.com/etcd-io ARG LUET_PROJECT=luet-repo -FROM $SPECTRO_PUB_REPO/canvos/alpine-cert:v1.0.0 +ARG ALPINE_TAG=3.20 +ARG ALPINE_IMG=$SPECTRO_PUB_REPO/canvos/alpine:$ALPINE_TAG +FROM $ALPINE_IMG # Spectro Cloud and Kairos tags. ARG PE_VERSION=v4.4.8 @@ -118,6 +119,16 @@ END ARG IMAGE_PATH=$IMAGE_REGISTRY/$IMAGE_REPO:$K8S_DISTRIBUTION-$K8S_VERSION-$IMAGE_TAG ARG CMDLINE="stylus.registration" +alpine-all: + BUILD --platform=linux/amd64 --platform=linux/arm64 +alpine + +alpine: + FROM alpine:$ALPINE_TAG + RUN apk add --no-cache bash curl jq ca-certificates upx + RUN update-ca-certificates + + SAVE IMAGE --push gcr.io/spectro-dev-public/canvos/alpine:$ALPINE_TAG + build-all-images: IF $FIPS_ENABLED BUILD +build-provider-images-fips @@ -133,170 +144,33 @@ build-all-images: END build-provider-images: + FROM $ALPINE_IMG + + IF [ !-n "$K8S_DISTRIBUTION"] + RUN echo "K8S_DISTRIBUTION is not set. Please set K8S_DISTRIBUTION to kubeadm, kubeadm-fips, k3s, or rke2." && exit 1 + END + IF [ "$IS_UKI" = "true" ] ARG TARGET=uki-provider-image ELSE ARG TARGET=provider-image END - IF [ "$K8S_VERSION" = "" ] - IF [ "$K8S_DISTRIBUTION" = "kubeadm" ] - BUILD +$TARGET --K8S_VERSION=1.24.6 - BUILD +$TARGET --K8S_VERSION=1.25.2 - BUILD +$TARGET --K8S_VERSION=1.25.13 - BUILD +$TARGET --K8S_VERSION=1.25.15 - BUILD +$TARGET --K8S_VERSION=1.26.4 - BUILD +$TARGET --K8S_VERSION=1.26.8 - BUILD +$TARGET --K8S_VERSION=1.26.10 - BUILD +$TARGET --K8S_VERSION=1.26.12 - BUILD +$TARGET --K8S_VERSION=1.26.15 - BUILD +$TARGET --K8S_VERSION=1.27.2 - BUILD +$TARGET --K8S_VERSION=1.27.5 - BUILD +$TARGET --K8S_VERSION=1.27.7 - BUILD +$TARGET --K8S_VERSION=1.27.9 - BUILD +$TARGET --K8S_VERSION=1.27.11 - BUILD +$TARGET --K8S_VERSION=1.27.15 - BUILD +$TARGET --K8S_VERSION=1.27.16 - BUILD +$TARGET --K8S_VERSION=1.28.2 - BUILD +$TARGET --K8S_VERSION=1.28.5 - BUILD +$TARGET --K8S_VERSION=1.28.9 - BUILD +$TARGET --K8S_VERSION=1.28.11 - BUILD +$TARGET --K8S_VERSION=1.28.12 - BUILD +$TARGET --K8S_VERSION=1.28.13 - BUILD +$TARGET --K8S_VERSION=1.29.0 - BUILD +$TARGET --K8S_VERSION=1.29.6 - BUILD +$TARGET --K8S_VERSION=1.29.7 - BUILD +$TARGET --K8S_VERSION=1.29.8 - BUILD +$TARGET --K8S_VERSION=1.30.4 - ELSE IF [ "$K8S_DISTRIBUTION" = "rke2" ] - BUILD +$TARGET --K8S_VERSION=1.24.6 - BUILD +$TARGET --K8S_VERSION=1.25.2 - BUILD +$TARGET --K8S_VERSION=1.25.13 - BUILD +$TARGET --K8S_VERSION=1.25.15 - BUILD +$TARGET --K8S_VERSION=1.26.4 - BUILD +$TARGET --K8S_VERSION=1.26.8 - BUILD +$TARGET --K8S_VERSION=1.26.10 - BUILD +$TARGET --K8S_VERSION=1.26.12 - BUILD +$TARGET --K8S_VERSION=1.26.14 - BUILD +$TARGET --K8S_VERSION=1.26.15 - BUILD +$TARGET --K8S_VERSION=1.27.2 - BUILD +$TARGET --K8S_VERSION=1.27.5 - BUILD +$TARGET --K8S_VERSION=1.27.7 - BUILD +$TARGET --K8S_VERSION=1.27.9 - BUILD +$TARGET --K8S_VERSION=1.27.11 - BUILD +$TARGET --K8S_VERSION=1.27.13 - BUILD +$TARGET --K8S_VERSION=1.27.14 - BUILD +$TARGET --K8S_VERSION=1.27.15 - BUILD +$TARGET --K8S_VERSION=1.28.2 - BUILD +$TARGET --K8S_VERSION=1.28.5 - BUILD +$TARGET --K8S_VERSION=1.28.7 - BUILD +$TARGET --K8S_VERSION=1.28.9 - BUILD +$TARGET --K8S_VERSION=1.28.10 - BUILD +$TARGET --K8S_VERSION=1.28.11 - BUILD +$TARGET --K8S_VERSION=1.28.12 - BUILD +$TARGET --K8S_VERSION=1.29.3 - BUILD +$TARGET --K8S_VERSION=1.29.4 - BUILD +$TARGET --K8S_VERSION=1.29.5 - BUILD +$TARGET --K8S_VERSION=1.29.6 - BUILD +$TARGET --K8S_VERSION=1.29.7 - BUILD +$TARGET --K8S_VERSION=1.30.3 - ELSE IF [ "$K8S_DISTRIBUTION" = "k3s" ] - BUILD +$TARGET --K8S_VERSION=1.24.6 - BUILD +$TARGET --K8S_VERSION=1.25.2 - BUILD +$TARGET --K8S_VERSION=1.25.13 - BUILD +$TARGET --K8S_VERSION=1.25.15 - BUILD +$TARGET --K8S_VERSION=1.26.4 - BUILD +$TARGET --K8S_VERSION=1.26.8 - BUILD +$TARGET --K8S_VERSION=1.26.10 - BUILD +$TARGET --K8S_VERSION=1.26.14 - BUILD +$TARGET --K8S_VERSION=1.27.2 - BUILD +$TARGET --K8S_VERSION=1.27.5 - BUILD +$TARGET --K8S_VERSION=1.27.7 - BUILD +$TARGET --K8S_VERSION=1.27.11 - BUILD +$TARGET --K8S_VERSION=1.27.15 - BUILD +$TARGET --K8S_VERSION=1.28.2 - BUILD +$TARGET --K8S_VERSION=1.28.7 - BUILD +$TARGET --K8S_VERSION=1.28.11 - BUILD +$TARGET --K8S_VERSION=1.28.13 - BUILD +$TARGET --K8S_VERSION=1.29.2 - BUILD +$TARGET --K8S_VERSION=1.29.6 - BUILD +$TARGET --K8S_VERSION=1.29.8 - BUILD +$TARGET --K8S_VERSION=1.30.4 - END - ELSE - BUILD +$TARGET --K8S_VERSION="$K8S_VERSION" - END -build-provider-images-fips: IF [ "$K8S_VERSION" = "" ] - IF [ "$K8S_DISTRIBUTION" = "kubeadm-fips" ] - BUILD +provider-image --K8S_VERSION=1.24.13 - BUILD +provider-image --K8S_VERSION=1.25.9 - BUILD +provider-image --K8S_VERSION=1.26.4 - BUILD +provider-image --K8S_VERSION=1.26.12 - BUILD +provider-image --K8S_VERSION=1.26.15 - BUILD +provider-image --K8S_VERSION=1.27.2 - BUILD +provider-image --K8S_VERSION=1.27.9 - BUILD +provider-image --K8S_VERSION=1.27.14 - BUILD +provider-image --K8S_VERSION=1.27.15 - BUILD +provider-image --K8S_VERSION=1.27.16 - BUILD +provider-image --K8S_VERSION=1.28.5 - BUILD +provider-image --K8S_VERSION=1.28.10 - BUILD +provider-image --K8S_VERSION=1.28.11 - BUILD +provider-image --K8S_VERSION=1.28.12 - BUILD +provider-image --K8S_VERSION=1.28.13 - BUILD +provider-image --K8S_VERSION=1.29.0 - BUILD +provider-image --K8S_VERSION=1.29.5 - BUILD +provider-image --K8S_VERSION=1.29.6 - BUILD +provider-image --K8S_VERSION=1.29.7 - BUILD +provider-image --K8S_VERSION=1.29.8 - BUILD +provider-image --K8S_VERSION=1.30.4 - ELSE IF [ "$K8S_DISTRIBUTION" = "rke2" ] - BUILD +provider-image --K8S_VERSION=1.24.6 - BUILD +provider-image --K8S_VERSION=1.25.0 - BUILD +provider-image --K8S_VERSION=1.25.2 - BUILD +provider-image --K8S_VERSION=1.26.4 - BUILD +provider-image --K8S_VERSION=1.26.12 - BUILD +provider-image --K8S_VERSION=1.26.14 - BUILD +provider-image --K8S_VERSION=1.27.2 - BUILD +provider-image --K8S_VERSION=1.27.9 - BUILD +provider-image --K8S_VERSION=1.27.11 - BUILD +provider-image --K8S_VERSION=1.27.14 - BUILD +provider-image --K8S_VERSION=1.27.15 - BUILD +provider-image --K8S_VERSION=1.28.5 - BUILD +provider-image --K8S_VERSION=1.28.7 - BUILD +provider-image --K8S_VERSION=1.28.10 - BUILD +provider-image --K8S_VERSION=1.28.11 - BUILD +provider-image --K8S_VERSION=1.28.12 - BUILD +provider-image --K8S_VERSION=1.29.0 - BUILD +provider-image --K8S_VERSION=1.29.3 - BUILD +provider-image --K8S_VERSION=1.29.5 - BUILD +provider-image --K8S_VERSION=1.29.6 - BUILD +provider-image --K8S_VERSION=1.29.7 - BUILD +provider-image --K8S_VERSION=1.30.4 - ELSE - BUILD +provider-image --K8S_VERSION=1.24.6 - BUILD +provider-image --K8S_VERSION=1.25.2 - BUILD +provider-image --K8S_VERSION=1.26.4 - BUILD +provider-image --K8S_VERSION=1.26.12 - BUILD +provider-image --K8S_VERSION=1.26.14 - BUILD +provider-image --K8S_VERSION=1.27.2 - BUILD +provider-image --K8S_VERSION=1.27.9 - BUILD +provider-image --K8S_VERSION=1.27.11 - BUILD +provider-image --K8S_VERSION=1.27.15 - BUILD +provider-image --K8S_VERSION=1.28.5 - BUILD +provider-image --K8S_VERSION=1.28.7 - BUILD +provider-image --K8S_VERSION=1.28.11 - BUILD +provider-image --K8S_VERSION=1.29.0 - BUILD +provider-image --K8S_VERSION=1.29.2 - BUILD +provider-image --K8S_VERSION=1.29.6 - BUILD +provider-image --K8S_VERSION=1.28.13 - BUILD +provider-image --K8S_VERSION=1.29.8 - BUILD +provider-image --K8S_VERSION=1.30.4 + WORKDIR /workdir + COPY k8s_version.json k8s_version.json + ENV K8S_DISTRIBUTION=$K8S_DISTRIBUTION + RUN jq -r ".$K8S_DISTRIBUTION[]" k8s_version.json > k8s_version.txt + FOR version IN $(cat k8s_version.txt) + BUILD +$TARGET --K8S_VERSION=$version END ELSE - BUILD +provider-image --K8S_VERSION="$K8S_VERSION" + BUILD +$TARGET --K8S_VERSION=$K8S_VERSION END +build-provider-images-fips: + BUILD +build-provider-images + BASE_ALPINE: COMMAND IF [ ! -z $PROXY_CERT_PATH ] @@ -534,6 +408,7 @@ uki-genkey: END download-sbctl: + FROM $ALPINE_IMG DO +BASE_ALPINE RUN curl -Ls https://github.com/Foxboron/sbctl/releases/download/0.13/sbctl-0.13-linux-amd64.tar.gz | tar -xvzf - && mv sbctl/sbctl /usr/bin/sbctl SAVE ARTIFACT /usr/bin/sbctl @@ -1008,9 +883,8 @@ download-third-party: SAVE ARTIFACT /binaries/${binary}/latest/$BIN_TYPE/$TARGETARCH/${binary}.version ${binary}.version third-party: - DO +BASE_ALPINE + FROM $ALPINE_IMG ARG binary - RUN apk add upx WORKDIR /WORKDIR COPY (+download-third-party/${binary} --binary=${binary}) /WORKDIR/${binary} diff --git a/k8s_version.json b/k8s_version.json new file mode 100644 index 0000000..9893ea3 --- /dev/null +++ b/k8s_version.json @@ -0,0 +1,106 @@ +{ + "k3s": [ + "1.24.6", + "1.25.2", + "1.26.4", + "1.26.12", + "1.26.14", + "1.27.2", + "1.27.9", + "1.27.11", + "1.27.15", + "1.28.5", + "1.28.7", + "1.28.11", + "1.28.13", + "1.29.0", + "1.29.2", + "1.29.6", + "1.29.8", + "1.30.4" + ], + "kubeadm": [ + "1.24.6", + "1.25.2", + "1.25.13", + "1.25.15", + "1.26.4", + "1.26.8", + "1.26.10", + "1.26.12", + "1.26.15", + "1.27.2", + "1.27.5", + "1.27.7", + "1.27.9", + "1.27.11", + "1.27.15", + "1.27.16", + "1.28.2", + "1.28.5", + "1.28.9", + "1.28.11", + "1.28.12", + "1.28.13", + "1.29.0", + "1.29.6", + "1.29.7", + "1.29.8", + "1.30.4" + ], + "rke2": [ + "1.24.6", + "1.25.2", + "1.25.13", + "1.26.4", + "1.26.8", + "1.26.10", + "1.26.12", + "1.26.14", + "1.26.15", + "1.27.2", + "1.27.5", + "1.27.7", + "1.27.9", + "1.27.11", + "1.27.13", + "1.27.14", + "1.27.15", + "1.28.2", + "1.28.5", + "1.28.7", + "1.28.9", + "1.28.10", + "1.28.11", + "1.28.12", + "1.29.3", + "1.29.4", + "1.29.5", + "1.29.6", + "1.29.7", + "1.30.3" + ], + "kubeadm-fips": [ + "1.24.13", + "1.25.9", + "1.26.4", + "1.26.12", + "1.26.15", + "1.27.2", + "1.27.9", + "1.27.14", + "1.27.15", + "1.27.16", + "1.28.5", + "1.28.10", + "1.28.11", + "1.28.12", + "1.28.13", + "1.29.0", + "1.29.5", + "1.29.6", + "1.29.7", + "1.29.8", + "1.30.4" + ] +} From 81a3b8d3581fa4337f019201ca3952651c87dc78 Mon Sep 17 00:00:00 2001 From: Santhosh Date: Wed, 4 Sep 2024 16:33:57 +0530 Subject: [PATCH 03/10] Update luet-repo version (#268) --- Earthfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Earthfile b/Earthfile index 0703804..a815d0b 100644 --- a/Earthfile +++ b/Earthfile @@ -14,7 +14,7 @@ FROM $ALPINE_IMG # Spectro Cloud and Kairos tags. ARG PE_VERSION=v4.4.8 -ARG SPECTRO_LUET_VERSION=v1.3.5-alpha1 +ARG SPECTRO_LUET_VERSION=v1.3.5-alpha2 ARG KAIROS_VERSION=v3.0.14 ARG K3S_FLAVOR_TAG=k3s1 ARG RKE2_FLAVOR_TAG=rke2r1 From 42617694413315a3050ef2c8af0ed4ad844d5a27 Mon Sep 17 00:00:00 2001 From: Santhosh Date: Thu, 5 Sep 2024 14:26:50 +0530 Subject: [PATCH 04/10] Update luet version (#269) --- Earthfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Earthfile b/Earthfile index a815d0b..5967f7a 100644 --- a/Earthfile +++ b/Earthfile @@ -14,7 +14,7 @@ FROM $ALPINE_IMG # Spectro Cloud and Kairos tags. ARG PE_VERSION=v4.4.8 -ARG SPECTRO_LUET_VERSION=v1.3.5-alpha2 +ARG SPECTRO_LUET_VERSION=v1.3.5 ARG KAIROS_VERSION=v3.0.14 ARG K3S_FLAVOR_TAG=k3s1 ARG RKE2_FLAVOR_TAG=rke2r1 From 5fff96c1208f3aac055b8bcb073111f4071a9728 Mon Sep 17 00:00:00 2001 From: Nianyu Shen Date: Thu, 5 Sep 2024 12:25:52 -0700 Subject: [PATCH 05/10] fix kubeadm-fips (#270) Signed-off-by: Nianyu Shen --- Earthfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Earthfile b/Earthfile index 5967f7a..ba3dd78 100644 --- a/Earthfile +++ b/Earthfile @@ -160,7 +160,7 @@ build-provider-images: WORKDIR /workdir COPY k8s_version.json k8s_version.json ENV K8S_DISTRIBUTION=$K8S_DISTRIBUTION - RUN jq -r ".$K8S_DISTRIBUTION[]" k8s_version.json > k8s_version.txt + RUN jq -r --arg key "$K8S_DISTRIBUTION" 'if .[$key] then .[$key][] else empty end' k8s_version.json > k8s_version.txt FOR version IN $(cat k8s_version.txt) BUILD +$TARGET --K8S_VERSION=$version END From 23b80331a92aeb8461a299412ec6443fca4e2f86 Mon Sep 17 00:00:00 2001 From: Nianyu Shen Date: Thu, 5 Sep 2024 14:46:41 -0700 Subject: [PATCH 06/10] add os version json (#271) Signed-off-by: Nianyu Shen --- os_version.json | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 os_version.json diff --git a/os_version.json b/os_version.json new file mode 100644 index 0000000..ffd3abf --- /dev/null +++ b/os_version.json @@ -0,0 +1,4 @@ +{ + "ubuntu": ["22.04", "20.04"], + "opensuse-leap": ["15.5"] +} From 4f39ce5facc1d3e43e15cd0a001d6a9dcf700448 Mon Sep 17 00:00:00 2001 From: Nianyu Shen Date: Thu, 5 Sep 2024 22:58:43 -0700 Subject: [PATCH 07/10] use ubuntu image instead of ubuntu-systemd (#272) --- Earthfile | 14 +++++++------- earthly.sh | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Earthfile b/Earthfile index ba3dd78..fed7d50 100644 --- a/Earthfile +++ b/Earthfile @@ -189,7 +189,7 @@ uki-iso: SAVE ARTIFACT /build/* AS LOCAL ./build/ uki-provider-image: - FROM --platform=linux/${ARCH} +ubuntu-systemd + FROM --platform=linux/${ARCH} +ubuntu RUN apt-get update && apt-get install -y rsync WORKDIR / @@ -414,7 +414,7 @@ download-sbctl: SAVE ARTIFACT /usr/bin/sbctl uki-byok: - FROM +ubuntu-systemd + FROM +ubuntu RUN apt-get update && apt-get install -y efitools curl COPY +download-sbctl/sbctl /usr/bin/sbctl @@ -826,7 +826,7 @@ build-efi-size-check: SAVE ARTIFACT target/x86_64-unknown-uefi/debug/efi-size-check.efi iso-efi-size-check: - FROM +ubuntu-systemd + FROM +ubuntu RUN apt-get update RUN apt-get install -y mtools xorriso @@ -848,13 +848,13 @@ iso-efi-size-check: SAVE ARTIFACT efi-size-check.iso AS LOCAL ./build/ -ubuntu-systemd: +ubuntu: IF [ "$FIPS_ENABLED" = "true" ] - ARG SYSTEMD_IMAGE=$SPECTRO_PUB_REPO/third-party/ubuntu-systemd-fips:20.04 + ARG UBUNTU_IMAGE=$SPECTRO_PUB_REPO/third-party/ubuntu-fips:22.04 ELSE - ARG SYSTEMD_IMAGE=$SPECTRO_PUB_REPO/third-party/ubuntu-systemd:22.04 + ARG UBUNTU_IMAGE=$SPECTRO_PUB_REPO/third-party/ubuntu:22.04 END - FROM $SYSTEMD_IMAGE + FROM $UBUNTU_IMAGE OS_RELEASE: COMMAND diff --git a/earthly.sh b/earthly.sh index ea0c323..a9ff8a2 100755 --- a/earthly.sh +++ b/earthly.sh @@ -61,7 +61,7 @@ PE_VERSION=$(git describe --abbrev=0 --tags) SPECTRO_PUB_REPO=gcr.io/spectro-images-public EARTHLY_VERSION=v0.8.5 source .arg -ALPINE_IMG=$SPECTRO_PUB_REPO/alpine:3.20.2 +ALPINE_IMG=$SPECTRO_PUB_REPO/canvos/alpine:3.20 ### Verify Depencies # Check if Docker is installed if command -v docker >/dev/null 2>&1; then From 16832b75746e5f929e85b697062a42c51e14d0bc Mon Sep 17 00:00:00 2001 From: Santhosh Date: Sat, 7 Sep 2024 00:57:38 +0530 Subject: [PATCH 08/10] Update luet repo version (#273) --- Earthfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Earthfile b/Earthfile index fed7d50..c5ff469 100644 --- a/Earthfile +++ b/Earthfile @@ -14,7 +14,7 @@ FROM $ALPINE_IMG # Spectro Cloud and Kairos tags. ARG PE_VERSION=v4.4.8 -ARG SPECTRO_LUET_VERSION=v1.3.5 +ARG SPECTRO_LUET_VERSION=v1.3.6 ARG KAIROS_VERSION=v3.0.14 ARG K3S_FLAVOR_TAG=k3s1 ARG RKE2_FLAVOR_TAG=rke2r1 From 92f348ba6d21ef0025677d299dc0d1798d708e85 Mon Sep 17 00:00:00 2001 From: Santhosh Date: Wed, 11 Sep 2024 22:58:32 +0530 Subject: [PATCH 09/10] Update luet-repo version (#274) --- Earthfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Earthfile b/Earthfile index c5ff469..36465bf 100644 --- a/Earthfile +++ b/Earthfile @@ -14,7 +14,7 @@ FROM $ALPINE_IMG # Spectro Cloud and Kairos tags. ARG PE_VERSION=v4.4.8 -ARG SPECTRO_LUET_VERSION=v1.3.6 +ARG SPECTRO_LUET_VERSION=v1.3.7 ARG KAIROS_VERSION=v3.0.14 ARG K3S_FLAVOR_TAG=k3s1 ARG RKE2_FLAVOR_TAG=rke2r1 From 9ed2b036aabf8e55cdd5299eb23ed9d2a2cceb89 Mon Sep 17 00:00:00 2001 From: Santhosh Date: Fri, 13 Sep 2024 11:50:35 +0530 Subject: [PATCH 10/10] Update Earthfile - PE_VERSION to 4.4.12 (#275) --- Earthfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Earthfile b/Earthfile index 36465bf..675f633 100644 --- a/Earthfile +++ b/Earthfile @@ -13,7 +13,7 @@ ARG ALPINE_IMG=$SPECTRO_PUB_REPO/canvos/alpine:$ALPINE_TAG FROM $ALPINE_IMG # Spectro Cloud and Kairos tags. -ARG PE_VERSION=v4.4.8 +ARG PE_VERSION=v4.4.12 ARG SPECTRO_LUET_VERSION=v1.3.7 ARG KAIROS_VERSION=v3.0.14 ARG K3S_FLAVOR_TAG=k3s1