k3s: update to v1.31.1+k3s1

Bumping k3s to version v1.31.1+k3s1, which comprises the following commits:

    452dbbc14c update kubernetes to v1.31.1-k3s3 (#10910)
    9ae2c39004 Update Kubernetes to v1.31.1 (#10895)
    d926e69073 Fix hosts.toml header var
    2caa785e17 Only clean up containerd hosts dirs managed by k3s
    4c8ef7f477 Fix rotateca validation failures when not touching default self-signed CAs
    0c8d3c0d58 Bump helm-controller for skip-verify/plain-http and updated tolerations
    db3cf9370e Bump containerd to v1.7.21, runc to v1.1.14
    28a1fd0302 Update coredns to 1.11.3 and metrics-server to 0.7.2
    944b3b2830 Bump traefik to v2.11.8
    703e7697b0 Tag PR image build as latest before scanning
    88d5576be6 Fix /trivy action running against target branch instead of PR branch
    9c537cb705 Bump aquasecurity/trivy-action from 0.20.0 to 0.24.0 (#10795)
    be60661f18 Add trivy scanning trigger for PRs (#10758)
    e0c4e60171 Update CNI plugins version
    3923e0c699 Cover edge case when on new minor release for E2E upgrade test (#10781)
    8bfcfd70cc Fix deploy latest commit on E2E tests (#10725)
    e8de533e90 Remove secrets encryption controller (#10612)
    34be6d96d1 Update kubernetes to v1.31.0-k3s3 (#10780)
    c7468edbe7 Bump go dependencies to match upstream 1.31
    ebbb109840 Update VERSION_K8S to handle any k3s revision
    f5c6472b16 Bump Kine to v0.12.0
    d358a89171 Fix secrets-encrypt metrics
    178aadbe20 Add k3s-io/kubernetes tags
    5087240e32 Downgrade Microsoft/hcsshim to v0.8.26
    8cbcbcd044 go generate
    20b50426ab Update to v1.31.0
    876d54cf49 chore: Bump Trivy version (#10670)
    518276fb77 adding MariaDB to README.md (#10717)
    649678bd89 Fix k3s-killall.sh support for custom data dir
    38df76708d Fix caching name for e2e vagrant box (#10695)
    ae0d79c7ea Update to v1.30.3-k3s1 and Go 1.22.5 (#10536)
    019b0afdd8 Fix: Add $SUDO prefix to transactional-update commands in install script (#10531)
    22fb7049bd Add tolerations support for DaemonSet pods
    daf0094cc7 Bump helm-controller to v0.16.3 to drop Helm v2 support
    ac247d29cf Update to newer OS images for install testing (#10681)
    0ee714d62b Bump containerd to v1.7.20 (#10659)
    acb71ee379 Allow Amazon Linux 2 rpm installs
    79ec016b6d Allow kylin V10 rpm installs
    8ff7d162cc Allow fedora iot rpm installs
    45c04f3502 Allow Amazon Linux 2023 rpm installs
    3aceb85c22 Add a change for killall to not unmount server and agent directory
    82ba778a86 bump docker/docker to v25.0.6
    38e8b01b8f update stable channel to v1.30.3+k3s1 (#10647)
    bffdf463e1 Fix cloudprovider controller name
    e168438d44 Wire lasso metrics up to common gatherer
    e2179aa957 Update pkg/cluster/managed.go
    3ec086f6f7 Update pkg/secretsencrypt/config.go
    e4f3cc7b54 remove deprecated use of wait functions
    e514940020 Fix inconsistent loading of config dropins when config file does not exist
    9111b1f77e Add K3S_DATA_DIR as env var for --data-dir flag
    a26a5ab1d7 Don't set K3S_DATA_DIR env var
    59e0761043 Use higher QPS for secrets reencryption (#10571)
    a70157c12e Allow Pprof and Superisor metrics in standalone mode (#10576)
    ecff337e00 Enhance E2E Hardened option (#10558)
    d4c3422a85 Fix ipv6 sysctl required by non-ipv6 LoadBalancer service
    21611c5665 Cap length of generated name used for servicelb daemonset
    891e72f90f Update secretsencrypt pagination
    c2216a62ad Use pagination when retrieving etcd snapshot list
    37830fe170 Don't use server and token values from config file for etcd-snapshot commands
    cb6bf74bc4 Add dial duration to debug error message
    118acabec2 Fix IPv6 primary node-ip handling
    9841517457 Fix agents removing configured supervisor address
    9d0c2e0000 Fix reentrant rlock in loadbalancer.dialContext
    b999a5b23d Bump kine to v0.11.11
    58ab25927f For E2E upgrade test, automatically determine the channel to use (#10461)
    c36db53e54 Add etcd s3 config secret implementation
    5508589fae chore: Bump Trivy version
    eb8bd15889 Ensure remotedialer kubelet connections use kubelet bind address
    a0b374508e Bump Local Path Provisioner version (#10394)
    0b417385a4 chore: Bump golang:alpine version
    f6942f3de4 Bump github.com/hashicorp/go-retryablehttp from 0.7.4 to 0.7.7
    b045465178 Add data-dir to uninstall and killall scripts
    d1709d60ce Fix INSTALL_K3S_PR support
    047664b610 Bump k3s-root to v0.14.0
    4204248bc3 Check for bad token permissions when install via PR (#10387)
    8f9ad1f992 Move test-compat to GHA (#10414)

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Bruce Ashfield 2024-09-26 02:40:18 +00:00
parent 75b6a5cf61
commit 2ef1ee0412
4 changed files with 683 additions and 673 deletions

View File

@ -1,4 +1,4 @@
# github.com/Microsoft/hcsshim v0.12.3
# github.com/Microsoft/hcsshim v0.12.6
## explicit
# github.com/Mirantis/cri-dockerd v0.0.0-00010101000000-000000000000
## explicit
@ -8,7 +8,7 @@
## explicit
# github.com/containerd/aufs v1.0.0
## explicit
# github.com/containerd/cgroups/v3 v3.0.2
# github.com/containerd/cgroups/v3 v3.0.3
## explicit
# github.com/containerd/containerd v1.7.16
## explicit
@ -22,15 +22,15 @@
## explicit
# github.com/coreos/go-systemd/v22 v22.5.0
## explicit
# github.com/docker/docker v25.0.5+incompatible
# github.com/docker/docker v27.1.1+incompatible
## explicit
# github.com/erikdubbelboer/gspt v0.0.0-20190125194910-e68493906b83
## explicit
# github.com/flannel-io/flannel v0.25.4
# github.com/flannel-io/flannel v0.25.6
## explicit
# github.com/go-bindata/go-bindata v3.1.2+incompatible
## explicit
# github.com/go-logr/logr v1.4.1
# github.com/go-logr/logr v1.4.2
## explicit
# github.com/go-logr/stdr v1.2.3-0.20220714215716-96bad1d688c5
## explicit
@ -56,13 +56,11 @@
## explicit
# github.com/json-iterator/go v1.1.12
## explicit
# github.com/k3s-io/helm-controller v0.16.1
# github.com/k3s-io/helm-controller v0.16.4
## explicit
# github.com/k3s-io/kine v0.11.9
# github.com/k3s-io/kine v0.12.0
## explicit
# github.com/klauspost/compress v1.17.7
## explicit
# github.com/kubernetes-sigs/cri-tools v0.0.0-00010101000000-000000000000
# github.com/klauspost/compress v1.17.9
## explicit
# github.com/lib/pq v1.10.2
## explicit
@ -76,11 +74,11 @@
## explicit
# github.com/natefinch/lumberjack v2.0.0+incompatible
## explicit
# github.com/onsi/ginkgo/v2 v2.16.0
# github.com/onsi/ginkgo/v2 v2.20.0
## explicit
# github.com/onsi/gomega v1.32.0
# github.com/onsi/gomega v1.34.1
## explicit
# github.com/opencontainers/runc v1.1.12
# github.com/opencontainers/runc v1.1.13
## explicit
# github.com/opencontainers/selinux v1.11.0
## explicit
@ -88,17 +86,17 @@
## explicit
# github.com/pkg/errors v0.9.1
## explicit
# github.com/prometheus/client_golang v1.19.1
# github.com/prometheus/client_golang v1.20.1
## explicit
# github.com/prometheus/common v0.49.0
# github.com/prometheus/common v0.55.0
## explicit
# github.com/rancher/dynamiclistener v0.6.0-rc1
## explicit
# github.com/rancher/lasso v0.0.0-20240430201833-6f3def65ffc5
# github.com/rancher/lasso v0.0.0-20240724174736-24ab3dbf26f0
## explicit
# github.com/rancher/permissions v0.0.0-20240523180510-4001d3d637f7
## explicit
# github.com/rancher/remotedialer v0.3.0
# github.com/rancher/remotedialer v0.4.1
## explicit
# github.com/rancher/wharfie v0.6.4
## explicit
@ -116,75 +114,91 @@
## explicit
# github.com/stretchr/testify v1.9.0
## explicit
# github.com/urfave/cli v1.22.14
# github.com/urfave/cli v1.22.15
## explicit
# github.com/vishvananda/netlink v1.2.1-beta.2
## explicit
# github.com/yl2chen/cidranger v1.0.2
## explicit
# go.etcd.io/etcd/api/v3 v3.5.13
# go.etcd.io/etcd/api/v3 v3.5.15
## explicit
# go.etcd.io/etcd/client/pkg/v3 v3.5.13
# go.etcd.io/etcd/client/v3 v3.5.14
## explicit
# go.etcd.io/etcd/client/v3 v3.5.13
## explicit
# go.etcd.io/etcd/etcdutl/v3 v3.5.9
# go.etcd.io/etcd/etcdutl/v3 v3.5.13
## explicit
# go.etcd.io/etcd/server/v3 v3.5.13
## explicit
# go.uber.org/zap v1.27.0
# golang.org/x/crypto v0.25.0
## explicit
# golang.org/x/crypto v0.23.0
# golang.org/x/net v0.28.0
## explicit
# golang.org/x/net v0.25.0
# golang.org/x/sync v0.8.0
## explicit
# golang.org/x/sync v0.7.0
# golang.org/x/sys v0.24.0
## explicit
# golang.org/x/sys v0.20.0
## explicit
# google.golang.org/grpc v1.63.2
# google.golang.org/grpc v1.66.0
## explicit
# gopkg.in/yaml.v2 v2.4.0
## explicit
# inet.af/tcpproxy v0.0.0-20200125044825-b6bb9b5b8252
## explicit
# k8s.io/api v0.30.2
# k8s.io/api v0.31.1
## explicit
# k8s.io/apimachinery v0.30.2
# k8s.io/apimachinery v0.31.1
## explicit
# k8s.io/apiserver v0.30.2
# k8s.io/apiserver v0.31.1
## explicit
# k8s.io/cli-runtime v0.22.2
# k8s.io/cli-runtime v0.31.1-rc.1
## explicit
# k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
## explicit
# k8s.io/cloud-provider v0.30.2
# k8s.io/cloud-provider v0.31.1
## explicit
# k8s.io/cluster-bootstrap v0.0.0
## explicit
# k8s.io/component-base v0.30.2
# k8s.io/component-base v0.31.1
## explicit
# k8s.io/component-helpers v0.30.2
# k8s.io/component-helpers v0.31.1
## explicit
# k8s.io/cri-api v0.30.2
# k8s.io/cri-api v0.32.0-alpha.0
## explicit
# k8s.io/klog/v2 v2.120.1
# k8s.io/cri-client v0.31.1
## explicit
# k8s.io/klog/v2 v2.130.1
## explicit
# k8s.io/kube-proxy v0.0.0
## explicit
# k8s.io/kubectl v0.25.0
# k8s.io/kubectl v0.31.1-rc.1
## explicit
# k8s.io/kubernetes v1.30.2
# k8s.io/kubernetes v1.31.1
## explicit
# k8s.io/utils v0.0.0-20240310230437-4693a0247e57
# k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
## explicit
# sigs.k8s.io/cri-tools v0.0.0-00010101000000-000000000000
## explicit
# sigs.k8s.io/yaml v1.4.0
## explicit
# cloud.google.com/go/compute v1.23.3
# github.com/antlr4-go/antlr/v4 v4.13.0
## explicit
# cloud.google.com/go/compute/metadata v0.2.3
# github.com/bahlo/generic-list-go v0.2.0
## explicit
# dario.cat/mergo v1.0.0
# github.com/buger/jsonparser v1.1.1
## explicit
# github.com/fxamacker/cbor/v2 v2.7.0
## explicit
# github.com/go-task/slim-sprig/v3 v3.0.0
## explicit
# github.com/invopop/jsonschema v0.12.0
## explicit
# github.com/stretchr/objx v0.5.2
## explicit
# github.com/wk8/go-ordered-map/v2 v2.1.8
## explicit
# github.com/x448/float16 v0.8.4
## explicit
# gopkg.in/evanphx/json-patch.v4 v4.12.0
## explicit
# dario.cat/mergo v1.0.1
## explicit
# github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24
## explicit
@ -192,8 +206,6 @@
## explicit
# github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1
## explicit
# github.com/GoogleCloudPlatform/k8s-cloud-provider v1.18.1-0.20220218231025-f11817397a1b
## explicit
# github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab
## explicit
# github.com/MakeNowJust/heredoc v1.0.0
@ -204,11 +216,9 @@
## explicit
# github.com/Rican7/retry v0.1.0
## explicit
# github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df
## explicit
# github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e
## explicit
# github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a
# github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2
## explicit
# github.com/avast/retry-go/v4 v4.6.0
## explicit
@ -222,59 +232,65 @@
## explicit
# github.com/canonical/go-dqlite v1.5.1
## explicit
# github.com/cenkalti/backoff/v4 v4.2.1
# github.com/cenkalti/backoff/v4 v4.3.0
## explicit
# github.com/cespare/xxhash/v2 v2.2.0
# github.com/cespare/xxhash/v2 v2.3.0
## explicit
# github.com/chai2010/gettext-go v1.0.2
## explicit
# github.com/checkpoint-restore/go-criu/v5 v5.3.0
## explicit
# github.com/cilium/ebpf v0.9.1
# github.com/cilium/ebpf v0.11.0
## explicit
# github.com/container-storage-interface/spec v1.8.0
# github.com/container-storage-interface/spec v1.9.0
## explicit
# github.com/containerd/btrfs/v2 v2.0.0
## explicit
# github.com/containerd/cgroups v1.1.0
## explicit
# github.com/containerd/console v1.0.3
# github.com/containerd/console v1.0.4
## explicit
# github.com/containerd/containerd/api v1.8.0-rc.3
## explicit
# github.com/containerd/continuity v0.4.3
## explicit
# github.com/containerd/errdefs v0.1.0
## explicit
# github.com/containerd/fifo v1.1.0
## explicit
# github.com/containerd/go-cni v1.1.9
# github.com/containerd/go-cni v1.1.10
## explicit
# github.com/containerd/go-runc v1.0.0
# github.com/containerd/go-runc v1.1.0
## explicit
# github.com/containerd/imgcrypt v1.1.8
# github.com/containerd/imgcrypt v1.2.0-rc1
## explicit
# github.com/containerd/log v0.1.0
## explicit
# github.com/containerd/nri v0.6.1
## explicit
# github.com/containerd/platforms v0.2.1
## explicit
# github.com/containerd/stargz-snapshotter/estargz v0.15.1
## explicit
# github.com/containerd/ttrpc v1.2.4
# github.com/containerd/ttrpc v1.2.5
## explicit
# github.com/containerd/typeurl v1.0.2
## explicit
# github.com/containerd/typeurl/v2 v2.1.1
# github.com/containerd/typeurl/v2 v2.2.0
## explicit
# github.com/containernetworking/cni v1.1.2
# github.com/containernetworking/cni v1.2.3
## explicit
# github.com/containernetworking/plugins v1.4.1
# github.com/containernetworking/plugins v1.5.1
## explicit
# github.com/containers/ocicrypt v1.1.10
# github.com/containers/ocicrypt v1.2.0
## explicit
# github.com/coreos/go-oidc v2.2.1+incompatible
## explicit
# github.com/coreos/go-semver v0.3.1
## explicit
# github.com/cpuguy83/go-md2man/v2 v2.0.3
# github.com/cpuguy83/go-md2man/v2 v2.0.4
## explicit
# github.com/cyphar/filepath-securejoin v0.2.4
# github.com/cyphar/filepath-securejoin v0.2.5
## explicit
# github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
## explicit
@ -284,9 +300,9 @@
## explicit
# github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0
## explicit
# github.com/distribution/reference v0.5.0
# github.com/distribution/reference v0.6.0
## explicit
# github.com/docker/cli v24.0.7+incompatible
# github.com/docker/cli v27.1.2+incompatible
## explicit
# github.com/docker/distribution v2.8.3+incompatible
## explicit
@ -306,7 +322,7 @@
## explicit
# github.com/emicklei/go-restful v2.16.0+incompatible
## explicit
# github.com/emicklei/go-restful/v3 v3.11.3
# github.com/emicklei/go-restful/v3 v3.12.1
## explicit
# github.com/euank/go-kmsg-parser v2.0.0+incompatible
## explicit
@ -324,21 +340,17 @@
## explicit
# github.com/fsnotify/fsnotify v1.7.0
## explicit
# github.com/fvbommel/sortorder v1.1.0
## explicit
# github.com/ghodss/yaml v1.0.0
## explicit
# github.com/go-errors/errors v1.4.2
## explicit
# github.com/go-jose/go-jose/v3 v3.0.3
# github.com/go-jose/go-jose/v4 v4.0.2
## explicit
# github.com/go-openapi/jsonpointer v0.20.2
# github.com/go-openapi/jsonpointer v0.21.0
## explicit
# github.com/go-openapi/jsonreference v0.20.4
# github.com/go-openapi/jsonreference v0.21.0
## explicit
# github.com/go-openapi/swag v0.22.9
## explicit
# github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572
# github.com/go-openapi/swag v0.23.0
## explicit
# github.com/goccy/go-json v0.10.2
## explicit
@ -358,7 +370,7 @@
## explicit
# github.com/google/btree v1.1.2
## explicit
# github.com/google/cel-go v0.17.8
# github.com/google/cel-go v0.20.1
## explicit
# github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49
## explicit
@ -370,16 +382,10 @@
## explicit
# github.com/google/gopacket v1.1.19
## explicit
# github.com/google/pprof v0.0.0-20240207164012-fb44976bdcd5
## explicit
# github.com/google/s2a-go v0.1.7
# github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8
## explicit
# github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
## explicit
# github.com/googleapis/enterprise-certificate-proxy v0.3.2
## explicit
# github.com/googleapis/gax-go/v2 v2.12.0
## explicit
# github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7
## explicit
# github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
@ -388,9 +394,9 @@
## explicit
# github.com/grpc-ecosystem/grpc-gateway v1.16.0
## explicit
# github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0
# github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0
## explicit
# github.com/hanwen/go-fuse/v2 v2.4.0
# github.com/hanwen/go-fuse/v2 v2.5.1
## explicit
# github.com/hashicorp/errwrap v1.1.0
## explicit
@ -398,15 +404,15 @@
## explicit
# github.com/hashicorp/go-multierror v1.1.1
## explicit
# github.com/hashicorp/go-retryablehttp v0.7.4
# github.com/hashicorp/go-retryablehttp v0.7.7
## explicit
# github.com/hashicorp/go-version v1.6.0
# github.com/hashicorp/go-version v1.7.0
## explicit
# github.com/hashicorp/golang-lru v0.5.4
## explicit
# github.com/hashicorp/golang-lru/arc/v2 v2.0.5
## explicit
# github.com/hashicorp/golang-lru/v2 v2.0.5
# github.com/hashicorp/golang-lru/v2 v2.0.7
## explicit
# github.com/huin/goupnp v1.3.0
## explicit
@ -414,7 +420,7 @@
## explicit
# github.com/inconshreveable/mousetrap v1.1.0
## explicit
# github.com/intel/goresctrl v0.3.0
# github.com/intel/goresctrl v0.7.0
## explicit
# github.com/ipfs/boxo v0.10.0
## explicit
@ -494,8 +500,6 @@
## explicit
# github.com/mattn/go-isatty v0.0.20
## explicit
# github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0
## explicit
# github.com/mdlayher/genetlink v1.3.2
## explicit
# github.com/mdlayher/netlink v1.7.2
@ -528,17 +532,19 @@
## explicit
# github.com/moby/locker v1.0.1
## explicit
# github.com/moby/spdystream v0.2.0
# github.com/moby/spdystream v0.4.0
## explicit
# github.com/moby/sys/mountinfo v0.6.2
# github.com/moby/sys/mountinfo v0.7.2
## explicit
# github.com/moby/sys/sequential v0.5.0
# github.com/moby/sys/sequential v0.6.0
## explicit
# github.com/moby/sys/signal v0.7.0
# github.com/moby/sys/signal v0.7.1
## explicit
# github.com/moby/sys/symlink v0.2.0
# github.com/moby/sys/symlink v0.3.0
## explicit
# github.com/moby/sys/user v0.1.0
# github.com/moby/sys/user v0.3.0
## explicit
# github.com/moby/sys/userns v0.1.0
## explicit
# github.com/moby/term v0.5.0
## explicit
@ -606,7 +612,7 @@
## explicit
# github.com/pelletier/go-toml v1.9.5
## explicit
# github.com/pelletier/go-toml/v2 v2.2.2
# github.com/pelletier/go-toml/v2 v2.2.3
## explicit
# github.com/peterbourgon/diskv v2.0.1+incompatible
## explicit
@ -618,9 +624,9 @@
## explicit
# github.com/pquerna/cachecontrol v0.1.0
## explicit
# github.com/prometheus/client_model v0.6.0
# github.com/prometheus/client_model v0.6.1
## explicit
# github.com/prometheus/procfs v0.12.0
# github.com/prometheus/procfs v0.15.1
## explicit
# github.com/quic-go/qpack v0.4.0
## explicit
@ -644,11 +650,11 @@
## explicit
# github.com/spf13/afero v1.11.0
## explicit
# github.com/spf13/cobra v1.8.0
# github.com/spf13/cobra v1.8.1
## explicit
# github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6
## explicit
# github.com/stoewer/go-strcase v1.2.0
# github.com/stoewer/go-strcase v1.3.0
## explicit
# github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635
## explicit
@ -660,7 +666,7 @@
## explicit
# github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75
## explicit
# github.com/urfave/cli/v2 v2.26.0
# github.com/urfave/cli/v2 v2.27.4
## explicit
# github.com/vbatts/tar-split v0.11.5
## explicit
@ -672,9 +678,11 @@
## explicit
# github.com/xlab/treeprint v1.2.0
## explicit
# github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673
# github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1
## explicit
# go.etcd.io/bbolt v1.3.9
# go.etcd.io/bbolt v1.3.11
## explicit
# go.etcd.io/etcd/client/pkg/v3 v3.5.14
## explicit
# go.etcd.io/etcd/client/v2 v2.305.13
## explicit
@ -688,23 +696,25 @@
## explicit
# go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.42.0
## explicit
# go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1
# go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0
## explicit
# go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0
# go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0
## explicit
# go.opentelemetry.io/otel v1.24.0
# go.opentelemetry.io/otel v1.28.0
## explicit
# go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0
# go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0
## explicit
# go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0
# go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0
## explicit
# go.opentelemetry.io/otel/metric v1.24.0
# go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0
## explicit
# go.opentelemetry.io/otel/sdk v1.24.0
# go.opentelemetry.io/otel/metric v1.28.0
## explicit
# go.opentelemetry.io/otel/trace v1.24.0
# go.opentelemetry.io/otel/sdk v1.28.0
## explicit
# go.opentelemetry.io/proto/otlp v1.0.0
# go.opentelemetry.io/otel/trace v1.28.0
## explicit
# go.opentelemetry.io/proto/otlp v1.3.1
## explicit
# go.starlark.net v0.0.0-20230525235612-a134d8f9ddca
## explicit
@ -716,19 +726,21 @@
## explicit
# go.uber.org/multierr v1.11.0
## explicit
# golang.org/x/exp v0.0.0-20240222234643-814bf88cf225
# go.uber.org/zap v1.27.0
## explicit
# golang.org/x/mod v0.17.0
# golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
## explicit
# golang.org/x/oauth2 v0.17.0
# golang.org/x/mod v0.20.0
## explicit
# golang.org/x/term v0.20.0
# golang.org/x/oauth2 v0.21.0
## explicit
# golang.org/x/text v0.15.0
# golang.org/x/term v0.23.0
## explicit
# golang.org/x/text v0.17.0
## explicit
# golang.org/x/time v0.5.0
## explicit
# golang.org/x/tools v0.20.0
# golang.org/x/tools v0.24.0
## explicit
# golang.zx2c4.com/wireguard v0.0.0-20230325221338-052af4a8072b
## explicit
@ -736,19 +748,13 @@
## explicit
# gonum.org/v1/gonum v0.13.0
## explicit
# google.golang.org/api v0.152.0
# google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9
## explicit
# google.golang.org/appengine v1.6.8
# google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094
## explicit
# google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80
# google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf
## explicit
# google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80
## explicit
# google.golang.org/genproto/googleapis/rpc v0.0.0-20240228224816-df926f6c8641
## explicit
# google.golang.org/protobuf v1.33.0
## explicit
# gopkg.in/gcfg.v1 v1.2.3
# google.golang.org/protobuf v1.34.2
## explicit
# gopkg.in/inf.v0 v0.9.1
## explicit
@ -758,13 +764,11 @@
## explicit
# gopkg.in/square/go-jose.v2 v2.6.0
## explicit
# gopkg.in/warnings.v0 v0.1.2
## explicit
# gopkg.in/yaml.v3 v3.0.1
## explicit
# k8s.io/apiextensions-apiserver v0.30.2
# k8s.io/apiextensions-apiserver v0.31.1
## explicit
# k8s.io/code-generator v0.30.2
# k8s.io/code-generator v0.31.1
## explicit
# k8s.io/controller-manager v0.25.4
## explicit
@ -780,59 +784,59 @@
## explicit
# k8s.io/kms v0.0.0
## explicit
# k8s.io/kube-aggregator v0.30.2
# k8s.io/kube-aggregator v0.31.1
## explicit
# k8s.io/kube-controller-manager v0.0.0
## explicit
# k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
# k8s.io/kube-openapi v0.0.0-20240730131305-7a9a4e85957e
## explicit
# k8s.io/kube-scheduler v0.0.0
## explicit
# k8s.io/kubelet v0.28.6
## explicit
# k8s.io/legacy-cloud-providers v0.0.0
# k8s.io/kubelet v0.31.1
## explicit
# k8s.io/metrics v0.0.0
## explicit
# k8s.io/mount-utils v0.30.2
# k8s.io/mount-utils v0.31.1
## explicit
# k8s.io/pod-security-admission v0.0.0
## explicit
# lukechampine.com/blake3 v1.2.1
## explicit
# sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0
# sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3
## explicit
# sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd
## explicit
# sigs.k8s.io/knftables v0.0.16
# sigs.k8s.io/knftables v0.0.17
## explicit
# sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3
# sigs.k8s.io/kustomize/api v0.17.2
## explicit
# sigs.k8s.io/kustomize/kustomize/v5 v5.0.4-0.20230601165947-6ce0bf390ce3
# sigs.k8s.io/kustomize/kustomize/v5 v5.4.2
## explicit
# sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3
# sigs.k8s.io/kustomize/kyaml v0.17.1
## explicit
# sigs.k8s.io/structured-merge-diff/v4 v4.4.1
## explicit
# tags.cncf.io/container-device-interface v0.7.2
# tags.cncf.io/container-device-interface v0.8.0
## explicit
# tags.cncf.io/container-device-interface/specs-go v0.7.0
# tags.cncf.io/container-device-interface/specs-go v0.8.0
## explicit
# github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.11.0
# github.com/Mirantis/cri-dockerd => github.com/k3s-io/cri-dockerd v0.3.12-k3s1.30-3
# github.com/cloudnativelabs/kube-router/v2 => github.com/k3s-io/kube-router/v2 v2.1.2
# github.com/containerd/containerd => github.com/k3s-io/containerd v1.7.17-k3s1
# github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.11.7
# github.com/Mirantis/cri-dockerd => github.com/k3s-io/cri-dockerd v0.3.15-k3s1.31-3
# 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.21-k3s2
# github.com/containerd/imgcrypt => github.com/containerd/imgcrypt v1.1.11
# github.com/distribution/reference => github.com/distribution/reference v0.5.0
# github.com/docker/cli => github.com/docker/cli v27.1.2+incompatible
# github.com/docker/distribution => github.com/docker/distribution v2.8.3+incompatible
# github.com/docker/docker => github.com/docker/docker v25.0.4+incompatible
# github.com/emicklei/go-restful/v3 => github.com/emicklei/go-restful/v3 v3.9.0
# github.com/docker/docker => github.com/docker/docker v25.0.6+incompatible
# github.com/emicklei/go-restful/v3 => github.com/emicklei/go-restful/v3 v3.11.0
# github.com/golang/protobuf => github.com/golang/protobuf v1.5.4
# 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/open-policy-agent/opa => github.com/open-policy-agent/opa v0.59.0
# github.com/opencontainers/runc => github.com/k3s-io/runc v1.1.12-k3s1
# github.com/opencontainers/runc => github.com/k3s-io/runc v1.1.14-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/prometheus/client_golang => github.com/prometheus/client_golang v1.19.1
# github.com/prometheus/common => github.com/prometheus/common v0.55.0
# 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
@ -845,44 +849,44 @@
# go.etcd.io/etcd/server/v3 => github.com/k3s-io/etcd/server/v3 v3.5.13-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.45.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/crypto => golang.org/x/crypto v0.24.0
# golang.org/x/net => golang.org/x/net v0.26.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.58.3
# 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.30.2-k3s1
# k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.30.2-k3s1
# k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.30.2-k3s1
# k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.30.2-k3s1
# k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.30.2-k3s1
# k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.30.2-k3s1
# k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.30.2-k3s1
# k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.30.2-k3s1
# k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.30.2-k3s1
# k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.30.2-k3s1
# k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.30.2-k3s1
# k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.30.2-k3s1
# k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.30.2-k3s1
# k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.30.2-k3s1
# k8s.io/dynamic-resource-allocation => github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.30.2-k3s1
# k8s.io/endpointslice => github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.30.2-k3s1
# k8s.io/api => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.31.1-k3s3
# k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.31.1-k3s3
# k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.31.1-k3s3
# k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.31.1-k3s3
# k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.31.1-k3s3
# k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.31.1-k3s3
# k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.31.1-k3s3
# k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.31.1-k3s3
# k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.31.1-k3s3
# k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.31.1-k3s3
# k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.31.1-k3s3
# k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.31.1-k3s3
# k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.31.1-k3s3
# k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.31.1-k3s3
# k8s.io/dynamic-resource-allocation => github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.31.1-k3s3
# k8s.io/endpointslice => github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.31.1-k3s3
# k8s.io/klog => github.com/k3s-io/klog v1.0.0-k3s2
# k8s.io/klog/v2 => github.com/k3s-io/klog/v2 v2.120.1-k3s1
# k8s.io/kms => github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.30.2-k3s1
# k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.30.2-k3s1
# k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.30.2-k3s1
# k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.30.2-k3s1
# k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.30.2-k3s1
# k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.30.2-k3s1
# k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.30.2-k3s1
# k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.30.2-k3s1
# k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.30.2-k3s1
# k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.30.2-k3s1
# k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.30.2-k3s1
# k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.30.2-k3s1
# k8s.io/pod-security-admission => github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.30.2-k3s1
# k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.30.2-k3s1
# k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.30.2-k3s1
# k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.30.2-k3s1
# k8s.io/kms => github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.31.1-k3s3
# k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.31.1-k3s3
# k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.31.1-k3s3
# k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.31.1-k3s3
# k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.31.1-k3s3
# k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.31.1-k3s3
# k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.31.1-k3s3
# k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.31.1-k3s3
# k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.31.1-k3s3
# k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.31.1-k3s3
# k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.31.1-k3s3
# k8s.io/pod-security-admission => github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.31.1-k3s3
# k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.31.1-k3s3
# k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.31.1-k3s3
# k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.31.1-k3s3
# sigs.k8s.io/cri-tools => github.com/k3s-io/cri-tools v1.31.0-k3s2
# sourcegraph.com/sourcegraph/go-diff => github.com/sourcegraph/go-diff v0.6.0

View File

@ -4,7 +4,7 @@ HOMEPAGE = "https://k3s.io/"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${S}/src/import/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
SRC_URI = "git://github.com/rancher/k3s.git;branch=release-1.30;name=k3s;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \
SRC_URI = "git://github.com/rancher/k3s.git;branch=release-1.31;name=k3s;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \
file://k3s.service \
file://k3s-agent.service \
file://k3s-agent \
@ -16,10 +16,10 @@ SRC_URI = "git://github.com/rancher/k3s.git;branch=release-1.30;name=k3s;protoco
"
SRC_URI[k3s.md5sum] = "363d3a08dc0b72ba6e6577964f6e94a5"
SRCREV_k3s = "16321f2554c50281218f3efe999e085b5c6aeefc"
SRCREV_k3s = "452dbbc14c747a0070fdf007ef2239a6e5d8d934"
SRCREV_FORMAT = "k3s_fuse"
PV = "v1.28.7+k3s1+git${SRCREV_k3s}"
PV = "v1.31.1+k3s1+git${SRCREV_k3s}"
include src_uri.inc

View File

@ -1,10 +1,10 @@
export sites="k8s.io/utils:k8s.io/utils:force \
k8s.io/gengo:k8s.io/gengo:force \
go.uber.org/fx:go.uber.org/fx:force \
go.uber.org/zap:go.uber.org/zap:force \
dario.cat/mergo:dario.cat/mergo:force \
go.starlark.net:go.starlark.net:force \
go.uber.org/dig:go.uber.org/dig:force \
go.uber.org/zap:go.uber.org/zap:force \
gopkg.in/inf.v0:gopkg.in/inf.v0:force \
gopkg.in/ini.v1:gopkg.in/ini.v1:force \
golang.org/x/net:golang.org/x/net:force \
@ -17,12 +17,12 @@ export sites="k8s.io/utils:k8s.io/utils:force \
go.uber.org/mock:go.uber.org/mock:force \
golang.org/x/exp:golang.org/x/exp:force \
golang.org/x/mod:golang.org/x/mod:force \
gopkg.in/gcfg.v1:gopkg.in/gcfg.v1:force \
gopkg.in/yaml.v3:gopkg.in/yaml.v3:force \
sigs.k8s.io/json:sigs.k8s.io/json:force \
k8s.io/gengo/v2:k8s.io/gengo/v2/v2:force \
github.com/lib/pq:github.com/lib/pq:force \
golang.org/x/sync:golang.org/x/sync:force \
k8s.io/cri-client:k8s.io/cri-client:force \
github.com/rs/xid:github.com/rs/xid:force \
golang.org/x/term:golang.org/x/term:force \
golang.org/x/text:golang.org/x/text:force \
@ -39,11 +39,9 @@ export sites="k8s.io/utils:k8s.io/utils:force \
github.com/moby/term:github.com/moby/term:force \
go.mozilla.org/pkcs7:go.mozilla.org/pkcs7:force \
go.uber.org/multierr:go.uber.org/multierr:force \
gopkg.in/warnings.v0:gopkg.in/warnings.v0:force \
github.com/pkg/errors:github.com/pkg/errors:force \
github.com/urfave/cli:github.com/urfave/cli:force \
github.com/docker/cli:github.com/docker/cli:force \
google.golang.org/api:google.golang.org/api:force \
sigs.k8s.io/knftables:sigs.k8s.io/knftables:force \
github.com/golang/mock:github.com/golang/mock:force \
github.com/google/uuid:github.com/google/uuid:force \
@ -68,6 +66,7 @@ export sites="k8s.io/utils:k8s.io/utils:force \
github.com/go-logr/stdr:github.com/go-logr/stdr:force \
github.com/go-test/deep:github.com/go-test/deep:force \
github.com/otiai10/copy:github.com/otiai10/copy:force \
github.com/x448/float16:github.com/x448/float16:force \
github.com/Rican7/retry:github.com/Rican7/retry:force \
github.com/beorn7/perks:github.com/beorn7/perks:force \
github.com/blang/semver:github.com/blang/semver:force \
@ -82,6 +81,8 @@ export sites="k8s.io/utils:k8s.io/utils:force \
github.com/docker/docker:github.com/docker/docker:force \
github.com/joho/godotenv:github.com/joho/godotenv:force \
github.com/rancher/lasso:github.com/rancher/lasso:force \
sigs.k8s.io/cri-tools:github.com/k3s-io/cri-tools:force \
github.com/stretchr/objx:github.com/stretchr/objx:force \
github.com/armon/circbuf:github.com/armon/circbuf:force \
github.com/goccy/go-json:github.com/goccy/go-json:force \
github.com/gogo/protobuf:github.com/gogo/protobuf:force \
@ -89,7 +90,6 @@ export sites="k8s.io/utils:k8s.io/utils:force \
github.com/google/cel-go:github.com/google/cel-go:force \
github.com/google/go-cmp:github.com/google/go-cmp:force \
github.com/google/gofuzz:github.com/google/gofuzz:force \
github.com/google/s2a-go:github.com/google/s2a-go:force \
github.com/imdario/mergo:github.com/imdario/mergo:force \
github.com/koron/go-ssdp:github.com/koron/go-ssdp:force \
github.com/libp2p/go-nat:github.com/libp2p/go-nat:force \
@ -154,6 +154,7 @@ export sites="k8s.io/utils:k8s.io/utils:force \
github.com/libp2p/go-libp2p:github.com/libp2p/go-libp2p:force \
github.com/mattn/go-sqlite3:github.com/mattn/go-sqlite3:force \
github.com/stretchr/testify:github.com/stretchr/testify:force \
github.com/buger/jsonparser:github.com/buger/jsonparser:force \
github.com/containerd/ttrpc:github.com/containerd/ttrpc:force \
github.com/coreos/go-semver:github.com/coreos/go-semver:force \
github.com/docker/go-events:github.com/docker/go-events:force \
@ -167,7 +168,6 @@ export sites="k8s.io/utils:k8s.io/utils:force \
github.com/mistifyio/go-zfs:github.com/mistifyio/go-zfs:force \
github.com/syndtr/goleveldb:github.com/syndtr/goleveldb:force \
github.com/vbatts/tar-split:github.com/vbatts/tar-split:force \
google.golang.org/appengine:google.golang.org/appengine:force \
sigs.k8s.io/kustomize/api:sigs.k8s.io/kustomize/api/api:force \
go.etcd.io/etcd/api/v3:github.com/k3s-io/etcd/api/v3/api:force \
go.etcd.io/etcd/pkg/v3:github.com/k3s-io/etcd/pkg/v3/pkg:force \
@ -176,6 +176,7 @@ export sites="k8s.io/utils:k8s.io/utils:force \
github.com/minio/minio-go/v7:github.com/minio/minio-go/v7:force \
github.com/prometheus/common:github.com/prometheus/common:force \
github.com/yl2chen/cidranger:github.com/yl2chen/cidranger:force \
github.com/fxamacker/cbor/v2:github.com/fxamacker/cbor/v2:force \
github.com/Azure/go-ansiterm:github.com/Azure/go-ansiterm:force \
github.com/avast/retry-go/v4:github.com/avast/retry-go/v4:force \
github.com/benbjohnson/clock:github.com/benbjohnson/clock:force \
@ -205,17 +206,18 @@ export sites="k8s.io/utils:k8s.io/utils:force \
github.com/flannel-io/flannel:github.com/flannel-io/flannel:force \
github.com/ipfs/go-ds-leveldb:github.com/ipfs/go-ds-leveldb:force \
github.com/klauspost/compress:github.com/klauspost/compress:force \
github.com/antlr4-go/antlr/v4:github.com/antlr4-go/antlr/v4:force \
github.com/invopop/jsonschema:github.com/invopop/jsonschema:force \
github.com/JeffAshton/win_pdh:github.com/JeffAshton/win_pdh:force \
github.com/Microsoft/go-winio:github.com/Microsoft/go-winio:force \
github.com/containerd/cgroups:github.com/containerd/cgroups:force \
github.com/containerd/console:github.com/containerd/console:force \
github.com/containerd/errdefs:github.com/containerd/errdefs:force \
github.com/containerd/go-runc:github.com/containerd/go-runc:force \
github.com/containerd/typeurl:github.com/containerd/typeurl:force \
github.com/dustin/go-humanize:github.com/dustin/go-humanize:force \
github.com/evanphx/json-patch:github.com/evanphx/json-patch:force \
github.com/fvbommel/sortorder:github.com/fvbommel/sortorder:force \
github.com/go-jose/go-jose/v3:github.com/go-jose/go-jose/v3:force \
github.com/go-task/slim-sprig:github.com/go-task/slim-sprig:force \
github.com/go-jose/go-jose/v4:github.com/go-jose/go-jose/v4:force \
github.com/ipld/go-ipld-prime:github.com/ipld/go-ipld-prime:force \
github.com/jackpal/go-nat-pmp:github.com/jackpal/go-nat-pmp:force \
github.com/klauspost/cpuid/v2:github.com/klauspost/cpuid/v2:force \
@ -231,6 +233,7 @@ export sites="k8s.io/utils:k8s.io/utils:force \
github.com/stoewer/go-strcase:github.com/stoewer/go-strcase:force \
go.etcd.io/etcd/raft/v3:github.com/k3s-io/etcd/raft/v3/raft:force \
github.com/moby/sys/signal:github.com/moby/sys/signal/signal:force \
github.com/moby/sys/userns:github.com/moby/sys/userns/userns:force \
github.com/Mirantis/cri-dockerd:github.com/k3s-io/cri-dockerd:force \
github.com/containerd/containerd:github.com/k3s-io/containerd:force \
github.com/erikdubbelboer/gspt:github.com/erikdubbelboer/gspt:force \
@ -238,6 +241,7 @@ export sites="k8s.io/utils:k8s.io/utils:force \
github.com/rancher/permissions:github.com/rancher/permissions:force \
github.com/rancher/wrangler/v3:github.com/rancher/wrangler/v3:force \
github.com/vishvananda/netlink:github.com/vishvananda/netlink:force \
gopkg.in/evanphx/json-patch.v4:gopkg.in/evanphx/json-patch.v4:force \
github.com/MakeNowJust/heredoc:github.com/MakeNowJust/heredoc:force \
github.com/NYTimes/gziphandler:github.com/NYTimes/gziphandler:force \
github.com/canonical/go-dqlite:github.com/canonical/go-dqlite:force \
@ -259,11 +263,10 @@ export sites="k8s.io/utils:k8s.io/utils:force \
sigs.k8s.io/kustomize/kyaml:sigs.k8s.io/kustomize/kyaml/kyaml:force \
github.com/natefinch/lumberjack:github.com/natefinch/lumberjack:force \
github.com/rancher/remotedialer:github.com/rancher/remotedialer:force \
cloud.google.com/go/compute:cloud.google.com/go/compute/compute:force \
github.com/containerd/platforms:github.com/containerd/platforms:force \
github.com/davidlazar/go-crypto:github.com/davidlazar/go-crypto:force \
github.com/euank/go-kmsg-parser:github.com/euank/go-kmsg-parser:force \
github.com/exponent-io/jsonpath:github.com/exponent-io/jsonpath:force \
github.com/googleapis/gax-go/v2:github.com/googleapis/gax-go/v2:force \
github.com/hashicorp/go-version:github.com/hashicorp/go-version:force \
github.com/hashicorp/golang-lru:github.com/hashicorp/golang-lru:force \
github.com/mitchellh/go-homedir:github.com/mitchellh/go-homedir:force \
@ -272,11 +275,13 @@ export sites="k8s.io/utils:k8s.io/utils:force \
github.com/pelletier/go-toml/v2:github.com/pelletier/go-toml/v2:force \
github.com/pquerna/cachecontrol:github.com/pquerna/cachecontrol:force \
github.com/tchap/go-patricia/v2:github.com/tchap/go-patricia/v2:force \
github.com/kubernetes-sigs/cri-tools:github.com/k3s-io/cri-tools:force \
github.com/containerd/cgroups/v3:github.com/containerd/cgroups/v3:force \
github.com/coreos/go-systemd/v22:github.com/coreos/go-systemd/v22:force \
github.com/go-bindata/go-bindata:github.com/go-bindata/go-bindata:force \
go.etcd.io/etcd/server/v3:github.com/k3s-io/etcd/server/v3/server:force \
github.com/bahlo/generic-list-go:github.com/bahlo/generic-list-go:force \
github.com/go-task/slim-sprig/v3:github.com/go-task/slim-sprig/v3:force \
github.com/wk8/go-ordered-map/v2:github.com/wk8/go-ordered-map/v2:force \
github.com/containerd/continuity:github.com/containerd/continuity:force \
github.com/containerd/typeurl/v2:github.com/containerd/typeurl/v2:force \
github.com/cpuguy83/go-md2man/v2:github.com/cpuguy83/go-md2man/v2:force \
@ -313,7 +318,6 @@ export sites="k8s.io/utils:k8s.io/utils:force \
github.com/prometheus/client_model:github.com/prometheus/client_model:force \
github.com/quic-go/webtransport-go:github.com/quic-go/webtransport-go:force \
github.com/russross/blackfriday/v2:github.com/russross/blackfriday/v2:force \
sigs.k8s.io/kustomize/kustomize/v5:sigs.k8s.io/kustomize/kustomize/v5/kustomize:force \
go.opentelemetry.io/otel/metric:go.opentelemetry.io/otel/metric/metric:force \
github.com/prometheus/client_golang:github.com/prometheus/client_golang:force \
github.com/daviddengcn/go-colortext:github.com/daviddengcn/go-colortext:force \
@ -341,16 +345,18 @@ export sites="k8s.io/utils:k8s.io/utils:force \
github.com/libopenstorage/openstorage:github.com/libopenstorage/openstorage:force \
github.com/multiformats/go-multicodec:github.com/multiformats/go-multicodec:force \
github.com/opentracing/opentracing-go:github.com/opentracing/opentracing-go:force \
go.etcd.io/etcd/client/pkg/v3:github.com/k3s-io/etcd/client/pkg/v3/client/pkg:force \
github.com/AdamKorcz/go-118-fuzz-build:github.com/AdamKorcz/go-118-fuzz-build:force \
github.com/bronze1man/goStrongswanVici:github.com/bronze1man/goStrongswanVici:force \
github.com/containerd/containerd/api:github.com/containerd/containerd/api/api:force \
github.com/containernetworking/plugins:github.com/containernetworking/plugins:force \
github.com/google/go-containerregistry:github.com/google/go-containerregistry:force \
github.com/grpc-ecosystem/grpc-gateway:github.com/grpc-ecosystem/grpc-gateway:force \
github.com/monochromegane/go-gitignore:github.com/monochromegane/go-gitignore:force \
github.com/multiformats/go-multistream:github.com/multiformats/go-multistream:force \
github.com/opencontainers/runtime-spec:github.com/opencontainers/runtime-spec:force \
go.etcd.io/etcd/client/pkg/v3:github.com/k3s-io/etcd/client/pkg/v3/client/pkg:force \
github.com/opencontainers/runtime-tools:github.com/opencontainers/runtime-tools:force \
sigs.k8s.io/kustomize/kustomize/v5:sigs.k8s.io/kustomize/kustomize/v5/kustomize:force \
tags.cncf.io/container-device-interface:tags.cncf.io/container-device-interface:force \
github.com/containerd/stargz-snapshotter:github.com/containerd/stargz-snapshotter:force \
github.com/checkpoint-restore/go-criu/v5:github.com/checkpoint-restore/go-criu/v5:force \
@ -366,7 +372,6 @@ export sites="k8s.io/utils:k8s.io/utils:force \
github.com/libp2p/go-libp2p-routing-helpers:github.com/libp2p/go-libp2p-routing-helpers:force \
github.com/grpc-ecosystem/go-grpc-middleware:github.com/grpc-ecosystem/go-grpc-middleware:force \
github.com/grpc-ecosystem/go-grpc-prometheus:github.com/grpc-ecosystem/go-grpc-prometheus:force \
cloud.google.com/go/compute/metadata:cloud.google.com/go/compute/metadata/compute/metadata:force \
github.com/containerd/fuse-overlayfs-snapshotter:github.com/containerd/fuse-overlayfs-snapshotter:force \
k8s.io/cri-api:github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api/staging/src/k8s.io/cri-api:force \
k8s.io/kubectl:github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl/staging/src/k8s.io/kubectl:force \
@ -374,16 +379,12 @@ export sites="k8s.io/utils:k8s.io/utils:force \
k8s.io/metrics:github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics/staging/src/k8s.io/metrics:force \
google.golang.org/genproto/googleapis/api:google.golang.org/genproto/googleapis/api/googleapis/api:force \
google.golang.org/genproto/googleapis/rpc:google.golang.org/genproto/googleapis/rpc/googleapis/rpc:force \
github.com/GoogleCloudPlatform/k8s-cloud-provider:github.com/GoogleCloudPlatform/k8s-cloud-provider:force \
github.com/decred/dcrd/dcrec/secp256k1/v4:github.com/decred/dcrd/dcrec/secp256k1/v4/dcrec/secp256k1:force \
github.com/googleapis/enterprise-certificate-proxy:github.com/googleapis/enterprise-certificate-proxy:force \
k8s.io/apiserver:github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver/staging/src/k8s.io/apiserver:force \
k8s.io/client-go:github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go/staging/src/k8s.io/client-go:force \
github.com/matttproud/golang_protobuf_extensions/v2:github.com/matttproud/golang_protobuf_extensions/v2:force \
github.com/containerd/stargz-snapshotter/estargz:github.com/containerd/stargz-snapshotter/estargz/estargz:force \
k8s.io/kube-proxy:github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy/staging/src/k8s.io/kube-proxy:force \
tags.cncf.io/container-device-interface/specs-go:tags.cncf.io/container-device-interface/specs-go/specs-go:force \
github.com/antlr/antlr4/runtime/Go/antlr/v4:github.com/antlr/antlr4/runtime/Go/antlr/v4/runtime/Go/antlr/v4:force \
k8s.io/cli-runtime:github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime/staging/src/k8s.io/cli-runtime:force \
k8s.io/mount-utils:github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils/staging/src/k8s.io/mount-utils:force \
k8s.io/apimachinery:github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery/staging/src/k8s.io/apimachinery:force \
@ -399,13 +400,13 @@ export sites="k8s.io/utils:k8s.io/utils:force \
k8s.io/controller-manager:github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager/staging/src/k8s.io/controller-manager:force \
sigs.k8s.io/apiserver-network-proxy/konnectivity-client:sigs.k8s.io/apiserver-network-proxy/konnectivity-client/konnectivity-client:force \
k8s.io/csi-translation-lib:github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib/staging/src/k8s.io/csi-translation-lib:force \
k8s.io/legacy-cloud-providers:github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers/staging/src/k8s.io/legacy-cloud-providers:force \
k8s.io/pod-security-admission:github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission/staging/src/k8s.io/pod-security-admission:force \
k8s.io/apiextensions-apiserver:github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver/staging/src/k8s.io/apiextensions-apiserver:force \
k8s.io/kube-controller-manager:github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager/staging/src/k8s.io/kube-controller-manager:force \
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp:go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/instrumentation/net/http/otelhttp:force \
k8s.io/dynamic-resource-allocation:github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation/staging/src/k8s.io/dynamic-resource-allocation:force \
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc:go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/exporters/otlp/otlptrace/otlptracegrpc:force \
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp:go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp/exporters/otlp/otlptrace/otlptracehttp:force \
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc:go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/instrumentation/google.golang.org/grpc/otelgrpc:force \
go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful:go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful/instrumentation/github.com/emicklei/go-restful/otelrestful:force"

File diff suppressed because it is too large Load Diff