kairos bump 2.4.2 (#96)

spectrocloud · Nov 17, 2023 · 1c94a07 · 1c94a07
1 parent 4b2a5a5
commit 1c94a07
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/.arg.template b/.arg.template
@@ -2,7 +2,7 @@ CUSTOM_TAG=demo
 IMAGE_REGISTRY=ttl.sh
 OS_DISTRIBUTION=ubuntu
 IMAGE_REPO=$OS_DISTRIBUTION
-OS_VERSION=22
+OS_VERSION=22.04
 K8S_DISTRIBUTION=k3s
 ISO_NAME=palette-edge-installer
 ARCH=amd64

diff --git a/Earthfile b/Earthfile
@@ -13,7 +13,7 @@ ARG CUSTOM_TAG
 ARG ARCH
 ARG PE_VERSION=v4.1.2
 ARG SPECTRO_LUET_VERSION=v1.2.0
-ARG KAIROS_VERSION=v2.4.1
+ARG KAIROS_VERSION=v2.4.2
 ARG K3S_FLAVOR_TAG=k3s1
 ARG RKE2_FLAVOR_TAG=rke2r1
 ARG BASE_IMAGE_URL=quay.io/kairos
@@ -35,12 +35,10 @@ ARG UPDATE_KERNEL=false
 ARG ETCD_VERSION="v3.5.5"
 
 IF [ "$OS_DISTRIBUTION" = "ubuntu" ] && [ "$BASE_IMAGE" = "" ]
-    ARG BASE_IMAGE_NAME=core-$OS_DISTRIBUTION-$OS_VERSION-lts
-    ARG BASE_IMAGE_TAG=core-$OS_DISTRIBUTION-$OS_VERSION-lts:$KAIROS_VERSION
+    ARG BASE_IMAGE_TAG=$OS_DISTRIBUTION:$OS_VERSION-core-$ARCH-generic-$KAIROS_VERSION
     ARG BASE_IMAGE=$BASE_IMAGE_URL/$BASE_IMAGE_TAG
 ELSE IF [ "$OS_DISTRIBUTION" = "opensuse-leap" ] && [ "$BASE_IMAGE" = "" ]
-    ARG BASE_IMAGE_NAME=core-$OS_DISTRIBUTION  
-    ARG BASE_IMAGE_TAG=core-$OS_DISTRIBUTION:$KAIROS_VERSION
+    ARG BASE_IMAGE_TAG=opensuse:leap-$OS_VERSION-core-$ARCH-generic-$KAIROS_VERSION
     ARG BASE_IMAGE=$BASE_IMAGE_URL/$BASE_IMAGE_TAG
 ELSE IF [ "$OS_DISTRIBUTION" = "rhel" ] || [ "$OS_DISTRIBUTION" = "sles" ]
     # Check for default value for rhel