PE-4442: kairos upgrade to 3.1.2

spectrocloud · Sep 2, 2024 · 3853d8b · 3853d8b
1 parent 5e7f3e3
commit 3853d8b
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/Earthfile b/Earthfile
@@ -14,11 +14,11 @@ FROM $SPECTRO_PUB_REPO/canvos/alpine-cert:v1.0.0
 # Spectro Cloud and Kairos tags.
 ARG PE_VERSION=v4.4.8
 ARG SPECTRO_LUET_VERSION=v1.3.5-alpha1
-ARG KAIROS_VERSION=v3.0.14
+ARG KAIROS_VERSION=v3.1.2
 ARG K3S_FLAVOR_TAG=k3s1
 ARG RKE2_FLAVOR_TAG=rke2r1
 ARG BASE_IMAGE_URL=quay.io/kairos
-ARG OSBUILDER_VERSION=v0.201.0
+ARG OSBUILDER_VERSION=v0.300.3
 ARG OSBUILDER_IMAGE=quay.io/kairos/osbuilder-tools:$OSBUILDER_VERSION
 ARG K3S_PROVIDER_VERSION=v4.4.2
 ARG KUBEADM_PROVIDER_VERSION=v4.4.1

diff --git a/rhel-core-images/Dockerfile.rhel8 b/rhel-core-images/Dockerfile.rhel8
@@ -57,7 +57,7 @@ RUN uuidgen > /etc/machine-id && dnf install -y \
     rsync jq && dnf clean all
 
 
-COPY --from=quay.io/kairos/framework:v2.7.41 / /
+COPY --from=quay.io/kairos/framework:v2.11.2 / /
 
 RUN sed -i 's/\bsource\b/./g' /system/oem/00_rootfs.yaml
 RUN sed -i 's/\bsource\b/./g' /system/oem/09_openrc_services.yaml

diff --git a/rhel-core-images/Dockerfile.rhel9 b/rhel-core-images/Dockerfile.rhel9
@@ -57,7 +57,7 @@ RUN uuidgen > /etc/machine-id && dnf install -y \
     rsync jq && dnf clean all
 
 
-COPY --from=quay.io/kairos/framework:v2.7.41 / /
+COPY --from=quay.io/kairos/framework:v2.11.2 / /
 
 RUN sed -i 's/\bsource\b/./g' /system/oem/00_rootfs.yaml
 RUN sed -i 's/\bsource\b/./g' /system/oem/09_openrc_services.yaml

diff --git a/rhel-core-images/README.md b/rhel-core-images/README.md
@@ -26,7 +26,7 @@ This scenario is for the environment where Red Hat Satellite must be used and ac
 
 1. Mirror base RHEL UBI image (`registry.access.redhat.com/ubi9-init:9.4-6`) to the internal Container registry. Provide image path for the build process by using argument `BASE_IMAGE`. 
 
-2. Mirror Kairos framework image (`quay.io/kairos/framework:v2.7.41`) to the internal Container registry. Provide image path for the build process by using argument `KAIROS_FRAMEWORK_IMAGE`. 
+2. Mirror Kairos framework image (`quay.io/kairos/framework:v2.11.2`) to the internal Container registry. Provide image path for the build process by using argument `KAIROS_FRAMEWORK_IMAGE`. 
 
 3. Have the following repostiories synced and available on Red Hat Satellite:
 

diff --git a/rhel-fips/Dockerfile b/rhel-fips/Dockerfile
@@ -83,7 +83,7 @@ RUN mkdir -p /run/lock && \
 # Copy the os-release file to identify the OS
 COPY --from=osbuilder /workspace/os-release /etc/os-release
 
-COPY --from=gcr.io/spectro-images-public/kairos/framework:v2.7.41-fips-spectro / /
+COPY --from=gcr.io/spectro-images-public/kairos/framework:v2.11.2-fips / /
 
 RUN sed -i 's/\bsource\b/./g' /system/oem/00_rootfs.yaml
 RUN sed -i 's/\bsource\b/./g' /system/oem/09_openrc_services.yaml

diff --git a/slem/Dockerfile b/slem/Dockerfile
@@ -30,7 +30,7 @@ RUN mkdir -p /run/lock
 RUN mkdir -p /usr/libexec
 RUN touch /usr/libexec/.keep
 
-COPY --from=quay.io/kairos/framework:v2.7.41 / /
+COPY --from=quay.io/kairos/framework:v2.11.2 / /
 
 RUN sed -i 's/\bsource\b/./g' /system/oem/00_rootfs.yaml
 RUN sed -i 's/\bsource\b/./g' /system/oem/09_openrc_services.yaml

diff --git a/ubuntu-fips/Dockerfile b/ubuntu-fips/Dockerfile
@@ -1,6 +1,6 @@
 
 # Kairos framework packages for ubuntu fips
-FROM gcr.io/spectro-images-public/kairos/framework:v2.7.41-fips-spectro as kairos-fips
+FROM gcr.io/spectro-images-public/kairos/framework:v2.11.2-fips as kairos-fips
 
 # Base ubuntu image (focal)
 FROM ubuntu:focal as base