From e7131d72cadc8d5cdc08f40c3693374e8fdebf0e Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Fri, 11 Oct 2024 19:20:19 +0000 Subject: [PATCH] Bump K3s version for release-v1.31 Updates k3s: https://github.com/k3s-io/k3s/compare/2caa785e17a0...d74ad4253a54 Signed-off-by: Brad Davidson --- go.mod | 146 ++++++++++++++++++------------------ go.sum | 175 ++++++++++++++++++++++--------------------- scripts/build-images | 4 +- scripts/version.sh | 2 +- 4 files changed, 165 insertions(+), 162 deletions(-) diff --git a/go.mod b/go.mod index 7b64dc41b5..9f8fa7c283 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ 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.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/containerd => github.com/k3s-io/containerd v1.7.22-k3s1 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 v25.0.6+incompatible @@ -35,39 +35,39 @@ replace ( google.golang.org/genproto => google.golang.org/genproto v0.0.0-20230525234035-dd9d682886f9 google.golang.org/grpc => google.golang.org/grpc v1.65.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.31.0-k3s3 - k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.31.0-k3s3 - k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.31.0-k3s3 - k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.31.0-k3s3 - k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.31.0-k3s3 - k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.31.0-k3s3 - k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.31.0-k3s3 - k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.31.0-k3s3 - k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.31.0-k3s3 - k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.31.0-k3s3 - k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.31.0-k3s3 - k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.31.0-k3s3 - k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.31.0-k3s3 - k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.31.0-k3s3 - k8s.io/dynamic-resource-allocation => github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.31.0-k3s3 - k8s.io/endpointslice => github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.31.0-k3s3 + 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 // k3s-release-1.k8s.io/api => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.30.0-k3s1 k8s.io/klog/v2 => github.com/k3s-io/klog/v2 v2.120.1-k3s1 // k3s-main - k8s.io/kms => github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.31.0-k3s3 - k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.31.0-k3s3 - k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.31.0-k3s3 - k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.31.0-k3s3 - k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.31.0-k3s3 - k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.31.0-k3s3 - k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.31.0-k3s3 - k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.31.0-k3s3 - k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.31.0-k3s3 - k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.31.0-k3s3 - k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.31.0-k3s3 - k8s.io/pod-security-admission => github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.31.0-k3s3 - k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.31.0-k3s3 - k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.31.0-k3s3 - k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.31.0-k3s3 + 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 ) require ( @@ -77,16 +77,16 @@ require ( github.com/containernetworking/plugins v1.5.1 github.com/google/go-containerregistry v0.20.2 github.com/iamacarpet/go-win64api v0.0.0-20240507095429-873e84e85847 - github.com/k3s-io/helm-controller v0.16.4 - github.com/k3s-io/k3s v1.31.1-0.20240906183011-2caa785e17a0 // release-1.31 - github.com/k3s-io/kine v0.12.0 + github.com/k3s-io/helm-controller v0.16.5 + github.com/k3s-io/k3s v1.31.2-0.20241012053821-d74ad4253a54 // release-1.31 + github.com/k3s-io/kine v0.13.2 github.com/libp2p/go-netroute v0.2.1 github.com/natefinch/lumberjack v2.0.0+incompatible // indirect github.com/onsi/ginkgo/v2 v2.20.1 github.com/onsi/gomega v1.34.1 github.com/pkg/errors v0.9.1 github.com/rancher/permissions v0.0.0-20240523180510-4001d3d637f7 - github.com/rancher/wharfie v0.6.6 + github.com/rancher/wharfie v0.6.7 github.com/rancher/wins v0.4.17 github.com/rancher/wrangler/v3 v3.0.0 github.com/sirupsen/logrus v1.9.3 @@ -95,16 +95,16 @@ require ( github.com/tigera/operator v1.28.1 github.com/urfave/cli v1.22.15 golang.org/x/sync v0.8.0 - golang.org/x/sys v0.24.0 - google.golang.org/grpc v1.66.0 - k8s.io/api v0.31.0 - k8s.io/apimachinery v0.31.0 - k8s.io/apiserver v0.31.0 + golang.org/x/sys v0.25.0 + google.golang.org/grpc v1.67.0 + k8s.io/api v0.31.1 + k8s.io/apimachinery v0.31.1 + k8s.io/apiserver v0.31.1 k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible - k8s.io/component-base v0.31.0 + k8s.io/component-base v0.31.1 k8s.io/cri-api v0.32.0-alpha.0 k8s.io/klog/v2 v2.130.1 - k8s.io/kubernetes v1.31.0 + k8s.io/kubernetes v1.31.1 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 sigs.k8s.io/yaml v1.4.0 ) @@ -189,7 +189,7 @@ require ( github.com/go-openapi/jsonpointer v0.21.0 // indirect github.com/go-openapi/jsonreference v0.21.0 // indirect github.com/go-openapi/swag v0.23.0 // indirect - github.com/go-sql-driver/mysql v1.7.1 // indirect + github.com/go-sql-driver/mysql v1.8.1 // indirect github.com/go-task/slim-sprig/v3 v3.0.0 // indirect github.com/go-test/deep v1.0.7 // indirect github.com/goccy/go-json v0.10.2 // indirect @@ -238,9 +238,9 @@ require ( github.com/ipld/go-ipld-prime v0.20.0 // indirect github.com/jackc/pgerrcode v0.0.0-20220416144525-469b46aa5efa // indirect github.com/jackc/pgpassfile v1.0.0 // indirect - github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect - github.com/jackc/pgx/v5 v5.5.4 // indirect - github.com/jackc/puddle/v2 v2.2.1 // indirect + github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect + github.com/jackc/pgx/v5 v5.7.1 // indirect + github.com/jackc/puddle/v2 v2.2.2 // indirect github.com/jackpal/go-nat-pmp v1.0.2 // indirect github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect github.com/jbenet/goprocess v0.1.4 // indirect @@ -251,10 +251,9 @@ 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.9 // indirect + github.com/klauspost/compress v1.17.10 // indirect github.com/klauspost/cpuid/v2 v2.2.7 // indirect github.com/koron/go-ssdp v0.0.4 // indirect - github.com/lib/pq v1.10.2 // indirect github.com/libopenstorage/openstorage v1.0.0 // indirect github.com/libp2p/go-buffer-pool v0.1.0 // indirect github.com/libp2p/go-cidranger v1.1.0 // indirect @@ -274,7 +273,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.19 // indirect + github.com/mattn/go-sqlite3 v1.14.23 // indirect github.com/mdlayher/genetlink v1.3.2 // indirect github.com/mdlayher/netlink v1.7.2 // indirect github.com/mdlayher/socket v0.4.1 // indirect @@ -371,14 +370,14 @@ require ( github.com/xiang90/probing v0.0.0-20221125231312-a49e3df8f510 // indirect github.com/yl2chen/cidranger v1.0.2 // indirect go.etcd.io/bbolt v1.3.11 // indirect - go.etcd.io/etcd/api/v3 v3.5.15 // indirect - go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect - go.etcd.io/etcd/client/v2 v2.305.13 // indirect - go.etcd.io/etcd/client/v3 v3.5.14 // indirect + go.etcd.io/etcd/api/v3 v3.5.16 // indirect + go.etcd.io/etcd/client/pkg/v3 v3.5.16 // indirect + go.etcd.io/etcd/client/v2 v2.305.16 // indirect + go.etcd.io/etcd/client/v3 v3.5.16 // indirect go.etcd.io/etcd/etcdutl/v3 v3.5.13 // indirect - go.etcd.io/etcd/pkg/v3 v3.5.13 // indirect - go.etcd.io/etcd/raft/v3 v3.5.13 // indirect - go.etcd.io/etcd/server/v3 v3.5.13 // indirect + go.etcd.io/etcd/pkg/v3 v3.5.16 // indirect + go.etcd.io/etcd/raft/v3 v3.5.16 // indirect + go.etcd.io/etcd/server/v3 v3.5.16 // indirect go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.42.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect @@ -395,21 +394,21 @@ require ( go.uber.org/mock v0.4.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect - golang.org/x/crypto v0.25.0 // indirect + golang.org/x/crypto v0.27.0 // indirect golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect golang.org/x/mod v0.20.0 // indirect golang.org/x/net v0.28.0 // indirect golang.org/x/oauth2 v0.21.0 // indirect golang.org/x/term v0.23.0 // indirect - golang.org/x/text v0.17.0 // indirect + golang.org/x/text v0.18.0 // indirect golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.24.0 // indirect golang.zx2c4.com/wireguard v0.0.0-20230325221338-052af4a8072b // indirect golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230429144221-925a1e7659e6 // indirect gonum.org/v1/gonum v0.13.0 // indirect google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf // 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/protobuf v1.34.2 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect @@ -418,27 +417,26 @@ require ( gopkg.in/square/go-jose.v2 v2.6.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - inet.af/tcpproxy v0.0.0-20200125044825-b6bb9b5b8252 // indirect - k8s.io/apiextensions-apiserver v0.31.0 // indirect - k8s.io/cli-runtime v0.31.0-rc.1 // indirect - k8s.io/cloud-provider v0.31.0 // indirect + k8s.io/apiextensions-apiserver v0.31.1 // indirect + k8s.io/cli-runtime v0.31.1-rc.1 // indirect + k8s.io/cloud-provider v0.31.1 // indirect k8s.io/cluster-bootstrap v0.0.0 // indirect - k8s.io/component-helpers v0.31.0 // indirect + k8s.io/component-helpers v0.31.1 // indirect k8s.io/controller-manager v0.27.10 // indirect - k8s.io/cri-client v0.31.0 // indirect + k8s.io/cri-client v0.31.1 // indirect k8s.io/csi-translation-lib v0.0.0 // indirect k8s.io/dynamic-resource-allocation v0.0.0 // indirect k8s.io/endpointslice v0.0.0 // indirect k8s.io/kms v0.27.10 // indirect - k8s.io/kube-aggregator v0.31.0 // indirect + k8s.io/kube-aggregator v0.31.1 // indirect k8s.io/kube-controller-manager v0.0.0 // indirect k8s.io/kube-openapi v0.0.0-20240730131305-7a9a4e85957e // indirect k8s.io/kube-proxy v0.0.0 // indirect k8s.io/kube-scheduler v0.0.0 // indirect - k8s.io/kubectl v0.31.0-rc.1 // indirect - k8s.io/kubelet v0.31.0 // indirect + k8s.io/kubectl v0.31.1-rc.1 // indirect + k8s.io/kubelet v0.31.1 // indirect k8s.io/metrics v0.0.0 // indirect - k8s.io/mount-utils v0.31.0 // indirect + k8s.io/mount-utils v0.31.1 // indirect k8s.io/pod-security-admission v0.0.0 // indirect lukechampine.com/blake3 v1.2.1 // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect @@ -448,6 +446,10 @@ require ( sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect ) -require github.com/moby/sys/userns v0.1.0 // indirect +require ( + filippo.io/edwards25519 v1.1.0 // indirect + github.com/inetaf/tcpproxy v0.0.0-20240214030015-3ce58045626c // indirect + github.com/moby/sys/userns v0.1.0 // indirect +) replace sigs.k8s.io/cri-tools => github.com/k3s-io/cri-tools v1.31.0-k3s2 diff --git a/go.sum b/go.sum index 519265f361..b73c5fce29 100644 --- a/go.sum +++ b/go.sum @@ -233,6 +233,8 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7 dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU= dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4= dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU= +filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= +filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8= git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= git.sr.ht/~sbinet/gg v0.3.1/go.mod h1:KGYtlADtqsqANL9ueOFkWymvzUvLMQllU5Ixo+8v3pc= @@ -320,6 +322,7 @@ github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hC github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-metrics v0.3.0/go.mod h1:zXjbSimjXTd7vOpY8B0/2LpvNvDoXBuplAD+gJD3GYs= +github.com/armon/go-proxyproto v0.0.0-20210323213023-7e956b284f0a/go.mod h1:QmP9hvJ91BbJmGVGSbutW19IC0Q9phDCLGaomwTJbgU= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= @@ -687,8 +690,8 @@ github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8w 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= github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= -github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI= -github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= +github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y= +github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= @@ -995,6 +998,8 @@ github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+h github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +github.com/inetaf/tcpproxy v0.0.0-20240214030015-3ce58045626c h1:gYfYE403/nlrGNYj6BEOs9ucLCAGB9gstlSk92DttTg= +github.com/inetaf/tcpproxy v0.0.0-20240214030015-3ce58045626c/go.mod h1:Di7LXRyUcnvAcLicFhtM9/MlZl/TNgRSDHORM2c6CMI= github.com/influxdata/tdigest v0.0.1/go.mod h1:Z0kXnxzbTC2qrx4NaIzYkE1k66+6oEDQTvL95hQFh5Y= github.com/ipfs/boxo v0.10.0 h1:tdDAxq8jrsbRkYoF+5Rcqyeb91hgWe2hp7iLu7ORZLY= github.com/ipfs/boxo v0.10.0/go.mod h1:Fg+BnfxZ0RPzR0nOodzdIq3A7KgoWAOWsEIImrIQdBM= @@ -1023,12 +1028,12 @@ github.com/jackc/pgerrcode v0.0.0-20220416144525-469b46aa5efa h1:s+4MhCQ6YrzisK6 github.com/jackc/pgerrcode v0.0.0-20220416144525-469b46aa5efa/go.mod h1:a/s9Lp5W7n/DD0VrVoyJ00FbP2ytTPDVOivvn2bMlds= github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= -github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk= -github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= -github.com/jackc/pgx/v5 v5.5.4 h1:Xp2aQS8uXButQdnCMWNmvx6UysWQQC+u1EoizjguY+8= -github.com/jackc/pgx/v5 v5.5.4/go.mod h1:ez9gk+OAat140fv9ErkZDYFWmXLfV+++K0uAOiwgm1A= -github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk= -github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= +github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo= +github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= +github.com/jackc/pgx/v5 v5.7.1 h1:x7SYsPBYDkHDksogeSmZZ5xzThcTgRz++I5E+ePFUcs= +github.com/jackc/pgx/v5 v5.7.1/go.mod h1:e7O26IywZZ+naJtWWos6i6fvWK+29etgITqrqHLfoZA= +github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo= +github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus= github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= github.com/jarcoal/httpmock v1.0.5/go.mod h1:ATjnClrvW/3tijVmpL/va5Z3aAyGvqU3gCT8nX0Txik= @@ -1078,8 +1083,8 @@ 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.21-k3s2 h1:QnveYvdMinAgN2vDlkulVMrpnde0irZv2q6dJsDQmBw= -github.com/k3s-io/containerd v1.7.21-k3s2/go.mod h1:T9perze1nIMl5JzddImIgsCEDaM0i8nAfnm+U48DmJw= +github.com/k3s-io/containerd v1.7.22-k3s1 h1:+StsyV/pl4NL5gDA5dzcPi4anuhCI4ONuzCwjBwjrUE= +github.com/k3s-io/containerd v1.7.22-k3s1/go.mod h1:T9perze1nIMl5JzddImIgsCEDaM0i8nAfnm+U48DmJw= github.com/k3s-io/cri-dockerd v0.3.15-k3s1.31-3 h1:TH3zSbIM9zSZMeWKcWjQqeja3FsmJYwLUHglD7nuUEc= github.com/k3s-io/cri-dockerd v0.3.15-k3s1.31-3/go.mod h1:ny6wyM7fqfew5FABQ+MtKaU07rhsHhlXr/jtFsA2m8Y= github.com/k3s-io/etcd/api/v3 v3.5.13-k3s1 h1:aq6fxlEKdwCooLE3HOR6227U51DEvOw3DEbriJxD2QM= @@ -1098,70 +1103,70 @@ github.com/k3s-io/etcd/raft/v3 v3.5.13-k3s1 h1:yexUwAPPdmYfIMWOj6sSyJ2nEe8QOrFzN 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/helm-controller v0.16.4 h1:l1noZJacLT2C9JUgfwO9SV8XtfAv1J9avVXyzv8tYHo= -github.com/k3s-io/helm-controller v0.16.4/go.mod h1:AcSxEhOIUgeVvBTnJOAwcezBZXtYew/RhKwO5xp3RlM= -github.com/k3s-io/k3s v1.31.1-0.20240906183011-2caa785e17a0 h1:5ZOzgTL9p7G1lFhA1tP9oKf2KEQqY6doyo6Pnd3V89Y= -github.com/k3s-io/k3s v1.31.1-0.20240906183011-2caa785e17a0/go.mod h1:VApfr/FHCiAnngFENl1yHI2oDsGXFeAJQhLe1i8iSy4= -github.com/k3s-io/kine v0.12.0 h1:OWUdEAjwbZivVCwOWaPbTNnnQTrEmSW32+13UWQjYz4= -github.com/k3s-io/kine v0.12.0/go.mod h1:L4x3qotFebVh1ZVzYwFVL5PPfqw2sRJTjDTIeViO70Y= +github.com/k3s-io/helm-controller v0.16.5 h1:SsUHfksQXNwePkswv4a970EGD2h0Exsf6t3IdXhpXRo= +github.com/k3s-io/helm-controller v0.16.5/go.mod h1:AcSxEhOIUgeVvBTnJOAwcezBZXtYew/RhKwO5xp3RlM= +github.com/k3s-io/k3s v1.31.2-0.20241012053821-d74ad4253a54 h1:e2C12NHGk3611S1Uc5hPR1oa1zjwGiHZUW8lvBi9kkg= +github.com/k3s-io/k3s v1.31.2-0.20241012053821-d74ad4253a54/go.mod h1:SCNR9LeHnQ4H3XQLAeeSFfyoxpzHHhxIEy5SAjje7NM= +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/klog v1.0.0-k3s2/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= github.com/k3s-io/klog/v2 v2.120.1-k3s1 h1:7twAHPFpZA21KdMnMNnj68STQMPldAxF2Zsaol57dxw= github.com/k3s-io/klog/v2 v2.120.1-k3s1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= 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.31.0-k3s3 h1:xGU1SH0h6Df1VSakJ4TNuYba6/SAfUb+pNAYx3ExmbM= -github.com/k3s-io/kubernetes v1.31.0-k3s3/go.mod h1:UTpGn7nxrUrPWw5hNIYTAjodcWIvLakgHpLtfrr6GC8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.31.0-k3s3 h1:kYImKPev0qtAVBjohUiamANiJyIzOXXQ/PR7zE1JSec= -github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.31.0-k3s3/go.mod h1:KaRi43US9TCyITVXRX8uu9F8GDZSFJYuOtgC4rjoR7g= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.31.0-k3s3 h1:SCeEmwUwzvWkWs1cL+3lsZtiba3N8OCllSuK4cOa9uk= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.31.0-k3s3/go.mod h1:kzodfhDvQWeYegyO3XMoHI9B1fB8S9F20GkJrMGyizk= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.31.0-k3s3 h1:t33AUp7mDkGATwWfptYXyy5HkN1GqCMBZfIgsxASFGk= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.31.0-k3s3/go.mod h1:5F0wbie5xX1jDEg5sk5dr+KF8rwFkYtZFHDhSF/UsG4= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.31.0-k3s3 h1:P51Yq4yymToHtakyD3CCaJzaF81+qXMEGQqcOX0ZYAc= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.31.0-k3s3/go.mod h1:HJ1b6VgXrf+cWYPUzAO6sIKfdcHFZsASDzAp2Z99hQk= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.31.0-k3s3 h1:Y1SVtmTaO5zy07EVXv/4j0j/NrwSsLn0VENZ0KBalcY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.31.0-k3s3/go.mod h1:ajLlT5ogqDck94zgV1JL+dRaHBXR27MFxRqHg5ojeQA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.31.0-k3s3 h1:4wgsgYfMdPpzfFUj7SNq1qoxTtHUJmFXMUFD/jPIWkg= -github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.31.0-k3s3/go.mod h1:acnXvvIK5YiMMAflXv5ug7ClSCjxYChU5y63sTDuv3I= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.31.0-k3s3 h1:HOj//ctoLwFQjpHFFfTk4f4SS5vvORmEXJFMxq2mrX0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.31.0-k3s3/go.mod h1:aq39X+7JBHuYgLje0hmtOFnNwDFGxC3kMnxy6TK0IfE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.31.0-k3s3 h1:T+ZWDYEc4d76PrZjFJWDo2pZN2qZhrLnytSB7Svn+7M= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.31.0-k3s3/go.mod h1:sC54xeBDUh723Sh3/rBJpYmjuu2TFYRg8jbiGa+2gR4= -github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.31.0-k3s3/go.mod h1:kpHioo65EeiEH6lBGgJq/xueL4Kr7PUMp7J4J5TTg4c= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.31.0-k3s3 h1:KVjtvv8omTCndEEVt4+nd00AMmI8fSSll1/Mpl1CkNc= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.31.0-k3s3/go.mod h1:PFOdhUAVD6O6z1yuKxWS3EKXSKdZhKjOlCrcuJRxOBA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.31.0-k3s3 h1:dd5Nf+xjP5YVIZmot6OIKGbziYZhwnXmlV3sHARej24= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.31.0-k3s3/go.mod h1:DbKVutwtVincRfT23dk3SQ8uIyMSkFhsaNxqifftcDk= -github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.31.0-k3s3 h1:wIEz+Omcnin2pNOajbQGVbfkEMYpMOnxGF44Tb76wEw= -github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.31.0-k3s3/go.mod h1:zXRPI4iMORj8r8MtMpObg4dfVgb8ENDSnWcw5r5obp0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.31.0-k3s3 h1:MiDBz3gKlpWfsUu5LY2BKrBRilxLVWBX9M1w9Wa9Wqg= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.31.0-k3s3/go.mod h1:e2pTb6psrP2AtdW24SxJaesf2402rQ0YjNa7qYssoi0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.31.0-k3s3 h1:Bv3e9Td45IwyRXmwIxVV1DxOgqgNSx2c2ruq8gph42M= -github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.31.0-k3s3/go.mod h1:Ygc1DPcdWYjsDbAxP+rIzSbU2D83HFsJ3Cp0bs3brio= -github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.31.0-k3s3 h1:mwhFn1V3lEB3/wpUTFSpS/Ah816hoHd3f37K7u+Nh5M= -github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.31.0-k3s3/go.mod h1:iyXR8oPR54q4bj4LWeUHHrULA/Nm0LjfiR3JHe08sak= -github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.31.0-k3s3 h1:A80/H9MBTzJjsbyxEDw2gWq/fhpvGt8AbMja44dtLVk= -github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.31.0-k3s3/go.mod h1:VKJKC/px/hHUfsxDZmE+kezqfte7vi3ctPekcirZzMM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.31.0-k3s3 h1:9CvQCvLUufe/b/Yww2AkV4PahxiMk2BYbMtEmkr58Ns= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.31.0-k3s3/go.mod h1:gClzb5q8LLAagWlaL9S/rt8IcU3iY6gRARKN09DY4o8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.31.0-k3s3 h1:RkE/HBZPH29t8i+A+ho2pRxUximJLp3WltgdXHKYrto= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.31.0-k3s3/go.mod h1:xc/cVRFh9PdcOsDAnHdB0fuQWih/w8hxbF8Ca4FXHSU= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.31.0-k3s3 h1:iX0mZ5RZqfJJBJOVtAj3s3pXFDtPhSADFfQIlCC2qKw= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.31.0-k3s3/go.mod h1:l7Pv6S9sCmzj5ZLTQIf/twX4WrJ6D7WOPbDUfkllT0c= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.31.0-k3s3 h1:du6Pv8B688FzJkj4Byg28WLjRgAlidiUKi9zzMv5grU= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.31.0-k3s3/go.mod h1:oJOlcxyiohRkqraS+VHuxGd0oMp3N60mbMTaP3YTW0w= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.31.0-k3s3 h1:nX7H7xuED1tbkxTDB3hkall3cgoTixXjrCgWTxdaSyU= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.31.0-k3s3/go.mod h1:z259VFq5HmPqCcBj78z2uPawedjLkjRagQ98aPQKG8c= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.31.0-k3s3 h1:I7TnG/wpnuMLsJLnV1bTOVvQssNq9DrQfqLhyl7U7gg= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.31.0-k3s3/go.mod h1:upu9UjdY08ZgnQwjd8rlxSN5in0Yl2JrtHilExOCsfI= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.31.0-k3s3 h1:R79CsXq5Cqpd/u3P5bVNiB0j5I4oZiaRG0+ZZQcf7KM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.31.0-k3s3/go.mod h1:PeBIZnl5Zg5qaT6JFfsDBaw0IlAL4F3mEVy9VovTW6k= -github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.31.0-k3s3 h1:/Q5f5aNNJMTXnWVedwqblUWrH8lSQ3BmdM8Hak6QG7w= -github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.31.0-k3s3/go.mod h1:CXuAS4zkSBWhGd++sFZlq3a7qfcMbGGwJvRn4W0/378= -github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.31.0-k3s3 h1:8ZpGfpKzHpyzFNGOH9MhbkEyezCy9MwMsP3mS1CRuZg= -github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.31.0-k3s3/go.mod h1:p5r0u2M9KzooTgHDz4zRsUt02y4Yx7/5uPwgr0nSGqg= -github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.31.0-k3s3 h1:LCZWmkBHHA3CZb5uEM7/ThQY2IKHHGFbV/rkAEK6m8s= -github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.31.0-k3s3/go.mod h1:nOJes2FVv6qZXUU3CGubLnloPJVV4rZ+jm0bLRCKKOM= +github.com/k3s-io/kubernetes v1.31.1-k3s3 h1:ZI9L5470m0OnYR/S45ItBK1eOMMnJV7TirWoyRXhLMk= +github.com/k3s-io/kubernetes v1.31.1-k3s3/go.mod h1:/YGPL//Fb9mdv5vukvAQ7Xon+Bqwry52bmjTdORAw+Q= +github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.31.1-k3s3 h1:TQSxiv2OhgRczJFUFm0PXLlD4dyI2f+czmLfLnU3CAM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.31.1-k3s3/go.mod h1:KaRi43US9TCyITVXRX8uu9F8GDZSFJYuOtgC4rjoR7g= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.31.1-k3s3 h1:EPlRDPSlWt/gBUzL5RPRRIuFCAKio9UuxwPNg5jqI44= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.31.1-k3s3/go.mod h1:kzodfhDvQWeYegyO3XMoHI9B1fB8S9F20GkJrMGyizk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.31.1-k3s3 h1:l38/LexHRajuguKIFEeRP03tYLfCEYnuuoYZC7UeZTM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.31.1-k3s3/go.mod h1:5F0wbie5xX1jDEg5sk5dr+KF8rwFkYtZFHDhSF/UsG4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.31.1-k3s3 h1:17/ehFImJ6srv0rXPGJVVu/F4Han6UOftNaB8wsIT00= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.31.1-k3s3/go.mod h1:HJ1b6VgXrf+cWYPUzAO6sIKfdcHFZsASDzAp2Z99hQk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.31.1-k3s3 h1:Q0rQqUEZaOkThQX3M8nQyviak1+qnFVbKMZPLbowzFE= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.31.1-k3s3/go.mod h1:ajLlT5ogqDck94zgV1JL+dRaHBXR27MFxRqHg5ojeQA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.31.1-k3s3 h1:UXXbB4xE2hxIlrYt6ciU3IlSpEMv0izV8qpVwMTOMLs= +github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.31.1-k3s3/go.mod h1:acnXvvIK5YiMMAflXv5ug7ClSCjxYChU5y63sTDuv3I= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.31.1-k3s3 h1:lKmfpFyerEMPMvTu1YfP7y0AM5mczND1qi0ej7ZA1KE= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.31.1-k3s3/go.mod h1:aq39X+7JBHuYgLje0hmtOFnNwDFGxC3kMnxy6TK0IfE= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.31.1-k3s3 h1:zXgIDWlpxJrywlkDa/BrKkVhRdpEgATZQw4WGkDoceE= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.31.1-k3s3/go.mod h1:sC54xeBDUh723Sh3/rBJpYmjuu2TFYRg8jbiGa+2gR4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.31.1-k3s3/go.mod h1:kpHioo65EeiEH6lBGgJq/xueL4Kr7PUMp7J4J5TTg4c= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.31.1-k3s3 h1:WofC9Kx9nz6QS+4R0RFmJXDfh4z6/IhJva6pC/kdeyQ= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.31.1-k3s3/go.mod h1:PFOdhUAVD6O6z1yuKxWS3EKXSKdZhKjOlCrcuJRxOBA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.31.1-k3s3 h1:rNeCLEKT0woFNvdmFPaP04f/9HIyrZCu99t7rcrgv3s= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.31.1-k3s3/go.mod h1:DbKVutwtVincRfT23dk3SQ8uIyMSkFhsaNxqifftcDk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.31.1-k3s3 h1:phjGDUMtOcBrGWW0WN8zC/B9EHfafr+FZCzpx8RFHEQ= +github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.31.1-k3s3/go.mod h1:zXRPI4iMORj8r8MtMpObg4dfVgb8ENDSnWcw5r5obp0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.31.1-k3s3 h1:264xhEjjdMHU4cvtI5AKXsTd7yQPnaz8hv3uABNaEQU= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.31.1-k3s3/go.mod h1:e2pTb6psrP2AtdW24SxJaesf2402rQ0YjNa7qYssoi0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.31.1-k3s3 h1:OQbIWCKJg44WLzri0MJJM5IbjDF/6xxAsSW+SCvlSMA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.31.1-k3s3/go.mod h1:Ygc1DPcdWYjsDbAxP+rIzSbU2D83HFsJ3Cp0bs3brio= +github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.31.1-k3s3 h1:3hv/TBFmZilg1lUT7Ixaj+XnuLJ4l+EEmpkAJwu6LcI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.31.1-k3s3/go.mod h1:iyXR8oPR54q4bj4LWeUHHrULA/Nm0LjfiR3JHe08sak= +github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.31.1-k3s3 h1:3MiBA36oCFgFShfbZcvWpQqJevOntYeWKGH2aULHydo= +github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.31.1-k3s3/go.mod h1:VKJKC/px/hHUfsxDZmE+kezqfte7vi3ctPekcirZzMM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.31.1-k3s3 h1:I8y5CZoIeXg2BsH1k2OIqS+VU+jSpyx29OnYWPaQe3Y= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.31.1-k3s3/go.mod h1:gClzb5q8LLAagWlaL9S/rt8IcU3iY6gRARKN09DY4o8= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.31.1-k3s3 h1:/xR9OR86+iB4CK0YcFKqJ7mNFAhw4+a5Iz91lZNX2kY= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.31.1-k3s3/go.mod h1:xc/cVRFh9PdcOsDAnHdB0fuQWih/w8hxbF8Ca4FXHSU= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.31.1-k3s3 h1:8PhQeiS0IelPHPwmJoMQWBsCOK5wtcoZTJPui7Wojz0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.31.1-k3s3/go.mod h1:l7Pv6S9sCmzj5ZLTQIf/twX4WrJ6D7WOPbDUfkllT0c= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.31.1-k3s3 h1:dNX5ccNaE4/GZGnZVZI3W5tLOX/oiotS38pwbqgKhTA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.31.1-k3s3/go.mod h1:oJOlcxyiohRkqraS+VHuxGd0oMp3N60mbMTaP3YTW0w= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.31.1-k3s3 h1:GUzPqwirzsvb5IGtMg/0e2eqw0M8tqoqsWvRSxtY0ik= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.31.1-k3s3/go.mod h1:z259VFq5HmPqCcBj78z2uPawedjLkjRagQ98aPQKG8c= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.31.1-k3s3 h1:PuRt73t3aNs0qnvmA9K4X9YVCx4ZS4UkeUQyu2CMwYk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.31.1-k3s3/go.mod h1:upu9UjdY08ZgnQwjd8rlxSN5in0Yl2JrtHilExOCsfI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.31.1-k3s3 h1:myVvgreZwN4LhIpi5uxXKQQ+P7QGtcng3k4/wQg2V5k= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.31.1-k3s3/go.mod h1:PeBIZnl5Zg5qaT6JFfsDBaw0IlAL4F3mEVy9VovTW6k= +github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.31.1-k3s3 h1:FoCs0NCkHBKUgr2mIVsX0MB6EGIIGZbCpmKEFNFfqgw= +github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.31.1-k3s3/go.mod h1:CXuAS4zkSBWhGd++sFZlq3a7qfcMbGGwJvRn4W0/378= +github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.31.1-k3s3 h1:9EZH/VYYTSQ06/qMHExPJn9oFdcqzZ+mma7Yx2mY+1I= +github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.31.1-k3s3/go.mod h1:p5r0u2M9KzooTgHDz4zRsUt02y4Yx7/5uPwgr0nSGqg= +github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.31.1-k3s3 h1:XJbSUNXUSGUgSfokPZJRaWCAk3+YLQdK4oX4boUXRvA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.31.1-k3s3/go.mod h1:nOJes2FVv6qZXUU3CGubLnloPJVV4rZ+jm0bLRCKKOM= 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/spegel v0.0.23-0.20240516234953-f3d2c4072314 h1:TrZb/yM0OtBuifPXlKaOfcxpJqzakA8+KsoO4c69ZLM= @@ -1179,8 +1184,8 @@ github.com/kisom/goutils v1.4.3/go.mod h1:Lp5qrquG7yhYnWzZCI/68Pa/GpFynw//od6EkG github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE= github.com/klauspost/compress v1.14.4/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= -github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= -github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +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/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM= @@ -1213,8 +1218,6 @@ github.com/letsencrypt/pkcs11key/v4 v4.0.0/go.mod h1:EFUvBDay26dErnNb70Nd0/VW3tJ github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.10.1/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/lib/pq v1.10.2 h1:AqzbZs4ZoCBp+GtejcpCpcxM3zlSMx29dXbUSeVtJb8= -github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/libopenstorage/openstorage v1.0.0 h1:GLPam7/0mpdP8ZZtKjbfcXJBTIA/T1O6CBErVEFEyIM= github.com/libopenstorage/openstorage v1.0.0/go.mod h1:Sp1sIObHjat1BeXhfMqLZ14wnOzEhNx2YQedreMcUyc= github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8= @@ -1292,8 +1295,8 @@ github.com/mattn/go-shellwords v1.0.10/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.19 h1:fhGleo2h1p8tVChob4I9HpmVFIAkKGpiukdrgQbWfGI= -github.com/mattn/go-sqlite3 v1.14.19/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= +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-zglob v0.0.1/go.mod h1:9fxibJccNxU2cnpIKLRRFA7zX7qhkJIQWBb449FYHOo= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mdlayher/genetlink v1.3.2 h1:KdrNKe+CTu+IbZnm/GVUMXSqBBLqcGpRDa0xkQy56gw= @@ -1612,8 +1615,8 @@ github.com/rancher/permissions v0.0.0-20240523180510-4001d3d637f7 h1:0Kg2SGoMeU1 github.com/rancher/permissions v0.0.0-20240523180510-4001d3d637f7/go.mod h1:fsbs0YOsGn1ofPD5p+BuI4qDhbMbSJtTegKt6Ucna+c= github.com/rancher/remotedialer v0.4.1 h1:jwOf2kPRjBBpSFofv1OuZHWaYHeC9Eb6/XgDvbkoTgc= github.com/rancher/remotedialer v0.4.1/go.mod h1:Ys004RpJuTLSm+k4aYUCoFiOOad37ubYev3TkOFg/5w= -github.com/rancher/wharfie v0.6.6 h1:ESxPxBDiq9RXd8G9fC71qc7+AbetThVtxPC9K8VVZ2Y= -github.com/rancher/wharfie v0.6.6/go.mod h1:sfCy07HF8EE1MDKhpDc/cLptLTiTC0y/wisD44gr8uc= +github.com/rancher/wharfie v0.6.7 h1:BhbBVJSLoDQMkZb+zVTLEKckUbq4sc3ZmEYqGakggSY= +github.com/rancher/wharfie v0.6.7/go.mod h1:ew49A9PzRsTngdzXIkgakfhMq3mHMA650HS1OVQpaNA= github.com/rancher/wins v0.4.17 h1:Rh/3bVWNsXU4JOrn5/LpTdgQzCd3L8pYhW8a2sg6K60= github.com/rancher/wins v0.4.17/go.mod h1:31SyQWwDHjoYzU+jZRMmME90YzPKLJ2eCfsLVOwNoek= github.com/rancher/wrangler/v3 v3.0.0 h1:IHHCA+vrghJDPxjtLk4fmeSCFhNe9fFzLFj3m2B0YpA= @@ -2119,8 +2122,8 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= -golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= -golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= +golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -2343,8 +2346,8 @@ google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de/go. google.golang.org/genproto/googleapis/api v0.0.0-20240513163218-0867130af1f8/go.mod h1:vPrPUTsDCYxXWjP7clS81mZ6/803D8K4iM9Ma27VKas= google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:RGnPtTG7r4i8sPlNyDeikXF99hMM+hN6QMm4ooG9g2g= google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157/go.mod h1:99sLkeliLXfdj2J75X3Ho+rrVCaJze0uwN7zDDkjPVU= -google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1:0+ozOGcrp+Y8Aq8TLNN2Aliibms5LEzsq99ZZmAGYm0= -google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw= +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/bytestream v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:ylj+BE99M198VPbBh6A8d9n3w8fChvyLK3wwBOjXBFA= google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234015-3fc162c6f38a/go.mod h1:xURIpW9ES5+/GZhnV6beoEtxQrnkRGIfP5VQG2tCBLc= google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= @@ -2365,8 +2368,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240515191416-fc5f0ca64291/go. google.golang.org/genproto/googleapis/rpc v0.0.0-20240521202816-d264139d666e/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf h1:liao9UHurZLtiEwBgT9LMOnKYsHze6eA6w1KQCMVN2Q= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= +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/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= @@ -2442,10 +2445,8 @@ honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= honnef.co/go/tools v0.1.4/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= howett.net/plist v0.0.0-20181124034731-591f970eefbb/go.mod h1:vMygbs4qMhSZSc4lCUl2OEE+rDiIIJAIdR4m7MiMcm0= -inet.af/tcpproxy v0.0.0-20200125044825-b6bb9b5b8252 h1:gmJCKidOfjKDUHF1jjke+I+2iQIyE3HNNxu2OKO/FUI= -inet.af/tcpproxy v0.0.0-20200125044825-b6bb9b5b8252/go.mod h1:zq+R+tLcdHugi7Jt+FtIQY6m6wtX34lr2CdQVH2fhW0= -k8s.io/cri-client v0.31.0 h1:lu+Fq1h9GYIJO0PiWX1tH5KEhbD4H52grWss4CVMlqc= -k8s.io/cri-client v0.31.0/go.mod h1:rAZ0wx1Yqq4XwfL89Hvzl6rCbnkK0k/rm4DuW48O1+I= +k8s.io/cri-client v0.31.1 h1:w5D7BAhiaSVVDZqHs7YUZPpuUCybx8tCxfdBuDBw7zo= +k8s.io/cri-client v0.31.1/go.mod h1:voVfZexZQwvlf/JD8w30sGN0k22LRcHRfCj7+m4kAXE= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70/go.mod h1:VH3AT8AaQOqiGjMF9p0/IM1Dj+82ZwjfxUP1IxaHE+8= k8s.io/kube-openapi v0.0.0-20211110012726-3cc51fd1e909/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE= diff --git a/scripts/build-images b/scripts/build-images index 7da4cc8c56..fe77eca79b 100755 --- a/scripts/build-images +++ b/scripts/build-images @@ -19,8 +19,8 @@ xargs -n1 -t docker image pull --quiet << EOF >> build/images-core.txt ${REGISTRY}/rancher/hardened-etcd:${ETCD_VERSION}-build20240910 ${REGISTRY}/rancher/hardened-k8s-metrics-server:v0.7.1-build20240910 ${REGISTRY}/rancher/hardened-addon-resizer:1.8.20-build20240910 - ${REGISTRY}/rancher/klipper-helm:v0.9.2-build20240828 - ${REGISTRY}/rancher/klipper-lb:v0.4.9 + ${REGISTRY}/rancher/klipper-helm:v0.9.3-build20241008 + ${REGISTRY}/rancher/mirrored-library-busybox:1.36.1 ${REGISTRY}/rancher/mirrored-pause:${PAUSE_VERSION} ${REGISTRY}/rancher/mirrored-ingress-nginx-kube-webhook-certgen:v1.4.4 ${REGISTRY}/rancher/nginx-ingress-controller:v1.10.5-hardened1 diff --git a/scripts/version.sh b/scripts/version.sh index a92a8ea30b..dd28c20faa 100755 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -36,7 +36,7 @@ KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.31.1} KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.31.1-rke2r1-build20240912} ETCD_VERSION=${ETCD_VERSION:-v3.5.13-k3s1} PAUSE_VERSION=${PAUSE_VERSION:-3.6} -CCM_VERSION=${CCM_VERSION:-v1.31.1-build20241010} +CCM_VERSION=${CCM_VERSION:-v1.31.2-0.20241012053821-d74ad4253a54-build20241014} if [ -d .git ]; then if [ -z "$GIT_TAG" ]; then