Skip to content

Commit

Permalink
copy apparmor to /usr/bin and update provider/pe versions (#81)
Browse files Browse the repository at this point in the history
* Update ubuntu-fips kernel for fips

* move etcdctl to /usr/bin (#59) (#61)

(cherry picked from commit 96372c7)

Co-authored-by: Nianyu Shen <[email protected]>

* PE-2558: use fips image for rke2 if fips_enabled is true (#67) (#68)

(cherry picked from commit fff7a34)

Co-authored-by: Santhosh <[email protected]>

* 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 <[email protected]>
Co-authored-by: vipsharm <[email protected]>
Co-authored-by: Piyush Kumar <[email protected]>
(cherry picked from commit da91d45)

# Conflicts:
#	Earthfile
  • Loading branch information
santhoshdaivajna committed Oct 18, 2023
1 parent 12042db commit 4bd808d
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,27 @@ 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
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
Expand Down

0 comments on commit 4bd808d

Please sign in to comment.