From 825c007077b56a2b70b1a4ea156c409bc527dc95 Mon Sep 17 00:00:00 2001 From: Arun Sharma Date: Thu, 14 Mar 2024 08:28:12 +0000 Subject: [PATCH 1/6] fde with kairos 3.0 --- Earthfile | 2 +- ubuntu-fips/Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Earthfile b/Earthfile index b6c353e..e62f83a 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.0 ARG SPECTRO_LUET_VERSION=v1.2.0 -ARG KAIROS_VERSION=v2.4.3 +ARG KAIROS_VERSION=v3.0.0 ARG K3S_FLAVOR_TAG=k3s1 ARG RKE2_FLAVOR_TAG=rke2r1 ARG BASE_IMAGE_URL=quay.io/kairos diff --git a/ubuntu-fips/Dockerfile b/ubuntu-fips/Dockerfile index e3d02d7..8ad58bc 100644 --- a/ubuntu-fips/Dockerfile +++ b/ubuntu-fips/Dockerfile @@ -1,12 +1,12 @@ # Kairos framework packages for ubuntu fips -FROM quay.io/kairos/framework:v2.4.3_fips as kairos-fips +FROM quay.io/kairos/framework:v2.7.14-fips as kairos-fips # Base ubuntu image (focal) FROM ubuntu:focal as base # Generate os-release file -FROM quay.io/kairos/osbuilder-tools:v0.7.11 as osbuilder +FROM quay.io/kairos/osbuilder-tools:v0.200.6 as osbuilder RUN zypper install -y gettext && zypper clean RUN mkdir /workspace COPY --from=base /etc/os-release /workspace/os-release From 3b869cc0bbda5ab5b5a8a8241a497caa452e198d Mon Sep 17 00:00:00 2001 From: Arun Sharma Date: Wed, 20 Mar 2024 09:31:28 +0000 Subject: [PATCH 2/6] rhel changes --- rhel-core-images/Dockerfile.rhel8 | 2 +- rhel-fips/Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rhel-core-images/Dockerfile.rhel8 b/rhel-core-images/Dockerfile.rhel8 index 4b44e90..cefa9e0 100644 --- a/rhel-core-images/Dockerfile.rhel8 +++ b/rhel-core-images/Dockerfile.rhel8 @@ -56,7 +56,7 @@ RUN uuidgen > /etc/machine-id && dnf install -y \ kernel kernel-modules kernel-modules-extra \ rsync jq && dnf clean all -COPY --from=quay.io/kairos/framework:v2.4.3_generic / / +COPY --from=quay.io/kairos/framework:v2.7.17 / / RUN mkdir -p /run/lock RUN touch /usr/libexec/.keep diff --git a/rhel-fips/Dockerfile b/rhel-fips/Dockerfile index edf8301..54b7664 100644 --- a/rhel-fips/Dockerfile +++ b/rhel-fips/Dockerfile @@ -5,7 +5,7 @@ ARG PASSWORD FROM $BASE_IMAGE as base # Generate os-release file -FROM quay.io/kairos/osbuilder-tools:v0.7.11 as osbuilder +FROM quay.io/kairos/osbuilder-tools:v0.200.5 as osbuilder RUN zypper install -y gettext && zypper clean RUN mkdir /workspace COPY --from=base /etc/os-release /workspace/os-release @@ -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=quay.io/kairos/framework:v2.4.3_fips / / +COPY --from=quay.io/kairos/framework:v2.7.14-fips / / COPY overlay/rhel8 / From a635d7ee339834ae8c3d2d2f6643fec65712dd8a Mon Sep 17 00:00:00 2001 From: Arun Sharma Date: Tue, 9 Apr 2024 13:42:15 +0000 Subject: [PATCH 3/6] kairos v3 changes --- Earthfile | 12 ++++++------ rhel-core-images/Dockerfile.rhel8 | 2 +- rhel-fips/Dockerfile | 4 ++-- slem/Dockerfile | 2 +- ubuntu-fips/Dockerfile | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Earthfile b/Earthfile index e62f83a..f7ac613 100644 --- a/Earthfile +++ b/Earthfile @@ -12,11 +12,11 @@ FROM $SPECTRO_PUB_REPO/canvos/alpine-cert:v1.0.0 ## Spectro Cloud and Kairos Tags ## ARG PE_VERSION=v4.3.0 ARG SPECTRO_LUET_VERSION=v1.2.0 -ARG KAIROS_VERSION=v3.0.0 +ARG KAIROS_VERSION=v3.0.3 ARG K3S_FLAVOR_TAG=k3s1 ARG RKE2_FLAVOR_TAG=rke2r1 ARG BASE_IMAGE_URL=quay.io/kairos -ARG OSBUILDER_VERSION=v0.200.5 +ARG OSBUILDER_VERSION=v0.200.9 ARG OSBUILDER_IMAGE=quay.io/kairos/osbuilder-tools:$OSBUILDER_VERSION ARG K3S_PROVIDER_VERSION=v4.2.1 ARG KUBEADM_PROVIDER_VERSION=v4.2.1 @@ -83,11 +83,11 @@ build-all-images: BUILD +build-provider-images END IF [ "$ARCH" = "arm64" ] - BUILD --platform=linux/arm64 +iso-image - BUILD --platform=linux/arm64 +iso + BUILD --platform=linux/arm64 +iso-image + BUILD --platform=linux/arm64 +iso ELSE IF [ "$ARCH" = "amd64" ] - BUILD --platform=linux/amd64 +iso-image - BUILD --platform=linux/amd64 +iso + BUILD --platform=linux/amd64 +iso-image + BUILD --platform=linux/amd64 +iso END build-provider-images: diff --git a/rhel-core-images/Dockerfile.rhel8 b/rhel-core-images/Dockerfile.rhel8 index cefa9e0..8af0f89 100644 --- a/rhel-core-images/Dockerfile.rhel8 +++ b/rhel-core-images/Dockerfile.rhel8 @@ -56,7 +56,7 @@ RUN uuidgen > /etc/machine-id && dnf install -y \ kernel kernel-modules kernel-modules-extra \ rsync jq && dnf clean all -COPY --from=quay.io/kairos/framework:v2.7.17 / / +COPY --from=quay.io/kairos/framework:v2.7.22 / / RUN mkdir -p /run/lock RUN touch /usr/libexec/.keep diff --git a/rhel-fips/Dockerfile b/rhel-fips/Dockerfile index 54b7664..3e45fc6 100644 --- a/rhel-fips/Dockerfile +++ b/rhel-fips/Dockerfile @@ -5,7 +5,7 @@ ARG PASSWORD FROM $BASE_IMAGE as base # Generate os-release file -FROM quay.io/kairos/osbuilder-tools:v0.200.5 as osbuilder +FROM quay.io/kairos/osbuilder-tools:v0.200.9 as osbuilder RUN zypper install -y gettext && zypper clean RUN mkdir /workspace COPY --from=base /etc/os-release /workspace/os-release @@ -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=quay.io/kairos/framework:v2.7.14-fips / / +COPY --from=quay.io/kairos/framework:v2.7.22-fips / / COPY overlay/rhel8 / diff --git a/slem/Dockerfile b/slem/Dockerfile index 31ca407..098ff3e 100644 --- a/slem/Dockerfile +++ b/slem/Dockerfile @@ -28,7 +28,7 @@ RUN mkdir -p /run/lock RUN mkdir -p /usr/libexec RUN touch /usr/libexec/.keep -COPY --from=quay.io/kairos/framework:v2.4.3_generic / / +COPY --from=quay.io/kairos/framework:v2.7.22 / / # Remove file below to allow dracut to build initrd without dhcp-client RUN rm -rf /usr/lib/dracut/modules.d/35network-legacy diff --git a/ubuntu-fips/Dockerfile b/ubuntu-fips/Dockerfile index 8ad58bc..68b6c94 100644 --- a/ubuntu-fips/Dockerfile +++ b/ubuntu-fips/Dockerfile @@ -1,12 +1,12 @@ # Kairos framework packages for ubuntu fips -FROM quay.io/kairos/framework:v2.7.14-fips as kairos-fips +FROM quay.io/kairos/framework:v2.7.22-fips as kairos-fips # Base ubuntu image (focal) FROM ubuntu:focal as base # Generate os-release file -FROM quay.io/kairos/osbuilder-tools:v0.200.6 as osbuilder +FROM quay.io/kairos/osbuilder-tools:v0.200.9 as osbuilder RUN zypper install -y gettext && zypper clean RUN mkdir /workspace COPY --from=base /etc/os-release /workspace/os-release From f0c3968d3e0c232a435102edc4f867dce80d25fd Mon Sep 17 00:00:00 2001 From: Arun Sharma Date: Wed, 17 Apr 2024 09:52:04 +0000 Subject: [PATCH 4/6] updating osbuilder and framework --- Dockerfile | 6 +++--- rhel-core-images/Dockerfile.rhel8 | 2 +- rhel-fips/Dockerfile | 2 +- slem/Dockerfile | 2 +- ubuntu-fips/Dockerfile | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5762b27..ed1a2f0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,9 +24,9 @@ RUN if [ "${OS_DISTRIBUTION}" = "opensuse-leap" ] && [ "${PROXY_CERT_PATH}" != " ### To install the nginx package for Ubuntu ### #TODO: Remove the following line. This is only for dev purpose. -RUN useradd -m kairos && echo "kairos:kairos" | chpasswd -RUN adduser kairos sudo -RUN echo '%sudo ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers +# RUN useradd -m kairos && echo "kairos:kairos" | chpasswd +# RUN adduser kairos sudo +# RUN echo '%sudo ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers # RUN apt-get update && apt-get install nginx -y ### or diff --git a/rhel-core-images/Dockerfile.rhel8 b/rhel-core-images/Dockerfile.rhel8 index 121ff26..43ab4d3 100644 --- a/rhel-core-images/Dockerfile.rhel8 +++ b/rhel-core-images/Dockerfile.rhel8 @@ -56,7 +56,7 @@ RUN uuidgen > /etc/machine-id && dnf install -y \ kernel kernel-modules kernel-modules-extra \ rsync jq && dnf clean all -COPY --from=quay.io/kairos/framework:v2.7.22 / / +COPY --from=quay.io/kairos/framework:v2.8.0 / / RUN mkdir -p /run/lock RUN touch /usr/libexec/.keep diff --git a/rhel-fips/Dockerfile b/rhel-fips/Dockerfile index 3e45fc6..205cdf8 100644 --- a/rhel-fips/Dockerfile +++ b/rhel-fips/Dockerfile @@ -5,7 +5,7 @@ ARG PASSWORD FROM $BASE_IMAGE as base # Generate os-release file -FROM quay.io/kairos/osbuilder-tools:v0.200.9 as osbuilder +FROM quay.io/kairos/osbuilder-tools:v0.200.11 as osbuilder RUN zypper install -y gettext && zypper clean RUN mkdir /workspace COPY --from=base /etc/os-release /workspace/os-release diff --git a/slem/Dockerfile b/slem/Dockerfile index 098ff3e..7827442 100644 --- a/slem/Dockerfile +++ b/slem/Dockerfile @@ -28,7 +28,7 @@ RUN mkdir -p /run/lock RUN mkdir -p /usr/libexec RUN touch /usr/libexec/.keep -COPY --from=quay.io/kairos/framework:v2.7.22 / / +COPY --from=quay.io/kairos/framework:v2.8.0 / / # Remove file below to allow dracut to build initrd without dhcp-client RUN rm -rf /usr/lib/dracut/modules.d/35network-legacy diff --git a/ubuntu-fips/Dockerfile b/ubuntu-fips/Dockerfile index 68b6c94..a0298ee 100644 --- a/ubuntu-fips/Dockerfile +++ b/ubuntu-fips/Dockerfile @@ -6,7 +6,7 @@ FROM quay.io/kairos/framework:v2.7.22-fips as kairos-fips FROM ubuntu:focal as base # Generate os-release file -FROM quay.io/kairos/osbuilder-tools:v0.200.9 as osbuilder +FROM quay.io/kairos/osbuilder-tools:v0.200.11 as osbuilder RUN zypper install -y gettext && zypper clean RUN mkdir /workspace COPY --from=base /etc/os-release /workspace/os-release From 900efa420d2cfa7648d8100e5645144883d47fbb Mon Sep 17 00:00:00 2001 From: Arun Sharma Date: Wed, 24 Apr 2024 03:45:17 +0000 Subject: [PATCH 5/6] fix for rhel --- Earthfile | 4 ++-- rhel-fips/Dockerfile | 2 +- ubuntu-fips/Dockerfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Earthfile b/Earthfile index 045f3c2..0528c34 100644 --- a/Earthfile +++ b/Earthfile @@ -249,11 +249,11 @@ install-k8s: luet repo add spectro --type docker --url gcr.io/spectro-dev-public/luet-repo --priority 1 -y && \ luet repo update IF [ "$K8S_DISTRIBUTION" = "kubeadm" ] - RUN luet install -y container-runtime/containerd + RUN luet install -y container-runtime/containerd --system-target /output END IF [ "$K8S_DISTRIBUTION" = "kubeadm-fips" ] - RUN luet install -y container-runtime/containerd-fips + RUN luet install -y container-runtime/containerd-fips --system-target /output END RUN luet install -y k8s/$K8S_DISTRIBUTION@$BASE_K8S_VERSION --system-target /output && luet cleanup RUN rm -rf /output/var/cache/* diff --git a/rhel-fips/Dockerfile b/rhel-fips/Dockerfile index 205cdf8..19c8d5b 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=quay.io/kairos/framework:v2.7.22-fips / / +COPY --from=quay.io/kairos/framework:v2.8.0-fips / / COPY overlay/rhel8 / diff --git a/ubuntu-fips/Dockerfile b/ubuntu-fips/Dockerfile index a0298ee..085efe4 100644 --- a/ubuntu-fips/Dockerfile +++ b/ubuntu-fips/Dockerfile @@ -1,6 +1,6 @@ # Kairos framework packages for ubuntu fips -FROM quay.io/kairos/framework:v2.7.22-fips as kairos-fips +FROM quay.io/kairos/framework:v2.8.0-fips as kairos-fips # Base ubuntu image (focal) FROM ubuntu:focal as base From 37f266b40e1ffeb491ccdb363da7d8106c6f4a42 Mon Sep 17 00:00:00 2001 From: Arun Sharma Date: Thu, 25 Apr 2024 03:03:25 +0000 Subject: [PATCH 6/6] mapping kairos version to framework version --- rhel-core-images/Dockerfile.rhel8 | 2 +- rhel-fips/Dockerfile | 2 +- slem/Dockerfile | 2 +- ubuntu-fips/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rhel-core-images/Dockerfile.rhel8 b/rhel-core-images/Dockerfile.rhel8 index 43ab4d3..44bfe21 100644 --- a/rhel-core-images/Dockerfile.rhel8 +++ b/rhel-core-images/Dockerfile.rhel8 @@ -56,7 +56,7 @@ RUN uuidgen > /etc/machine-id && dnf install -y \ kernel kernel-modules kernel-modules-extra \ rsync jq && dnf clean all -COPY --from=quay.io/kairos/framework:v2.8.0 / / +COPY --from=quay.io/kairos/framework:v2.7.28 / / RUN mkdir -p /run/lock RUN touch /usr/libexec/.keep diff --git a/rhel-fips/Dockerfile b/rhel-fips/Dockerfile index 19c8d5b..839beb7 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=quay.io/kairos/framework:v2.8.0-fips / / +COPY --from=quay.io/kairos/framework:v2.7.28-fips / / COPY overlay/rhel8 / diff --git a/slem/Dockerfile b/slem/Dockerfile index 7827442..5e4477e 100644 --- a/slem/Dockerfile +++ b/slem/Dockerfile @@ -28,7 +28,7 @@ RUN mkdir -p /run/lock RUN mkdir -p /usr/libexec RUN touch /usr/libexec/.keep -COPY --from=quay.io/kairos/framework:v2.8.0 / / +COPY --from=quay.io/kairos/framework:v2.7.28 / / # Remove file below to allow dracut to build initrd without dhcp-client RUN rm -rf /usr/lib/dracut/modules.d/35network-legacy diff --git a/ubuntu-fips/Dockerfile b/ubuntu-fips/Dockerfile index 085efe4..1e34d4e 100644 --- a/ubuntu-fips/Dockerfile +++ b/ubuntu-fips/Dockerfile @@ -1,6 +1,6 @@ # Kairos framework packages for ubuntu fips -FROM quay.io/kairos/framework:v2.8.0-fips as kairos-fips +FROM quay.io/kairos/framework:v2.7.28-fips as kairos-fips # Base ubuntu image (focal) FROM ubuntu:focal as base