From 4bd808d474b8c4b00440a8963616feea87f146d2 Mon Sep 17 00:00:00 2001 From: Santhosh Date: Wed, 18 Oct 2023 14:45:32 -0700 Subject: [PATCH] copy apparmor to /usr/bin and update provider/pe versions (#81) * Update ubuntu-fips kernel for fips * move etcdctl to /usr/bin (#59) (#61) (cherry picked from commit 96372c7ec02cef74ef01f39ab959865e85915e65) Co-authored-by: Nianyu Shen * PE-2558: use fips image for rke2 if fips_enabled is true (#67) (#68) (cherry picked from commit fff7a34e30c294a5cac73bae07161ef97f53070f) Co-authored-by: Santhosh * add support for sles os_distribution (#69) * Release 4.0.6 * update provider versions * update to ghcr * update k3s version * Update provider versions * Update kubeadm and luet repo versions * copied apparmor_parser to /usr/local/bin * disable swap for kubeadm/kubeadm-fips * remove swapoff * copy apparmor to /usr/bin * Update Earthfile v410-alpha6 kubeadm * update pe version --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Nianyu Shen Co-authored-by: vipsharm Co-authored-by: Piyush Kumar (cherry picked from commit da91d45e118c65dfd58244bc2b2a079b1999ffd4) # Conflicts: # Earthfile --- Earthfile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Earthfile b/Earthfile index 2560175..1d9a594 100644 --- a/Earthfile +++ b/Earthfile @@ -9,7 +9,11 @@ ARG IMAGE_REPO=$OS_DISTRIBUTION ARG K8S_DISTRIBUTION ARG CUSTOM_TAG ARG ARCH +<<<<<<< HEAD ARG PE_VERSION=v4.0.6 +======= +ARG PE_VERSION=v4.1.0-alpha9 +>>>>>>> da91d45 (copy apparmor to /usr/bin and update provider/pe versions (#81)) ARG SPECTRO_LUET_VERSION=v1.1.9 ARG KAIROS_VERSION=v2.3.2 ARG K3S_FLAVOR_TAG=k3s1 @@ -17,9 +21,15 @@ ARG RKE2_FLAVOR_TAG=rke2r1 ARG BASE_IMAGE_URL=quay.io/kairos ARG OSBUILDER_VERSION=v0.7.11 ARG OSBUILDER_IMAGE=quay.io/kairos/osbuilder-tools:$OSBUILDER_VERSION +<<<<<<< HEAD ARG K3S_PROVIDER_VERSION=v4.1.0-alpha4 ARG KUBEADM_PROVIDER_VERSION=v4.1.0-alpha7 ARG RKE2_PROVIDER_VERSION=v4.1.0-alpha3 +======= +ARG K3S_PROVIDER_VERSION=v4.1.0-alpha3 +ARG KUBEADM_PROVIDER_VERSION=v4.1.0-alpha6 +ARG RKE2_PROVIDER_VERSION=v4.1.0-alpha2 +>>>>>>> da91d45 (copy apparmor to /usr/bin and update provider/pe versions (#81)) ARG FIPS_ENABLED=false ARG HTTP_PROXY ARG HTTPS_PROXY