From b55a187d382cc347d229e925948ba86257e72e83 Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Wed, 13 Nov 2024 19:27:42 +0000 Subject: [PATCH 1/5] Bump K3s version for release-1.28 Updates k3s: https://github.com/k3s-io/k3s/compare/63bfb1936862...46fbfb7ee74f7e1047e75de8d731f20120bf3cc2 Signed-off-by: Brad Davidson --- go.mod | 148 ++++++++++++++++----------------- go.sum | 252 +++++++++++++++++++++++++++++---------------------------- 2 files changed, 205 insertions(+), 195 deletions(-) diff --git a/go.mod b/go.mod index 4cd3455008..418c101393 100644 --- a/go.mod +++ b/go.mod @@ -1,12 +1,14 @@ module github.com/rancher/rke2 -go 1.22.5 +go 1.22.7 + +toolchain go1.22.8 replace ( github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.11.7 github.com/Mirantis/cri-dockerd => github.com/k3s-io/cri-dockerd v0.3.12-k3s1.28 github.com/cloudnativelabs/kube-router/v2 => github.com/k3s-io/kube-router/v2 v2.2.1 - github.com/containerd/containerd => github.com/k3s-io/containerd v1.7.22-k3s1.28 + github.com/containerd/containerd => github.com/k3s-io/containerd v1.7.23-k3s1.28 github.com/distribution/reference => github.com/distribution/reference v0.5.0 github.com/docker/distribution => github.com/docker/distribution v2.8.3+incompatible github.com/docker/docker => github.com/docker/docker v24.0.10-0.20240723193628-852759a7df45+incompatible @@ -15,21 +17,21 @@ replace ( github.com/google/cel-go => github.com/google/cel-go v0.16.1 github.com/googleapis/gax-go/v2 => github.com/googleapis/gax-go/v2 v2.12.0 github.com/kubernetes-sigs/cri-tools => github.com/k3s-io/cri-tools v1.29.0-k3s1 - github.com/opencontainers/runc => github.com/k3s-io/runc v1.1.14-k3s1 + github.com/opencontainers/runc => github.com/k3s-io/runc v1.2.1-k3s1 github.com/opencontainers/selinux => github.com/opencontainers/selinux v1.11.0 github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.18.0 github.com/prometheus/common => github.com/prometheus/common v0.45.0 github.com/rancher/wrangler => github.com/rancher/wrangler v1.1.1-0.20230818201331-3604a6be798d github.com/spegel-org/spegel => github.com/k3s-io/spegel v0.0.23-0.20240516234953-f3d2c4072314 github.com/ugorji/go => github.com/ugorji/go v1.2.11 - go.etcd.io/etcd/api/v3 => github.com/k3s-io/etcd/api/v3 v3.5.13-k3s1 - go.etcd.io/etcd/client/pkg/v3 => github.com/k3s-io/etcd/client/pkg/v3 v3.5.13-k3s1 - go.etcd.io/etcd/client/v2 => github.com/k3s-io/etcd/client/v2 v2.305.13-k3s1 - go.etcd.io/etcd/client/v3 => github.com/k3s-io/etcd/client/v3 v3.5.13-k3s1 - go.etcd.io/etcd/etcdutl/v3 => github.com/k3s-io/etcd/etcdutl/v3 v3.5.13-k3s1 - go.etcd.io/etcd/pkg/v3 => github.com/k3s-io/etcd/pkg/v3 v3.5.13-k3s1 - go.etcd.io/etcd/raft/v3 => github.com/k3s-io/etcd/raft/v3 v3.5.13-k3s1 - go.etcd.io/etcd/server/v3 => github.com/k3s-io/etcd/server/v3 v3.5.13-k3s1 + go.etcd.io/etcd/api/v3 => github.com/k3s-io/etcd/api/v3 v3.5.16-k3s1 + go.etcd.io/etcd/client/pkg/v3 => github.com/k3s-io/etcd/client/pkg/v3 v3.5.16-k3s1 + go.etcd.io/etcd/client/v2 => github.com/k3s-io/etcd/client/v2 v2.305.16-k3s1 + go.etcd.io/etcd/client/v3 => github.com/k3s-io/etcd/client/v3 v3.5.16-k3s1 + go.etcd.io/etcd/etcdutl/v3 => github.com/k3s-io/etcd/etcdutl/v3 v3.5.16-k3s1 + go.etcd.io/etcd/pkg/v3 => github.com/k3s-io/etcd/pkg/v3 v3.5.16-k3s1 + go.etcd.io/etcd/raft/v3 => github.com/k3s-io/etcd/raft/v3 v3.5.16-k3s1 + go.etcd.io/etcd/server/v3 => github.com/k3s-io/etcd/server/v3 v3.5.16-k3s1 go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful => go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.44.0 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc => go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp => go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 @@ -46,45 +48,45 @@ replace ( go.opentelemetry.io/proto/otlp => go.opentelemetry.io/proto/otlp v0.19.0 golang.org/x/crypto => golang.org/x/crypto v0.17.0 golang.org/x/net => golang.org/x/net v0.17.0 - golang.org/x/sys => golang.org/x/sys v0.18.0 + golang.org/x/sys => golang.org/x/sys v0.21.0 google.golang.org/genproto => google.golang.org/genproto v0.0.0-20230525234035-dd9d682886f9 google.golang.org/grpc => google.golang.org/grpc v1.64.0 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.28.14-k3s2 - k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.28.14-k3s2 - k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.28.14-k3s2 - k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.28.14-k3s2 - k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.28.14-k3s2 - k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.28.14-k3s2 - k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.28.14-k3s2 - k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.28.14-k3s2 - k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.28.14-k3s2 - k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.28.14-k3s2 - k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.28.14-k3s2 - k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.28.14-k3s2 - k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.28.14-k3s2 - k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.28.14-k3s2 - k8s.io/dynamic-resource-allocation => github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.28.14-k3s2 - k8s.io/endpointslice => github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.28.14-k3s2 + k8s.io/api => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.28.15-k3s1 + k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.28.15-k3s1 + k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.28.15-k3s1 + k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.28.15-k3s1 + k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.28.15-k3s1 + k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.28.15-k3s1 + k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.28.15-k3s1 + k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.28.15-k3s1 + k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.28.15-k3s1 + k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.28.15-k3s1 + k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.28.15-k3s1 + k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.28.15-k3s1 + k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.28.15-k3s1 + k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.28.15-k3s1 + k8s.io/dynamic-resource-allocation => github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.28.15-k3s1 + k8s.io/endpointslice => github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.28.15-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.28.14-k3s2 - k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.28.14-k3s2 - k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.28.14-k3s2 + k8s.io/kms => github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.28.15-k3s1 + k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.28.15-k3s1 + k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.28.15-k3s1 k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 - k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.28.14-k3s2 - k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.28.14-k3s2 - k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.28.14-k3s2 - k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.28.14-k3s2 - k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.28.14-k3s2 - k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.28.14-k3s2 - k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.28.14-k3s2 - k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.28.14-k3s2 - k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.28.14-k3s2 - k8s.io/pod-security-admission => github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.28.14-k3s2 - k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.28.14-k3s2 - k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.28.14-k3s2 - k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.28.14-k3s2 + k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.28.15-k3s1 + k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.28.15-k3s1 + k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.28.15-k3s1 + k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.28.15-k3s1 + k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.28.15-k3s1 + k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.28.15-k3s1 + k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.28.15-k3s1 + k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.28.15-k3s1 + k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.28.15-k3s1 + k8s.io/pod-security-admission => github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.28.15-k3s1 + k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.28.15-k3s1 + k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.28.15-k3s1 + k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.28.15-k3s1 ) require ( @@ -95,8 +97,8 @@ require ( github.com/google/go-containerregistry v0.20.2 github.com/iamacarpet/go-win64api v0.0.0-20210311141720-fe38760bed28 github.com/k3s-io/helm-controller v0.15.15 - github.com/k3s-io/k3s v1.28.15-0.20241016053552-63bfb1936862 // release-1.28 - github.com/k3s-io/kine v0.13.2 + github.com/k3s-io/k3s v1.28.16-0.20241113032900-46fbfb7ee74f // release-1.28 + github.com/k3s-io/kine v0.13.5 github.com/libp2p/go-netroute v0.2.1 github.com/natefinch/lumberjack v2.0.0+incompatible github.com/onsi/ginkgo/v2 v2.19.0 @@ -113,7 +115,7 @@ require ( github.com/urfave/cli v1.22.15 golang.org/x/sync v0.8.0 golang.org/x/sys v0.25.0 - google.golang.org/grpc v1.67.0 + google.golang.org/grpc v1.68.0 k8s.io/api v0.30.3 k8s.io/apimachinery v0.30.3 k8s.io/apiserver v0.29.0 @@ -122,7 +124,7 @@ require ( k8s.io/cri-api v0.30.3 k8s.io/klog/v2 v2.130.1 k8s.io/kubernetes v1.29.9 - k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 + k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3 sigs.k8s.io/yaml v1.4.0 ) @@ -147,7 +149,7 @@ require ( github.com/Microsoft/go-winio v0.6.2 // indirect github.com/Mirantis/cri-dockerd v0.0.0-00010101000000-000000000000 // indirect github.com/NYTimes/gziphandler v1.1.1 // indirect - github.com/Rican7/retry v0.1.0 // indirect + github.com/Rican7/retry v0.3.1 // indirect github.com/alexflint/go-filemutex v1.3.0 // indirect github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e // indirect @@ -157,13 +159,13 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/blang/semver v3.5.1+incompatible // indirect github.com/blang/semver/v4 v4.0.0 // indirect - github.com/bronze1man/goStrongswanVici v0.0.0-20221114103242-3f6dc524986c // indirect + github.com/bronze1man/goStrongswanVici v0.0.0-20231128135937-211cef3b0b20 // indirect github.com/buger/jsonparser v1.1.1 // indirect github.com/canonical/go-dqlite v1.5.1 // indirect github.com/cenkalti/backoff/v4 v4.3.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect - github.com/checkpoint-restore/go-criu/v5 v5.3.0 // indirect - github.com/cilium/ebpf v0.11.0 // indirect + github.com/checkpoint-restore/go-criu/v6 v6.3.0 // indirect + github.com/cilium/ebpf v0.16.0 // indirect github.com/cloudnativelabs/kube-router/v2 v2.0.0-00010101000000-000000000000 // indirect github.com/container-storage-interface/spec v1.8.0 // indirect github.com/containerd/cgroups v1.1.0 // indirect @@ -171,7 +173,7 @@ require ( github.com/containerd/console v1.0.4 // indirect github.com/containerd/containerd v1.7.16 // indirect github.com/containerd/containerd/api v1.8.0-rc.3 // indirect - github.com/containerd/errdefs v0.1.0 // indirect + github.com/containerd/errdefs v0.3.0 // indirect github.com/containerd/fifo v1.1.0 // indirect github.com/containerd/fuse-overlayfs-snapshotter v1.0.8 // indirect github.com/containerd/log v0.1.0 // indirect @@ -181,12 +183,12 @@ require ( github.com/containerd/ttrpc v1.2.5 // indirect github.com/containerd/typeurl/v2 v2.2.0 // indirect github.com/containernetworking/cni v1.2.3 // indirect - github.com/coreos/go-iptables v0.7.0 // indirect + github.com/coreos/go-iptables v0.8.0 // indirect github.com/coreos/go-oidc v2.2.1+incompatible // indirect github.com/coreos/go-semver v0.3.1 // indirect github.com/coreos/go-systemd/v22 v22.5.0 // indirect - github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect - github.com/cyphar/filepath-securejoin v0.2.4 // indirect + github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect + github.com/cyphar/filepath-securejoin v0.3.4 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect @@ -207,7 +209,7 @@ require ( github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect github.com/evanphx/json-patch v5.6.0+incompatible // indirect github.com/felixge/httpsnoop v1.0.4 // indirect - github.com/flannel-io/flannel v0.25.6 // indirect + github.com/flannel-io/flannel v0.25.7 // indirect github.com/flynn/noise v1.1.0 // indirect github.com/francoispqt/gojay v1.2.13 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect @@ -226,7 +228,7 @@ require ( github.com/gofrs/flock v0.8.1 // indirect github.com/gofrs/uuid v4.4.0+incompatible // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang-jwt/jwt/v4 v4.5.0 // indirect + github.com/golang-jwt/jwt/v4 v4.5.1 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/mock v1.6.0 // indirect github.com/golang/protobuf v1.5.4 // indirect @@ -284,7 +286,7 @@ require ( github.com/josharian/native v1.1.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/karrick/godirwalk v1.17.0 // indirect - github.com/klauspost/compress v1.17.10 // indirect + github.com/klauspost/compress v1.17.11 // indirect github.com/klauspost/cpuid/v2 v2.2.7 // indirect github.com/koron/go-ssdp v0.0.4 // indirect github.com/libopenstorage/openstorage v1.0.0 // indirect @@ -306,7 +308,7 @@ require ( github.com/mailru/easyjson v0.7.7 // indirect github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect github.com/mattn/go-isatty v0.0.20 // indirect - github.com/mattn/go-sqlite3 v1.14.23 // indirect + github.com/mattn/go-sqlite3 v1.14.24 // indirect github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect github.com/mdlayher/genetlink v1.3.2 // indirect github.com/mdlayher/netlink v1.7.2 // indirect @@ -323,7 +325,7 @@ require ( github.com/moby/ipvs v1.1.0 // indirect github.com/moby/locker v1.0.1 // indirect github.com/moby/spdystream v0.2.0 // indirect - github.com/moby/sys/mountinfo v0.6.2 // indirect + github.com/moby/sys/mountinfo v0.7.1 // indirect github.com/moby/sys/sequential v0.5.0 // indirect github.com/moby/sys/signal v0.7.0 // indirect github.com/moby/sys/user v0.3.0 // indirect @@ -367,7 +369,7 @@ require ( github.com/pierrec/lz4 v2.6.0+incompatible // indirect github.com/polydawn/refmt v0.89.0 // indirect github.com/pquerna/cachecontrol v0.1.0 // indirect - github.com/prometheus/client_golang v1.19.1 // indirect + github.com/prometheus/client_golang v1.20.5 // indirect github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.55.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect @@ -395,7 +397,7 @@ require ( github.com/tidwall/btree v1.6.0 // indirect github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 // indirect github.com/vbatts/tar-split v0.11.5 // indirect - github.com/vishvananda/netlink v1.2.1-beta.2 // indirect + github.com/vishvananda/netlink v1.3.0 // indirect github.com/vishvananda/netns v0.0.4 // indirect github.com/vmware/govmomi v0.30.6 // indirect github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 // indirect @@ -430,19 +432,19 @@ require ( golang.org/x/crypto v0.27.0 // indirect golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect golang.org/x/mod v0.19.0 // indirect - golang.org/x/net v0.28.0 // indirect - golang.org/x/oauth2 v0.21.0 // indirect - golang.org/x/term v0.22.0 // indirect + golang.org/x/net v0.29.0 // indirect + golang.org/x/oauth2 v0.22.0 // indirect + golang.org/x/term v0.24.0 // indirect golang.org/x/text v0.18.0 // indirect - golang.org/x/time v0.5.0 // indirect + golang.org/x/time v0.6.0 // indirect golang.org/x/tools v0.23.0 // indirect - golang.zx2c4.com/wireguard v0.0.0-20230325221338-052af4a8072b // indirect + golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173 // indirect golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230429144221-925a1e7659e6 // indirect gonum.org/v1/gonum v0.13.0 // indirect google.golang.org/api v0.169.0 // indirect - google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect + google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/gcfg.v1 v1.2.3 // indirect gopkg.in/inf.v0 v0.9.1 // indirect @@ -464,11 +466,11 @@ require ( k8s.io/kms v0.0.0 // indirect k8s.io/kube-aggregator v0.29.0 // indirect k8s.io/kube-controller-manager v0.0.0 // indirect - k8s.io/kube-openapi v0.0.0-20240730131305-7a9a4e85957e // indirect + k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 // indirect k8s.io/kube-proxy v0.0.0 // indirect k8s.io/kube-scheduler v0.0.0 // indirect k8s.io/kubectl v0.25.4 // indirect - k8s.io/kubelet v0.28.14 // indirect + k8s.io/kubelet v0.28.15 // indirect k8s.io/legacy-cloud-providers v0.0.0 // indirect k8s.io/metrics v0.0.0 // indirect k8s.io/mount-utils v0.29.0 // indirect diff --git a/go.sum b/go.sum index cc3b8854ff..614108c3db 100644 --- a/go.sum +++ b/go.sum @@ -336,8 +336,8 @@ github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAE github.com/OneOfOne/xxhash v1.2.8/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= -github.com/Rican7/retry v0.1.0 h1:FqK94z34ly8Baa6K+G8Mmza9rYWTKOJk+yckIBB5qVk= -github.com/Rican7/retry v0.1.0/go.mod h1:FgOROf8P5bebcC1DS0PdOQiqGUridaZvikzUmkFW6gg= +github.com/Rican7/retry v0.3.1 h1:scY4IbO8swckzoA/11HgBwaZRJEyY9vaNJshcdhp1Mc= +github.com/Rican7/retry v0.3.1/go.mod h1:CxSDrhAyXmTMeEuRAnArMu1FHu48vtfjLREWqVl7Vw0= github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= @@ -424,8 +424,8 @@ github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b/go.mod h1:ac9efd0D github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g= -github.com/bronze1man/goStrongswanVici v0.0.0-20221114103242-3f6dc524986c h1:JY0NMX6F455gODxoTSesio3OmhM8HEniyFMWgpHvTY0= -github.com/bronze1man/goStrongswanVici v0.0.0-20221114103242-3f6dc524986c/go.mod h1:fWUtBEPt2yjrr3WFhOqvajM8JSEU8bEeBcoeSCsKRpc= +github.com/bronze1man/goStrongswanVici v0.0.0-20231128135937-211cef3b0b20 h1:JMoL5xJSYxo1QVJ3c+4FutWQnks3gZX9DYkgAnvg+5g= +github.com/bronze1man/goStrongswanVici v0.0.0-20231128135937-211cef3b0b20/go.mod h1:fWUtBEPt2yjrr3WFhOqvajM8JSEU8bEeBcoeSCsKRpc= github.com/bshuster-repo/logrus-logstash-hook v1.0.0/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk= github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs= @@ -455,8 +455,8 @@ github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/checkpoint-restore/go-criu/v5 v5.3.0 h1:wpFFOoomK3389ue2lAb0Boag6XPht5QYpipxmSNL4d8= -github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E= +github.com/checkpoint-restore/go-criu/v6 v6.3.0 h1:mIdrSO2cPNWQY1truPg6uHLXyKHk3Z5Odx4wjKOASzA= +github.com/checkpoint-restore/go-criu/v6 v6.3.0/go.mod h1:rrRTN/uSwY2X+BPRl/gkulo9gsKOSAeVp9/K2tv7xZI= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= @@ -464,8 +464,9 @@ github.com/cilium/ebpf v0.2.0/go.mod h1:To2CFviqOWL/M0gIMsvSMlqe7em/l1ALkX1PyjrX github.com/cilium/ebpf v0.4.0/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA= github.com/cilium/ebpf v0.9.1/go.mod h1:+OhNOIXx/Fnu1IE8bJz2dzOA+VSfyTfdNUVdlQnxUFY= -github.com/cilium/ebpf v0.11.0 h1:V8gS/bTCCjX9uUnkUFUpPsksM8n1lXBAvHcpiFk1X2Y= -github.com/cilium/ebpf v0.11.0/go.mod h1:WE7CZAnqOL2RouJ4f1uyNhqr2P4CCvXFIqdRDUgWsVs= +github.com/cilium/ebpf v0.12.3/go.mod h1:TctK1ivibvI3znr66ljgi4hqOT8EYQjz1KWBfb1UVgM= +github.com/cilium/ebpf v0.16.0 h1:+BiEnHL6Z7lXnlGUsXQPPAE7+kenAd4ES8MQ5min0Ok= +github.com/cilium/ebpf v0.16.0/go.mod h1:L7u2Blt2jMM/vLAVgjxluxtBKlz3/GWjB0dMOEngfwE= github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= github.com/cloudflare/backoff v0.0.0-20161212185259-647f3cdfc87a/go.mod h1:rzgs2ZOiguV6/NpiDgADjRLPNyZlApIWxKpkT+X8SdY= @@ -506,8 +507,8 @@ github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e/go.mod h1:EX github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM= github.com/containerd/continuity v0.4.3 h1:6HVkalIp+2u1ZLH1J/pYX2oBVXlJZvh1X1A7bEZ9Su8= github.com/containerd/continuity v0.4.3/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ= -github.com/containerd/errdefs v0.1.0 h1:m0wCRBiu1WJT/Fr+iOoQHMQS/eP5myQ8lCv4Dz5ZURM= -github.com/containerd/errdefs v0.1.0/go.mod h1:YgWiiHtLmSeBrvpw+UfPijzbLaB77mEG1WwJTDETIV0= +github.com/containerd/errdefs v0.3.0 h1:FSZgGOeK4yuT/+DnF07/Olde/q4KBoMsaamhXxIMDp4= +github.com/containerd/errdefs v0.3.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M= github.com/containerd/fifo v1.0.0/go.mod h1:ocF/ME1SX5b1AOlWi9r677YJmCPSwwWnQ9O123vzpE4= github.com/containerd/fifo v1.1.0 h1:4I2mbh5stb1u6ycIABlBw9zgtlK8viPI9QkQNRQEEmY= github.com/containerd/fifo v1.1.0/go.mod h1:bmC4NWMbXlt2EZ0Hc7Fx7QzTFxgPID13eH0Qu+MAb2o= @@ -557,8 +558,8 @@ github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc github.com/coreos/etcd v3.3.15+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-iptables v0.6.0/go.mod h1:Qe8Bv2Xik5FyTXwgIbLAnv2sWSBmvWdFETJConOQ//Q= -github.com/coreos/go-iptables v0.7.0 h1:XWM3V+MPRr5/q51NuWSgU0fqMad64Zyxs8ZUoMsamr8= -github.com/coreos/go-iptables v0.7.0/go.mod h1:Qe8Bv2Xik5FyTXwgIbLAnv2sWSBmvWdFETJConOQ//Q= +github.com/coreos/go-iptables v0.8.0 h1:MPc2P89IhuVpLI7ETL/2tx3XZ61VeICZjYqDEgNsPRc= +github.com/coreos/go-iptables v0.8.0/go.mod h1:Qe8Bv2Xik5FyTXwgIbLAnv2sWSBmvWdFETJConOQ//Q= github.com/coreos/go-oidc v2.2.1+incompatible h1:mh48q/BqXqgjVHpy2ZY7WnWAbenxRjsz9N1i1YxjHAk= github.com/coreos/go-oidc v2.2.1+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= @@ -578,16 +579,17 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsr github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4= github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.5 h1:ZtcqGrnekaHpVLArFSe4HK5DoKx1T0rq2DwVB0alcyc= +github.com/cpuguy83/go-md2man/v2 v2.0.5/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= -github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg= -github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= +github.com/cyphar/filepath-securejoin v0.3.4 h1:VBWugsJh2ZxJmLFSM06/0qzQyiQX2Qs0ViKrUAcqdZ8= +github.com/cyphar/filepath-securejoin v0.3.4/go.mod h1:8s/MCNJREmFK0H02MF6Ihv1nakJe4L/w3WZLHNkvlYM= github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod h1:Ct2BUK8SB0YC1SMSibvLzxjeJLnrYEVLULFNiHY9YfQ= github.com/d2g/dhcp4client v1.0.0/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW34z5W5s= github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod h1:Eo87+Kg/IX2hfWJfwxMzLyuSZyxSoAug2nGa1G2QAi8= @@ -711,8 +713,8 @@ github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSw github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/flannel-io/flannel v0.25.6 h1:NcXfV7CF4/EhdoD+5mwS6lrqLtqK0PPxtCC9SykvSYM= -github.com/flannel-io/flannel v0.25.6/go.mod h1:ZgaK2rPi625QEBQAXfyE+1Ll3LD010kje+Bdini9QNE= +github.com/flannel-io/flannel v0.25.7 h1:gJiwuGL0g9U7iXGcYsqohnQ21zMaojq1g+mIasknDQU= +github.com/flannel-io/flannel v0.25.7/go.mod h1:czbAIM78Ma8p48eAqUhkOlP/jKotg2wvGlnmKjiobLM= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/flynn/noise v1.1.0 h1:KjPQoQCEFdZDiP03phOvGi11+SVVhBG2wOWAorLsstg= github.com/flynn/noise v1.1.0/go.mod h1:xbMo+0i6+IGbYdJhF31t2eR1BIU0CYc12+BNAKwUTag= @@ -808,6 +810,8 @@ github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+Gr github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ= github.com/go-pdf/fpdf v0.5.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M= github.com/go-pdf/fpdf v0.6.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M= +github.com/go-quicktest/qt v1.101.0 h1:O1K29Txy5P2OK0dGo59b7b0LR6wKfIhttaAhHUyn7eI= +github.com/go-quicktest/qt v1.101.0/go.mod h1:14Bz/f7NwaXPtdYEgzsx46kqSxVwTbzVZsDC26tQJow= github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= @@ -852,8 +856,9 @@ github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69 github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang-jwt/jwt/v4 v4.4.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= -github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg= github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= +github.com/golang-jwt/jwt/v4 v4.5.1 h1:JdqV9zKUdtaa9gdPlywC3aeoEsR681PlKC+4F5gQgeo= +github.com/golang-jwt/jwt/v4 v4.5.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/glog v0.0.0-20210429001901-424d2337a529/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -1200,6 +1205,8 @@ github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtL github.com/josharian/native v1.1.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w= github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7/go.mod h1:2iMrUgbbvHEiQClaW2NsSzMyGHqN+rDFqY705q49KG0= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= +github.com/jsimonetti/rtnetlink/v2 v2.0.1 h1:xda7qaHDSVOsADNouv7ukSuicKZO7GgVUCXxpaIEIlM= +github.com/jsimonetti/rtnetlink/v2 v2.0.1/go.mod h1:7MoNYNbb3UaDHtF8udiJo/RH6VsTKP1pqKLUTVCvToE= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -1213,94 +1220,94 @@ github.com/juju/ratelimit v1.0.1/go.mod h1:qapgC/Gy+xNh9UxzV13HGGl/6UXNN+ct+vwSg github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= -github.com/k3s-io/containerd v1.7.22-k3s1.28 h1:xmjGz0RakOL/C7z3FM53ke3mHkXLCl8rInGpP9EfNyI= -github.com/k3s-io/containerd v1.7.22-k3s1.28/go.mod h1:T9perze1nIMl5JzddImIgsCEDaM0i8nAfnm+U48DmJw= +github.com/k3s-io/containerd v1.7.23-k3s1.28 h1:NHnt78AD3uv4ZLw+4u5AL1TTrTanVxs8gmZffRmmfow= +github.com/k3s-io/containerd v1.7.23-k3s1.28/go.mod h1:+vNritUoqQTlFedsBErSkyu1yqf3eYikE3oGbEICi+g= github.com/k3s-io/cri-dockerd v0.3.12-k3s1.28 h1:6M8Gpo/CC3AQKZ58Hodz9qZZhvyC2wHv0s45ja9HB9o= github.com/k3s-io/cri-dockerd v0.3.12-k3s1.28/go.mod h1:YWXI6VrFgqt6VTgvSPvTKYFE+mL37s7jUFufY18JcaE= -github.com/k3s-io/etcd/api/v3 v3.5.13-k3s1 h1:aq6fxlEKdwCooLE3HOR6227U51DEvOw3DEbriJxD2QM= -github.com/k3s-io/etcd/api/v3 v3.5.13-k3s1/go.mod h1:gBqlqkcMMZMVTMm4NDZloEVJzxQOQIls8splbqBDa0c= -github.com/k3s-io/etcd/client/pkg/v3 v3.5.13-k3s1 h1:t2I25UtBvohVAhlyXpYjd/Lznm+ybxNhvs3cnEGsF4Y= -github.com/k3s-io/etcd/client/pkg/v3 v3.5.13-k3s1/go.mod h1:XxHT4u1qU12E2+po+UVPrEeL94Um6zL58ppuJWXSAB8= -github.com/k3s-io/etcd/client/v2 v2.305.13-k3s1 h1:lvIdlAI6xRIHSUJC43sJx9lmxehq2quGb+8z5TJldGg= -github.com/k3s-io/etcd/client/v2 v2.305.13-k3s1/go.mod h1:iQnL7fepbiomdXMb3om1rHq96htNNGv2sJkEcZGDRRg= -github.com/k3s-io/etcd/client/v3 v3.5.13-k3s1 h1:/D6KAEGVzwivnjxZ5CzVIykVloLoKB/TBeKw2tKKVQ0= -github.com/k3s-io/etcd/client/v3 v3.5.13-k3s1/go.mod h1:cqiAeY8b5DEEcpxvgWKsbLIWNM/8Wy2xJSDMtioMcoI= -github.com/k3s-io/etcd/etcdutl/v3 v3.5.13-k3s1 h1:fIt+PVHCeINM5fl9OfMI+o9BJKf951pRiVcCytFW97c= -github.com/k3s-io/etcd/etcdutl/v3 v3.5.13-k3s1/go.mod h1:2vhvTIQobP+Cb04qzlcbKGvX6J5oq/N1kquk1yCDIQY= -github.com/k3s-io/etcd/pkg/v3 v3.5.13-k3s1 h1:uLU/SnBuhtSkdBk830x0pseHSsQQvh99C3deG6nc9d0= -github.com/k3s-io/etcd/pkg/v3 v3.5.13-k3s1/go.mod h1:N+4PLrp7agI/Viy+dUYpX7iRtSPvKq+w8Y14d1vX+m0= -github.com/k3s-io/etcd/raft/v3 v3.5.13-k3s1 h1:yexUwAPPdmYfIMWOj6sSyJ2nEe8QOrFzNuvYGRAsm5E= -github.com/k3s-io/etcd/raft/v3 v3.5.13-k3s1/go.mod h1:uUFibGLn2Ksm2URMxN1fICGhk8Wu96EfDQyuLhAcAmw= -github.com/k3s-io/etcd/server/v3 v3.5.13-k3s1 h1:Pqcxkg7V60c26ZpHoekP9QoUdLuduxFn827A/5CIwm4= -github.com/k3s-io/etcd/server/v3 v3.5.13-k3s1/go.mod h1:K/8nbsGupHqmr5MkgaZpLlH1QdX1pcNQLAkODy44XcQ= +github.com/k3s-io/etcd/api/v3 v3.5.16-k3s1 h1:RNExemPFr4S+VqJ2jXVf0Y9iXaps0pTeklSN735z0Mw= +github.com/k3s-io/etcd/api/v3 v3.5.16-k3s1/go.mod h1:1P4SlIP/VwkDmGo3OlOD7faPeP8KDIFhqvciH5EfN28= +github.com/k3s-io/etcd/client/pkg/v3 v3.5.16-k3s1 h1:wEmVFnZ+h3v5ECRmX6jf4SeIykDQei+DRnBczM23YQA= +github.com/k3s-io/etcd/client/pkg/v3 v3.5.16-k3s1/go.mod h1:V8acl8pcEK0Y2g19YlOV9m9ssUe6MgiDSobSoaBAM0E= +github.com/k3s-io/etcd/client/v2 v2.305.16-k3s1 h1:f7qWAqVhxrMdBt0coehUYfP0Cix7clL2ko/XCqvWols= +github.com/k3s-io/etcd/client/v2 v2.305.16-k3s1/go.mod h1:h9YxWCzcdvZENbfzBTFCnoNumr2ax3F19sKMqHFmXHE= +github.com/k3s-io/etcd/client/v3 v3.5.16-k3s1 h1:ON2Cd0Fx+qQ53GS6qK6Mr9fh7MFCShZfw+rsrLZ6j5M= +github.com/k3s-io/etcd/client/v3 v3.5.16-k3s1/go.mod h1:X+rExSGkyqxvu276cr2OwPLBaeqFu1cIl4vmRjAD/50= +github.com/k3s-io/etcd/etcdutl/v3 v3.5.16-k3s1 h1:qUuDUhfhOZ3D6/XsW04jV514+DhV7R669+/+3n9i7VY= +github.com/k3s-io/etcd/etcdutl/v3 v3.5.16-k3s1/go.mod h1:X22QojXcHZNS3TPAitpcYW7rwTvnmchFwAKkSSz0Ncw= +github.com/k3s-io/etcd/pkg/v3 v3.5.16-k3s1 h1:4nDx3la68jehJfqWPs1Yx1clPW7938pKQXrVxp2OgyA= +github.com/k3s-io/etcd/pkg/v3 v3.5.16-k3s1/go.mod h1:+lutCZHG5MBBFI/U4eYT5yL7sJfnexsoM20Y0t2uNuY= +github.com/k3s-io/etcd/raft/v3 v3.5.16-k3s1 h1:nD/YzAeIbEcSkXAQFRwAs/2zc2vXAkKmQnDKf6UDCxY= +github.com/k3s-io/etcd/raft/v3 v3.5.16-k3s1/go.mod h1:P4UP14AxofMJ/54boWilabqqWoW9eLodl6I5GdGzazI= +github.com/k3s-io/etcd/server/v3 v3.5.16-k3s1 h1:9c0DChFw6WRz6r+eCuVLBltZcRwT6h1l79biTPuAGR0= +github.com/k3s-io/etcd/server/v3 v3.5.16-k3s1/go.mod h1:ynhyZZpdDp1Gq49jkUg5mfkDWZwXnn3eIqCqtJnrD/s= github.com/k3s-io/helm-controller v0.15.15 h1:Ot7IWTyl0+gowYG9ZxOq8esyxqoOmKUPMRPvD3TUTas= github.com/k3s-io/helm-controller v0.15.15/go.mod h1:xGN8KNHGkmlaCwyjNx281cR8IEqC9MJgyMaS3wn1k+o= -github.com/k3s-io/k3s v1.28.15-0.20241016053552-63bfb1936862 h1:d0EqC1ge7KDdwczNLshzAPpRagQWcUs0z9yqQeYApH0= -github.com/k3s-io/k3s v1.28.15-0.20241016053552-63bfb1936862/go.mod h1:NK/PNDoGD6LcAospuoy4ij8t+w9iPBP2+hBa70zAsec= -github.com/k3s-io/kine v0.13.2 h1:l++g2KY/3UaPJiGpgYuGoqaaYKeMpVj9fP/yfnSxHxo= -github.com/k3s-io/kine v0.13.2/go.mod h1:Zi9F142tmeXVqhPjL6KHVnwOBs8wc/V5r3avKSpIHn0= +github.com/k3s-io/k3s v1.28.16-0.20241113032900-46fbfb7ee74f h1:tEG0MN60qTPuh/GchL6LGsKQZwWDum3BUMHnrIVWygo= +github.com/k3s-io/k3s v1.28.16-0.20241113032900-46fbfb7ee74f/go.mod h1:nZMBcsv4/mGP9y6R6ado1TG6MNq+fyZwK7Ojuwbh4nM= +github.com/k3s-io/kine v0.13.5 h1:bVTcxCHJVUqeyz0mJenO+WFHkxtgD2aRwLt1JcJ0pq8= +github.com/k3s-io/kine v0.13.5/go.mod h1:OIG+kPc9cU+NDHnVm+aR0PyZYExdZWU+vlJynhH4haU= github.com/k3s-io/klog v1.0.0-k3s2/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= github.com/k3s-io/klog/v2 v2.100.1-k3s1 h1:xb/Ta8dpQuIZueQEw2YTZUYrKoILdBmPiITVkNmYPa0= github.com/k3s-io/klog/v2 v2.100.1-k3s1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= github.com/k3s-io/kube-router/v2 v2.2.1 h1:LrU6l4khFt67+QCIvgok9B/C9JY/U2/TaF9TCVUw0vw= github.com/k3s-io/kube-router/v2 v2.2.1/go.mod h1:OWqBKftzZRXF79mDv1MLiYbvD7RP/kzrk5X5NupAawM= -github.com/k3s-io/kubernetes v1.28.14-k3s2 h1:1aaK4cHl7bGGqF5aUubSEg5KRv+q7IEbJkAU8nbiRVY= -github.com/k3s-io/kubernetes v1.28.14-k3s2/go.mod h1:chlmcCDBnOA/y+572cw8dO0Rci1wiA8bm5+zhPdFLCk= -github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.28.14-k3s2 h1:qVnUVNWyMv7jSGzRgycN7tZwRdXm8FY5KmQGvTyuWiE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.28.14-k3s2/go.mod h1:pkQ1fRUQGPIcEafim+HRGpLoINmJ5NXdD9PCsdNF7sM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.28.14-k3s2 h1:tWiUaYxS7Ws6SsRg7RTJ1I95+Rmn2/bnC7Ylcne9ARs= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.28.14-k3s2/go.mod h1:jYu2WJNys0YsaQaWogXmC8vXzPrk5mClz/XZNWrgwpk= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.28.14-k3s2 h1:J3UzhPUQKDaTZuGBAJGtXgzRZ6J2Q3UKNi+E0P7eMgY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.28.14-k3s2/go.mod h1:uWR2HuDJVCHpIROldiK0YakARglCGuNMR6eGkt08ywQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.28.14-k3s2 h1:XX0L+x9zIrj+cnKGOttU2KeMqQ9+/jeohJPK1bEruDw= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.28.14-k3s2/go.mod h1:T2OGq17rzeHxuU3TgMpJmjImFyYTavKkD0FJM1mVQ8s= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.28.14-k3s2 h1:pYxPck4KzTY7nWk4O48ShHgNXJbHqRPefIUaJLIrXAY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.28.14-k3s2/go.mod h1:HPvQOvFvqq40yQs47hrYeZr5A4abVH6eJ5F/b/1BMJY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.28.14-k3s2 h1:wHQgxVxOqfw61du5gDsudmGdqigGzD0sISCfR+HN7K4= -github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.28.14-k3s2/go.mod h1:5/W9XaqI1bRF/L+tZT0SExq+XEBrMES+wEiIUphJDCY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.28.14-k3s2 h1:iSrf1PdKsdAYgOR/qBpg2QWf5Qh9d9WQqALg2Zcevi0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.28.14-k3s2/go.mod h1:5H+bgbEOZrretf6yaao0FUge//gJtp2XW66ZFOJkb+A= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.28.14-k3s2 h1:TgQg5dU2lGh+OuVvakbo0uo+eb505VAEeapqybq7voo= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.28.14-k3s2/go.mod h1:mWI+DQm0pC/+wTs5JC8DpvpqOh2G74X7UVtk1HCH7Z8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.28.14-k3s2/go.mod h1:KQubkwUjWm1IQX+yoRnMV47TJJZgcWK70LedtxxozMY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.28.14-k3s2 h1:SvNrCN8vEZLDyjwLyPrr2WzzGsQ+CIHvd3s8k5a3gAs= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.28.14-k3s2/go.mod h1:nKweG7AAnRoQa9GFnstbk19WEY0yqgEkGDKqCMGQkyA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.28.14-k3s2 h1:jOqJRlBCgEc0H1UhrtglbAfkckwZsjd7+DtI4k13EJc= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.28.14-k3s2/go.mod h1:W1SAueFUA9yXMewJjosAPMYk7zm/OvMfQsAXbXZKUHo= -github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.28.14-k3s2 h1:k2O3MNE+DzYE8Mnuoq0Ag2pf6RVRR0nx32Xq60+RMnQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.28.14-k3s2/go.mod h1:5P0QAR5khUSCD9UXEKi4n0M+HMNWKqOs6p5T74GpghM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.28.14-k3s2 h1:U4ffPIEAchP9F4bwaHETlTEQYR909oUYKm4+Yzv4MUY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.28.14-k3s2/go.mod h1:wvJ+QNRnFlQBxZ+zKhj9Hq42OECxNF+4VVLBjEbTkzU= -github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.28.14-k3s2 h1:2EawNTn6eSWhU6O0DoqIUzK81rm4to13/4nsWeBityE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.28.14-k3s2/go.mod h1:cqYqJOp4xDTnD3Ptl5Us6IFovMrfVqokycAMwAfJuU4= -github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.28.14-k3s2 h1:BpjTJJqHWzoKVKEVoJ+f17a24S92Mf15U0vhy5pN9VY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.28.14-k3s2/go.mod h1:RX/xG0KwzN4jtKfb60DvPSzNiYPqEog9X1KEZy3yp+E= -github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.28.14-k3s2 h1:P/eJ0+c7ho9XxD5EiRc4IHNvkVmHLNfQZS3+pu8fDtw= -github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.28.14-k3s2/go.mod h1:89uVsbKtM79aiuT4BM5Pi2vS+PxKxE671rL2MQkZ/dc= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.28.14-k3s2 h1:J3pgfK4j37jGmKNwdf16A4vVrK6AtxHY4objuvBHk/0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.28.14-k3s2/go.mod h1:zqzmSOkqzK+nFXtbVPZfICX+2xB+yozc3Yh2XxRXZbI= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.28.14-k3s2 h1:Gx6C0k6nQNPvy/dVJSP0RVbJ0y1/ZX5ALS56Mrr6rlE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.28.14-k3s2/go.mod h1:jbea/ZCfYDo4IB+FgwbXOR9odP0cEHHVhCUAZsEXZB4= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.28.14-k3s2 h1:ns7Tz64rgkygRwvbOpPsx5tPnT44MGkCag/ac/jcvV8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.28.14-k3s2/go.mod h1:hA9kK1e8lHfO+ldh3waPzc96cXPS3BqY5cjTftGEcv8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.28.14-k3s2 h1:VH161jzWhpDRuPa8IDEGpVp/jSuCN/bYarU/zPHsEiM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.28.14-k3s2/go.mod h1:KBUihK9Tir5VKDQ1KleA9DUnXRwzF1iqTsalp0KUkBo= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.28.14-k3s2 h1:b21/rB2r75ZPhmkZtYQZEXC4XeD8D9Iyz/yCmbYM5qw= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.28.14-k3s2/go.mod h1:SmdvvCM8+dA2fs0DKzSuDNFbThBrR2JrzbHX3eDLoc0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.28.14-k3s2 h1:0IP9IVoyxkhpv4FuB7ul2w27iMvDRcz4BvfZD+NMdDY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.28.14-k3s2/go.mod h1:p0+Uqj6KBZcTk9pmm/wdK8wQXqqa6LRpxRywnRWuHIM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.28.14-k3s2 h1:Cp/03poi/SMY+wAEki8Nr8cZIHROzW+nAdWtgG3PY6w= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.28.14-k3s2/go.mod h1:SNUut6y8TeJU+ly1b6SmfyQV77K2nQ4dZrQYxni9/h0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.28.14-k3s2 h1:kMH46Njd02La7vMqPkMu6xV8fcrjQbj2RBEPmOqopQY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.28.14-k3s2/go.mod h1:6blXkI8KYd/qOz58T6OYYia5Ax2FU8myWMLM6JPnJ5g= -github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.28.14-k3s2 h1:OtZ2AkwgXHFbl451nfoT2bHDCi05z5lvx9tcCyiKyNY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.28.14-k3s2/go.mod h1:X5xpMnqwP9Hsl9vKVwv2KEExgBE5CzEmJzvZjRkXz4o= -github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.28.14-k3s2 h1:RRBNOIoxd+RlahglEsVG+EMRkYPHAmfgLxXFlUMKERM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.28.14-k3s2/go.mod h1:iK9nacF+VipK+G0o0wdwWbvCwKm5RJ/t1l5Ec40iiKk= -github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.28.14-k3s2 h1:yPLvNewjCB6i24wCMQm1TIo0W1T+niq9xlTp7NmLurM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.28.14-k3s2/go.mod h1:bMYswV5hWouQuwnBUWvw9pw6wolAYMjDMMVEUYLnYos= -github.com/k3s-io/runc v1.1.14-k3s1 h1:PcwbBuIfjI9A0T1fq7XIdIxqYHWarDlRln7QsppQQmQ= -github.com/k3s-io/runc v1.1.14-k3s1/go.mod h1:E4C2z+7BxR7GHXp0hAY53mek+x49X1LjPNeMTfRGvOA= +github.com/k3s-io/kubernetes v1.28.15-k3s1 h1:JyhRz3IVBCvYxdrfHLqwPqUIjJLnl4ASK/79ognVQlo= +github.com/k3s-io/kubernetes v1.28.15-k3s1/go.mod h1:chlmcCDBnOA/y+572cw8dO0Rci1wiA8bm5+zhPdFLCk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.28.15-k3s1 h1:o/2LrfkLdUpIm3hx2quIMVLv+VLJkJyD+GkwLcj4Hvs= +github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.28.15-k3s1/go.mod h1:pkQ1fRUQGPIcEafim+HRGpLoINmJ5NXdD9PCsdNF7sM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.28.15-k3s1 h1:Lrh7a/PmoCDZcrlNo1FPp0d2+qsJVBdixEq+vAMI9T4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.28.15-k3s1/go.mod h1:jYu2WJNys0YsaQaWogXmC8vXzPrk5mClz/XZNWrgwpk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.28.15-k3s1 h1:SkgzagGVmWICdOpQHaK1IXFzfAySpHfd0zYol3ybuLc= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.28.15-k3s1/go.mod h1:uWR2HuDJVCHpIROldiK0YakARglCGuNMR6eGkt08ywQ= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.28.15-k3s1 h1:bpJN4UwaawQ2GXdL97H3ZfyxoDcDAwFzXZaXzqP5FvA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.28.15-k3s1/go.mod h1:T2OGq17rzeHxuU3TgMpJmjImFyYTavKkD0FJM1mVQ8s= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.28.15-k3s1 h1:+M1grsiV/PZaB/v1Jn9HnS9KBvjhXyTLFDpp4vKAF8Y= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.28.15-k3s1/go.mod h1:HPvQOvFvqq40yQs47hrYeZr5A4abVH6eJ5F/b/1BMJY= +github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.28.15-k3s1 h1:180lKO5zbse+56Fiyl0ASqULVidY6OJ+0PDTBnJeP9s= +github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.28.15-k3s1/go.mod h1:5/W9XaqI1bRF/L+tZT0SExq+XEBrMES+wEiIUphJDCY= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.28.15-k3s1 h1:l1aSEtkvyaRm9u7vdirOdpgVBPsJaI4z429AsNOiiu8= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.28.15-k3s1/go.mod h1:5H+bgbEOZrretf6yaao0FUge//gJtp2XW66ZFOJkb+A= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.28.15-k3s1 h1:4ZrhAddjP3KwIatDoP8HaAs482GE7kRa7GqFhNGaH/I= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.28.15-k3s1/go.mod h1:mWI+DQm0pC/+wTs5JC8DpvpqOh2G74X7UVtk1HCH7Z8= +github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.28.15-k3s1/go.mod h1:KQubkwUjWm1IQX+yoRnMV47TJJZgcWK70LedtxxozMY= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.28.15-k3s1 h1:coXOGL6hcCjpSmtUvPY7SbtyyQkUbP3uHuyMcHfcoGc= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.28.15-k3s1/go.mod h1:nKweG7AAnRoQa9GFnstbk19WEY0yqgEkGDKqCMGQkyA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.28.15-k3s1 h1:OukI0iHa7tvhiNK1kdfKNEACjsw3MRZnnZf67P3IoLI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.28.15-k3s1/go.mod h1:W1SAueFUA9yXMewJjosAPMYk7zm/OvMfQsAXbXZKUHo= +github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.28.15-k3s1 h1:xGxnRRfnBIhWxB5YvfvftOAAtqXL34JjXXmtW4erYoI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.28.15-k3s1/go.mod h1:5P0QAR5khUSCD9UXEKi4n0M+HMNWKqOs6p5T74GpghM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.28.15-k3s1 h1:c95Trtagv5TEf7beMBBnIQuYJGZKV2xDFUZLHbdlExQ= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.28.15-k3s1/go.mod h1:wvJ+QNRnFlQBxZ+zKhj9Hq42OECxNF+4VVLBjEbTkzU= +github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.28.15-k3s1 h1:P1yRvgsmZyqPoghg+FjxDkBJhEVDP4Ri+uV1qVZjeYY= +github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.28.15-k3s1/go.mod h1:cqYqJOp4xDTnD3Ptl5Us6IFovMrfVqokycAMwAfJuU4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.28.15-k3s1 h1:JAJ2wOVbCMjGc5bzLMxAA9tF9wJJ6tCLDi9pRWcwqlI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.28.15-k3s1/go.mod h1:RX/xG0KwzN4jtKfb60DvPSzNiYPqEog9X1KEZy3yp+E= +github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.28.15-k3s1 h1:welekIUxfO0ACFMFFhnbTrFKnDlU2f3bUO79vbjbm+Q= +github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.28.15-k3s1/go.mod h1:89uVsbKtM79aiuT4BM5Pi2vS+PxKxE671rL2MQkZ/dc= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.28.15-k3s1 h1:0lEkXAse3ZG/pu8cJj9wauuvs5Q9HWx4jxTvWrc4rsc= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.28.15-k3s1/go.mod h1:zqzmSOkqzK+nFXtbVPZfICX+2xB+yozc3Yh2XxRXZbI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.28.15-k3s1 h1:PCYB0fefhHF6IiQgRPjPO9Al3OMzqtg/XaWW5nBSwQc= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.28.15-k3s1/go.mod h1:jbea/ZCfYDo4IB+FgwbXOR9odP0cEHHVhCUAZsEXZB4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.28.15-k3s1 h1:56DMCzIiL7vKFDWvtUhFnpHEuqNtj11IMUrPczNYXFA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.28.15-k3s1/go.mod h1:hA9kK1e8lHfO+ldh3waPzc96cXPS3BqY5cjTftGEcv8= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.28.15-k3s1 h1:KKGhoz/s0fefXii7xPws+0dt3uQHON19lI6/JlJ05GU= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.28.15-k3s1/go.mod h1:KBUihK9Tir5VKDQ1KleA9DUnXRwzF1iqTsalp0KUkBo= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.28.15-k3s1 h1:/rRM0Bn2zAVMjV52eHwhs5UQ0Uwd1gxTbuptXo9EULk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.28.15-k3s1/go.mod h1:SmdvvCM8+dA2fs0DKzSuDNFbThBrR2JrzbHX3eDLoc0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.28.15-k3s1 h1:GKZgsiBi47vMG5UQ+Tn0QkLE++yz5Ilqo6JNFNVIXbM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.28.15-k3s1/go.mod h1:p0+Uqj6KBZcTk9pmm/wdK8wQXqqa6LRpxRywnRWuHIM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.28.15-k3s1 h1:I5JO8YFdslFe4oE/VwSQpuKCKTc/k1W9thCAUJDxixk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.28.15-k3s1/go.mod h1:SNUut6y8TeJU+ly1b6SmfyQV77K2nQ4dZrQYxni9/h0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.28.15-k3s1 h1:MT0VIlSKIygKSgR8iBPEt281qXS7qA6CKy3Hhtfp7ws= +github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.28.15-k3s1/go.mod h1:6blXkI8KYd/qOz58T6OYYia5Ax2FU8myWMLM6JPnJ5g= +github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.28.15-k3s1 h1:q4rQb5oscpa54wHwaIRlCY28xtanWHxMHKex9EBYZaM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.28.15-k3s1/go.mod h1:X5xpMnqwP9Hsl9vKVwv2KEExgBE5CzEmJzvZjRkXz4o= +github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.28.15-k3s1 h1:mJUOYNM5tQPukhLSdrdCXuj4zTHKbQ0q7rvXVTrgHUk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.28.15-k3s1/go.mod h1:iK9nacF+VipK+G0o0wdwWbvCwKm5RJ/t1l5Ec40iiKk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.28.15-k3s1 h1:lUm1YVGb9Rd7h4CtxJZR/angipqegug1xcH08HiBPRs= +github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.28.15-k3s1/go.mod h1:bMYswV5hWouQuwnBUWvw9pw6wolAYMjDMMVEUYLnYos= +github.com/k3s-io/runc v1.2.1-k3s1 h1:74ZffmoNVdX+jO+XYLv0iU/A9Yse1DZ2slZog7gNDgE= +github.com/k3s-io/runc v1.2.1-k3s1/go.mod h1:/PXzF0h531HTMsYQnmxXkBD7YaGShm/2zcRB79dksUc= github.com/k3s-io/spegel v0.0.23-0.20240516234953-f3d2c4072314 h1:TrZb/yM0OtBuifPXlKaOfcxpJqzakA8+KsoO4c69ZLM= github.com/k3s-io/spegel v0.0.23-0.20240516234953-f3d2c4072314/go.mod h1:bMHfSjj1+Zf5VITCZe/wLjuni6rYAj/DjPU/kIVnhfA= github.com/karrick/godirwalk v1.17.0 h1:b4kY7nqDdioR/6qnbHQyDvmA17u5G1cZ6J+CZXwSWoI= @@ -1321,8 +1328,8 @@ github.com/klauspost/compress v1.14.4/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47e github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= github.com/klauspost/compress v1.16.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/klauspost/compress v1.17.2/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= -github.com/klauspost/compress v1.17.10 h1:oXAz+Vh0PMUvJczoi+flxpnBEPxoER1IaAnU/NMPtT0= -github.com/klauspost/compress v1.17.10/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= +github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc= +github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= @@ -1442,8 +1449,8 @@ github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lL github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= github.com/mattn/go-sqlite3 v1.14.7/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= github.com/mattn/go-sqlite3 v1.14.14/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= -github.com/mattn/go-sqlite3 v1.14.23 h1:gbShiuAP1W5j9UOksQ06aiiqPMxYecovVGwmTxWtuw0= -github.com/mattn/go-sqlite3 v1.14.23/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= +github.com/mattn/go-sqlite3 v1.14.24 h1:tpSp2G2KyMnnQu99ngJ47EIkWVmliIizyZBfPrBWDRM= +github.com/mattn/go-sqlite3 v1.14.24/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= github.com/mattn/go-zglob v0.0.1/go.mod h1:9fxibJccNxU2cnpIKLRRFA7zX7qhkJIQWBb449FYHOo= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= @@ -1516,9 +1523,9 @@ github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg= github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc= github.com/moby/spdystream v0.2.0 h1:cjW1zVyyoiM0T7b6UoySUFqzXMoqRckQtXwGPiBhOM8= github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= -github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU= -github.com/moby/sys/mountinfo v0.6.2 h1:BzJjoreD5BMFNmD9Rus6gdd1pLuecOFPt8wC+Vygl78= github.com/moby/sys/mountinfo v0.6.2/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI= +github.com/moby/sys/mountinfo v0.7.1 h1:/tTvQaSJRr2FshkhXiIpux6fQ2Zvc4j7tAhMTStAG2g= +github.com/moby/sys/mountinfo v0.7.1/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI= github.com/moby/sys/sequential v0.5.0 h1:OPvI35Lzn9K04PBbCLW0g4LcFAJgHsvXsRyewg5lXtc= github.com/moby/sys/sequential v0.5.0/go.mod h1:tH2cOOs5V9MlPiXcQzRC+eEyab644PWKGRYaaV5ZZlo= github.com/moby/sys/signal v0.6.0/go.mod h1:GQ6ObYZfqacOwTtlXvcmh9A26dVRul/hbOZn88Kg8Tg= @@ -1816,6 +1823,7 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= +github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/rootless-containers/rootlesskit v1.0.1 h1:jepqW1txFSowKSMAEkVhWH3Oa1TCY9S400MVYe/6Iro= @@ -1841,7 +1849,6 @@ github.com/santhosh-tekuri/jsonschema v1.2.4/go.mod h1:TEAUOeZSmIxTTuHatJzrvARHi github.com/sassoftware/go-rpmutils v0.0.0-20190420191620-a8f1baeba37b/go.mod h1:am+Fp8Bt506lA3Rk3QCmSqmYmLMnPDhdDUcosQCAx+I= github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= github.com/seccomp/libseccomp-golang v0.10.0 h1:aA4bp+/Zzi0BnWZ2F1wgNBs5gTpm+na2rWM6M9YjLpY= github.com/seccomp/libseccomp-golang v0.10.0/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= @@ -1991,7 +1998,6 @@ github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZ github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8= github.com/ulikunitz/xz v0.5.7/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/urfave/cli v1.19.1/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= -github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli v1.22.5/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= @@ -2012,8 +2018,9 @@ github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMI github.com/vishvananda/netlink v1.0.0/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk= github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= github.com/vishvananda/netlink v1.1.1-0.20210330154013-f5de75959ad5/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho= -github.com/vishvananda/netlink v1.2.1-beta.2 h1:Llsql0lnQEbHj0I1OuKyp8otXp0r3q0mPkuhwHfStVs= github.com/vishvananda/netlink v1.2.1-beta.2/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho= +github.com/vishvananda/netlink v1.3.0 h1:X7l42GfcV4S6E4vHTsw48qbrV+9PVojNfIhZcwQdrZk= +github.com/vishvananda/netlink v1.3.0/go.mod h1:i6NetklAujEcC6fK0JPjT8qSwWyO0HLn4UKG+hGqeJs= github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= @@ -2071,7 +2078,6 @@ go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= -go.etcd.io/bbolt v1.3.9/go.mod h1:zaO32+Ti0PK1ivdPtgMESzuzL2VPoIG1PCQNvOdo/dE= go.etcd.io/bbolt v1.3.10/go.mod h1:bK3UQLPJZly7IlNmV7uVHJDxfe5aK9Ll93e/74Y9oEQ= go.etcd.io/bbolt v1.3.11 h1:yGEzV1wPz2yVCLsD8ZAiGHhHVlczyC9d1rP43/VCRJ0= go.etcd.io/bbolt v1.3.11/go.mod h1:dksAq7YMXoljX0xu6VF5DMZGbhYYoLUalEiSySYAS4I= @@ -2176,6 +2182,7 @@ golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMk golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA= golang.org/x/exp v0.0.0-20220827204233-334a2380cb91/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= +golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8= golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= @@ -2271,8 +2278,8 @@ golang.org/x/oauth2 v0.15.0/go.mod h1:q48ptWNTY5XWf+JNten23lcvHpLJ0ZSxF5ttTHKVCA golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5HA= golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8= -golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs= -golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= +golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA= +golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -2298,16 +2305,16 @@ golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= -golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk= -golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4= +golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM= +golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -2342,8 +2349,9 @@ golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.1.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= +golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -2447,8 +2455,8 @@ golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNq golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= -golang.zx2c4.com/wireguard v0.0.0-20230325221338-052af4a8072b h1:J1CaxgLerRR5lgx3wnr6L04cJFbWoceSK9JWBdglINo= -golang.zx2c4.com/wireguard v0.0.0-20230325221338-052af4a8072b/go.mod h1:tqur9LnfstdR9ep2LaJT4lFUl0EjlHtge+gAjmsHUG4= +golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173 h1:/jFs0duh4rdb8uIfPMv78iAJGcPKDeqAFnaLBropIC4= +golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173/go.mod h1:tkCQ4FQXmpAgYVh++1cq16/dH4QJtmvpRv19DWGAHSA= golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230429144221-925a1e7659e6 h1:CawjfCvYQH2OU3/TnxLx97WDSUDRABfT18pCOYwc2GE= golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230429144221-925a1e7659e6/go.mod h1:3rxYc4HtVcSG9gVaTs2GEBdehh+sYPOwKtyUWEOTb80= gomodules.xyz/jsonpatch/v2 v2.2.0/go.mod h1:WXp+iVDkoLQqPudfQ9GBlwB2eZ5DKOnjQZCYdOS8GPY= @@ -2566,8 +2574,8 @@ google.golang.org/genproto/googleapis/api v0.0.0-20240205150955-31a09d347014/go. google.golang.org/genproto/googleapis/api v0.0.0-20240221002015-b0ce06bbee7c/go.mod h1:5iCWqnniDlqZHrd3neWVTOwvh/v6s3232omMecelax8= google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2/go.mod h1:O1cOfN1Cy6QEYr7VxtjOyP5AdAuR0aJ/MYZaaof623Y= google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237/go.mod h1:Z5Iiy3jtmioajWHDGFk7CeugTyHtPvMHA4UTmUkyalE= -google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 h1:wKguEg1hsxI2/L3hUYrpo1RVi48K+uTyzKqprwLXsb8= -google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142/go.mod h1:d6be+8HhtEtucleCbxpPW9PA9XwISACu8nvpPqF0BVo= +google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 h1:hjSy6tcFQZ171igDaN5QHOw2n6vx40juYbC/x67CEhc= +google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:qpvKtACPCQhAdu3PyQgV4l3LMXZEtft7y8QcarRsp9I= google.golang.org/genproto/googleapis/bytestream v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:ylj+BE99M198VPbBh6A8d9n3w8fChvyLK3wwBOjXBFA= google.golang.org/genproto/googleapis/bytestream v0.0.0-20231030173426-d783a09b4405/go.mod h1:GRUCuLdzVqZte8+Dl/D4N25yLzcGqqWaYkeVOwulFqw= google.golang.org/genproto/googleapis/bytestream v0.0.0-20231212172506-995d672761c0/go.mod h1:guYXGPwC6jwxgWKW5Y405fKWOFNwlvUlUnzyp9i0uqo= @@ -2600,8 +2608,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240228224816-df926f6c8641/go. google.golang.org/genproto/googleapis/rpc v0.0.0-20240304161311-37d4d3c04a78/go.mod h1:UCOku4NytXMJuLQE5VuqA5lX3PcHCBo8pxNyvkf4xBs= google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 h1:e7S5W7MGGLaSu8j3YjdezkZ+m1/Nm0uRVRMEMGk26Xs= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= @@ -2694,8 +2702,8 @@ k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A= -k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3 h1:b2FmK8YH+QEwq/Sy2uAEhmqL5nPfGYbJOcaqjeYYZoA= +k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= lukechampine.com/blake3 v1.2.1 h1:YuqqRuaqsGV71BV/nm9xlI0MKUv4QC54jQnBChWbGnI= lukechampine.com/blake3 v1.2.1/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k= lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= From b1d6431eec8746b9968e584f79b24108a52590c5 Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Wed, 6 Nov 2024 21:43:35 +0000 Subject: [PATCH 2/5] Sync CLI flags with k3s Signed-off-by: Brad Davidson (cherry picked from commit f4cbef9c5cea4dda4a4bd2a5d6d9adf3765115d7) Signed-off-by: Brad Davidson --- pkg/cli/cmds/agent.go | 1 + pkg/cli/cmds/server.go | 1 + 2 files changed, 2 insertions(+) diff --git a/pkg/cli/cmds/agent.go b/pkg/cli/cmds/agent.go index 5a2c6e31e8..7d97fb98a3 100644 --- a/pkg/cli/cmds/agent.go +++ b/pkg/cli/cmds/agent.go @@ -31,6 +31,7 @@ var ( "docker": dropFlag, "container-runtime-endpoint": copyFlag, "disable-default-registry-endpoint": copyFlag, + "nonroot-devices": copyFlag, "image-service-endpoint": dropFlag, "pause-image": dropFlag, "default-runtime": copyFlag, diff --git a/pkg/cli/cmds/server.go b/pkg/cli/cmds/server.go index 003e8d6990..74d4c5785b 100644 --- a/pkg/cli/cmds/server.go +++ b/pkg/cli/cmds/server.go @@ -97,6 +97,7 @@ var ( "docker": dropFlag, "container-runtime-endpoint": copyFlag, "disable-default-registry-endpoint": copyFlag, + "nonroot-devices": copyFlag, "embedded-registry": copyFlag, "supervisor-metrics": copyFlag, "image-service-endpoint": dropFlag, From e7a8ae90275060a7c0f32b48d293290c0141514f Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Wed, 6 Nov 2024 21:38:54 +0000 Subject: [PATCH 3/5] Bump containerd and etcd to sync with k3s Signed-off-by: Brad Davidson (cherry picked from commit 3231a38114d8417df842f22fcd458379a6a00391) Signed-off-by: Brad Davidson --- Dockerfile | 2 +- Dockerfile.windows | 2 +- scripts/build-binary | 2 +- scripts/build-images | 2 +- scripts/build-windows-binary | 2 +- scripts/version.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6230554fa4..3f2f321796 100644 --- a/Dockerfile +++ b/Dockerfile @@ -118,7 +118,7 @@ RUN rm -vf /charts/*.sh /charts/*.md /charts/chart_versions.yaml # must be placed in bin/ of the file image and subdirectories of bin/ will be flattened during installation. # This means bin/foo/bar will become bin/bar when rke2 installs this to the host FROM rancher/hardened-kubernetes:v1.28.15-rke2r1-build20241023 AS kubernetes -FROM rancher/hardened-containerd:v1.7.22-k3s1-build20241010 AS containerd +FROM rancher/hardened-containerd:v1.7.23-k3s1-build20241106 AS containerd FROM rancher/hardened-crictl:v1.28.0-build20241008 AS crictl FROM rancher/hardened-runc:v1.1.14-build20240910 AS runc diff --git a/Dockerfile.windows b/Dockerfile.windows index fa55cc9415..1ba70e510e 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -38,7 +38,7 @@ RUN curl -sL https://raw.githubusercontent.com/golangci/golangci-lint/master/ins WORKDIR /source # End Dapper stuff -FROM --platform=$BUILDPLATFORM rancher/hardened-containerd:v1.7.22-k3s1-build20241010-amd64-windows AS containerd +FROM --platform=$BUILDPLATFORM rancher/hardened-containerd:v1.7.23-k3s1-build20241106-amd64-windows AS containerd FROM build as windows-runtime-collect ARG KUBERNETES_VERSION=dev diff --git a/scripts/build-binary b/scripts/build-binary index 18701483b9..4afb6d199c 100755 --- a/scripts/build-binary +++ b/scripts/build-binary @@ -30,7 +30,7 @@ VERSION_FLAGS=" -X ${K3S_PKG}/pkg/version.Version=${VERSION} -X ${K3S_PKG}/pkg/version.UpstreamGolang=${VERSION_GOLANG} -X ${RKE2_PKG}/pkg/images.DefaultRegistry=${REGISTRY} - -X ${RKE2_PKG}/pkg/images.DefaultEtcdImage=rancher/hardened-etcd:${ETCD_VERSION}-build20240910 + -X ${RKE2_PKG}/pkg/images.DefaultEtcdImage=rancher/hardened-etcd:${ETCD_VERSION}-build20241106 -X ${RKE2_PKG}/pkg/images.DefaultKubernetesImage=rancher/hardened-kubernetes:${KUBERNETES_IMAGE_TAG} -X ${RKE2_PKG}/pkg/images.DefaultPauseImage=rancher/mirrored-pause:${PAUSE_VERSION} -X ${RKE2_PKG}/pkg/images.DefaultRuntimeImage=${REPO}/${PROG}-runtime:${DOCKERIZED_VERSION} diff --git a/scripts/build-images b/scripts/build-images index 7a5c98bc3d..4fd5e97169 100755 --- a/scripts/build-images +++ b/scripts/build-images @@ -16,7 +16,7 @@ xargs -n1 -t docker image pull --quiet << EOF >> build/images-core.txt ${REGISTRY}/rancher/hardened-coredns:v1.11.3-build20241018 ${REGISTRY}/rancher/hardened-cluster-autoscaler:v1.8.11-build20241014 ${REGISTRY}/rancher/hardened-dns-node-cache:1.23.1-build20241008 - ${REGISTRY}/rancher/hardened-etcd:${ETCD_VERSION}-build20240910 + ${REGISTRY}/rancher/hardened-etcd:${ETCD_VERSION}-build20241106 ${REGISTRY}/rancher/hardened-k8s-metrics-server:v0.7.1-build20241008 ${REGISTRY}/rancher/hardened-addon-resizer:1.8.20-build20241001 ${REGISTRY}/rancher/klipper-helm:v0.9.3-build20241008 diff --git a/scripts/build-windows-binary b/scripts/build-windows-binary index 6544d7035b..ed4503ac6d 100755 --- a/scripts/build-windows-binary +++ b/scripts/build-windows-binary @@ -31,7 +31,7 @@ VERSION_FLAGS=" -X ${K3S_PKG}/pkg/version.Version=${VERSION} -X ${K3S_PKG}/pkg/version.UpstreamGolang=${VERSION_GOLANG} -X ${RKE2_PKG}/pkg/images.DefaultRegistry=${REGISTRY} - -X ${RKE2_PKG}/pkg/images.DefaultEtcdImage=rancher/hardened-etcd:${ETCD_VERSION}-build20240910 + -X ${RKE2_PKG}/pkg/images.DefaultEtcdImage=rancher/hardened-etcd:${ETCD_VERSION}-build20241106 -X ${RKE2_PKG}/pkg/images.DefaultKubernetesImage=${REPO}/hardened-kubernetes:${KUBERNETES_IMAGE_TAG} -X ${RKE2_PKG}/pkg/images.DefaultPauseImage=rancher/mirrored-pause:${PAUSE_VERSION} -X ${RKE2_PKG}/pkg/images.DefaultRuntimeImage=${REPO}/${PROG}-runtime:${DOCKERIZED_VERSION}-${GOOS}-${GOARCH} diff --git a/scripts/version.sh b/scripts/version.sh index 2df98650fa..c16f1006f5 100755 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -34,7 +34,7 @@ RELEASE=${PROG}.${PLATFORM} # hardcode versions unless set specifically KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.28.15} KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.28.15-rke2r1-build20241023} -ETCD_VERSION=${ETCD_VERSION:-v3.5.13-k3s1} +ETCD_VERSION=${ETCD_VERSION:-v3.5.16-k3s1} PAUSE_VERSION=${PAUSE_VERSION:-3.6} CCM_VERSION=${CCM_VERSION:-v1.28.15-0.20241016053552-63bfb1936862-build20241016} From 991a1475ec4b14b757c8a7af2184b47d3145e2cd Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Thu, 24 Oct 2024 20:09:44 +0000 Subject: [PATCH 4/5] Only clean up pod filesystems if umount succeeds Signed-off-by: Brad Davidson (cherry picked from commit abfac1fbfb6b647a9bd5cf42646448ef96e299c6) Signed-off-by: Brad Davidson --- bundle/bin/rke2-killall.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bundle/bin/rke2-killall.sh b/bundle/bin/rke2-killall.sh index f9db1010cb..6f6c128c35 100755 --- a/bundle/bin/rke2-killall.sh +++ b/bundle/bin/rke2-killall.sh @@ -43,8 +43,7 @@ do_unmount_and_remove() { MOUNTS=$(printf ${MOUNTS} | grep "^$1" | sort -r) if [ -n "${MOUNTS}" ]; then set -x - umount ${MOUNTS} - rm -rf --one-file-system ${MOUNTS} + umount -- ${MOUNTS} && rm -rf --one-file-system -- ${MOUNTS} else set -x fi From 67196817fcafbfb0076b4a472ac198be2d2d30ae Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Wed, 6 Nov 2024 21:26:17 +0000 Subject: [PATCH 5/5] Remove special hostname behavior for aws cloud-provider The in-tree aws cloud provider has been removed and the kubelet will fail to start if the cloud-provider-name is set to aws, so this is dead code. Signed-off-by: Brad Davidson (cherry picked from commit 89a8d81227fe12fb8ca7f4aecff22ac6834e0643) Signed-off-by: Brad Davidson --- pkg/rke2/rke2_linux.go | 64 ------------------------------------------ 1 file changed, 64 deletions(-) diff --git a/pkg/rke2/rke2_linux.go b/pkg/rke2/rke2_linux.go index 3bf5c9e3c9..f0902668c4 100644 --- a/pkg/rke2/rke2_linux.go +++ b/pkg/rke2/rke2_linux.go @@ -4,16 +4,10 @@ package rke2 import ( - "bytes" - "context" "fmt" - "io/ioutil" - "net/http" - "os/exec" "path/filepath" "strconv" "strings" - "time" "github.com/k3s-io/k3s/pkg/agent/config" "github.com/k3s-io/k3s/pkg/cli/cmds" @@ -24,7 +18,6 @@ import ( "github.com/rancher/rke2/pkg/cli/defaults" "github.com/rancher/rke2/pkg/images" "github.com/rancher/rke2/pkg/podexecutor" - "github.com/sirupsen/logrus" "github.com/urfave/cli" ) @@ -96,19 +89,6 @@ func initExecutor(clx *cli.Context, cfg Config, isServer bool) (*podexecutor.Sta Name: cfg.CloudProviderName, Path: cfg.CloudProviderConfig, } - if clx.String("node-name") == "" && cfg.CloudProviderName == "aws" { - fqdn := hostnameFromMetadataEndpoint(context.Background()) - if fqdn == "" { - hostFQDN, err := hostnameFQDN() - if err != nil { - return nil, err - } - fqdn = hostFQDN - } - if err := clx.Set("node-name", fqdn); err != nil { - return nil, err - } - } } if cfg.KubeletPath == "" { @@ -489,47 +469,3 @@ func parseControlPlaneMounts(cfg Config) (*podexecutor.ControlPlaneMounts, error CloudControllerManager: cfg.ExtraMounts.CloudControllerManager.Value(), }, nil } - -func hostnameFQDN() (string, error) { - cmd := exec.Command("hostname", "-f") - - var b bytes.Buffer - cmd.Stdout = &b - - if err := cmd.Run(); err != nil { - return "", err - } - - return strings.TrimSpace(b.String()), nil -} - -func hostnameFromMetadataEndpoint(ctx context.Context) string { - ctx, cancel := context.WithTimeout(ctx, time.Second) - defer cancel() - - req, err := http.NewRequestWithContext(ctx, http.MethodGet, "http://169.254.169.254/latest/meta-data/local-hostname", nil) - if err != nil { - logrus.Debugf("Failed to create request for metadata endpoint: %v", err) - return "" - } - - resp, err := http.DefaultClient.Do(req) - if err != nil { - logrus.Debugf("Failed to get local-hostname from metadata endpoint: %v", err) - return "" - } - defer resp.Body.Close() - - if resp.StatusCode != http.StatusOK { - logrus.Debugf("Metadata endpoint returned unacceptable status code %d", resp.StatusCode) - return "" - } - - b, err := ioutil.ReadAll(resp.Body) - if err != nil { - logrus.Debugf("Failed to read response body from metadata endpoint: %v", err) - return "" - } - - return strings.TrimSpace(string(b)) -}