From 362288c6d6caef74b051c6ddc2e12443f02e982c Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Thu, 8 Aug 2024 21:59:35 +0000 Subject: [PATCH 1/3] Bump containerd to v1.7.20 Signed-off-by: Brad Davidson --- Dockerfile | 2 +- Dockerfile.windows | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 815dc4930d..e7fbeede79 100644 --- a/Dockerfile +++ b/Dockerfile @@ -118,7 +118,7 @@ RUN rm -vf /charts/*.sh /charts/*.md /charts/chart_versions.yaml # must be placed in bin/ of the file image and subdirectories of bin/ will be flattened during installation. # This means bin/foo/bar will become bin/bar when rke2 installs this to the host FROM rancher/hardened-kubernetes:v1.30.3-rke2r1-build20240717 AS kubernetes -FROM rancher/hardened-containerd:v1.7.17-k3s1-build20240605 AS containerd +FROM rancher/hardened-containerd:v1.7.20-k3s1-build20240802 AS containerd FROM rancher/hardened-crictl:v1.29.0-build20231219 AS crictl FROM rancher/hardened-runc:v1.1.12-build20240201 AS runc diff --git a/Dockerfile.windows b/Dockerfile.windows index 0a8c800649..4a5b9d6753 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -38,7 +38,7 @@ RUN curl -sL https://raw.githubusercontent.com/golangci/golangci-lint/master/ins WORKDIR /source # End Dapper stuff -FROM rancher/hardened-containerd:v1.7.17-k3s1-build20240605-amd64-windows AS containerd +FROM rancher/hardened-containerd:v1.7.20-k3s1-build20240802-amd64-windows AS containerd FROM build as windows-runtime-collect ARG KUBERNETES_VERSION=dev From fc7dcf0d0ad43ccca76b150a04e2d6e2734b4163 Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Thu, 8 Aug 2024 22:16:35 +0000 Subject: [PATCH 2/3] Bump K3s version for v1.30 Updates k3s: https://github.com/k3s-io/k3s/compare/37830fe170fa...b11486d3cd4aa40f3102577ab7352de5992ca43d Signed-off-by: Brad Davidson --- go.mod | 106 +++++++++++++++++++++-------------------- go.sum | 147 ++++++++++++++++++++++++++++++--------------------------- 2 files changed, 133 insertions(+), 120 deletions(-) diff --git a/go.mod b/go.mod index 750f2b8f78..76f5868ccf 100644 --- a/go.mod +++ b/go.mod @@ -6,9 +6,10 @@ replace ( 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/containerd/containerd => github.com/k3s-io/containerd v1.7.20-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.4+incompatible + github.com/docker/docker => github.com/docker/docker v25.0.6+incompatible 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 @@ -35,40 +36,40 @@ replace ( google.golang.org/genproto => google.golang.org/genproto v0.0.0-20230525234035-dd9d682886f9 google.golang.org/grpc => google.golang.org/grpc v1.58.3 gopkg.in/square/go-jose.v2 => gopkg.in/square/go-jose.v2 v2.6.0 - k8s.io/api => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.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.30.3-k3s1 + k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.30.3-k3s1 + k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.30.3-k3s1 + k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.30.3-k3s1 + k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.30.3-k3s1 + k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.30.3-k3s1 + k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.30.3-k3s1 + k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.30.3-k3s1 + k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.30.3-k3s1 + k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.30.3-k3s1 + k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.30.3-k3s1 + k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.30.3-k3s1 + k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.30.3-k3s1 + k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.30.3-k3s1 + k8s.io/dynamic-resource-allocation => github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.30.3-k3s1 + k8s.io/endpointslice => github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.30.3-k3s1 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.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.30.3-k3s1 + k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.30.3-k3s1 + k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.30.3-k3s1 + k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.30.3-k3s1 + k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.30.3-k3s1 + k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.30.3-k3s1 + k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.30.3-k3s1 + k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.30.3-k3s1 + k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.30.3-k3s1 + k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.30.3-k3s1 + k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.30.3-k3s1 + k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.30.3-k3s1 + k8s.io/pod-security-admission => github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.30.3-k3s1 + k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.30.3-k3s1 + k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.30.3-k3s1 + k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.30.3-k3s1 ) require ( @@ -79,7 +80,7 @@ require ( github.com/google/go-containerregistry v0.19.0 github.com/iamacarpet/go-win64api v0.0.0-20210311141720-fe38760bed28 github.com/k3s-io/helm-controller v0.16.1 - github.com/k3s-io/k3s v1.30.3-0.20240715171250-37830fe170fa // master + github.com/k3s-io/k3s v1.30.4-0.20240806155201-b11486d3cd4a // master github.com/k3s-io/kine v0.11.11 github.com/libp2p/go-netroute v0.2.1 github.com/natefinch/lumberjack v2.0.0+incompatible @@ -98,14 +99,14 @@ require ( golang.org/x/sync v0.7.0 golang.org/x/sys v0.20.0 google.golang.org/grpc v1.63.2 - k8s.io/api v0.30.2 - k8s.io/apimachinery v0.30.2 - k8s.io/apiserver v0.30.2 + k8s.io/api v0.30.3 + k8s.io/apimachinery v0.30.3 + k8s.io/apiserver v0.30.3 k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible - k8s.io/component-base v0.30.2 - k8s.io/cri-api v0.30.2 + k8s.io/component-base v0.30.3 + k8s.io/cri-api v0.30.3 k8s.io/klog/v2 v2.120.1 - k8s.io/kubernetes v1.30.2 + k8s.io/kubernetes v1.30.3 k8s.io/utils v0.0.0-20240310230437-4693a0247e57 sigs.k8s.io/yaml v1.4.0 ) @@ -144,12 +145,15 @@ require ( github.com/containerd/cgroups/v3 v3.0.2 // indirect github.com/containerd/console v1.0.3 // indirect github.com/containerd/containerd v1.7.16 // indirect + github.com/containerd/containerd/api v1.7.19 // indirect + github.com/containerd/errdefs v0.1.0 // indirect github.com/containerd/fifo v1.1.0 // indirect github.com/containerd/fuse-overlayfs-snapshotter v1.0.8 // indirect github.com/containerd/log v0.1.0 // indirect + github.com/containerd/platforms v0.2.1 // indirect github.com/containerd/stargz-snapshotter v0.15.1 // indirect github.com/containerd/stargz-snapshotter/estargz v0.15.1 // indirect - github.com/containerd/ttrpc v1.2.4 // indirect + github.com/containerd/ttrpc v1.2.5 // indirect github.com/containerd/typeurl/v2 v2.1.1 // indirect github.com/containernetworking/cni v1.1.2 // indirect github.com/coreos/go-iptables v0.7.0 // indirect @@ -161,7 +165,7 @@ require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect - github.com/distribution/reference v0.5.0 // indirect + github.com/distribution/reference v0.6.0 // indirect github.com/docker/cli v24.0.7+incompatible // indirect github.com/docker/distribution v2.8.3+incompatible // indirect github.com/docker/docker v25.0.5+incompatible // indirect @@ -227,7 +231,7 @@ require ( github.com/hashicorp/go-version v1.6.0 // indirect github.com/hashicorp/golang-lru v0.5.4 // indirect github.com/hashicorp/golang-lru/arc/v2 v2.0.5 // indirect - github.com/hashicorp/golang-lru/v2 v2.0.5 // indirect + github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect github.com/huin/goupnp v1.3.0 // indirect github.com/imdario/mergo v0.3.16 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect @@ -344,7 +348,7 @@ require ( github.com/quic-go/quic-go v0.42.0 // indirect github.com/quic-go/webtransport-go v0.6.0 // indirect github.com/rancher/dynamiclistener v0.6.0-rc1 // indirect - github.com/rancher/lasso v0.0.0-20240430201833-6f3def65ffc5 // indirect + github.com/rancher/lasso v0.0.0-20240724174736-24ab3dbf26f0 // indirect github.com/rancher/remotedialer v0.4.1 // indirect github.com/raulk/go-watchdog v1.3.0 // indirect github.com/robfig/cron/v3 v3.0.1 // indirect @@ -368,7 +372,7 @@ require ( github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 // indirect github.com/xiang90/probing v0.0.0-20221125231312-a49e3df8f510 // indirect github.com/yl2chen/cidranger v1.0.2 // indirect - go.etcd.io/bbolt v1.3.9 // indirect + go.etcd.io/bbolt v1.3.10 // indirect go.etcd.io/etcd/api/v3 v3.5.13 // indirect go.etcd.io/etcd/client/pkg/v3 v3.5.13 // indirect go.etcd.io/etcd/client/v2 v2.305.13 // indirect @@ -420,17 +424,17 @@ require ( 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.30.2 // indirect + k8s.io/apiextensions-apiserver v0.30.3 // indirect k8s.io/cli-runtime v0.22.2 // indirect - k8s.io/cloud-provider v0.30.2 // indirect + k8s.io/cloud-provider v0.30.3 // indirect k8s.io/cluster-bootstrap v0.0.0 // indirect - k8s.io/component-helpers v0.30.2 // indirect + k8s.io/component-helpers v0.30.3 // indirect k8s.io/controller-manager v0.25.4 // indirect k8s.io/csi-translation-lib v0.0.0 // indirect k8s.io/dynamic-resource-allocation v0.0.0 // indirect k8s.io/endpointslice v0.0.0 // indirect k8s.io/kms v0.0.0 // indirect - k8s.io/kube-aggregator v0.30.2 // indirect + k8s.io/kube-aggregator v0.30.3 // indirect k8s.io/kube-controller-manager v0.0.0 // indirect k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect k8s.io/kube-proxy v0.0.0 // indirect @@ -439,7 +443,7 @@ require ( k8s.io/kubelet v0.28.6 // indirect k8s.io/legacy-cloud-providers v0.0.0 // indirect k8s.io/metrics v0.0.0 // indirect - k8s.io/mount-utils v0.30.2 // indirect + k8s.io/mount-utils v0.30.3 // 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.29.0 // indirect diff --git a/go.sum b/go.sum index 438751cb8e..df17e8d2ee 100644 --- a/go.sum +++ b/go.sum @@ -441,11 +441,15 @@ github.com/containerd/cgroups/v3 v3.0.2/go.mod h1:JUgITrzdFqp42uI2ryGA+ge0ap/nxz github.com/containerd/console v1.0.1/go.mod h1:XUsP6YE/mKtz6bxc+I8UiKKTP04qjQL4qcS3XoQ5xkw= github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw= github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= +github.com/containerd/containerd/api v1.7.19 h1:VWbJL+8Ap4Ju2mx9c9qS1uFSB1OVYr5JJrW2yT5vFoA= +github.com/containerd/containerd/api v1.7.19/go.mod h1:fwGavl3LNwAV5ilJ0sbrABL44AQxmNjDRcwheXDb6Ig= github.com/containerd/continuity v0.0.0-20190827140505-75bee3e2ccb6/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e/go.mod h1:EXlVlkqNba9rJe3j7w3Xa924itAMLgZH4UD/Q4PExuQ= github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM= github.com/containerd/continuity v0.4.3 h1:6HVkalIp+2u1ZLH1J/pYX2oBVXlJZvh1X1A7bEZ9Su8= github.com/containerd/continuity v0.4.3/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ= +github.com/containerd/errdefs v0.1.0 h1:m0wCRBiu1WJT/Fr+iOoQHMQS/eP5myQ8lCv4Dz5ZURM= +github.com/containerd/errdefs v0.1.0/go.mod h1:YgWiiHtLmSeBrvpw+UfPijzbLaB77mEG1WwJTDETIV0= github.com/containerd/fifo v1.0.0/go.mod h1:ocF/ME1SX5b1AOlWi9r677YJmCPSwwWnQ9O123vzpE4= github.com/containerd/fifo v1.1.0 h1:4I2mbh5stb1u6ycIABlBw9zgtlK8viPI9QkQNRQEEmY= github.com/containerd/fifo v1.1.0/go.mod h1:bmC4NWMbXlt2EZ0Hc7Fx7QzTFxgPID13eH0Qu+MAb2o= @@ -458,6 +462,8 @@ github.com/containerd/imgcrypt v1.1.8/go.mod h1:x6QvFIkMyO2qGIY2zXc88ivEzcbgvLdW github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= github.com/containerd/nri v0.6.1/go.mod h1:7+sX3wNx+LR7RzhjnJiUkFDhn18P5Bg/0VnJ/uXpRJM= +github.com/containerd/platforms v0.2.1 h1:zvwtM3rz2YHPQsF2CHYM8+KtB5dvhISiXh5ZpSBQv6A= +github.com/containerd/platforms v0.2.1/go.mod h1:XHCb+2/hzowdiut9rkudds9bE5yJ7npe7dG/wG+uFPw= github.com/containerd/stargz-snapshotter v0.15.1 h1:fpsP4kf/Z4n2EYnU0WT8ZCE3eiKDwikDhL6VwxIlgeA= github.com/containerd/stargz-snapshotter v0.15.1/go.mod h1:74D+J1m1RMXytLmWxegXWhtOSRHPWZKpKc2NdK3S+us= github.com/containerd/stargz-snapshotter/estargz v0.14.3/go.mod h1:KY//uOCIkSuNAHhJogcZtrNHdKrA99/FCCRjE3HD36o= @@ -467,8 +473,8 @@ github.com/containerd/ttrpc v1.1.0/go.mod h1:XX4ZTnoOId4HklF4edwc4DcqskFZuvXB1Ev github.com/containerd/ttrpc v1.1.2/go.mod h1:XX4ZTnoOId4HklF4edwc4DcqskFZuvXB1Evzy5KFQpQ= github.com/containerd/ttrpc v1.2.2/go.mod h1:sIT6l32Ph/H9cvnJsfXM5drIVzTr5A2flTf1G5tYZak= github.com/containerd/ttrpc v1.2.3/go.mod h1:ieWsXucbb8Mj9PH0rXCw1i8IunRbbAiDkpXkbfflWBM= -github.com/containerd/ttrpc v1.2.4 h1:eQCQK4h9dxDmpOb9QOOMh2NHTfzroH1IkmHiKZi05Oo= -github.com/containerd/ttrpc v1.2.4/go.mod h1:ojvb8SJBSch0XkqNO0L0YX/5NxR3UnVk2LzFKBK0upc= +github.com/containerd/ttrpc v1.2.5 h1:IFckT1EFQoFBMG4c3sMdT8EP3/aKfumK1msY+Ze4oLU= +github.com/containerd/ttrpc v1.2.5/go.mod h1:YCXHsb32f+Sq5/72xHubdiJRQY9inL4a4ZQrAbN1q9o= github.com/containerd/typeurl v1.0.2 h1:Chlt8zIieDbzQFzXzAeBEF92KhExuE4p9p92/QmY7aY= github.com/containerd/typeurl v1.0.2/go.mod h1:9trJWW2sRlGub4wZJRTW83VtbOLS6hwcDZXTn6oPz9s= github.com/containerd/typeurl/v2 v2.1.1 h1:3Q4Pt7i8nYwy2KmQWIw2+1hTvwTE/6w9FqcttATPO/4= @@ -560,8 +566,8 @@ github.com/docker/cli v24.0.7+incompatible h1:wa/nIwYFW7BVTGa7SWPVyyXU9lgORqUb1x github.com/docker/cli v24.0.7+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v25.0.4+incompatible h1:XITZTrq+52tZyZxUOtFIahUf3aH367FLxJzt9vZeAF8= -github.com/docker/docker v25.0.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v25.0.6+incompatible h1:5cPwbwriIcsua2REJe8HqQV+6WlWc1byg2QSXzBxBGg= +github.com/docker/docker v25.0.6+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A= github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0= github.com/docker/go-connections v0.3.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= @@ -1002,8 +1008,8 @@ github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+l github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/golang-lru/arc/v2 v2.0.5 h1:l2zaLDubNhW4XO3LnliVj0GXO3+/CGNJAg1dcN2Fpfw= github.com/hashicorp/golang-lru/arc/v2 v2.0.5/go.mod h1:ny6zBSQZi2JxIeYcv7kt2sH2PXJtirBN7RDhRpxPkxU= -github.com/hashicorp/golang-lru/v2 v2.0.5 h1:wW7h1TG88eUIJ2i69gaE3uNVtEPIagzhGvHgwfx2Vm4= -github.com/hashicorp/golang-lru/v2 v2.0.5/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= +github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k= +github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= @@ -1122,8 +1128,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.17-k3s1 h1:jXPVFdg+vEwsx7amOvjPIx180ltbKBBZM5tfBaQtlzA= -github.com/k3s-io/containerd v1.7.17-k3s1/go.mod h1:T36IsoYQp97IT+64ws3GTq27V+M3518W11PDvOlBKPQ= +github.com/k3s-io/containerd v1.7.20-k3s1 h1:FeCcavKY1couxHhedhVuqljxCTaalg14NewcOJAVe94= +github.com/k3s-io/containerd v1.7.20-k3s1/go.mod h1:SrCa3lpQtDlG5+nAyz2n0k7KpWqkxxpN5ve+GoO+irc= github.com/k3s-io/cri-dockerd v0.3.12-k3s1.30-3 h1:lmvoMmpiprwTdQFW5p3f+Y1ZRnx2YDKENSsUZsUCszc= github.com/k3s-io/cri-dockerd v0.3.12-k3s1.30-3/go.mod h1:L7HNeF+iZZ/btgefGZI5v7oB1TQgpFyWvbhmFzfsWAY= github.com/k3s-io/etcd/api/v3 v3.5.13-k3s1 h1:aq6fxlEKdwCooLE3HOR6227U51DEvOw3DEbriJxD2QM= @@ -1144,8 +1150,8 @@ github.com/k3s-io/etcd/server/v3 v3.5.13-k3s1 h1:Pqcxkg7V60c26ZpHoekP9QoUdLuduxF github.com/k3s-io/etcd/server/v3 v3.5.13-k3s1/go.mod h1:K/8nbsGupHqmr5MkgaZpLlH1QdX1pcNQLAkODy44XcQ= github.com/k3s-io/helm-controller v0.16.1 h1:4sdJSYdAeTvMjjq3Pt1ZcyenRTJIAvKojTWRg/i8Ne4= github.com/k3s-io/helm-controller v0.16.1/go.mod h1:AcSxEhOIUgeVvBTnJOAwcezBZXtYew/RhKwO5xp3RlM= -github.com/k3s-io/k3s v1.30.3-0.20240715171250-37830fe170fa h1:e10fSy6kOLn/6PmTnBbgdB6vV4w1TZbGDHB+/uBmGmk= -github.com/k3s-io/k3s v1.30.3-0.20240715171250-37830fe170fa/go.mod h1:P2DbmuA0en/cuqTJAESELQUh5UjI4fIXorDz+klhX9A= +github.com/k3s-io/k3s v1.30.4-0.20240806155201-b11486d3cd4a h1:CjYx16dSjz0wX0Q27tcft4IExkrWBDpO2s2YS1DHul0= +github.com/k3s-io/k3s v1.30.4-0.20240806155201-b11486d3cd4a/go.mod h1:JOhjb9e1Q7j+Nqzlokja9obTXD0RjvbqKYUKxeWIxX8= github.com/k3s-io/kine v0.11.11 h1:f1DhpGNjCDVd1HFWPbeA824YP7MtsrKgstoJ5M0SRgs= github.com/k3s-io/kine v0.11.11/go.mod h1:L4x3qotFebVh1ZVzYwFVL5PPfqw2sRJTjDTIeViO70Y= github.com/k3s-io/klog v1.0.0-k3s2/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= @@ -1153,61 +1159,61 @@ github.com/k3s-io/klog/v2 v2.120.1-k3s1 h1:7twAHPFpZA21KdMnMNnj68STQMPldAxF2Zsao github.com/k3s-io/klog/v2 v2.120.1-k3s1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= github.com/k3s-io/kube-router/v2 v2.1.2 h1:/eLfIsELLsqqRW1skIJ2qe7bWL6IZZ9Hg3IniIgObXo= github.com/k3s-io/kube-router/v2 v2.1.2/go.mod h1:a7QUTzCmDayYvqh6tXSKEB/ICSuGCs64qD4aCtaJqAU= -github.com/k3s-io/kubernetes v1.30.2-k3s1 h1:+rTGAaGx3okaaL0QK+ijGjRBwouyOzIljhefdmNHFts= -github.com/k3s-io/kubernetes v1.30.2-k3s1/go.mod h1:yPbIk3MhmhGigX62FLJm+CphNtjxqCvAIFQXup6RKS0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.30.2-k3s1 h1:BOu/ImiorbEEJOaDBPJKqal9nwxa7xY/gSWmZryO6NE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.30.2-k3s1/go.mod h1:MT0Wu+tcrQr/oMnfrjzdSZ7mzCiwx4+KDhIqa/+Br/I= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.30.2-k3s1 h1:d+xP6IY25nguOsjz2WTef0qxc/L88xc9JCpnlSSqO7k= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.30.2-k3s1/go.mod h1:DPOzzIf6n1/l8+PABfoqj81RjqyBLI6+/Pjkys3zrQo= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.30.2-k3s1 h1:NuH1JtMezQcFdvc4jBzLjQPbvIQd0yek2BHNLI8FsUw= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.30.2-k3s1/go.mod h1:t8MQn0aJW4Wz3tmdr/QDNyBZquwqtqEUKqbKhQKjbp0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.30.2-k3s1 h1:JHfmpcRfFRQsP76I0WFQm/mUXDyRMaiYKBRFu8AeLMI= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.30.2-k3s1/go.mod h1:CUVmmmibyDvJRSdzgx+XZGcX4B6BBIyQWJ0XaZQDQ7U= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.30.2-k3s1 h1:ZjlnJ1Y0+gzIHLvfPy613RYB1CIjBAItoCyaurly46U= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.30.2-k3s1/go.mod h1:qzsasJdVj8wPJy0h4FrdC+Cqc6LGDP0PRlMUHxXx4mM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.30.2-k3s1 h1:WkkcmOmzqIS/9PZ657W8EeXCtVrkqzahyFB94gxNcIk= -github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.30.2-k3s1/go.mod h1:a+0Y4gJdcOQ9xQVK4WvIoKe99lj/AoaSorN3vpDRXec= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.30.2-k3s1 h1:X0wyq2OtT2qz55yk4CNKHbZrv13CuWoJsNCalAYwuiQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.30.2-k3s1/go.mod h1:xi+XvU2vbnQtFkiU1pqn+dxcXwQADYeC1is21ciK2ss= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.30.2-k3s1 h1:eSK7Nh21lKCSOjJgY7RTzm+lXf3eUGB/a5Igl0svhJE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.30.2-k3s1/go.mod h1:UQkCN/yAyK9GkwLx9OvIewMG++WMMmqM1ol0dZeih0Q= -github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.30.2-k3s1/go.mod h1:dJC5AAQqmx2mhue0I0usnIajihQLIT37R3DDuUppdPE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.30.2-k3s1 h1:Y/TcciBBzBSZIamyG/YhTQiOjYdA5K/5E/hJjXJpO78= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.30.2-k3s1/go.mod h1:z0h1kSKwTKBb7mekPRApPIiQKjQ/97LEewIX0U2fTco= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.30.2-k3s1 h1:ze/Ghlt7VBjLE45P+U6fsCbEo+eUydpMfj/wGxb1vP8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.30.2-k3s1/go.mod h1:JnDaovXMrRoLaNWAFTTYwljG5uo1YoITYNw/8P0m/Zo= -github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.30.2-k3s1 h1:xKnoP/0/E6dO8xJYMrhfdanJclKQu5BGKVrEi8d0njY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.30.2-k3s1/go.mod h1:tGylrLWeY7AO4OR0evvI0CxLsmJZy83yPrtysLsGDXg= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.30.2-k3s1 h1:r3O8wKVKiqdsR3p/g4bB8fXJhG+lH0fBJqV1+I3qDLU= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.30.2-k3s1/go.mod h1:/fkfIpAg9LQ3JKsBg3Zqxq1kpwX7uK8K66o573HlRZc= -github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.30.2-k3s1 h1:sTHuf6seVxZiFKAaCCOqlWpDgB9mwVqRk4st32hEwPM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.30.2-k3s1/go.mod h1:ef38HCcCShGOPx8s6rnAlzS1hYCCGmiLGw3A2GGZ1pg= -github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.30.2-k3s1 h1:7mQcM6SG9pvtHOSDZkcTMXPuNJQVv5j4UNXJyEy2tDs= -github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.30.2-k3s1/go.mod h1:bLEkcQbwz8O7Q8Mb6O42blnLPr8T3OX+FoGuNSQZjqM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.30.2-k3s1 h1:10Y+AO4WPsLuHMX02tHQak9U+29KVoW/Bu/3mH3YqPE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.30.2-k3s1/go.mod h1:BIBwT7suEpxuEi3NZ7UVDtHYnRaurx9FZShAXM4wHLQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.30.2-k3s1 h1:pvZwlX5sdy7jhwK+5mAmQoof5M5/ZJC9WHjGIzh4NEs= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.30.2-k3s1/go.mod h1:tig/CdAZHSLnfo7HOBGtZEUcX2ym3ksoloM6gnm3/ws= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.30.2-k3s1 h1:ihOmqgqm/s/dsZzGFvOFxCUU2XUCULDM6a0l6Fcg9E4= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.30.2-k3s1/go.mod h1:w5RFyNnjfeptLtXFfHgzLwXaVNy+ESLZQJCbRdFzjN8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.30.2-k3s1 h1:STlNgQfaNR22AwQsIJfJ9ibr5J1+P4hs3Vm96lAVWPY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.30.2-k3s1/go.mod h1:tGb0LmTLtAqnOfXUlj+Ex+mNXxTlmGdkJFcI+JgnyAs= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.30.2-k3s1 h1:99zWE2Xjty+dtA6hMuSrZ+jZtQw28UnqrAz0kACMXrs= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.30.2-k3s1/go.mod h1:jlYTzNX+XdkW78Tbu7zNj9n/lnSEKQNl8McQPhMhmwM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.30.2-k3s1 h1:YgF0uqi5akqD8UjnXrKG/MERmSYXWe63ZA7d2RNGdc8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.30.2-k3s1/go.mod h1:2tg98tG689zt0TE5sHNPDd49OztHg0/wqaXIz7RLEoI= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.30.2-k3s1 h1:JaDZo0g30AWI0ribLFNw2wvRPBUJtut4HhuwrM2eJtk= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.30.2-k3s1/go.mod h1:WuomGAL3Q6+EQK2bfHud4HD3RruJvIQRA4uuoZ4Ew+w= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.30.2-k3s1 h1:7+fvDTAwEJjDg4bAJjLwavzaL/lFJsoMEfo/MtThXcQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.30.2-k3s1/go.mod h1:J3s04GUInRh4RD9N0tbJpkP1lciQ3WqFk69BvbNRtaQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.30.2-k3s1 h1:qclj6zIjvwv8TRyDtZJqMOa5y3LxvWd145TVxMORi8E= -github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.30.2-k3s1/go.mod h1:FJ958oArq2Ca4R+aGj08ySB5IZU3CBIhhDihWp6tqiI= -github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.30.2-k3s1 h1:ujK5h1fkM+OtQMwCk2+QfgJLSoTcrJsdjsrnWlK7h4Y= -github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.30.2-k3s1/go.mod h1:zuttgbAy71QJ952slY86DBJu3fexyrTMXqfaTU1i3dE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.30.2-k3s1 h1:8eHNYyT6bB+YnnNGopPzSxfscmERyGBoaPhJDROR8us= -github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.30.2-k3s1/go.mod h1:4xH05OdueH2hpDdvzFGddYb+1GoCt/1GzcYN7ci1S14= -github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.30.2-k3s1 h1:4cMZWzHEbKgplVpH7jr81YJVNm05Y2PJe9HfYuIsBW8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.30.2-k3s1/go.mod h1:TkJPz7+fWPDnOlud9WxO+KEu1KMBxQ6i9xsWryJd0l8= +github.com/k3s-io/kubernetes v1.30.3-k3s1 h1:gXxtGAa4qdbKLEeu/P4d0zcAx7C00Oc5o2pfjA2zhAI= +github.com/k3s-io/kubernetes v1.30.3-k3s1/go.mod h1:yPbIk3MhmhGigX62FLJm+CphNtjxqCvAIFQXup6RKS0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.30.3-k3s1 h1:rKIGzNJ8E7ykRoBvG3JhylQXN14VIbyBaEZuL8j1Z+4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.30.3-k3s1/go.mod h1:MT0Wu+tcrQr/oMnfrjzdSZ7mzCiwx4+KDhIqa/+Br/I= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.30.3-k3s1 h1:MwvMqKOPwgzGhZNVRyotzZsvzge65zuap1gaa7fJOnw= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.30.3-k3s1/go.mod h1:DPOzzIf6n1/l8+PABfoqj81RjqyBLI6+/Pjkys3zrQo= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.30.3-k3s1 h1:2E8hJPqvQaXzu3s3T2kd/GU8C+T4zjcoOVr8EzqZXHc= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.30.3-k3s1/go.mod h1:t8MQn0aJW4Wz3tmdr/QDNyBZquwqtqEUKqbKhQKjbp0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.30.3-k3s1 h1:L3OW1u33oBlu1ztL4qp3EGvDdidRDbztcrlBCYjRw1c= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.30.3-k3s1/go.mod h1:CUVmmmibyDvJRSdzgx+XZGcX4B6BBIyQWJ0XaZQDQ7U= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.30.3-k3s1 h1:sEJKB+YRf7kdq4+znCPHnWybd9bCO5IJMJ0W7pobDv0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.30.3-k3s1/go.mod h1:qzsasJdVj8wPJy0h4FrdC+Cqc6LGDP0PRlMUHxXx4mM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.30.3-k3s1 h1:UcNdlf4Zdzwm3hwujMi7VLCj1F+ashCCAX1xuRoBi+Q= +github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.30.3-k3s1/go.mod h1:a+0Y4gJdcOQ9xQVK4WvIoKe99lj/AoaSorN3vpDRXec= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.30.3-k3s1 h1:wxSpgXHFPHAKICYwE9Lm+/P7/JVgBRRFALVuEJwUiMw= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.30.3-k3s1/go.mod h1:xi+XvU2vbnQtFkiU1pqn+dxcXwQADYeC1is21ciK2ss= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.30.3-k3s1 h1:W0YvqfGVtIDXaTYHSl7gwthDsDHNJOunhzbg54m41hc= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.30.3-k3s1/go.mod h1:UQkCN/yAyK9GkwLx9OvIewMG++WMMmqM1ol0dZeih0Q= +github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.30.3-k3s1/go.mod h1:dJC5AAQqmx2mhue0I0usnIajihQLIT37R3DDuUppdPE= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.30.3-k3s1 h1:GfELnjmwpBAg3MEi0NsbI6rq+r8fPNkphvAcstp7msA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.30.3-k3s1/go.mod h1:z0h1kSKwTKBb7mekPRApPIiQKjQ/97LEewIX0U2fTco= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.30.3-k3s1 h1:uQzY188nuZ+hWvsKjJgc10NCCSlFGyhauZbqh/rVvNo= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.30.3-k3s1/go.mod h1:JnDaovXMrRoLaNWAFTTYwljG5uo1YoITYNw/8P0m/Zo= +github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.30.3-k3s1 h1:cMUk7Pw2fEE/2bz4x0huPi5YX85f8RcJYcCyMqoDQDc= +github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.30.3-k3s1/go.mod h1:tGylrLWeY7AO4OR0evvI0CxLsmJZy83yPrtysLsGDXg= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.30.3-k3s1 h1:KAlcc49uk8KsJ5zW2zfRuvAlfo64Up/tEmIZdqprtUo= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.30.3-k3s1/go.mod h1:/fkfIpAg9LQ3JKsBg3Zqxq1kpwX7uK8K66o573HlRZc= +github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.30.3-k3s1 h1:aJA2XRwkF+M37xqF4jAkYQo4cfTofBEc2KW+h/QcqAQ= +github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.30.3-k3s1/go.mod h1:ef38HCcCShGOPx8s6rnAlzS1hYCCGmiLGw3A2GGZ1pg= +github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.30.3-k3s1 h1:YwbBie6Ur32TXIHzUv4Nqm1/NB8mih8D08wj/wJVdE8= +github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.30.3-k3s1/go.mod h1:bLEkcQbwz8O7Q8Mb6O42blnLPr8T3OX+FoGuNSQZjqM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.30.3-k3s1 h1:vqUxhtj2yRV7CNklrfWJ2Lv/0Ph3NBbvry07/Qx/PUM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.30.3-k3s1/go.mod h1:BIBwT7suEpxuEi3NZ7UVDtHYnRaurx9FZShAXM4wHLQ= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.30.3-k3s1 h1:bwrTHyVujdWkX5lq1SJ7MndoUkzFMBSGV/PrdGSZWTU= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.30.3-k3s1/go.mod h1:tig/CdAZHSLnfo7HOBGtZEUcX2ym3ksoloM6gnm3/ws= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.30.3-k3s1 h1:IRZ7MXvddLTvAPIGDmES+gQW55yD9X4tZLEQhqSGq6k= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.30.3-k3s1/go.mod h1:w5RFyNnjfeptLtXFfHgzLwXaVNy+ESLZQJCbRdFzjN8= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.30.3-k3s1 h1:cd/Qhwd5xPOP2iPycQG+lnp0MiiVrPG8TjvlYGpA4hY= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.30.3-k3s1/go.mod h1:tGb0LmTLtAqnOfXUlj+Ex+mNXxTlmGdkJFcI+JgnyAs= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.30.3-k3s1 h1:mEQxROIu/tSCdiK8rbjrmdGT6zWj8k7lqmxJzh6mG6o= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.30.3-k3s1/go.mod h1:jlYTzNX+XdkW78Tbu7zNj9n/lnSEKQNl8McQPhMhmwM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.30.3-k3s1 h1:FnBunXUVTJr2evNoU8MeJ8pvCrdykQ3URq95BAK4hSM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.30.3-k3s1/go.mod h1:2tg98tG689zt0TE5sHNPDd49OztHg0/wqaXIz7RLEoI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.30.3-k3s1 h1:HyPQw/XCjeq3AcsgDxJ+XUt9+46P6ZxBGPARh7Mq1lo= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.30.3-k3s1/go.mod h1:WuomGAL3Q6+EQK2bfHud4HD3RruJvIQRA4uuoZ4Ew+w= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.30.3-k3s1 h1:OVsrSk+hMCxOP7DO/3MFFqN1tg1P6WkEJGTVS8qoPi8= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.30.3-k3s1/go.mod h1:J3s04GUInRh4RD9N0tbJpkP1lciQ3WqFk69BvbNRtaQ= +github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.30.3-k3s1 h1:iSC6k7dVk3xgiGLqdFLuQg4m9SSOb/M/c0NMEsmzW7Q= +github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.30.3-k3s1/go.mod h1:FJ958oArq2Ca4R+aGj08ySB5IZU3CBIhhDihWp6tqiI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.30.3-k3s1 h1:6SbRe2zz/S+0IFzg+zWf+yF9Z9QvHfTXRIHwX6DsZwU= +github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.30.3-k3s1/go.mod h1:zuttgbAy71QJ952slY86DBJu3fexyrTMXqfaTU1i3dE= +github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.30.3-k3s1 h1:GriUST0hJw8qA47QpUqSwMt6yq2buClyAhh0YJovkhQ= +github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.30.3-k3s1/go.mod h1:4xH05OdueH2hpDdvzFGddYb+1GoCt/1GzcYN7ci1S14= +github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.30.3-k3s1 h1:btaOeVDurRHqolcdnKvPuemjZ7bu4hXblqsj1aKNFlA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.30.3-k3s1/go.mod h1:TkJPz7+fWPDnOlud9WxO+KEu1KMBxQ6i9xsWryJd0l8= github.com/k3s-io/runc v1.1.12-k3s1 h1:p2x48K2BbRdF8crLEB4xoJ1pdjSprlvNNGpYBBULHL4= github.com/k3s-io/runc v1.1.12-k3s1/go.mod h1:S+lQwSfncpBha7XTy/5lBwWgm5+y5Ma/O44Ekby9FK8= github.com/k3s-io/spegel v0.0.23-0.20240516234953-f3d2c4072314 h1:TrZb/yM0OtBuifPXlKaOfcxpJqzakA8+KsoO4c69ZLM= @@ -1700,8 +1706,8 @@ github.com/quic-go/webtransport-go v0.6.0/go.mod h1:9KjU4AEBqEQidGHNDkZrb8CAa1ab github.com/r3labs/diff/v2 v2.8.0/go.mod h1:I8noH9Fc2fjSaMxqF3G2lhDdC0b+JXCfyx85tWFM9kc= github.com/rancher/dynamiclistener v0.6.0-rc1 h1:Emwf9o7PMLdQNv4lvFx7xJKxDuDa4Y69GvVEGU9U9Js= github.com/rancher/dynamiclistener v0.6.0-rc1/go.mod h1:BIPgJ8xFSUyuTyGvRMVt++S1qjD3+7Ptvq1TXl6hcTM= -github.com/rancher/lasso v0.0.0-20240430201833-6f3def65ffc5 h1:6K4RhfmCy7uxaw9OzCljNLfFcgD/q7SeF+/2gCQ3Tvw= -github.com/rancher/lasso v0.0.0-20240430201833-6f3def65ffc5/go.mod h1:7WkdfPEvWAdnHVioMUkhpZkshJzjDY62ocHVhcbw89M= +github.com/rancher/lasso v0.0.0-20240724174736-24ab3dbf26f0 h1:rM56SuQHkXyzPqldBDMdBZ8H4tOzyfbKxMlGyKnTQF8= +github.com/rancher/lasso v0.0.0-20240724174736-24ab3dbf26f0/go.mod h1:A/y3BLQkxZXYD60MNDRwAG9WGxXfvd6Z6gWR/a8wPw8= github.com/rancher/permissions v0.0.0-20240523180510-4001d3d637f7 h1:0Kg2SGoMeU1ll4xPi4DE0+qNHLFO/U5MwtK0WrIdK+o= github.com/rancher/permissions v0.0.0-20240523180510-4001d3d637f7/go.mod h1:fsbs0YOsGn1ofPD5p+BuI4qDhbMbSJtTegKt6Ucna+c= github.com/rancher/remotedialer v0.2.6-0.20201012155453-8b1b7bb7d05f/go.mod h1:dbzn9NF1JWbGEHL6Q/1KG4KFROILiY/j6wmfF1Np3fk= @@ -1975,8 +1981,9 @@ go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= go.etcd.io/bbolt v1.3.8/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= -go.etcd.io/bbolt v1.3.9 h1:8x7aARPEXiXbHmtUwAIv7eV2fQFHrLLavdiJ3uzJXoI= go.etcd.io/bbolt v1.3.9/go.mod h1:zaO32+Ti0PK1ivdPtgMESzuzL2VPoIG1PCQNvOdo/dE= +go.etcd.io/bbolt v1.3.10 h1:+BqfJTcCzTItrop8mq/lbzL8wSGtj94UO/3U31shqG0= +go.etcd.io/bbolt v1.3.10/go.mod h1:bK3UQLPJZly7IlNmV7uVHJDxfe5aK9Ll93e/74Y9oEQ= go.etcd.io/etcd/etcdctl/v3 v3.5.0-alpha.0/go.mod h1:YPwSaBciV5G6Gpt435AasAG3ROetZsKNUzibRa/++oo= go.etcd.io/etcd/tests/v3 v3.5.0-alpha.0/go.mod h1:HnrHxjyCuZ8YDt8PYVyQQ5d1ZQfzJVEtQWllr5Vp/30= go.etcd.io/etcd/v3 v3.5.0-alpha.0/go.mod h1:JZ79d3LV6NUfPjUxXrpiFAYcjhT+06qqw+i28snx8To= @@ -2482,7 +2489,7 @@ google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc/go. google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98/go.mod h1:rsr7RhLuwsDKL7RmgDDCUc6yaGr1iqceVb5Wv6f6YvQ= google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e/go.mod h1:rsr7RhLuwsDKL7RmgDDCUc6yaGr1iqceVb5Wv6f6YvQ= google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk= -google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk= +google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f/go.mod h1:Uy9bTZJqmfrw2rIBxgGLnamc78euZULUBrLZ9XTITKI= google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 h1:Lj5rbfG876hIAYFjqiJnPHfhXbv+nzTWfm04Fg/XSVU= google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80/go.mod h1:4jWUdICTdgc3Ibxmr8nAJiiLHwQBY0UI0XZcEMaFKaA= google.golang.org/genproto/googleapis/bytestream v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:ylj+BE99M198VPbBh6A8d9n3w8fChvyLK3wwBOjXBFA= @@ -2496,6 +2503,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20230731190214-cbb8c96f2d6d/go. google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5/go.mod h1:zBEcrKX2ZOcEkHWxBPAIvYUWOKKMIhYcmNiUIu2ji3I= google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97/go.mod h1:v7nGkzlmW8P3n/bKmWBn2WpBjpOEx8Q6gMueudAmKfY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:oQ5rr10WTTMvP4A36n8JpR1OrO1BEiV4f78CneXZxkA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0/go.mod h1:FUoWkonphQm3RhTS+kOEhF8h0iDpm4tdXolVCeZ9KKA= google.golang.org/genproto/googleapis/rpc v0.0.0-20240228224816-df926f6c8641 h1:DKU1r6Tj5s1vlU/moGhuGz7E3xRfwjdAfDzbsaQJtEY= google.golang.org/genproto/googleapis/rpc v0.0.0-20240228224816-df926f6c8641/go.mod h1:UCOku4NytXMJuLQE5VuqA5lX3PcHCBo8pxNyvkf4xBs= google.golang.org/grpc v1.58.3 h1:BjnpXut1btbtgN/6sp+brB2Kbm2LjNXnidYujAVbSoQ= From 448363c55008341cf55921e6ab3d2201a6a18674 Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Fri, 9 Aug 2024 19:26:54 +0000 Subject: [PATCH 3/3] Bump klipper-lb image to track with k3s Signed-off-by: Brad Davidson --- scripts/build-images | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build-images b/scripts/build-images index d27e2f2e42..1effdeaffe 100755 --- a/scripts/build-images +++ b/scripts/build-images @@ -20,7 +20,7 @@ xargs -n1 -t docker image pull --quiet << EOF >> build/images-core.txt ${REGISTRY}/rancher/hardened-k8s-metrics-server:v0.7.1-build20240401 ${REGISTRY}/rancher/hardened-addon-resizer:1.8.20-build20240410 ${REGISTRY}/rancher/klipper-helm:v0.8.4-build20240523 - ${REGISTRY}/rancher/klipper-lb:v0.4.7 + ${REGISTRY}/rancher/klipper-lb:v0.4.9 ${REGISTRY}/rancher/mirrored-pause:${PAUSE_VERSION} ${REGISTRY}/rancher/mirrored-ingress-nginx-kube-webhook-certgen:v20230312-helm-chart-4.5.2-28-g66a760794 ${REGISTRY}/rancher/nginx-ingress-controller:v1.10.1-hardened2