From 17255760fdd50a678d22f138ede64d911d4e5d31 Mon Sep 17 00:00:00 2001 From: HarshwardhanPatil07 Date: Fri, 13 Nov 2026 15:02:12 +0530 Subject: [PATCH 1/7] build: Use Fedora 45 and Go 1.27 for the CLI Build the CLI container on Fedora 45 and set the module to Go 1.27. Pin the Ginkgo command through the Go tool declaration so the build uses the module version. Assisted-by: AI Signed-off-by: HarshwardhanPatil07 --- Containerfile | 2 +- Makefile | 2 +- go.mod | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Containerfile b/Containerfile index 1e2873c..fd3b2c7 100644 --- a/Containerfile +++ b/Containerfile @@ -1,5 +1,5 @@ # Build environment for bink CLI with all C dependencies -ARG FEDORA_VERSION=44 +ARG FEDORA_VERSION=45 FROM quay.io/fedora/fedora:${FEDORA_VERSION} AS builder # Install Go and required C libraries for Podman bindings diff --git a/Makefile b/Makefile index 19b5638..ce000fa 100644 --- a/Makefile +++ b/Makefile @@ -76,7 +76,7 @@ update-calico: @echo "✅ Updated $(CALICO_MANIFEST)" # Test targets -GINKGO := go run github.com/onsi/ginkgo/v2/ginkgo +GINKGO := go tool ginkgo TEST_PROCS ?= 3 GINKGO_FOCUS ?= GINKGO_FOCUS_FLAG := $(if $(GINKGO_FOCUS),--focus="$(GINKGO_FOCUS)",) diff --git a/go.mod b/go.mod index f2e9af4..38253f1 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/bootc-dev/bink -go 1.26.8 +go 1.27.3 require ( github.com/google/uuid v1.6.0 @@ -190,3 +190,5 @@ require ( sigs.k8s.io/structured-merge-diff/v6 v6.4.2 // indirect tags.cncf.io/container-device-interface v1.1.1 // indirect ) + +tool github.com/onsi/ginkgo/v2/ginkgo From f7034719099bdcad5e028b856e01991a597250d5 Mon Sep 17 00:00:00 2001 From: HarshwardhanPatil07 Date: Fri, 13 Nov 2026 15:02:22 +0530 Subject: [PATCH 2/7] node: Build Fedora 45 node and helper images Build bootc nodes, disk images, and helper images from Fedora 45. Have integration CI produce and test the Fedora 45 node tags before the CLI default is changed. Assisted-by: AI Signed-off-by: HarshwardhanPatil07 --- .github/workflows/integration-tests.yml | 2 +- containerfiles/cluster-image/Containerfile | 2 +- containerfiles/dns/Containerfile | 2 +- node-images/fedora/Containerfile | 6 ++++-- node-images/fedora/Containerfile.disk | 2 +- node-images/fedora/Makefile | 3 ++- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 5bfb019..c27262b 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -64,7 +64,7 @@ jobs: id: set-matrix run: | DEFAULT="1.36" - FEDORA_VERSION="44" + FEDORA_VERSION="45" # TODO: check how to configure renovate to update this list automatically ALL='["1.37", "1.36", "1.35"]' NON_DEFAULT=$(echo "$ALL" | jq -c --arg default "$DEFAULT" 'map(select(. != $default))') diff --git a/containerfiles/cluster-image/Containerfile b/containerfiles/cluster-image/Containerfile index 166d617..3b8cdd4 100644 --- a/containerfiles/cluster-image/Containerfile +++ b/containerfiles/cluster-image/Containerfile @@ -1,4 +1,4 @@ -ARG FEDORA_VERSION=44 +ARG FEDORA_VERSION=45 FROM quay.io/fedora/fedora:${FEDORA_VERSION} RUN dnf install -y --setopt=install_weak_deps=0 \ diff --git a/containerfiles/dns/Containerfile b/containerfiles/dns/Containerfile index b5761e0..ea51e1d 100644 --- a/containerfiles/dns/Containerfile +++ b/containerfiles/dns/Containerfile @@ -1,4 +1,4 @@ -ARG FEDORA_VERSION=44 +ARG FEDORA_VERSION=45 FROM registry.fedoraproject.org/fedora-minimal:${FEDORA_VERSION} RUN microdnf install -y dnsmasq && microdnf clean all diff --git a/node-images/fedora/Containerfile b/node-images/fedora/Containerfile index 76de3c2..bc0684c 100644 --- a/node-images/fedora/Containerfile +++ b/node-images/fedora/Containerfile @@ -1,8 +1,10 @@ -FROM quay.io/fedora/fedora-bootc:44 AS builder +ARG FEDORA_VERSION=45 +FROM quay.io/fedora/fedora-bootc:${FEDORA_VERSION} AS builder +ARG FEDORA_VERSION ARG KUBE_MINOR=1.36 RUN dnf -y install 'dnf5-command(copr)' && \ - dnf -y copr enable rhcontainerbot/bootc fedora-44-x86_64 + dnf -y copr enable rhcontainerbot/bootc fedora-${FEDORA_VERSION}-x86_64 RUN /usr/libexec/bootc-base-imagectl build-rootfs \ --manifest=minimal \ --no-docs \ diff --git a/node-images/fedora/Containerfile.disk b/node-images/fedora/Containerfile.disk index a729ac2..f9184d2 100644 --- a/node-images/fedora/Containerfile.disk +++ b/node-images/fedora/Containerfile.disk @@ -1,4 +1,4 @@ -ARG FEDORA_VERSION=44 +ARG FEDORA_VERSION=45 ARG BCVK_REF=main FROM quay.io/fedora/fedora-minimal:${FEDORA_VERSION} AS bcvk-builder diff --git a/node-images/fedora/Makefile b/node-images/fedora/Makefile index 319f156..184cd4c 100644 --- a/node-images/fedora/Makefile +++ b/node-images/fedora/Makefile @@ -1,7 +1,7 @@ .PHONY: build-bootc-image build-disk-image build-disk-image-composefs clean help KUBE_MINOR ?= 1.36 -FEDORA_VERSION ?= 44 +FEDORA_VERSION ?= 45 DISK_SIZE ?= 10G BUILD_MEMORY ?= 4G BUILD_LOG_DIR ?= /tmp/bcvk-logs @@ -22,6 +22,7 @@ build-bootc-image: --cap-add=all \ --security-opt=label=disable \ --device /dev/fuse \ + --build-arg FEDORA_VERSION=$(FEDORA_VERSION) \ --build-arg KUBE_MINOR=$(KUBE_MINOR) \ -t $(BOOTC_IMAGE) \ -f Containerfile \ From 999f984da2539e6bcb76ce87d74e0628e4f6eb41 Mon Sep 17 00:00:00 2001 From: HarshwardhanPatil07 Date: Fri, 13 Nov 2026 15:02:40 +0530 Subject: [PATCH 3/7] deps: Update compatible Go modules Refresh direct and indirect modules for the Fedora 45 and Go 1.27 build while keeping the Kubernetes dependency set compatible. Assisted-by: AI Signed-off-by: HarshwardhanPatil07 --- go.mod | 52 ++++++++++++++--------------- go.sum | 104 ++++++++++++++++++++++++++++----------------------------- 2 files changed, 78 insertions(+), 78 deletions(-) diff --git a/go.mod b/go.mod index 38253f1..3f0d227 100644 --- a/go.mod +++ b/go.mod @@ -11,9 +11,9 @@ require ( github.com/spf13/cobra v1.10.2 github.com/spf13/viper v1.21.0 go.podman.io/common v0.70.0 - go.podman.io/podman/v6 v6.1.4 - golang.org/x/crypto v0.58.0 - golang.org/x/term v0.47.0 + go.podman.io/podman/v6 v6.2.0 + golang.org/x/crypto v0.59.0 + golang.org/x/term v0.48.0 gopkg.in/yaml.v3 v3.0.1 k8s.io/api v0.37.2 k8s.io/apimachinery v0.37.2 @@ -55,28 +55,28 @@ require ( github.com/docker/docker-credential-helpers v0.9.12 // indirect github.com/docker/go-connections v0.8.2 // indirect github.com/docker/go-units v0.5.0 // indirect - github.com/emicklei/go-restful/v3 v3.14.0 // indirect + github.com/emicklei/go-restful/v3 v3.13.0 // indirect github.com/felixge/httpsnoop v1.1.0 // indirect github.com/fsnotify/fsnotify v1.10.1 // indirect github.com/fsouza/go-dockerclient v1.13.3 // indirect github.com/fxamacker/cbor/v2 v2.10.0 // indirect - github.com/go-jose/go-jose/v4 v4.1.7 // indirect + github.com/go-jose/go-jose/v4 v4.1.9 // indirect github.com/go-logr/logr v1.4.4 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-openapi/jsonpointer v1.0.2 // indirect github.com/go-openapi/jsonreference v1.0.3 // indirect - github.com/go-openapi/swag v0.29.2 // indirect - github.com/go-openapi/swag/cmdutils v0.29.2 // indirect + github.com/go-openapi/swag v0.28.0 // indirect + github.com/go-openapi/swag/cmdutils v0.28.0 // indirect github.com/go-openapi/swag/conv v0.29.2 // indirect - github.com/go-openapi/swag/fileutils v0.29.2 // indirect + github.com/go-openapi/swag/fileutils v0.28.0 // indirect github.com/go-openapi/swag/jsonutils v0.29.2 // indirect - github.com/go-openapi/swag/loading v0.29.2 // indirect - github.com/go-openapi/swag/mangling v0.29.2 // indirect - github.com/go-openapi/swag/netutils v0.29.2 // indirect + github.com/go-openapi/swag/loading v0.28.0 // indirect + github.com/go-openapi/swag/mangling v0.28.0 // indirect + github.com/go-openapi/swag/netutils v0.28.0 // indirect github.com/go-openapi/swag/pools v0.29.2 // indirect - github.com/go-openapi/swag/stringutils v0.29.2 // indirect + github.com/go-openapi/swag/stringutils v0.28.0 // indirect github.com/go-openapi/swag/typeutils v0.29.2 // indirect - github.com/go-openapi/swag/yamlutils v0.29.2 // indirect + github.com/go-openapi/swag/yamlutils v0.28.0 // indirect github.com/go-task/slim-sprig/v3 v3.0.0 // indirect github.com/go-viper/mapstructure/v2 v2.5.0 // indirect github.com/godbus/dbus/v5 v5.2.4 // indirect @@ -84,7 +84,7 @@ require ( github.com/google/go-cmp v0.7.0 // indirect github.com/google/go-containerregistry v0.22.1 // indirect github.com/google/go-intervals v0.0.2 // indirect - github.com/google/pprof v0.0.0-20261026192309-dbd0ed30aa88 // indirect + github.com/google/pprof v0.0.0-20261105003125-4bf881d7fb0b // indirect github.com/gorilla/mux v1.8.1 // indirect github.com/gorilla/schema v1.4.1 // indirect github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect @@ -99,10 +99,10 @@ require ( github.com/kr/fs v0.1.0 // indirect github.com/manifoldco/promptui v0.9.0 // indirect github.com/mattn/go-runewidth v0.0.31 // indirect - github.com/mattn/go-sqlite3 v1.14.52 // indirect + github.com/mattn/go-sqlite3 v1.14.53 // indirect github.com/miekg/pkcs11 v1.1.2 // indirect github.com/mistifyio/go-zfs/v4 v4.0.0 // indirect - github.com/moby/buildkit v0.34.1 // indirect + github.com/moby/buildkit v0.34.2 // indirect github.com/moby/docker-image-spec v1.3.1 // indirect github.com/moby/go-archive v0.3.3 // indirect github.com/moby/moby/api v1.56.1 // indirect @@ -140,7 +140,7 @@ require ( github.com/smallstep/pkcs7 v0.2.3 // indirect github.com/spf13/afero v1.15.0 // indirect github.com/spf13/cast v1.10.0 // indirect - github.com/spf13/pflag v1.0.10 // indirect + github.com/spf13/pflag v1.1.0 // indirect github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6 // indirect github.com/subosito/gotenv v1.6.0 // indirect github.com/sylabs/sif/v2 v2.24.2 // indirect @@ -162,20 +162,20 @@ require ( go.opentelemetry.io/otel/metric v1.47.0 // indirect go.opentelemetry.io/otel/trace v1.47.0 // indirect go.podman.io/buildah v1.46.0 // indirect - go.podman.io/image/v5 v5.42.0 // indirect - go.podman.io/storage v1.65.0 // indirect + go.podman.io/image/v5 v5.42.1 // indirect + go.podman.io/storage v1.65.1 // indirect go.yaml.in/yaml/v2 v2.4.4 // indirect go.yaml.in/yaml/v3 v3.0.6 // indirect golang.org/x/mod v0.42.0 // indirect golang.org/x/net v0.62.0 // indirect golang.org/x/oauth2 v0.37.0 // indirect - golang.org/x/sync v0.24.0 // indirect - golang.org/x/sys v0.49.0 // indirect - golang.org/x/text v0.43.0 // indirect + golang.org/x/sync v0.25.0 // indirect + golang.org/x/sys v0.50.0 // indirect + golang.org/x/text v0.44.0 // indirect golang.org/x/time v0.16.0 // indirect golang.org/x/tools v0.52.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20261026165753-2ffab32bce7e // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20261026165753-2ffab32bce7e // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20261104224025-d1e00e9f33ab // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20261104224025-d1e00e9f33ab // indirect google.golang.org/grpc v1.85.0 // indirect google.golang.org/protobuf v1.36.12 // indirect gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect @@ -184,8 +184,8 @@ require ( k8s.io/klog/v2 v2.140.0 // indirect k8s.io/kube-openapi v0.0.0-20260721132016-d427ff9ee9ad // indirect k8s.io/streaming v0.37.2 // indirect - k8s.io/utils v0.0.0-20260626114624-be93311217bd // indirect - sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect + k8s.io/utils v0.0.0-20261023123148-ca04ba58ecab // indirect + sigs.k8s.io/json v0.0.0-20260909141634-11ed52e25bc5 // indirect sigs.k8s.io/randfill v1.0.0 // indirect sigs.k8s.io/structured-merge-diff/v6 v6.4.2 // indirect tags.cncf.io/container-device-interface v1.1.1 // indirect diff --git a/go.sum b/go.sum index 7d25a45..8f8de3e 100644 --- a/go.sum +++ b/go.sum @@ -82,8 +82,8 @@ github.com/docker/go-connections v0.8.2 h1:9d9DEokx5W7qlr0shkFXIxEA7+TTD+llwzcyk github.com/docker/go-connections v0.8.2/go.mod h1:no1qkHdjq7kLMGUXYAduOhYPSJxxvgWBh7ogVvptn3Q= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -github.com/emicklei/go-restful/v3 v3.14.0 h1:6V6Ba8/5W1Z7amPinklZeCMlHBMwj53thpfxazCLMX4= -github.com/emicklei/go-restful/v3 v3.14.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= +github.com/emicklei/go-restful/v3 v3.13.0 h1:C4Bl2xDndpU6nJ4bc1jXd+uTmYPVUwkD6bFY/oTyCes= +github.com/emicklei/go-restful/v3 v3.13.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/felixge/httpsnoop v1.1.0 h1:3YtUj32ZZkqZtt3sZZsClsymw/QDuVfpNhoA31zeORc= github.com/felixge/httpsnoop v1.1.0/go.mod h1:Zqxgdd+1Rkcz8euOqdr7lqgCRJztwr5hp9vDSi5UZCE= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= @@ -101,8 +101,8 @@ github.com/gkampitakis/go-diff v1.3.2 h1:Qyn0J9XJSDTgnsgHRdz9Zp24RaJeKMUHg2+PDZZ github.com/gkampitakis/go-diff v1.3.2/go.mod h1:LLgOrpqleQe26cte8s36HTWcTmMEur6OPYerdAAS9tk= github.com/gkampitakis/go-snaps v0.5.15 h1:amyJrvM1D33cPHwVrjo9jQxX8g/7E2wYdZ+01KS3zGE= github.com/gkampitakis/go-snaps v0.5.15/go.mod h1:HNpx/9GoKisdhw9AFOBT1N7DBs9DiHo/hGheFGBZ+mc= -github.com/go-jose/go-jose/v4 v4.1.7 h1:Nac/98uT5LPkfbiFuYa8ktf62a2VxwQ4xbq1GK8pV5E= -github.com/go-jose/go-jose/v4 v4.1.7/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08= +github.com/go-jose/go-jose/v4 v4.1.9 h1:pKfeQkig1NmgK4hJrZYXLEYURXfoJB61Larw0uIW4gY= +github.com/go-jose/go-jose/v4 v4.1.9/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.4 h1:tG4xh9yMsRCAiodLVTxyrkzSZ9+o0L1Kg/+cPVcbP/8= github.com/go-logr/logr v1.4.4/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= @@ -112,32 +112,32 @@ github.com/go-openapi/jsonpointer v1.0.2 h1:NbW7xT2b+l7x+JefiPGDsZWsrLk1ogrz4AHK github.com/go-openapi/jsonpointer v1.0.2/go.mod h1:N0rI4MbNKD7xAFTiHtB+5Nhrg2j/wwYg7m7Fmb4/jk8= github.com/go-openapi/jsonreference v1.0.3 h1:5rDbq+JsjCv6/nUDDJt83nLZoADI4w03uvHXer+4aYQ= github.com/go-openapi/jsonreference v1.0.3/go.mod h1:OJSlMXHysgH272D9z2tiy2MGe5A9vQLHaCPb6KbYdE4= -github.com/go-openapi/swag v0.29.2 h1:9n8frkcsuQRA0INU31VbxNxt1zBaHxrHYGEf5BUjFi4= -github.com/go-openapi/swag v0.29.2/go.mod h1:RkCiX1gCVXWgLOavDXE3ALJrQ/VO2ziiIzOUs3z10xo= -github.com/go-openapi/swag/cmdutils v0.29.2 h1:cXEzX/nWCODon251f+1HgL75/R4XXML5IZxgLCWMoro= -github.com/go-openapi/swag/cmdutils v0.29.2/go.mod h1:XziaSVzYqkDvpWXzASfWajw2YvJrLscq610O2XiyqJw= +github.com/go-openapi/swag v0.28.0 h1:xkgbOSKj6DZziNpyqRRAOt3GJGtgjgsd2RoyT30VWuw= +github.com/go-openapi/swag v0.28.0/go.mod h1:4qYnT3Cqr1p1VknOdPo70evN4rgQnAg6jwApHyxSGIg= +github.com/go-openapi/swag/cmdutils v0.28.0 h1:7TOeNtkYru1SG8Y34tDh9WBbLsMqGnptuxWiHREPZ4Q= +github.com/go-openapi/swag/cmdutils v0.28.0/go.mod h1:Sm1MVFMkF6guJJ+pQqHnQA3N0j9qALV3NxzDSv6bETM= github.com/go-openapi/swag/conv v0.29.2 h1:8c9shoB8l0QRSR6ymq1llHdBWDqpIgJfjTGHx3Vuhm0= github.com/go-openapi/swag/conv v0.29.2/go.mod h1:AZS0YigTNf8qNtD6WqJz/N4RUNmpr76SyjFGkq4+p6Q= -github.com/go-openapi/swag/fileutils v0.29.2 h1:mdUL+Vw5ah1fO1AvFCoHeIyv7YZsCz2MN3KNqd/lLVI= -github.com/go-openapi/swag/fileutils v0.29.2/go.mod h1:7QKmmodjAebaq61lGVJa8ldLdGeMF4DSgYv8tXOGGo0= +github.com/go-openapi/swag/fileutils v0.28.0 h1:Z04XWQD7R8Eq+7GnOrjovBxPPmZzsS4gt2H2GPGIViU= +github.com/go-openapi/swag/fileutils v0.28.0/go.mod h1:VvJFZLTZS0AI854gEQz5tk7dBESdLjiNUMSZ/th2ry8= github.com/go-openapi/swag/jsonutils v0.29.2 h1:uZNSD2/rJDYAfvsLYkykTzXuyxM3QpDKV9jhRHrMu6k= github.com/go-openapi/swag/jsonutils v0.29.2/go.mod h1:ONTdNvj3Y+IXRzfa17E+Rgt2ns/qiSOYjIo2K7v2yDs= github.com/go-openapi/swag/jsonutils/fixtures_test v0.29.2 h1:w+Fd6EBOMGlC74GYGHqCLGyb3Bpams8TtNrgM/SG4jo= github.com/go-openapi/swag/jsonutils/fixtures_test v0.29.2/go.mod h1:HC2egPORFzbj/gf05Zrfgz8Mgplx3oW7hgGi7pjZVhM= -github.com/go-openapi/swag/loading v0.29.2 h1:QU1ry24e6r6Shoxe380Nx0X5iKkpRO+hJffsyJ2dVlY= -github.com/go-openapi/swag/loading v0.29.2/go.mod h1:DqilDjuiJKETecsS4TRopWG1acUDsfqN39ZmQhPu6uI= -github.com/go-openapi/swag/mangling v0.29.2 h1:ltdo3K0tTP4P6zWhVVWDU9D37/YYBuMJRdZxiS2Dtog= -github.com/go-openapi/swag/mangling v0.29.2/go.mod h1:RjDi4TnItAenS3cgCXSpIl1kKbjG7il6pnmQVl/8bp8= -github.com/go-openapi/swag/netutils v0.29.2 h1:dBli6jyUa93sDS/XYWShJzf4+nnVfFKfvY9SLUaUzB8= -github.com/go-openapi/swag/netutils v0.29.2/go.mod h1:1pM6Xg/Um8E1eps3umWl8Hme3ByWXOtHsvFC0CULHUE= +github.com/go-openapi/swag/loading v0.28.0 h1:td8QZdZC9MIYGGSnSPKShKiK22I2tU5UQvuUhIBPRLU= +github.com/go-openapi/swag/loading v0.28.0/go.mod h1:rXB0QiQX5mMveXEA7ouM4KiiM9jVJe4K6BVbwhD1M4k= +github.com/go-openapi/swag/mangling v0.28.0 h1:pH8eyeNO9SLYsTMWJrurnNfKmDa28XrlA+HePVD53VM= +github.com/go-openapi/swag/mangling v0.28.0/go.mod h1:jtBE2+V+3pILxOR7Vgce+Cwp6A2PgZbvVqfNntbVs0w= +github.com/go-openapi/swag/netutils v0.28.0 h1:YXN6TALEi2pzts8/8GNm6T61HTAZsieukGZidap989k= +github.com/go-openapi/swag/netutils v0.28.0/go.mod h1:J+WYyFMLtvtCGqa6jLv+YNUmIKI3ZRQRrvfNDMoQoEQ= github.com/go-openapi/swag/pools v0.29.2 h1:PlGoDRF8WtSyXkedZZkpW3f9wDhFf3u8KtaBcmgmh8c= github.com/go-openapi/swag/pools v0.29.2/go.mod h1:V3lhxVT4qDYRqc2MRSSbLsTYIYV/2HlHafhyEkmzLIc= -github.com/go-openapi/swag/stringutils v0.29.2 h1:lcnBxwAaysT3bMUVBfn9V/PkfVqkurpqufKU6rTUMGk= -github.com/go-openapi/swag/stringutils v0.29.2/go.mod h1:i9cdh7sGaa0nm3CqIvH5IM5h2QClk1wns2ktKeILvRI= +github.com/go-openapi/swag/stringutils v0.28.0 h1:ixsc9iYgDPubHL/8nSkbnryEHpD2VRlBMLKpQyPXcDU= +github.com/go-openapi/swag/stringutils v0.28.0/go.mod h1:lzRN95CxXmA03XcDWHLOb6nOMcxCqR5rGY0lOgsfRoM= github.com/go-openapi/swag/typeutils v0.29.2 h1:O7aVvkTs3pXwikgtrPLenigEMdQFgONKRooQA9pgf2I= github.com/go-openapi/swag/typeutils v0.29.2/go.mod h1:7+GDG+uz9Ke+eVt4rClZg7wklSDp8hT/mKNh/pC26TE= -github.com/go-openapi/swag/yamlutils v0.29.2 h1:IFKFFeDnuIwzfsuWRQU+rI8iL3g4XyAYjV/RlnlxPLM= -github.com/go-openapi/swag/yamlutils v0.29.2/go.mod h1:7MGqtcrK73sxQ4ceiyIf8qiXS/s09JLMdR5esK5euYQ= +github.com/go-openapi/swag/yamlutils v0.28.0 h1:TV3JXH6DS46KUroDtMLAYHGkdWf5VDq3wVWFirmzROY= +github.com/go-openapi/swag/yamlutils v0.28.0/go.mod h1:x0q/yndZHEgk9Rx3DyDqzFUmHy55KTvIZldvF2dTJXs= github.com/go-openapi/testify/enable/yaml/v2 v2.7.0 h1:wPW6YRgx3+SID1yUy/Xwa17L8kFEaEKod2VRbJDZNUs= github.com/go-openapi/testify/enable/yaml/v2 v2.7.0/go.mod h1:mI1M88etYbc3PhgHsWQK2kwvNwW5aGFqMPbmib+SGIs= github.com/go-openapi/testify/v2 v2.8.0 h1:19QDx5b57p8KjO2E4sgs/woL4Akp+FGLRlVm2xn0Rho= @@ -161,8 +161,8 @@ github.com/google/go-containerregistry v0.22.1/go.mod h1:bJR35SK8XgisYmhg/FMQ/5R github.com/google/go-intervals v0.0.2 h1:FGrVEiUnTRKR8yE04qzXYaJMtnIYqobR5QbblK3ixcM= github.com/google/go-intervals v0.0.2/go.mod h1:MkaR3LNRfeKLPmqgJYs4E66z5InYjmCjbbr4TQlcT6Y= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/pprof v0.0.0-20261026192309-dbd0ed30aa88 h1:BnzMe/RUfFezpFwXsOWHmSMNO8qt7755OL25C+AezGQ= -github.com/google/pprof v0.0.0-20261026192309-dbd0ed30aa88/go.mod h1:yUo1AMMpsPIDFGuwDK8nLcf8+vvAd5l2O6JDZ6hpwrM= +github.com/google/pprof v0.0.0-20261105003125-4bf881d7fb0b h1:5NKFt6kcAJNVt3XBOf8jwp8TnWZVOZFmmGkK0XextI4= +github.com/google/pprof v0.0.0-20261105003125-4bf881d7fb0b/go.mod h1:yUo1AMMpsPIDFGuwDK8nLcf8+vvAd5l2O6JDZ6hpwrM= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -203,16 +203,16 @@ github.com/maruel/natural v1.1.1 h1:Hja7XhhmvEFhcByqDoHz9QZbkWey+COd9xWfCfn1ioo= github.com/maruel/natural v1.1.1/go.mod h1:v+Rfd79xlw1AgVBjbO0BEQmptqb5HvL/k9GRHB7ZKEg= github.com/mattn/go-runewidth v0.0.31 h1:1oCV4ReTlosDBc6rYRw5cL8S/4y8iv5oRl4SJ5IBgwo= github.com/mattn/go-runewidth v0.0.31/go.mod h1:3qAiGCV4Koz/yuveO58qUefmUTRm8r0IGEXZ9jeHp/8= -github.com/mattn/go-sqlite3 v1.14.52 h1:wVbm2Qnf4OXkqhBTSPuCRZDRnxfbVrrmiCEroVdog8U= -github.com/mattn/go-sqlite3 v1.14.52/go.mod h1:6JTjA44L93a0QCyJef5YvlPoKXntQPjzWv5gtm9sB6w= +github.com/mattn/go-sqlite3 v1.14.53 h1:mnTM0owzUMrKuLo+0w51NUiB0ir2Fo7kFXlPt/l3BGs= +github.com/mattn/go-sqlite3 v1.14.53/go.mod h1:6JTjA44L93a0QCyJef5YvlPoKXntQPjzWv5gtm9sB6w= github.com/mfridman/tparse v0.18.0 h1:wh6dzOKaIwkUGyKgOntDW4liXSo37qg5AXbIhkMV3vE= github.com/mfridman/tparse v0.18.0/go.mod h1:gEvqZTuCgEhPbYk/2lS3Kcxg1GmTxxU7kTC8DvP0i/A= github.com/miekg/pkcs11 v1.1.2 h1:/VxmeAX5qU6Q3EwafypogwWbYryHFmF2RpkJmw3m4MQ= github.com/miekg/pkcs11 v1.1.2/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= github.com/mistifyio/go-zfs/v4 v4.0.0 h1:sU0+5dX45tdDK5xNZ3HBi95nxUc48FS92qbIZEvpAg4= github.com/mistifyio/go-zfs/v4 v4.0.0/go.mod h1:weotFtXTHvBwhr9Mv96KYnDkTPBOHFUbm9cBmQpesL0= -github.com/moby/buildkit v0.34.1 h1:jVdxsXX0UpU0q1Et+9lFezPmh9sGE6vF0TrKZaGlfy4= -github.com/moby/buildkit v0.34.1/go.mod h1:e+Za70y2a3nL1U2Y0P8TvhPyKp2Ok2NS+Q4siSArDiM= +github.com/moby/buildkit v0.34.2 h1:fXgOe79JW5zJNDumRtwTemOklLX66otQokObUXuiGJo= +github.com/moby/buildkit v0.34.2/go.mod h1:HyFnF6kIPzHvqopF1+BKeGY8Ee9MXmfR2n+0Gd4Y69s= github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0= github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo= github.com/moby/go-archive v0.3.3 h1:OxxR9paxsluYi+zDUEXTTaIxtkK3viymW+Ka7vRhhME= @@ -314,8 +314,8 @@ github.com/spf13/cast v1.10.0/go.mod h1:jNfB8QC9IA6ZuY2ZjDp0KtFO2LZZlg4S/7bzP6qq github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU= github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4= github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk= -github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/pflag v1.1.0 h1:6W6MbVUrnMb8PEhjkqwsVLY7ryuzRfFHF4mQd7L94ag= +github.com/spf13/pflag v1.1.0/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.21.0 h1:x5S+0EU27Lbphp4UKm1C+1oQO+rKx36vfCoaVebLFSU= github.com/spf13/viper v1.21.0/go.mod h1:P0lhsswPGWD/1lZJ9ny3fYnVqxiegrlNrEmgLjbTCAY= github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6 h1:pnnLyeX7o/5aX8qUQ69P/mLojDqwda8hFOCBTmP/6hw= @@ -386,48 +386,48 @@ go.podman.io/buildah v1.46.0 h1:+xBsV2cccaVTi0CY1c/D8nVe5LCWv1xtBOKoIDoq5o4= go.podman.io/buildah v1.46.0/go.mod h1:96n0tfaU1Ab/p4huHT2QACt+fL3RclcbvAcBQ4tEfPc= go.podman.io/common v0.70.0 h1:XPTq4/3BqHYzGM4SEOsWGhASOJAHZQep/r/lw5OG24c= go.podman.io/common v0.70.0/go.mod h1:55SIF0nIlE+4c0Fb4S1jjfg0qVGlpPHR+gqctAMuyUE= -go.podman.io/image/v5 v5.42.0 h1:C//Ix0Thj2LYOQO6++NjU3McLFLQbf4czgUyH98R9gc= -go.podman.io/image/v5 v5.42.0/go.mod h1:mmIgf9EdpF68j8vdX1/OxhOSIknU1PO3G6/ClRkrwm4= -go.podman.io/podman/v6 v6.1.4 h1:2aUnBUpWTFcrQ+zHBWYeiO4GPFe8x1eGc2skZKysPvk= -go.podman.io/podman/v6 v6.1.4/go.mod h1:OkGQgqxCEO+XFo+OX+enxnJmhjr0X6YMTM1n8rqKfd8= -go.podman.io/storage v1.65.0 h1:GgY5VibEw6coVhOGYWuxZ4F7H2AaTfPiwL7E1CJ2dnM= -go.podman.io/storage v1.65.0/go.mod h1:ZDXsVSzdho+p4fDky+iMVCPwRtjS1kSiHcyhBwUB6M0= +go.podman.io/image/v5 v5.42.1 h1:I8FkPUeBB1PGpU2W3mfFcG2aMlvAI/x3NdT/sK1IwyY= +go.podman.io/image/v5 v5.42.1/go.mod h1:DJl4PlLuZIbJBpN3Wk395Df8xHY9/3eZ1WlWmHlRcF8= +go.podman.io/podman/v6 v6.2.0 h1:mKEbX1U5uPIp8SGM1Mgin69Rs/eMvvldMQTFfnqvKPc= +go.podman.io/podman/v6 v6.2.0/go.mod h1:9hLeDVlMsd1kSP3RdLSOhDiZI0DqylydwC9wCkABpyY= +go.podman.io/storage v1.65.1 h1:tmus7lO5lmo6pPDHECKPrFP/DEWB8QQun96vBuQOKX0= +go.podman.io/storage v1.65.1/go.mod h1:ZDXsVSzdho+p4fDky+iMVCPwRtjS1kSiHcyhBwUB6M0= go.yaml.in/yaml/v2 v2.4.4 h1:tuyd0P+2Ont/d6e2rl3be67goVK4R6deVxCUX5vyPaQ= go.yaml.in/yaml/v2 v2.4.4/go.mod h1:gMZqIpDtDqOfM0uNfy0SkpRhvUryYH0Z6wdMYcacYXQ= go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= go.yaml.in/yaml/v3 v3.0.6 h1:zcDfvjXEqTQmpjniUBLc91xYJMB2c4QOFxEF/LCEckM= go.yaml.in/yaml/v3 v3.0.6/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg= -golang.org/x/crypto v0.58.0 h1:COkYLr4k7nDI4r6QtMML2AfzeIswWHAJthLS6K/M/54= -golang.org/x/crypto v0.58.0/go.mod h1:Xh+kl5A+M0gMiWDytH2Hhr5Z7WbNCpv/eB/EFgfSk+w= +golang.org/x/crypto v0.59.0 h1:xS2jhqYbzNrpvkWP2YTDf4TJwBy3ykR03i8vFDxEc7c= +golang.org/x/crypto v0.59.0/go.mod h1:veDyUwATGs3c+vN3VfTbzViMGXeTBk3WyhBOkn+F/4U= golang.org/x/mod v0.42.0 h1:ICeL3t2L30ljSPHHxDnR4fqVcBt/zR2zJAb9juavmQg= golang.org/x/mod v0.42.0/go.mod h1:u5fzIrRInkL8MaO1cbRkUHT64v303YIT5KEqpNr7jRs= golang.org/x/net v0.62.0 h1:18ELalfM5+XNRwzM2nYqXsZQ9ByS1uhj2O/U7+5jqRY= golang.org/x/net v0.62.0/go.mod h1:WgDCOTH8iwtB66T4/GfI94AHo/hhdb7Hah9NDseQfiI= golang.org/x/oauth2 v0.37.0 h1:JUlcxA8oAtauLfiH8FX2/FkAWHAdi0QtGCGc+hofE98= golang.org/x/oauth2 v0.37.0/go.mod h1:IxwZNxUULJmpBFf9K/9NTMSIfZZuvuTy1gGxhigP/58= -golang.org/x/sync v0.24.0 h1:iqiDrGoDgyuvAKrhLQthUEzU/R378N78gXbBjxed7oA= -golang.org/x/sync v0.24.0/go.mod h1:sUUOizhqBxiL6pEWpqNLUiaJn1ShEbZ6BBqskPbjZm0= +golang.org/x/sync v0.25.0 h1:dJnifr0nMV8/SBnBvdo4eSGGnrc3O4FFx6IqvtLcmRs= +golang.org/x/sync v0.25.0/go.mod h1:sUUOizhqBxiL6pEWpqNLUiaJn1ShEbZ6BBqskPbjZm0= golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.49.0 h1:XbzkgYJHdqh/8m2Uu0W/dQv8nktxx4BFHp1M0gROTXA= -golang.org/x/sys v0.49.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og= -golang.org/x/term v0.47.0 h1:cpyOwQkr2Nzxe2p6KnrTG7Ei2wtzjsuSjhpXXepZ/BM= -golang.org/x/term v0.47.0/go.mod h1:efAfAuG6RKABvg1ArGebRkvX6LXul14SM67o2e4mUCY= -golang.org/x/text v0.43.0 h1:1QivrlhwAsnMOcqgOdl9my7s9OyZl8O5/UGUTJVXoWc= -golang.org/x/text v0.43.0/go.mod h1:hbSIYA/amXcRXTFSZqh8tWHEoqRvvbKPJ2uz/KU+a+s= +golang.org/x/sys v0.50.0 h1:dkKZEFTEKaLr1sjhs0WiKqoi8Jj5nHbS3Njmx1UoMJs= +golang.org/x/sys v0.50.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og= +golang.org/x/term v0.48.0 h1:G6UU1eiSB8nl3DzeUGt7Mg+2SctI8tPS6Z5/mBt6cOk= +golang.org/x/term v0.48.0/go.mod h1:BRDLHCZr2SUjIeBHHpRyQeC9xzSAVbzY2rvKgafnHf4= +golang.org/x/text v0.44.0 h1:YItdp/mQNGnsmrgpcdA5yQ3bnRxCfo/Tj/iByGW9GGo= +golang.org/x/text v0.44.0/go.mod h1:S4FR1waQ9LbjQTls97SyRjDaUUVkaM+cXwwuG/G+MwY= golang.org/x/time v0.16.0 h1:vMb6ptszcQMkcwiRTAuNNU50gom6++Q/6gY2hDM6VDE= golang.org/x/time v0.16.0/go.mod h1:rVKOqvZeKvrDKTQiAHJ7wmwP0RzleSphoEA9RcdLA0s= golang.org/x/tools v0.52.0 h1:ryxg4U63oaUYk7uOLTF37n43f4qgtGvqV4Ioit1BaEs= golang.org/x/tools v0.52.0/go.mod h1:ItcP5UNaVGG+Yc4eIYmaFLNJ4soEopkx5Y2d4lcEurs= gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4= gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E= -google.golang.org/genproto/googleapis/api v0.0.0-20261026165753-2ffab32bce7e h1:e789sLZjeTdc02ZCQGTSzHOu0fR73+dwPQVKUp67Z88= -google.golang.org/genproto/googleapis/api v0.0.0-20261026165753-2ffab32bce7e/go.mod h1:vHV3wJM9WZyfV7GyB+OQGq5dWVrFwCDxapPK4WlRD88= -google.golang.org/genproto/googleapis/rpc v0.0.0-20261026165753-2ffab32bce7e h1:w3fy/G8OrJHYexn+u5y7hFyc8YRRIr7DCevtIOwAcGY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20261026165753-2ffab32bce7e/go.mod h1:OaIUM3+LpYcK2GXM4FTmhWoIq371Owdr+Cc7/BsYHHc= +google.golang.org/genproto/googleapis/api v0.0.0-20261104224025-d1e00e9f33ab h1:n6IDWZ1RzI/NberLoLLFNrjl1H45uhc4+WYsUf5lPPc= +google.golang.org/genproto/googleapis/api v0.0.0-20261104224025-d1e00e9f33ab/go.mod h1:vHV3wJM9WZyfV7GyB+OQGq5dWVrFwCDxapPK4WlRD88= +google.golang.org/genproto/googleapis/rpc v0.0.0-20261104224025-d1e00e9f33ab h1:8sYjjefPfQ+FZEh1ZwBAqK/NifJVhOxut8nRh3SJzZM= +google.golang.org/genproto/googleapis/rpc v0.0.0-20261104224025-d1e00e9f33ab/go.mod h1:OaIUM3+LpYcK2GXM4FTmhWoIq371Owdr+Cc7/BsYHHc= google.golang.org/grpc v1.85.0 h1:BPBCfuVRQ1qvBhKDOq9uvQllMvO59rKsYhXpp7Dd8vw= google.golang.org/grpc v1.85.0/go.mod h1:0rQrOD58yjal/0EaVbGBANindixsCZNQPDV3VKtaKuQ= google.golang.org/protobuf v1.36.12 h1:pJOKDDOyeXErUroCihFAd5LQuwXBSpVnKGrj5o/fwxc= @@ -457,12 +457,12 @@ k8s.io/kube-openapi v0.0.0-20260721132016-d427ff9ee9ad h1:oXImqH8mQNk7PmvzKhmN3d k8s.io/kube-openapi v0.0.0-20260721132016-d427ff9ee9ad/go.mod h1:0/mqHCVhlumdJ3BhCfnjSZQE037nAhNodh1/hK0T8/I= k8s.io/streaming v0.37.2 h1:xmzp9nbqIbjvsRcqrBYa+K5XPQ6Jy/Dm3zZ8mN916AI= k8s.io/streaming v0.37.2/go.mod h1:APlJR26ZWRcVy5bIEj0QRrKUXROtBHPcxl2NT7EAzPU= -k8s.io/utils v0.0.0-20260626114624-be93311217bd h1:Ea7fgQ5we8Y9T0OX5o0dAHzQOBRI07D/dEYRaB9ZZEs= -k8s.io/utils v0.0.0-20260626114624-be93311217bd/go.mod h1:xDxuJ0whA3d0I4mf/C4ppKHxXynQ+fxnkmQH0vTHnuk= +k8s.io/utils v0.0.0-20261023123148-ca04ba58ecab h1:pjQrNLaF//ytZtWwCAHtW+pqwSKjtWDqzA8+TCX37RI= +k8s.io/utils v0.0.0-20261023123148-ca04ba58ecab/go.mod h1:DdQ0BJxlQtuMlKDqdg7X5IMMQCXIk2b3d1/4M9OhUYo= pgregory.net/rapid v1.2.0 h1:keKAYRcjm+e1F0oAuU5F5+YPAWcyxNNRK2wud503Gnk= pgregory.net/rapid v1.2.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= -sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg= -sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg= +sigs.k8s.io/json v0.0.0-20260909141634-11ed52e25bc5 h1:k9jo7ED/fsfOcz3L1P20P5tjTNtsdQNwMOG2aKzHrl8= +sigs.k8s.io/json v0.0.0-20260909141634-11ed52e25bc5/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg= sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU= sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY= sigs.k8s.io/structured-merge-diff/v6 v6.4.2 h1:qdOxHwrl2Kaag1aQEarlYcOA9vSyGCp3CIki3aW8c4Q= From 8633b830ee33f1d8f206c6adeeccb4cd10d64cf0 Mon Sep 17 00:00:00 2001 From: HarshwardhanPatil07 Date: Fri, 13 Nov 2026 15:02:48 +0530 Subject: [PATCH 4/7] test: Fix wrapped Podman error fixture for Go 1.27 Go 1.27 vet rejects wrapping the pointer error model directly with percent-w. Join it with context so errors.Is still sees the intended error. Assisted-by: AI Signed-off-by: HarshwardhanPatil07 --- internal/registry/registry_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/registry/registry_test.go b/internal/registry/registry_test.go index 1db139d..227f97f 100644 --- a/internal/registry/registry_test.go +++ b/internal/registry/registry_test.go @@ -84,7 +84,7 @@ func TestIsPodmanNotFound(t *testing.T) { }, { name: "wrapped not found", - err: fmt.Errorf("removing container: %w", &errorhandling.ErrorModel{ + err: errors.Join(errors.New("removing container"), &errorhandling.ErrorModel{ ResponseCode: http.StatusNotFound, }), want: true, From 29cceed87af6ab699549484cffbda0104cb9ad21 Mon Sep 17 00:00:00 2001 From: HarshwardhanPatil07 Date: Fri, 13 Nov 2026 14:59:00 +0530 Subject: [PATCH 5/7] ci: Share AppArmor setup across image builds and tests The node image build failed when the runner AppArmor profile denied bwrap the dac_override capability. Use one checked runner setup after package installation in every affected job, so the build and runtime tests get the same policy state. Assisted-by: AI Signed-off-by: HarshwardhanPatil07 --- .github/actions/setup-apparmor/action.yml | 21 +++++++++++++++++++++ .github/actions/setup-bink/action.yml | 10 +++------- .github/workflows/integration-tests.yml | 4 ++++ .github/workflows/test-container-image.yml | 5 +++-- 4 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 .github/actions/setup-apparmor/action.yml diff --git a/.github/actions/setup-apparmor/action.yml b/.github/actions/setup-apparmor/action.yml new file mode 100644 index 0000000..22e7cc9 --- /dev/null +++ b/.github/actions/setup-apparmor/action.yml @@ -0,0 +1,21 @@ +name: Set up AppArmor for bink +description: Remove runner profiles that block bwrap and passt + +runs: + using: composite + steps: + - name: Remove restrictive profiles + shell: bash + run: | + sudo systemctl disable --now apparmor 2>/dev/null || true + sudo aa-teardown 2>/dev/null || true + sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0 + if sudo test -r /sys/kernel/security/apparmor/profiles && \ + sudo grep -Eq '^(unpriv_bwrap|passt) ' /sys/kernel/security/apparmor/profiles; then + echo 'AppArmor still has a profile that blocks bink builds or tests' >&2 + exit 1 + fi + if [ "$(sysctl -n kernel.apparmor_restrict_unprivileged_userns)" != 0 ]; then + echo 'AppArmor still restricts unprivileged user namespaces' >&2 + exit 1 + fi diff --git a/.github/actions/setup-bink/action.yml b/.github/actions/setup-bink/action.yml index b1dcc41..8be21b6 100644 --- a/.github/actions/setup-bink/action.yml +++ b/.github/actions/setup-bink/action.yml @@ -21,11 +21,6 @@ runs: - name: Configure kernel for nested containers shell: bash run: | - sudo systemctl disable --now apparmor 2>/dev/null || true - sudo aa-teardown 2>/dev/null || true - echo "AppArmor status after teardown:" - sudo aa-status 2>/dev/null || echo "(aa-status failed)" - sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0 sudo sysctl -w net.ipv6.conf.all.disable_ipv6=1 sudo sysctl -w net.ipv6.conf.default.disable_ipv6=1 @@ -52,8 +47,9 @@ runs: libbtrfs-dev \ libdevmapper-dev \ pkg-config - # passt's postinst reloads its AppArmor profile in enforce mode; remove it - sudo aa-teardown 2>/dev/null || true + + - name: Set up AppArmor + uses: ./.github/actions/setup-apparmor - name: Set up KVM shell: bash diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index c27262b..0a40fad 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -50,6 +50,7 @@ jobs: node-images: - 'node-images/fedora/**' - '.github/workflows/integration-tests.yml' + - '.github/actions/setup-apparmor/**' supported-versions: runs-on: ubuntu-latest @@ -98,6 +99,9 @@ jobs: sudo chmod 666 /dev/kvm ls -la /dev/kvm + - name: Set up AppArmor + uses: ./.github/actions/setup-apparmor + - name: Start local registry run: sudo podman run -d -p 5000:5000 --name registry docker.io/library/registry:2 diff --git a/.github/workflows/test-container-image.yml b/.github/workflows/test-container-image.yml index 9e13a4d..4f7b91d 100644 --- a/.github/workflows/test-container-image.yml +++ b/.github/workflows/test-container-image.yml @@ -37,8 +37,6 @@ jobs: - name: Configure kernel for nested containers run: | - sudo aa-teardown 2>/dev/null || true - sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0 sudo sysctl -w net.ipv6.conf.all.disable_ipv6=1 sudo sysctl -w net.ipv6.conf.default.disable_ipv6=1 @@ -47,6 +45,9 @@ jobs: sudo apt-get update sudo apt-get install -y podman + - name: Set up AppArmor + uses: ./.github/actions/setup-apparmor + - name: Configure Podman run: | podman --version From 06339850e2335e54c2551edd3843b67e8aae9192 Mon Sep 17 00:00:00 2001 From: HarshwardhanPatil07 Date: Fri, 13 Nov 2026 17:15:13 +0530 Subject: [PATCH 6/7] node: Fix Fedora 45 policy and nested image cache Fedora 45 installs the default image signature policy under /usr/share/containers, while CRI-O 1.36 still searches /etc/containers. Install the policy provider explicitly and point CRI-O to the packaged policy so control-plane pods can start. The nested container test cached a Kubernetes 1.35 node image even though bink defaults to 1.36. Cache the image actually used so nested Podman does not need to pull it through its unreliable DNS path. Assisted-by: AI Signed-off-by: HarshwardhanPatil07 --- .github/workflows/test-container-image.yml | 4 ++-- node-images/fedora/Containerfile | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-container-image.yml b/.github/workflows/test-container-image.yml index 4f7b91d..1da0966 100644 --- a/.github/workflows/test-container-image.yml +++ b/.github/workflows/test-container-image.yml @@ -18,7 +18,7 @@ concurrency: env: BINK_RUNTIME_IMAGES: >- ghcr.io/bootc-dev/bink/cluster:latest - ghcr.io/bootc-dev/bink/node:v1.35-fedora-44-disk + ghcr.io/bootc-dev/bink/node:v1.36-fedora-44-disk ghcr.io/bootc-dev/bink/dns:latest jobs: @@ -107,7 +107,7 @@ jobs: run: sudo make build-bink-image - name: Test nested mode - run: sudo -E hack/test-container-image.sh nested + run: sudo env IMAGE_CACHE_DIR="$IMAGE_CACHE_DIR" hack/test-container-image.sh nested timeout-minutes: 40 env: IMAGE_CACHE_DIR: /tmp/podman-image-cache diff --git a/node-images/fedora/Containerfile b/node-images/fedora/Containerfile index bc0684c..c051e07 100644 --- a/node-images/fedora/Containerfile +++ b/node-images/fedora/Containerfile @@ -15,6 +15,7 @@ RUN /usr/libexec/bootc-base-imagectl build-rootfs \ --install kubernetes${KUBE_MINOR}-kubeadm \ --install kubernetes${KUBE_MINOR}-client \ --install cri-o${KUBE_MINOR} \ + --install containers-common \ --install qemu-guest-agent \ --install bind-utils \ --install iputils \ @@ -37,6 +38,8 @@ RUN sed -i 's|"/opt/cni/bin"|"/var/lib/cni/bin"|g' /etc/crio/crio.conf && \ mkdir -p /etc/crio/crio.conf.d && \ printf '[crio.runtime]\npinns_path = "/usr/libexec/crio/pinns"\n' > /etc/crio/crio.conf.d/04-pinns.conf; \ fi +RUN mkdir -p /etc/crio/crio.conf.d && \ + printf '[crio.image]\nsignature_policy = "/usr/share/containers/policy.json"\n' > /etc/crio/crio.conf.d/05-signature-policy.conf RUN bootc container lint LABEL containers.bootc 1 From b2555d75273b51d6f4c159a003dc7b43375818d9 Mon Sep 17 00:00:00 2001 From: HarshwardhanPatil07 Date: Mon, 16 Nov 2026 13:21:05 +0530 Subject: [PATCH 7/7] ci: Use nested Podman DNS for image population The nested test forced 8.8.8.8 as its resolver. In PR 165 CI, lookups through that resolver failed for Kubernetes and Calico images, leaving the cluster image volume incomplete and CoreDNS unready. Let Podman provide the outer container resolver, which the host-network populator can use. Assisted-by: AI Signed-off-by: HarshwardhanPatil07 --- hack/test-container-image.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hack/test-container-image.sh b/hack/test-container-image.sh index 0a33ee4..8624e72 100755 --- a/hack/test-container-image.sh +++ b/hack/test-container-image.sh @@ -58,10 +58,6 @@ run_test() { fi sleep 0.5 done - # The outer container's resolv.conf points to the host's aardvark-dns, which is - # unreachable from inside nested podman networks. Override it so inner aardvark-dns - # forwards queries to a public resolver instead. - podman exec "${nested_container}" bash -c 'echo "nameserver 8.8.8.8" > /etc/resolv.conf' if podman exec "${nested_container}" test -d /cache; then echo "Loading cached images into nested podman..." podman exec "${nested_container}" bash -c 'for f in /cache/*.tar; do [ -f "$f" ] && podman load -i "$f"; done'