Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kairos bump 2.4.1 #89

Merged
merged 1 commit into from
Oct 27, 2023
Merged

kairos bump 2.4.1 #89

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 18 additions & 22 deletions Earthfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ARG CUSTOM_TAG
ARG ARCH
ARG PE_VERSION=v4.1.2
ARG SPECTRO_LUET_VERSION=v1.1.9
ARG KAIROS_VERSION=v2.3.2
ARG KAIROS_VERSION=v2.4.1
ARG K3S_FLAVOR_TAG=k3s1
ARG RKE2_FLAVOR_TAG=rke2r1
ARG BASE_IMAGE_URL=quay.io/kairos
Expand Down Expand Up @@ -53,7 +53,7 @@ build-all-images:
IF $FIPS_ENABLED
BUILD +build-provider-images-fips
ELSE
BUILD +build-provider-images
BUILD +build-provider-images
END
IF [ "$ARCH" = "arm64" ]
BUILD --platform=linux/arm64 +iso-image
Expand All @@ -64,22 +64,22 @@ build-all-images:
END

build-provider-images:
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.27.2
BUILD +provider-image --K8S_VERSION=1.25.13
BUILD +provider-image --K8S_VERSION=1.26.8
BUILD +provider-image --K8S_VERSION=1.27.5
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.27.2
BUILD +provider-image --K8S_VERSION=1.25.13
BUILD +provider-image --K8S_VERSION=1.26.8
BUILD +provider-image --K8S_VERSION=1.27.5


build-provider-images-fips:
IF $FIPS_ENABLED && [ "$K8S_DISTRIBUTION" = "kubeadm-fips" ]
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.27.2
ELSE IF $FIPS_ENABLED && [ "$K8S_DISTRIBUTION" = "rke2" ]
ELSE IF [ "$K8S_DISTRIBUTION" = "rke2" ]
BUILD +provider-image --K8S_VERSION=1.24.6
BUILD +provider-image --K8S_VERSION=1.25.2
BUILD +provider-image --K8S_VERSION=1.25.0
Expand Down Expand Up @@ -158,8 +158,8 @@ provider-image:
END

COPY --platform=linux/${ARCH} +kairos-provider-image/ /
COPY +stylus-image/etc/elemental/config.yaml /etc/elemental/config.yaml
COPY +stylus-image/etc/kairos/branding /etc/kairos/branding
COPY +stylus-image/oem/stylus_config.yaml /etc/kairos/branding/stylus_config.yaml
IF [ "$K8S_DISTRIBUTION" = "kubeadm" ]
RUN luet install -y container-runtime/containerd
END
Expand All @@ -179,15 +179,15 @@ provider-image:
SAVE IMAGE --push $IMAGE_PATH

stylus-image:
IF [ "$FIPS_ENABLED" = "true" ]
IF [ "$FIPS_ENABLED" = "true" ]
ARG STYLUS_BASE=gcr.io/spectro-images-public/stylus-framework-fips-linux-$ARCH:$PE_VERSION
ELSE
ELSE
ARG STYLUS_BASE=gcr.io/spectro-images-public/stylus-framework-linux-$ARCH:$PE_VERSION
END
END
FROM $STYLUS_BASE
SAVE ARTIFACT ./*
SAVE ARTIFACT /etc/kairos/branding
SAVE ARTIFACT /etc/elemental/config.yaml
SAVE ARTIFACT /oem/stylus_config.yaml

kairos-provider-image:
IF [ "$K8S_DISTRIBUTION" = "kubeadm" ]
Expand All @@ -210,9 +210,6 @@ base-image:
--build-arg OS_DISTRIBUTION=$OS_DISTRIBUTION --build-arg HTTP_PROXY=$HTTP_PROXY --build-arg HTTPS_PROXY=$HTTPS_PROXY \
--build-arg NO_PROXY=$NO_PROXY .

# IF $IS_JETSON
# COPY mount.yaml /system/oem/mount.yaml
# END
IF [ "$IS_JETSON" = "true" ]
COPY mount.yaml /system/oem/mount.yaml
END
Expand Down Expand Up @@ -305,7 +302,7 @@ base-image:
luet repo update
END

DO +OSRELEASE --OS_VERSION=$KAIROS_VERSION
DO +OS_RELEASE --OS_VERSION=$KAIROS_VERSION

RUN rm -rf /var/cache/* && \
journalctl --vacuum-size=1K && \
Expand All @@ -330,8 +327,7 @@ iso-image:
&& chmod 444 /etc/machine-id
SAVE IMAGE palette-installer-image:$PE_VERSION-$CUSTOM_TAG


OSRELEASE:
OS_RELEASE:
COMMAND
ARG OS_ID=${OS_DISTRIBUTION}
ARG OS_VERSION
Expand Down