diff --git a/Dockerfile.dapper b/Dockerfile.dapper index fa90d4ea0655..2654f138757a 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -1,4 +1,4 @@ -ARG GOLANG=golang:1.21.9-alpine3.18 +ARG GOLANG=golang:1.21.11-alpine3.19 FROM ${GOLANG} # Set proxy environment variables @@ -15,11 +15,11 @@ RUN apk -U --no-cache add \ zlib-dev tar zip squashfs-tools npm coreutils python3 py3-pip openssl-dev libffi-dev libseccomp \ libseccomp-dev libseccomp-static make libuv-static sqlite-dev sqlite-static libselinux \ libselinux-dev zlib-dev zlib-static zstd pigz alpine-sdk binutils-gold btrfs-progs-dev \ - btrfs-progs-static gawk yq \ + btrfs-progs-static gawk yq pipx \ && [ "$(go env GOARCH)" = "amd64" ] && apk -U --no-cache add mingw-w64-gcc || true # Install AWS CLI -RUN python3 -m pip install awscli +RUN PIPX_BIN_DIR=/usr/local/bin pipx install awscli # Install Trivy ENV TRIVY_VERSION="0.51.4" diff --git a/Dockerfile.local b/Dockerfile.local index 78b689bb5860..ee711f3e592a 100644 --- a/Dockerfile.local +++ b/Dockerfile.local @@ -1,4 +1,4 @@ -ARG GOLANG=golang:1.21.9-alpine3.18 +ARG GOLANG=golang:1.21.11-alpine3.19 FROM ${GOLANG} as infra ARG http_proxy=$http_proxy @@ -11,13 +11,13 @@ ENV no_proxy=$no_proxy RUN apk -U --no-cache add bash git gcc musl-dev docker vim less file curl wget ca-certificates jq linux-headers \ zlib-dev tar zip squashfs-tools npm coreutils python3 py3-pip openssl-dev libffi-dev libseccomp libseccomp-dev \ libseccomp-static make libuv-static sqlite-dev sqlite-static libselinux libselinux-dev zlib-dev zlib-static \ - zstd pigz alpine-sdk binutils-gold btrfs-progs-dev btrfs-progs-static gawk yq \ + zstd pigz alpine-sdk binutils-gold btrfs-progs-dev btrfs-progs-static gawk yq pipx \ && \ if [ "$(go env GOARCH)" = "amd64" ]; then \ apk -U --no-cache add mingw-w64-gcc; \ fi -RUN python3 -m pip install awscli +RUN PIPX_BIN_DIR=/usr/local/bin pipx install awscli # this works for both go 1.17 and 1.18 RUN GOPROXY=direct go install golang.org/x/tools/cmd/goimports@gopls/v0.11.0 diff --git a/Dockerfile.manifest b/Dockerfile.manifest index c07676835d61..a8088a722ad7 100644 --- a/Dockerfile.manifest +++ b/Dockerfile.manifest @@ -1,4 +1,4 @@ -ARG GOLANG=golang:1.21.9-alpine3.18 +ARG GOLANG=golang:1.21.11-alpine3.19 FROM ${GOLANG} COPY --from=plugins/manifest:1.2.3 /bin/* /bin/ diff --git a/Dockerfile.test b/Dockerfile.test index 23bfc7112a82..6e37bc7a7511 100644 --- a/Dockerfile.test +++ b/Dockerfile.test @@ -1,4 +1,4 @@ -ARG GOLANG=golang:1.21.9-alpine3.18 +ARG GOLANG=golang:1.21.11-alpine3.19 FROM ${GOLANG} as test-base RUN apk -U --no-cache add bash jq @@ -14,9 +14,9 @@ ENTRYPOINT ["/bin/test-mods"] FROM test-base as test-k3s -RUN apk -U --no-cache add git gcc musl-dev docker curl coreutils python3 openssl py3-pip procps findutils yq +RUN apk -U --no-cache add git gcc musl-dev docker curl coreutils python3 openssl py3-pip procps findutils yq pipx -RUN python3 -m pip install awscli +RUN PIPX_BIN_DIR=/usr/local/bin pipx install awscli ENV SONOBUOY_VERSION 0.57.1 @@ -44,7 +44,7 @@ RUN vagrant box add generic/ubuntu2204 --provider libvirt --force RUN curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"; \ chmod +x ./kubectl; \ mv ./kubectl /usr/local/bin/kubectl -RUN GO_VERSION=go1.21.9; \ +RUN GO_VERSION=go1.21.11; \ curl -O -L "https://golang.org/dl/${GO_VERSION}.linux-amd64.tar.gz"; \ rm -rf /usr/local/go; \ tar -C /usr/local -xzf ${GO_VERSION}.linux-amd64.tar.gz; diff --git a/go.mod b/go.mod index 5195398f0520..e6454b48f2d4 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/k3s-io/k3s -go 1.21.9 +go 1.21.11 replace ( github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.11.0 @@ -37,40 +37,40 @@ replace ( google.golang.org/genproto => google.golang.org/genproto v0.0.0-20230525234035-dd9d682886f9 google.golang.org/grpc => google.golang.org/grpc v1.58.3 gopkg.in/square/go-jose.v2 => gopkg.in/square/go-jose.v2 v2.6.0 - k8s.io/api => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.29.5-k3s1 - k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.29.5-k3s1 - k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.29.5-k3s1 - k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.29.5-k3s1 - k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.29.5-k3s1 - k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.29.5-k3s1 - k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.29.5-k3s1 - k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.29.5-k3s1 - k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.29.5-k3s1 - k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.29.5-k3s1 - k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.29.5-k3s1 - k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.29.5-k3s1 - k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.29.5-k3s1 - k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.29.5-k3s1 - k8s.io/dynamic-resource-allocation => github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.29.5-k3s1 - k8s.io/endpointslice => github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.29.5-k3s1 + k8s.io/api => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.29.6-k3s1 + k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.29.6-k3s1 + k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.29.6-k3s1 + k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.29.6-k3s1 + k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.29.6-k3s1 + k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.29.6-k3s1 + k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.29.6-k3s1 + k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.29.6-k3s1 + k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.29.6-k3s1 + k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.29.6-k3s1 + k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.29.6-k3s1 + k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.29.6-k3s1 + k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.29.6-k3s1 + k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.29.6-k3s1 + k8s.io/dynamic-resource-allocation => github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.29.6-k3s1 + k8s.io/endpointslice => github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.29.6-k3s1 k8s.io/klog => github.com/k3s-io/klog v1.0.0-k3s2 // k3s-release-1.x k8s.io/klog/v2 => github.com/k3s-io/klog/v2 v2.100.1-k3s1 // k3s-main - k8s.io/kms => github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.29.5-k3s1 - k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.29.5-k3s1 - k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.29.5-k3s1 - k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.29.5-k3s1 - k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.29.5-k3s1 - k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.29.5-k3s1 - k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.29.5-k3s1 - k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.29.5-k3s1 - k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.29.5-k3s1 - k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.29.5-k3s1 - k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.29.5-k3s1 - k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.29.5-k3s1 - k8s.io/pod-security-admission => github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.29.5-k3s1 - k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.29.5-k3s1 - k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.29.5-k3s1 - k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.29.5-k3s1 + k8s.io/kms => github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.29.6-k3s1 + k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.29.6-k3s1 + k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.29.6-k3s1 + k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.29.6-k3s1 + k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.29.6-k3s1 + k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.29.6-k3s1 + k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.29.6-k3s1 + k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.29.6-k3s1 + k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.29.6-k3s1 + k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.29.6-k3s1 + k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.29.6-k3s1 + k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.29.6-k3s1 + k8s.io/pod-security-admission => github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.29.6-k3s1 + k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.29.6-k3s1 + k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.29.6-k3s1 + k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.29.6-k3s1 sourcegraph.com/sourcegraph/go-diff => github.com/sourcegraph/go-diff v0.6.0 ) @@ -150,20 +150,20 @@ require ( google.golang.org/grpc v1.63.2 gopkg.in/yaml.v2 v2.4.0 inet.af/tcpproxy v0.0.0-20200125044825-b6bb9b5b8252 - k8s.io/api v0.29.5 - k8s.io/apimachinery v0.29.5 - k8s.io/apiserver v0.29.5 + k8s.io/api v0.29.6 + k8s.io/apimachinery v0.29.6 + k8s.io/apiserver v0.29.6 k8s.io/cli-runtime v0.22.2 k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible - k8s.io/cloud-provider v0.29.5 + k8s.io/cloud-provider v0.29.6 k8s.io/cluster-bootstrap v0.0.0 - k8s.io/component-base v0.29.5 - k8s.io/component-helpers v0.29.5 - k8s.io/cri-api v0.29.5-alpha.0 + k8s.io/component-base v0.29.6 + k8s.io/component-helpers v0.29.6 + k8s.io/cri-api v0.29.6-alpha.0 k8s.io/klog/v2 v2.120.1 k8s.io/kube-proxy v0.0.0 k8s.io/kubectl v0.25.0 - k8s.io/kubernetes v1.29.5 + k8s.io/kubernetes v1.29.6 k8s.io/utils v0.0.0-20240310230437-4693a0247e57 sigs.k8s.io/yaml v1.4.0 ) @@ -474,22 +474,22 @@ require ( gopkg.in/square/go-jose.v2 v2.6.0 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/apiextensions-apiserver v0.29.5 // indirect - k8s.io/code-generator v0.29.5 // indirect + k8s.io/apiextensions-apiserver v0.29.6 // indirect + k8s.io/code-generator v0.29.6 // indirect k8s.io/controller-manager v0.25.4 // indirect k8s.io/csi-translation-lib v0.0.0 // indirect k8s.io/dynamic-resource-allocation v0.0.0 // indirect k8s.io/endpointslice v0.0.0 // indirect k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect k8s.io/kms v0.0.0 // indirect - k8s.io/kube-aggregator v0.29.5 // indirect + k8s.io/kube-aggregator v0.29.6 // indirect k8s.io/kube-controller-manager v0.0.0 // indirect k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect k8s.io/kube-scheduler v0.0.0 // indirect k8s.io/kubelet v0.28.6 // indirect k8s.io/legacy-cloud-providers v0.0.0 // indirect k8s.io/metrics v0.0.0 // indirect - k8s.io/mount-utils v0.29.5 // indirect + k8s.io/mount-utils v0.29.6 // indirect k8s.io/pod-security-admission v0.0.0 // indirect lukechampine.com/blake3 v1.2.1 // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect diff --git a/go.sum b/go.sum index 79a6bacd47b1..096f3ba71873 100644 --- a/go.sum +++ b/go.sum @@ -958,62 +958,62 @@ github.com/k3s-io/klog/v2 v2.100.1-k3s1 h1:xb/Ta8dpQuIZueQEw2YTZUYrKoILdBmPiITVk github.com/k3s-io/klog/v2 v2.100.1-k3s1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= github.com/k3s-io/kube-router/v2 v2.1.2 h1:/eLfIsELLsqqRW1skIJ2qe7bWL6IZZ9Hg3IniIgObXo= github.com/k3s-io/kube-router/v2 v2.1.2/go.mod h1:a7QUTzCmDayYvqh6tXSKEB/ICSuGCs64qD4aCtaJqAU= -github.com/k3s-io/kubernetes v1.29.5-k3s1 h1:JmAFzA7xvfhzbEiOKCm2fgnpQzcJyEImltSF4sgdsHc= -github.com/k3s-io/kubernetes v1.29.5-k3s1/go.mod h1:28sDhcb87LX5z3GWAKYmLrhrifxi4W9bEWua4DRTIvk= -github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.29.5-k3s1 h1:X57423wRgTWRHi34aL3rl+A42CjeN08JvwskqXZ8ams= -github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.29.5-k3s1/go.mod h1:5QkiNrCD00SOAgo8cbr43DKfW7NqRF9NpGKMO5TnQ8U= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.29.5-k3s1 h1:40MKT44u9GXdoEFkuM8DvZZjoqSHJX8p9NexMO0hLxg= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.29.5-k3s1/go.mod h1:PsITwF8Ox/3gLX4kJsonfI15kansSVgDJ8CMw8QIiNI= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.29.5-k3s1 h1:tiI8gLzIsApOd3yURH8O/82lF0YOd6ajDmLcDv+g1Qc= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.29.5-k3s1/go.mod h1:166Zl0XJZbCvhEHvgP+h2m9Gm5xHxyQdgT9CyQRI9gw= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.29.5-k3s1 h1:7QgRNpykwForecNj8WqGl9xXXLnfQLNnbYB8H+JrXgA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.29.5-k3s1/go.mod h1:8oHn4XNhYd8BeMxP6iXndQKKHaWPh8q8hIhKPSKd9KE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.29.5-k3s1 h1:0VOWvIutJVamZ4TOUAgmXmPNqVOHId2RUx2M4Ho5Me8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.29.5-k3s1/go.mod h1:vPbAZgZ+2z6OdCp9taACrBBLlZGVfdOa7oC4+6iC0y4= -github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.29.5-k3s1 h1:a+Bt8f0oqnDfhdmyBMgGQjlKgGrkstqn+n/A5pK/V4Y= -github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.29.5-k3s1/go.mod h1:vizyXfZHS/27DtTTjZ5mPXS5geAMGB4kj5iZtIk+GdY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.29.5-k3s1 h1:/WAWOKVW/K/ysFSH5FFDrdLkgqi/wefOv6CGc2acqlA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.29.5-k3s1/go.mod h1:N4Rw9sJ86OQXDc5dUFx2MnIOSttMkGPtLZyEoCzry8Q= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.29.5-k3s1 h1:68om/3dymqgw9ZPMToz2IWu3SunA6foc9Jr6g7L0u/o= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.29.5-k3s1/go.mod h1:7nqgik19CFiTPjB0wYiE96lCsAPpytEAPT8Eqlhdrd8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.29.5-k3s1 h1:Lh+Gd3GxvLgHsPxcsLMAv6sm6s6P32Nj3b05Ou3TD40= -github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.29.5-k3s1/go.mod h1:aOKsghBDeKfSUqZ5vaOK6151HkaMkDsFBMkVR25teFQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.29.5-k3s1 h1:efUFxwuZ4AfLDdd8mEi4YsVAvKy5quFGti+psuatPvM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.29.5-k3s1/go.mod h1:6oRMFYEkMBlkkBVznsi7HH/kV5F7nhyd6cqXCRCdzdo= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.29.5-k3s1 h1:U1pkvm/XpBvR3DqK3vTarqouwTS1ifb1G5rIKwQ3MjY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.29.5-k3s1/go.mod h1:Qbpzsy+Ip0ceNppIQKfluwnEJ7UDjGmNeHqI4zn8H0E= -github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.29.5-k3s1 h1:/UnvmfqF4JzXcC1PtahHUdyohJOCla6VhqEjMdN1MOU= -github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.29.5-k3s1/go.mod h1:trkLHxYEftqdW4UG3vwDLSMOV2yZeDGh0dD6jdc32aM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.29.5-k3s1 h1:87AxuNhF9b39wk7nsgkK3Kp2uGoWnr3T9GANM9lEqu0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.29.5-k3s1/go.mod h1:9Tgle7RkZOzgRM2VCSvvXZZjsQqOC6dxLtYy6BF+5PE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.29.5-k3s1 h1:0DTqe8FgeR2leoN3Q9uQIFq2LGioCQ1qsC1bJp0ppAQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.29.5-k3s1/go.mod h1:r3eLoJhpPmT1wErodG1VONmI2pSfblZu1YWg7pWFZHE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.29.5-k3s1 h1:S9AuZYAEmYEipeP6nGU/RgCpWx7ew1OjWmuh+pKrFRE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.29.5-k3s1/go.mod h1:bffvbAY3XpW5Fu6GQjVfvhXpHQSqUfsqeNW8BwdX3LI= -github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.29.5-k3s1 h1:o7nNg4r8bj/q9mvuC9/vt/C8OwoScAAFlj74QzCTPfQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.29.5-k3s1/go.mod h1:BeunpqVyw83zVvf8H0iLOZWNXGoEDrmAHVcJ0NFzedk= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.29.5-k3s1 h1:Jq2EWMx5mxk/UPqXNbih09t1y9TbHqZJAImoiaoUch8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.29.5-k3s1/go.mod h1:4pCpiW+pKMCqRLVoGPw11lrvEriSyd8o7DSvCw2u9vY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.29.5-k3s1 h1:yPOJXrd/BTpTjHzlcBOwaxkVBizeaD27fuP+RcOeUP4= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.29.5-k3s1/go.mod h1:PMbMTXY5M1iXvr0tK1ycFlUJeiUOUPIWRnLDX/xDEac= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.29.5-k3s1 h1:w6JfYGgSFBt4QZ2DuwbaCUtZc2Bpw+MdJNtkRzuc2dY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.29.5-k3s1/go.mod h1:o+O+TlsY0xG7iLwJKjdpRaxDuf07JkEGfU73CcaVOi4= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.29.5-k3s1 h1:soegUDtXXD3YCMO2k3DUJlKFdc7NG9kZqMyS4k/iNpE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.29.5-k3s1/go.mod h1:2XJjMQo8aHpiGiJSr5C/ED69X7crURrDNYSJTt6j+bY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.29.5-k3s1 h1:S4jFOpDx6zbT0qh9O0F38avKVp+oQNP4C+h6LxDZYmw= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.29.5-k3s1/go.mod h1:2vDuSYmBuOfKFZ/R0632vKiomLKN5cLtyxuqA62Rlos= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.29.5-k3s1 h1:J8/41Yo1NI4/jZMQ0E1ts+NsTRng7KHMTGIbtPEhwbs= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.29.5-k3s1/go.mod h1:5wY3XB46NQ9oTQdYb92teimR+9yai6ssD9K+Rd6lmug= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.29.5-k3s1 h1:D9AErCPDy0x2knkj4BkUkDQRXlh7HLjBoHphZeuDRf0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.29.5-k3s1/go.mod h1:BIgdnnHLOvfduD5ggrkXS1GlUPsRdw5YblFcmhouhgQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.29.5-k3s1 h1:XwOSJ+ZusZAyfZy8PGDB9kR3NNC4L05rWVJOGEMdqnQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.29.5-k3s1/go.mod h1:97CWm18L5b4oLOLskR48LLoDZ3vgQgjtpcilI3+PTPY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.29.5-k3s1 h1:Siq/aiJp3urz7MWJ2ECptk7NxU+FQB/YrKgM2YWd5xw= -github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.29.5-k3s1/go.mod h1:qxF7PHN59cVDWlhEvESV5Oj0CvWpzoSTUmHzXXLoxqw= -github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.29.5-k3s1 h1:R9M7S2QvLugwRlYPJVEw0byHq9LIZ1T42zA6MPhGq1A= -github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.29.5-k3s1/go.mod h1:4KmkE88Y4LDYrotr6iqMrolXDcWWY7UqmroXTO/sxFw= -github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.29.5-k3s1 h1:cY3w/cC8WxDJhHhFu7+gj13bI7nFdWscfWNRDlXg3jY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.29.5-k3s1/go.mod h1:3nvUgy9DAoVbLCBJcIBDCldv+vAc7hcHl6xJFRSpvb4= +github.com/k3s-io/kubernetes v1.29.6-k3s1 h1:pidP0lw43xTrWwHsq+7ajgg/hz5jfMjCsA7qVIseuu4= +github.com/k3s-io/kubernetes v1.29.6-k3s1/go.mod h1:28sDhcb87LX5z3GWAKYmLrhrifxi4W9bEWua4DRTIvk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.29.6-k3s1 h1:8Co/cIEpFluxVV3Qqqpudjfvjb6XDo5YZUu/vDKOm10= +github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.29.6-k3s1/go.mod h1:5QkiNrCD00SOAgo8cbr43DKfW7NqRF9NpGKMO5TnQ8U= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.29.6-k3s1 h1:aEAkGE8VrZFbEq/hEOzGnxpZs1sM+lVFRWfLzWPfT1Q= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.29.6-k3s1/go.mod h1:PsITwF8Ox/3gLX4kJsonfI15kansSVgDJ8CMw8QIiNI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.29.6-k3s1 h1:0wjAzae9CpIg9Av67tlmH4uDUuAkyI83IlajvnGNRF8= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.29.6-k3s1/go.mod h1:166Zl0XJZbCvhEHvgP+h2m9Gm5xHxyQdgT9CyQRI9gw= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.29.6-k3s1 h1:SXtCa3JQ9RFVW8iuwTVpjcrcutDZU/c6SwC79f2xS+I= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.29.6-k3s1/go.mod h1:8oHn4XNhYd8BeMxP6iXndQKKHaWPh8q8hIhKPSKd9KE= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.29.6-k3s1 h1:QqHqbKAgdFSspfC7Aq+YJwjiZGYFPh2VDlkPTqdcabE= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.29.6-k3s1/go.mod h1:vPbAZgZ+2z6OdCp9taACrBBLlZGVfdOa7oC4+6iC0y4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.29.6-k3s1 h1:4RgxtYvE5iJSTknMsDxGEc9WqiwgCYApV5LCA/3IqZw= +github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.29.6-k3s1/go.mod h1:vizyXfZHS/27DtTTjZ5mPXS5geAMGB4kj5iZtIk+GdY= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.29.6-k3s1 h1:ZyepBot/QEhmG26oRj4yJanItvRYFgHVk2GOaOJkZ5k= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.29.6-k3s1/go.mod h1:N4Rw9sJ86OQXDc5dUFx2MnIOSttMkGPtLZyEoCzry8Q= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.29.6-k3s1 h1:f9oM6bmZs5/eY0KbHDx+ihPxGtgKP/FbQsEKyI+Ai8M= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.29.6-k3s1/go.mod h1:7nqgik19CFiTPjB0wYiE96lCsAPpytEAPT8Eqlhdrd8= +github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.29.6-k3s1 h1:i/b+KOvXUw/Wjf4BqAtZGmlSBBrjD2jPUdyXxxfFnC0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.29.6-k3s1/go.mod h1:aOKsghBDeKfSUqZ5vaOK6151HkaMkDsFBMkVR25teFQ= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.29.6-k3s1 h1:jR1gV5mUEzQbTmfmQTMlTTZFgrPRJEfQ/8Jku8RtJ58= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.29.6-k3s1/go.mod h1:6oRMFYEkMBlkkBVznsi7HH/kV5F7nhyd6cqXCRCdzdo= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.29.6-k3s1 h1:BKSUm+1v6x53L+9nHQ/zyFlhwxqPd3VQ09yUdpMSUA8= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.29.6-k3s1/go.mod h1:Qbpzsy+Ip0ceNppIQKfluwnEJ7UDjGmNeHqI4zn8H0E= +github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.29.6-k3s1 h1:0GZKyrpgmNRAnebUxc0cKNy0xI1Q8uSP1ra/+eTmQS0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.29.6-k3s1/go.mod h1:trkLHxYEftqdW4UG3vwDLSMOV2yZeDGh0dD6jdc32aM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.29.6-k3s1 h1:qXMh5bAyJS7eBGX2cavymjC486omP1SMv2bXrPMqk3U= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.29.6-k3s1/go.mod h1:9Tgle7RkZOzgRM2VCSvvXZZjsQqOC6dxLtYy6BF+5PE= +github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.29.6-k3s1 h1:4nYSyc56HvJ9n/R5wAwbBXqEjWVK+a/YwBwWq2cRg90= +github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.29.6-k3s1/go.mod h1:r3eLoJhpPmT1wErodG1VONmI2pSfblZu1YWg7pWFZHE= +github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.29.6-k3s1 h1:iK3UPDXnXm9tSsr6YkcW+6QvHYCJ7IbNDy+QPlECIa4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.29.6-k3s1/go.mod h1:bffvbAY3XpW5Fu6GQjVfvhXpHQSqUfsqeNW8BwdX3LI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.29.6-k3s1 h1:0gM1KxdFKI9K1s4tTaUrUzbRGac94DAaLEFltxq8viA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.29.6-k3s1/go.mod h1:BeunpqVyw83zVvf8H0iLOZWNXGoEDrmAHVcJ0NFzedk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.29.6-k3s1 h1:YL0bDieXOI85zSx4csPBgl+gYzPThYFEGX/hr7hOIfU= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.29.6-k3s1/go.mod h1:4pCpiW+pKMCqRLVoGPw11lrvEriSyd8o7DSvCw2u9vY= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.29.6-k3s1 h1:xfufX8z8jm1A5S1UdKhlEIDtmJKwRtL7+Ju0jx7Q8Cg= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.29.6-k3s1/go.mod h1:PMbMTXY5M1iXvr0tK1ycFlUJeiUOUPIWRnLDX/xDEac= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.29.6-k3s1 h1:pXOo7GLB61cJwf6sbayvEESrZjirvNJQTghCd7OUq1w= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.29.6-k3s1/go.mod h1:o+O+TlsY0xG7iLwJKjdpRaxDuf07JkEGfU73CcaVOi4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.29.6-k3s1 h1:gNtOsayqPOOzalLbAgrR3JSp89qV3oJ6H5xoWrLV0bQ= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.29.6-k3s1/go.mod h1:2XJjMQo8aHpiGiJSr5C/ED69X7crURrDNYSJTt6j+bY= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.29.6-k3s1 h1:ssgY/ogy+KuJ3s3mUJdTcOX3RivoQC1ZR81sfi7s6Uc= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.29.6-k3s1/go.mod h1:2vDuSYmBuOfKFZ/R0632vKiomLKN5cLtyxuqA62Rlos= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.29.6-k3s1 h1:1I+9/LCNpMZfAwp3k9icjTLs9GFLf2HfMVJJUXk61Sk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.29.6-k3s1/go.mod h1:5wY3XB46NQ9oTQdYb92teimR+9yai6ssD9K+Rd6lmug= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.29.6-k3s1 h1:B4Hwq9QsmXkOtKlscdlFgHU0w6M2PqN8DMso3ujIC8k= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.29.6-k3s1/go.mod h1:BIgdnnHLOvfduD5ggrkXS1GlUPsRdw5YblFcmhouhgQ= +github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.29.6-k3s1 h1:ElTxOIsQtOU9vaF00JxJmmDejr0H9w7jJsmCVCdDAJQ= +github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.29.6-k3s1/go.mod h1:97CWm18L5b4oLOLskR48LLoDZ3vgQgjtpcilI3+PTPY= +github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.29.6-k3s1 h1:pvssknP0VKkyfnQ2gaGaIW5iuAUogqIPNIhfuTsbLik= +github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.29.6-k3s1/go.mod h1:qxF7PHN59cVDWlhEvESV5Oj0CvWpzoSTUmHzXXLoxqw= +github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.29.6-k3s1 h1:3ZZMFD4BC5B1Z5Wodd5jSEOecgrJtwYpZiX5qEmV2Fo= +github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.29.6-k3s1/go.mod h1:4KmkE88Y4LDYrotr6iqMrolXDcWWY7UqmroXTO/sxFw= +github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.29.6-k3s1 h1:gysDJUyJvSOSSfxnc0/kOVdxM4BSaS+xS0l4SAGpPY0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.29.6-k3s1/go.mod h1:3nvUgy9DAoVbLCBJcIBDCldv+vAc7hcHl6xJFRSpvb4= github.com/k3s-io/runc v1.1.12-k3s1 h1:p2x48K2BbRdF8crLEB4xoJ1pdjSprlvNNGpYBBULHL4= github.com/k3s-io/runc v1.1.12-k3s1/go.mod h1:S+lQwSfncpBha7XTy/5lBwWgm5+y5Ma/O44Ekby9FK8= github.com/k3s-io/spegel v0.0.23-0.20240516234953-f3d2c4072314 h1:TrZb/yM0OtBuifPXlKaOfcxpJqzakA8+KsoO4c69ZLM=