From 3853d8bb74819fa68365a037730f936330753344 Mon Sep 17 00:00:00 2001 From: Arun Sharma Date: Mon, 2 Sep 2024 17:00:30 +0000 Subject: [PATCH 1/3] PE-4442: kairos upgrade to 3.1.2 --- Earthfile | 4 ++-- rhel-core-images/Dockerfile.rhel8 | 2 +- rhel-core-images/Dockerfile.rhel9 | 2 +- rhel-core-images/README.md | 2 +- rhel-fips/Dockerfile | 2 +- slem/Dockerfile | 2 +- ubuntu-fips/Dockerfile | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Earthfile b/Earthfile index 131381d..91bb2d5 100644 --- 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 index e9520db..7ec33d2 100644 --- 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 index 93ae8f7..9c0b815 100644 --- 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 index cfe5a1c..165c0e1 100644 --- 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 index 2fbe02b..ee0a312 100644 --- 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 index d252a92..6815aaf 100644 --- 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 index beb0558..70f92d2 100644 --- 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 From 14d1d432a7620279b644c10e907d0fad77cd741f Mon Sep 17 00:00:00 2001 From: Arun Sharma Date: Tue, 17 Sep 2024 11:10:18 +0000 Subject: [PATCH 2/3] kairos version to 3.1.3 --- rhel-core-images/Dockerfile.rhel8 | 2 +- rhel-core-images/Dockerfile.rhel9 | 2 +- rhel-core-images/README.md | 2 +- rhel-fips/Dockerfile | 2 +- slem/Dockerfile | 2 +- ubuntu-fips/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rhel-core-images/Dockerfile.rhel8 b/rhel-core-images/Dockerfile.rhel8 index 7ec33d2..5ff0fcf 100644 --- 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.11.2 / / +COPY --from=quay.io/kairos/framework:v2.11.7 / / 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 index 9c0b815..9e76cab 100644 --- 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.11.2 / / +COPY --from=quay.io/kairos/framework:v2.11.7 / / 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 index 165c0e1..59d8dca 100644 --- 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.11.2`) 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.7`) 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 index ee0a312..f0b6db8 100644 --- 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.11.2-fips / / +COPY --from=gcr.io/spectro-images-public/kairos/framework:v2.11.7-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 index 6815aaf..94452ce 100644 --- 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.11.2 / / +COPY --from=quay.io/kairos/framework:v2.11.7 / / 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 index 70f92d2..1501455 100644 --- 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.11.2-fips as kairos-fips +FROM gcr.io/spectro-images-public/kairos/framework:v2.11.7-fips as kairos-fips # Base ubuntu image (focal) FROM ubuntu:focal as base From 1323122952c43c856e0fd57a14f9a6d7f678c7e9 Mon Sep 17 00:00:00 2001 From: Arun Sharma Date: Tue, 17 Sep 2024 13:24:36 +0000 Subject: [PATCH 3/3] changing base image from spectro to quay for fips base images --- rhel-fips/Dockerfile | 3 ++- ubuntu-fips/Dockerfile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/rhel-fips/Dockerfile b/rhel-fips/Dockerfile index f0b6db8..56aee6a 100644 --- a/rhel-fips/Dockerfile +++ b/rhel-fips/Dockerfile @@ -83,7 +83,8 @@ 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.11.7-fips / / +# COPY --from=gcr.io/spectro-images-public/kairos/framework:v2.11.7-fips / / +COPY --from=quay.io/kairos/framework:v2.11.7-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/ubuntu-fips/Dockerfile b/ubuntu-fips/Dockerfile index 1501455..b5d6e75 100644 --- a/ubuntu-fips/Dockerfile +++ b/ubuntu-fips/Dockerfile @@ -1,6 +1,7 @@ # Kairos framework packages for ubuntu fips -FROM gcr.io/spectro-images-public/kairos/framework:v2.11.7-fips as kairos-fips +# FROM gcr.io/spectro-images-public/kairos/framework:v2.11.7-fips as kairos-fips +FROM quay.io/kairos/framework:v2.11.7-fips as kairos-fips # Base ubuntu image (focal) FROM ubuntu:focal as base