Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP] Update software in ISO to support user namespaces #18489

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
+14 −253
Draft

[WIP] Update software in ISO to support user namespaces #18489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
075f1f9
WIP
mbaynton Mar 17, 2024
6a56c88
bump buildroot
mbaynton Mar 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Expand Up @@ -44,7 +44,7 @@ KVM_GO_VERSION ?= $(GO_VERSION:.0=)


INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1)
BUILDROOT_BRANCH ?= 2023.02.9
BUILDROOT_BRANCH ?= 2024.02
# the go version on the line below is for the ISO
GOLANG_OPTIONS = GO_VERSION=1.21.6 GO_HASH_FILE=$(PWD)/deploy/iso/minikube-iso/go.hash
BUILDROOT_OPTIONS = BR2_EXTERNAL=../../deploy/iso/minikube-iso $(GOLANG_OPTIONS)
Expand Down Expand Up @@ -76,7 +76,7 @@ MINIKUBE_BUCKET ?= minikube/releases
MINIKUBE_UPLOAD_LOCATION := gs://${MINIKUBE_BUCKET}
MINIKUBE_RELEASES_URL=https://github.com/kubernetes/minikube/releases/download

KERNEL_VERSION ?= 5.10.207
KERNEL_VERSION ?= 6.6.22
# latest from https://github.com/golangci/golangci-lint/releases
# update this only by running `make update-golint-version`
GOLINT_VERSION ?= v1.56.2
Expand Down
5 changes: 3 additions & 2 deletions deploy/iso/minikube-iso/Dockerfile
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM ubuntu:20.04
FROM ubuntu:22.04

RUN apt-get update \
&& apt-get install -y apt dpkg apt-utils ca-certificates software-properties-common \
Expand All @@ -23,7 +23,8 @@ RUN apt-get update \
git \
wget \
cpio \
python \
python2 \
python3 \
unzip \
bc \
gcc-multilib \
Expand Down
2 changes: 1 addition & 1 deletion deploy/iso/minikube-iso/arch/x86_64/package/hyperv-daemons/hyperv-daemons.mk
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@
################################################################################

HYPERV_DAEMONS_VERSION = $(call qstrip,$(BR2_LINUX_KERNEL_VERSION))
HYPERV_DAEMONS_SITE = https://www.kernel.org/pub/linux/kernel/v5.x
HYPERV_DAEMONS_SITE = https://www.kernel.org/pub/linux/kernel/v6.x
HYPERV_DAEMONS_SOURCE = linux-$(HYPERV_DAEMONS_VERSION).tar.xz

define HYPERV_DAEMONS_BUILD_CMDS
Expand Down
4 changes: 2 additions & 2 deletions deploy/iso/minikube-iso/configs/minikube_x86_64_defconfig
View file
Open in desktop
Expand Up @@ -32,12 +32,12 @@ BR2_TARGET_ROOTFS_CPIO=y
BR2_TARGET_ROOTFS_CPIO_GZIP=y

# Linux headers same as kernel, a 5.10 series
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y

# Kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.207"
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.22"
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
BR2_LINUX_KERNEL_INSTALL_TARGET=y

Expand Down
2 changes: 0 additions & 2 deletions deploy/iso/minikube-iso/package/Config.in
View file
Open in desktop
@@ -1,7 +1,5 @@
menu "System tools"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/conmon/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crio-bin/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/sysdig/Config.in"
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few packages could be removed because they were added to the newer buildroot (and otherwise cause redefinition errors)

source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crun-latest/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/cni/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/automount/Config.in"
Expand Down
7 changes: 0 additions & 7 deletions deploy/iso/minikube-iso/package/conmon/Config.in
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions deploy/iso/minikube-iso/package/conmon/conmon.hash
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions deploy/iso/minikube-iso/package/conmon/conmon.mk
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion deploy/iso/minikube-iso/package/falco-module/Config.in
View file
Open in desktop
@@ -1,6 +1,6 @@
config BR2_PACKAGE_FALCO_MODULE
bool "falco-module"
default y
default n
depends on BR2_LINUX_KERNEL
select BR2_PACKAGE_NCURSES
select BR2_PACKAGE_LIBYAML
24 changes: 3 additions & 21 deletions deploy/iso/minikube-iso/package/falco-module/falco-module.hash
View file
Open in desktop
@@ -1,24 +1,6 @@
# falco
sha256 87c60273c35d544256e471b403497be33f24df662673338236ec92ba3fc1f8b7 0.19.0.tar.gz
sha256 b873e3590e56ead740ed905108221f98da6100da3c5b7acf2355ea1cf628d931 0.20.0.tar.gz
sha256 b1c9884855d58be94a97b2e348bcdc7db995800f0405b0f4e9a7176ee2f094a7 0.21.0.tar.gz
sha256 11890b1401c197c28ee0a70a364004f58f5ec5526365e9a283699a75e5662773 0.22.0.tar.gz
sha256 ed991ffbece8f543f5dc6aa5a660ab1ed4bae771b6aa4930663a3902cc160ea3 0.23.0.tar.gz
sha256 5703d724e0b2ce3b98208549ca9d1abdc9a0298a9abfd748b34863c0c4015dcf 0.24.0.tar.gz
sha256 1fa9c05e461817aa2542efa3b5e28e51a6caf02935dfc9d47271af79d5414947 0.28.0.tar.gz
sha256 9d90a86752a700dad2d1ea888b2cd33cdc808621faa2b6300bb0463d404744fb 0.30.0.tar.gz
sha256 0c7d88bfa2ec8e17e6e27158fabfb1d05982ede3138138b44a0f3ac6ffba5545 0.31.0.tar.gz
sha256 207b875c5b24717ecc9a5c288ff8df703d5d2a9ad00533f798d530e758f8ae42 0.31.1.tar.gz
sha256 d31f6aa19e4312e04fa7d13e6b1d7b3945582a7f3f1a3d27ae7b90a13df2e790 0.32.0.tar.gz

# sysdig
sha256 6e477ac5fe9d3110b870bd4495f01541373a008c375a1934a2d1c46798b6bad6 146a431edf95829ac11bfd9c85ba3ef08789bffe.tar.gz
sha256 1c69363e4c36cdaeed413c2ef557af53bfc4bf1109fbcb6d6e18dc40fe6ddec8 be1ea2d9482d0e6e2cb14a0fd7e08cbecf517f94.tar.gz
sha256 766e8952a36a4198fd976b9d848523e6abe4336612188e4fc911e217d8e8a00d 96bd9bc560f67742738eb7255aeb4d03046b8045.tar.gz
sha256 6c3f5f2d699c9540e281f50cbc5cb6b580f0fc689798bc65d4a77f57f932a71c 85c88952b018fdbce2464222c3303229f5bfcfad.tar.gz
sha256 9de717b3a4b611ea6df56afee05171860167112f74bb7717b394bcc88ac843cd 5c0b863ddade7a45568c0ac97d037422c9efb750.tar.gz
sha256 f602bd025ff2997ecce1bd1f479592ab666276912d72212ab8d1fffd38ab8c94 0.37.1.tar.gz

# falcosecurity/libs
sha256 2cf44f06a282e8cee7aa1f775a08ea94c06e275faaf0636b21eb06af28cf4b3f 319368f1ad778691164d33d59945e00c5752cd27.tar.gz
sha256 0f6dcdc3b94243c91294698ee343806539af81c5b33c60c6acf83fc1aa455e85 b7eb0dd65226a8dc254d228c8d950d07bf3521d2.tar.gz
sha256 b9034baeff4518b044574956f5768fac080c269bacad4a1e17a7f6fdb872ce66 39ae7d40496793cf3d3e7890c9bbdc202263836b.tar.gz
sha256 da3d2df24947f1f3c96c3aa8b8999dde691c5ba8bb15beba4486b4c7d6b9d7f9 0.14.3.tar.gz

4 changes: 2 additions & 2 deletions deploy/iso/minikube-iso/package/falco-module/falco-module.mk
View file
Open in desktop
Expand Up @@ -4,15 +4,15 @@
#
########################################################################

FALCO_MODULE_VERSION = 0.32.0
FALCO_MODULE_VERSION = 0.37.1
FALCO_MODULE_SITE = https://github.com/falcosecurity/falco/archive
FALCO_MODULE_SOURCE = $(FALCO_MODULE_VERSION).tar.gz
FALCO_MODULE_DEPENDENCIES += libyaml
FALCO_MODULE_LICENSE = Apache-2.0
FALCO_MODULE_LICENSE_FILES = COPYING

# see cmake/modules/falcosecurity-libs.cmake
FALCO_MODULE_FALCOSECURITY_LIBS_VERSION = 39ae7d40496793cf3d3e7890c9bbdc202263836b
FALCO_MODULE_FALCOSECURITY_LIBS_VERSION = 0.14.3
FALCO_MODULE_EXTRA_DOWNLOADS = https://github.com/falcosecurity/libs/archive/$(FALCO_MODULE_FALCOSECURITY_LIBS_VERSION).tar.gz

define FALCO_MODULE_FALCOSECURITY_LIBS_SRC
Expand Down
82 changes: 0 additions & 82 deletions ...nikube-iso/package/sysdig/0001-libsinsp-Apply-PATCH_COMMAND-to-fix-lua-types-and-fu.patch
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions deploy/iso/minikube-iso/package/sysdig/Config.in
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions deploy/iso/minikube-iso/package/sysdig/sysdig.hash
View file
Open in desktop

This file was deleted.

52 changes: 0 additions & 52 deletions deploy/iso/minikube-iso/package/sysdig/sysdig.mk
View file
Open in desktop

This file was deleted.