diff --git a/Earthfile b/Earthfile index 183ba24..8f44a20 100644 --- a/Earthfile +++ b/Earthfile @@ -12,7 +12,7 @@ FROM $SPECTRO_PUB_REPO/canvos/alpine-cert:v1.0.0 ## Spectro Cloud and Kairos Tags ## ARG PE_VERSION=v4.3.2 -ARG SPECTRO_LUET_VERSION=v1.2.7 +ARG SPECTRO_LUET_VERSION=v1.3.0 ARG KAIROS_VERSION=v3.0.10 ARG K3S_FLAVOR_TAG=k3s1 ARG RKE2_FLAVOR_TAG=rke2r1 @@ -20,7 +20,7 @@ ARG BASE_IMAGE_URL=quay.io/kairos ARG OSBUILDER_VERSION=v0.201.0 ARG OSBUILDER_IMAGE=quay.io/kairos/osbuilder-tools:$OSBUILDER_VERSION ARG K3S_PROVIDER_VERSION=v4.4.0-alpha2 -ARG KUBEADM_PROVIDER_VERSION=v4.4.0-alpha1 +ARG KUBEADM_PROVIDER_VERSION=v4.4.0-alpha2 ARG RKE2_PROVIDER_VERSION=v4.4.0-alpha1 # Variables used in the builds. Update for ADVANCED use cases only Modify in .arg file or via CLI arguements @@ -296,9 +296,16 @@ install-k8s: END WORKDIR /output + + IF [ "$ARCH" = "arm64" ] + ARG LUET_REPO=luet-repo-arm + ELSE IF [ "$ARCH" = "amd64" ] + ARG LUET_REPO=luet-repo + END RUN mkdir -p /etc/luet/repos.conf.d && \ - luet repo add spectro --type docker --url gcr.io/spectro-dev-public/luet-repo --priority 1 -y && \ + luet repo add spectro --type docker --url gcr.io/spectro-dev-public/$LUET_REPO/$SPECTRO_LUET_VERSION --priority 1 -y && \ luet repo update + IF [ "$K8S_DISTRIBUTION" = "kubeadm" ] RUN luet install -y container-runtime/containerd --system-target /output END @@ -603,11 +610,11 @@ base-image: IF [ "$ARCH" = "arm64" ] RUN mkdir -p /etc/luet/repos.conf.d && \ - SPECTRO_LUET_VERSION=$SPECTRO_LUET_VERSION luet repo add spectro --type docker --url gcr.io/spectro-dev-public/luet-repo-arm --priority 1 -y && \ + SPECTRO_LUET_VERSION=$SPECTRO_LUET_VERSION luet repo add spectro --type docker --url gcr.io/spectro-dev-public/luet-repo-arm/$SPECTRO_LUET_VERSION --priority 1 -y && \ luet repo update ELSE IF [ "$ARCH" = "amd64" ] RUN mkdir -p /etc/luet/repos.conf.d && \ - SPECTRO_LUET_VERSION=$SPECTRO_LUET_VERSION luet repo add spectro --type docker --url gcr.io/spectro-dev-public/luet-repo --priority 1 -y && \ + SPECTRO_LUET_VERSION=$SPECTRO_LUET_VERSION luet repo add spectro --type docker --url gcr.io/spectro-dev-public/luet-repo/$SPECTRO_LUET_VERSION --priority 1 -y && \ luet repo update END @@ -706,7 +713,7 @@ base-image: ARG LUET_REPO=luet-repo END RUN --no-cache mkdir -p /etc/luet/repos.conf.d && \ - SPECTRO_LUET_VERSION=$SPECTRO_LUET_VERSION luet repo add spectro --type docker --url $SPECTRO_LUET_REPO/$LUET_REPO --priority 1 -y + SPECTRO_LUET_VERSION=$SPECTRO_LUET_VERSION luet repo add spectro --type docker --url $SPECTRO_LUET_REPO/$LUET_REPO/$SPECTRO_LUET_VERSION --priority 1 -y COPY --if-exists spectro-luet-auth.yaml spectro-luet-auth.yaml RUN --no-cache if [ -f spectro-luet-auth.yaml ]; then cat spectro-luet-auth.yaml >> /etc/luet/repos.conf.d/spectro.yaml; fi