From 777a04d678f182fb4de3d3d4fac5d2d3b40eb8e1 Mon Sep 17 00:00:00 2001 From: Piyush Kumar Date: Wed, 15 May 2024 17:08:19 +0530 Subject: [PATCH 1/3] upgrade dev luet to 440-alpha4 --- Earthfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Earthfile b/Earthfile index 8f44a20..94fbf22 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.3.0 +ARG SPECTRO_LUET_VERSION=v4.4.0-alpha4 ARG KAIROS_VERSION=v3.0.10 ARG K3S_FLAVOR_TAG=k3s1 ARG RKE2_FLAVOR_TAG=rke2r1 @@ -298,9 +298,9 @@ install-k8s: WORKDIR /output IF [ "$ARCH" = "arm64" ] - ARG LUET_REPO=luet-repo-arm + ARG LUET_REPO=luet-dev-repo-arm ELSE IF [ "$ARCH" = "amd64" ] - ARG LUET_REPO=luet-repo + ARG LUET_REPO=luet-dev-repo END RUN mkdir -p /etc/luet/repos.conf.d && \ luet repo add spectro --type docker --url gcr.io/spectro-dev-public/$LUET_REPO/$SPECTRO_LUET_VERSION --priority 1 -y && \ @@ -610,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/$SPECTRO_LUET_VERSION --priority 1 -y && \ + SPECTRO_LUET_VERSION=$SPECTRO_LUET_VERSION luet repo add spectro --type docker --url gcr.io/spectro-dev-public/luet-dev-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/$SPECTRO_LUET_VERSION --priority 1 -y && \ + SPECTRO_LUET_VERSION=$SPECTRO_LUET_VERSION luet repo add spectro --type docker --url gcr.io/spectro-dev-public/luet-dev-repo/$SPECTRO_LUET_VERSION --priority 1 -y && \ luet repo update END @@ -708,9 +708,9 @@ base-image: RUN if [ ! -e /usr/bin/apparmor_parser ]; then cp /sbin/apparmor_parser /usr/bin/apparmor_parser; fi END IF [ "$ARCH" = "arm64" ] - ARG LUET_REPO=luet-repo-arm + ARG LUET_REPO=luet-dev-repo-arm ELSE IF [ "$ARCH" = "amd64" ] - ARG LUET_REPO=luet-repo + ARG LUET_REPO=luet-dev-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/$SPECTRO_LUET_VERSION --priority 1 -y From 8024db125acaaaaed59275b0e7ea3280c4a0cf0f Mon Sep 17 00:00:00 2001 From: Roshani Rathi <42164609+roshanirathi@users.noreply.github.com> Date: Tue, 21 May 2024 21:48:48 +0530 Subject: [PATCH 2/3] Update Earthfile --- Earthfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Earthfile b/Earthfile index 47cdc4c..98a7dd4 100644 --- a/Earthfile +++ b/Earthfile @@ -298,9 +298,9 @@ install-k8s: WORKDIR /output IF [ "$ARCH" = "arm64" ] - ARG LUET_REPO=luet-dev-repo-arm + ARG LUET_REPO=luet-repo-arm ELSE IF [ "$ARCH" = "amd64" ] - ARG LUET_REPO=luet-dev-repo + 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/$SPECTRO_LUET_VERSION --priority 1 -y && \ @@ -610,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-dev-repo-arm/$SPECTRO_LUET_VERSION --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-dev-repo/$SPECTRO_LUET_VERSION --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 @@ -708,9 +708,9 @@ base-image: RUN if [ ! -e /usr/bin/apparmor_parser ]; then cp /sbin/apparmor_parser /usr/bin/apparmor_parser; fi END IF [ "$ARCH" = "arm64" ] - ARG LUET_REPO=luet-dev-repo-arm + ARG LUET_REPO=luet-repo-arm ELSE IF [ "$ARCH" = "amd64" ] - ARG LUET_REPO=luet-dev-repo + 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/$SPECTRO_LUET_VERSION --priority 1 -y From 09dcec2d435109a75964e32239a106654e6998a1 Mon Sep 17 00:00:00 2001 From: Medhakulam <30567613+Medhakulam@users.noreply.github.com> Date: Wed, 22 May 2024 11:36:48 +0530 Subject: [PATCH 3/3] Update Earthfile with luet and kairos version --- Earthfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Earthfile b/Earthfile index 98a7dd4..ef702b5 100644 --- a/Earthfile +++ b/Earthfile @@ -12,8 +12,8 @@ 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=v4.4.0-alpha4 -ARG KAIROS_VERSION=v3.0.10 +ARG SPECTRO_LUET_VERSION=v1.3.1 +ARG KAIROS_VERSION=v3.0.11 ARG K3S_FLAVOR_TAG=k3s1 ARG RKE2_FLAVOR_TAG=rke2r1 ARG BASE_IMAGE_URL=quay.io/kairos