From f51872fc2288f25c9a4f1efec871dea475f529c7 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 6f449faf80..646d414230 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.27.16-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.26.1-build20230606 AS crictl FROM rancher/hardened-runc:v1.1.12-build20240201 AS runc diff --git a/Dockerfile.windows b/Dockerfile.windows index c29524fc65..e8a63e73ef 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 5e88bf03fb07e63ef0a27a84dbf3eaaccf37bdfe Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Thu, 8 Aug 2024 22:39:54 +0000 Subject: [PATCH 2/3] Bump K3s version for v1.27 Updates k3s: https://github.com/k3s-io/k3s/compare/13817fb201ce...8c79522e747233c4bfd45c07418b77660a6c0914 Signed-off-by: Brad Davidson --- go.mod | 98 +++++++++++++++++++------------------ go.sum | 152 ++++++++++++++++++++++++++++++--------------------------- 2 files changed, 132 insertions(+), 118 deletions(-) diff --git a/go.mod b/go.mod index aa9622f59b..09fb4ecd58 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.27 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-k3s2.27 + github.com/containerd/containerd => github.com/k3s-io/containerd v1.7.20-k3s1.28 + github.com/distribution/reference => github.com/distribution/reference v0.5.0 github.com/docker/distribution => github.com/docker/distribution v2.8.3+incompatible - github.com/docker/docker => github.com/docker/docker v24.0.8+incompatible + github.com/docker/docker => github.com/docker/docker v24.0.10-0.20240723193628-852759a7df45+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.1.1 github.com/kubernetes-sigs/cri-tools => github.com/k3s-io/cri-tools v1.26.0-rc.0-k3s1 @@ -49,40 +50,40 @@ replace ( google.golang.org/genproto => google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 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.27.15-k3s1 - k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.27.15-k3s1 - k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.27.15-k3s1 - k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.27.15-k3s1 - k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.27.15-k3s1 - k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.27.15-k3s1 - k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.27.15-k3s1 - k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.27.15-k3s1 - k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.27.15-k3s1 - k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.27.15-k3s1 - k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.27.15-k3s1 - k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.27.15-k3s1 - k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.27.15-k3s1 - k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.27.15-k3s1 - k8s.io/dynamic-resource-allocation => github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.27.15-k3s1 + k8s.io/api => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.27.16-k3s1 + k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.27.16-k3s1 + k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.27.16-k3s1 + k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.27.16-k3s1 + k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.27.16-k3s1 + k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.27.16-k3s1 + k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.27.16-k3s1 + k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.27.16-k3s1 + k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.27.16-k3s1 + k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.27.16-k3s1 + k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.27.16-k3s1 + k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.27.16-k3s1 + k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.27.16-k3s1 + k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.27.16-k3s1 + k8s.io/dynamic-resource-allocation => github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.27.16-k3s1 k8s.io/klog => github.com/k3s-io/klog v1.0.0-k3s2 // k3s-release-1.x k8s.io/klog/v2 => github.com/k3s-io/klog/v2 v2.90.1-k3s1 // k3s-main - k8s.io/kms => github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.27.15-k3s1 - k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.27.15-k3s1 - k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.27.15-k3s1 + k8s.io/kms => github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.27.16-k3s1 + k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.27.16-k3s1 + k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.27.16-k3s1 k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f - k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.27.15-k3s1 - k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.27.15-k3s1 - k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.27.15-k3s1 - k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.27.15-k3s1 - k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.27.15-k3s1 - k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.27.15-k3s1 - k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.27.15-k3s1 - k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.27.15-k3s1 - k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.27.15-k3s1 - k8s.io/pod-security-admission => github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.27.15-k3s1 - k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.27.15-k3s1 - k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.27.15-k3s1 - k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.27.15-k3s1 + k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.27.16-k3s1 + k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.27.16-k3s1 + k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.27.16-k3s1 + k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.27.16-k3s1 + k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.27.16-k3s1 + k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.27.16-k3s1 + k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.27.16-k3s1 + k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.27.16-k3s1 + k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.27.16-k3s1 + k8s.io/pod-security-admission => github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.27.16-k3s1 + k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.27.16-k3s1 + k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.27.16-k3s1 + k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.27.16-k3s1 ) require ( @@ -93,7 +94,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.15.10 - github.com/k3s-io/k3s v1.27.16-0.20240715173438-13817fb201ce //release-1.27 + github.com/k3s-io/k3s v1.27.17-0.20240806155222-8c79522e7472 //release-1.27 github.com/libp2p/go-netroute v0.2.1 github.com/natefinch/lumberjack v2.0.0+incompatible github.com/onsi/ginkgo/v2 v2.16.0 @@ -111,11 +112,11 @@ 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.29.3 - k8s.io/apimachinery v0.29.3 - k8s.io/apiserver v0.27.15 + k8s.io/api v0.30.0 + k8s.io/apimachinery v0.30.0 + k8s.io/apiserver v0.27.16 k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible - k8s.io/component-base v0.27.15 + k8s.io/component-base v0.27.16 k8s.io/cri-api v0.29.3 k8s.io/klog/v2 v2.120.1 k8s.io/kubernetes v1.27.15 @@ -167,12 +168,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 @@ -250,7 +254,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 @@ -369,7 +373,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.3.6 // indirect - github.com/rancher/lasso v0.0.0-20230830164424-d684fdeb6f29 // 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 @@ -395,7 +399,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 @@ -423,13 +427,13 @@ require ( go.uber.org/zap v1.27.0 // indirect golang.org/x/crypto v0.23.0 // indirect golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect - golang.org/x/mod v0.15.0 // indirect + golang.org/x/mod v0.17.0 // indirect golang.org/x/net v0.25.0 // indirect golang.org/x/oauth2 v0.17.0 // indirect golang.org/x/term v0.20.0 // indirect golang.org/x/text v0.15.0 // indirect golang.org/x/time v0.5.0 // indirect - golang.org/x/tools v0.18.0 // indirect + golang.org/x/tools v0.20.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 @@ -448,9 +452,9 @@ require ( inet.af/tcpproxy v0.0.0-20200125044825-b6bb9b5b8252 // indirect k8s.io/apiextensions-apiserver v0.25.4 // indirect k8s.io/cli-runtime v0.22.2 // indirect - k8s.io/cloud-provider v0.27.15 // indirect + k8s.io/cloud-provider v0.27.16 // indirect k8s.io/cluster-bootstrap v0.0.0 // indirect - k8s.io/component-helpers v0.27.15 // indirect + k8s.io/component-helpers v0.27.16 // 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 @@ -464,7 +468,7 @@ require ( k8s.io/kubelet v0.0.0 // indirect k8s.io/legacy-cloud-providers v0.0.0 // indirect k8s.io/metrics v0.0.0 // indirect - k8s.io/mount-utils v0.27.15 // indirect + k8s.io/mount-utils v0.27.16 // 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.1.2 // indirect diff --git a/go.sum b/go.sum index 6307842f16..9b4d00096b 100644 --- a/go.sum +++ b/go.sum @@ -320,11 +320,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= @@ -337,6 +341,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= @@ -346,8 +352,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= @@ -448,8 +454,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 v24.0.8+incompatible h1:lbGlhLzolo0tpp+paD0JzOYId072MQmQxZLPevQCFPU= -github.com/docker/docker v24.0.8+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v24.0.10-0.20240723193628-852759a7df45+incompatible h1:e8Zw21H1+oqrZM96LgE7xzChqLfPmpnO6SBb8DjQdTs= +github.com/docker/docker v24.0.10-0.20240723193628-852759a7df45+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.6.4/go.mod h1:ofX3UI0Gz1TteYBjtgs07O36Pyasyp66D2uKT7H8W1c= 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= @@ -767,6 +773,7 @@ github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/wire v0.3.0/go.mod h1:i1DMg/Lu8Sz5yYl25iOdmc5CT5qusaa+zmRWs16741s= @@ -867,8 +874,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= @@ -985,8 +992,8 @@ github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/juju/ratelimit v1.0.1/go.mod h1:qapgC/Gy+xNh9UxzV13HGGl/6UXNN+ct+vwSgWNm/qk= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= -github.com/k3s-io/containerd v1.7.17-k3s2.27 h1:z9vP1EMelViO2dtWhvdh7p+vGBOdzUD6X4Z9WdIgISI= -github.com/k3s-io/containerd v1.7.17-k3s2.27/go.mod h1:T36IsoYQp97IT+64ws3GTq27V+M3518W11PDvOlBKPQ= +github.com/k3s-io/containerd v1.7.20-k3s1.28 h1:KJ6hMfDWe+Gx5HsSgCLC0kZFlq1tsb/jfE4NpASzdkw= +github.com/k3s-io/containerd v1.7.20-k3s1.28/go.mod h1:SrCa3lpQtDlG5+nAyz2n0k7KpWqkxxpN5ve+GoO+irc= github.com/k3s-io/cri-dockerd v0.3.12-k3s1.27 h1:bbADVgQe8bCePog+Psn8zFT3WWIkFdG+QLBrmQaZq58= github.com/k3s-io/cri-dockerd v0.3.12-k3s1.27/go.mod h1:XTd52ab5jh0rpTzkNG6MDh44bl08MNeEizqPp9zmF/8= github.com/k3s-io/etcd/api/v3 v3.5.13-k3s1 h1:aq6fxlEKdwCooLE3HOR6227U51DEvOw3DEbriJxD2QM= @@ -1007,8 +1014,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.15.10 h1:TIfbbCbv8mJ1AquPzSxH3vMqIcqfgZ9Pr/Pq/jka/zc= github.com/k3s-io/helm-controller v0.15.10/go.mod h1:AYitg40howLjKloL/zdjDDOPL1jg/K5R4af0tQcyPR8= -github.com/k3s-io/k3s v1.27.16-0.20240715173438-13817fb201ce h1:jbN0OL8c38bt1xtveawIcNanBgNK5xJsdv0OKZJq5Ss= -github.com/k3s-io/k3s v1.27.16-0.20240715173438-13817fb201ce/go.mod h1:CGWnKdvmAcuWAqeuIEUeCSJaoSqS39LBLGALjWp5Vac= +github.com/k3s-io/k3s v1.27.17-0.20240806155222-8c79522e7472 h1:kuEkX+BOvfpuHFxpjRBYmG2nMHD0puYmZhHxBx3+xKs= +github.com/k3s-io/k3s v1.27.17-0.20240806155222-8c79522e7472/go.mod h1:0xASMmeyltlLDxSMHqBXYXcU6330Q1oTftYNAkOS2KM= 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= @@ -1016,59 +1023,59 @@ github.com/k3s-io/klog/v2 v2.90.1-k3s1 h1:QOJ/1xi4ERgpPGmSI3n1f989XjII+OvPdgdiMO github.com/k3s-io/klog/v2 v2.90.1-k3s1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= github.com/k3s-io/kube-router/v2 v2.1.2 h1:/eLfIsELLsqqRW1skIJ2qe7bWL6IZZ9Hg3IniIgObXo= github.com/k3s-io/kube-router/v2 v2.1.2/go.mod h1:a7QUTzCmDayYvqh6tXSKEB/ICSuGCs64qD4aCtaJqAU= -github.com/k3s-io/kubernetes v1.27.15-k3s1 h1:UHiSv4Kk0B3cLe3QGeDikfR8r+ilI+Uv5uz19WvCnKI= -github.com/k3s-io/kubernetes v1.27.15-k3s1/go.mod h1:T4toI2XSWG5FJoq/H8q9eFYPymAxe/k4UnaC00uPnMs= -github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.27.15-k3s1 h1:08GQ3ruAkoqEuPa6j7g16JRpGvibJRlffmTsTETDpps= -github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.27.15-k3s1/go.mod h1:QIR5QebyXKoLm1LCtJTryzjYWx+iFUG/IxhoRsYn/E8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.27.15-k3s1 h1:2f76bOfvssPt4uX63TcEWmjYjNxf0q7xVJwt8i67bes= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.27.15-k3s1/go.mod h1:KaEKv8/8HtOltbT23YYcYTRhaFpovdKxGkbxD+kjKI4= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.27.15-k3s1 h1:5WqObYv7SU8Ym/T4PFx7ucNmm5irNUGK26cHTIW0eMg= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.27.15-k3s1/go.mod h1:S+90/g/AT313nSBhhJrp7GXLVggOzlUomqeZvnNbi6Y= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.27.15-k3s1 h1:4w1YdKsYjl2rKS21IhwAITIG84HWOmuIJBfS1ZELJuc= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.27.15-k3s1/go.mod h1:hkKXPcOyKWEz7zmQc/8wY8xCf7fHxQPagQWaCTfleg0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.27.15-k3s1 h1:JjaWNThHPCCyZFw0aFPQEeyeRcDc6L0E2OUDTSJDfPc= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.27.15-k3s1/go.mod h1:ZNYI7sfQyOV7DBzt65OdF4kdgm6zMlUAklbahM98QCc= -github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.27.15-k3s1 h1:CYmaqX0GQIi77bc9g0/zowDu5koPyhYN4n3DxnilSYU= -github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.27.15-k3s1/go.mod h1:llqJdNKyvckdsrqmSZdBTnKQcqdov4MG8AHrNjwyzB0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.27.15-k3s1 h1:7C6E5AeWXsbD89ZAu6VIFP+wKqUUzw9+my0oysZx1AA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.27.15-k3s1/go.mod h1:ywjhL7dDJx5/Ws70LWdb7JhpIvHx1z7rk7Fnm92An9U= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.27.15-k3s1 h1:g50yQopz16bUfXF42XfRrS7xDDw3rdatxHu1hslB9L4= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.27.15-k3s1/go.mod h1:572lTEGrgw8Eeg2/vM5/tbGFLQ6VPzPvAV1cwr7HH6o= -github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.27.15-k3s1/go.mod h1:3zrB8vRPbcpGGFVd1YfHMfm2stYgIAMoI2QPUe0YrmE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.27.15-k3s1 h1:R0SbewdNs01GzrkU6Ed7jTeNSY2HnDJj3eRiPIZywRg= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.27.15-k3s1/go.mod h1:FO91l+rMrmpAXrFZM1Ad0G53BfuHKtrzcAwtyUw7DtQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.27.15-k3s1 h1:M2aCpyY+ANxZNJhEO+GxZv9pI4tmM8fAijF5Sn9XV2s= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.27.15-k3s1/go.mod h1:YqllO6ohcEX89/ePx58NJsZ5h7gXdyLr06N/Uwp0mgE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.27.15-k3s1 h1:PSoBocLGP5sBPRsNEauTw7gDEhz/+InTN8M+gBnhMtw= -github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.27.15-k3s1/go.mod h1:h+r/6tHitIBe3xh0hCgvdplD8mRZEJVg7IP8g7O45Pg= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.27.15-k3s1 h1:eCniUJdG5pOYRSxm0aFVYd0TAn8YdRcjSXGmcCOya8Y= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.27.15-k3s1/go.mod h1:F5c6ylm4dnDebf1zhgC1GaNRJjPtdQ89VLyujdK+h7g= -github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.27.15-k3s1 h1:3sWXJ3ZUGOojWOAZ0HG0SGJuCJv8UTRdStzJJ75v+XY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.27.15-k3s1/go.mod h1:axSKaScInHdu8DOm2oMtVn5XXFN7OitpK+EhooSCOTY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.27.15-k3s1 h1:d9NK3NicypOy3Ui4qpn/fM6HXnvRyVjSAeI/3ycUztY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.27.15-k3s1/go.mod h1:GECh4mhMdx9avg++N+A1zzq8ZL3O1ywttWWmTcS9Sj8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.27.15-k3s1 h1:6Plq758UuxDgAgCPJz+cNaZaaMmUB+mOsp2E/RscBsY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.27.15-k3s1/go.mod h1:RBTjrm34Pa+ic57WHBqXCrySBy9fHoZAXr4iYTl0fc8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.27.15-k3s1 h1:5U6QMtpyKxRpp8dwawR8pTGA72Y1A0QN6jLAEs3CLDs= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.27.15-k3s1/go.mod h1:9mnKdNbElTkRICL1XGAHk5zsXsyBfx6HUBGdXydGR60= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.27.15-k3s1 h1:89MOFDd3eAJ3Lis3HlBlonC/Ju/oHe1YXPNbIxP76hU= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.27.15-k3s1/go.mod h1:wEQYtyJryiTju8PAgnWXnfpVLsRHgk1vd8eSU3U/EM0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.27.15-k3s1 h1:P9by2glofQT4u27/OhtZ7E2ojNckhs8ZoV2cshGi/c0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.27.15-k3s1/go.mod h1:IZn62O7yycrrmgZyLmsb7TKEsTX522JeH88Ie/AARFs= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.27.15-k3s1 h1:ek3t84ZtZLwULlaDCxb7pELwsvQcjd5aY1sVtjC2F7k= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.27.15-k3s1/go.mod h1:VS1/stRJkv1d+bhHoKK5MUETwxwFPX1K4mkyelCvYsY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.27.15-k3s1 h1:BBkg+fZ8OtjnzukxzR5B0EFh7DkiYnFroLKR8dv1O5k= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.27.15-k3s1/go.mod h1:MBqXCSWqjj+ntJoiSXBVXqeQ4Yaxm502+dwVJnO5d5s= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.27.15-k3s1 h1:6IzWkZxsI4UHPb1YcVvLEnJHyXidDmcwWdm7KIqlQkg= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.27.15-k3s1/go.mod h1:NJoK5HWfqxJPp3C3aDGTqPS5LO/QNaFM3tfUPa8/AFQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.27.15-k3s1 h1:dtzehbjUUZwflnwukldjGa5eT7gH4OLUPhxIjEseSNY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.27.15-k3s1/go.mod h1:ruxTthLLPjlMUmm/FmzRWoLIGROIfr0alAYOzK4TAws= -github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.27.15-k3s1 h1:vHNmoHeg5uTDCeYXck71kxvNXtsKK/vKxdrd6mfCrZY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.27.15-k3s1/go.mod h1:ZH6GownaMleqPWwtbyAdtK2P5LRbWkJs9m9XyB/BcVI= -github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.27.15-k3s1 h1:H46ii7ah3PHs7xQkuUXMYsrmYzFVmezQBXMPVBvrAhg= -github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.27.15-k3s1/go.mod h1:qBn/yIz2kGgQrNlMhLU2Dcajkc92AZkjIsvqr8q7ARY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.27.15-k3s1 h1:bfiFEmFfJxf6PvU6jBQNGAdqBZiFoLEBKH4mOUZpdmA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.27.15-k3s1/go.mod h1:tY0Mpldpp2QPbKDMRjU2iFmlvFV9LEKRfPNoOw21XYk= +github.com/k3s-io/kubernetes v1.27.16-k3s1 h1:/5eMYv8aD9JSX6gPGToTLgXbzLrDDONj3Nr66cu1Ysk= +github.com/k3s-io/kubernetes v1.27.16-k3s1/go.mod h1:T4toI2XSWG5FJoq/H8q9eFYPymAxe/k4UnaC00uPnMs= +github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.27.16-k3s1 h1:8pJYzBGy+Ce8ApEMTlaydt6Mi1LURbQ5ocT20Y1gEYY= +github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.27.16-k3s1/go.mod h1:QIR5QebyXKoLm1LCtJTryzjYWx+iFUG/IxhoRsYn/E8= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.27.16-k3s1 h1:LYffOVuNJm3XjSy9+NtlX9ibjW7wAXzlVPZSA5eaStk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.27.16-k3s1/go.mod h1:KaEKv8/8HtOltbT23YYcYTRhaFpovdKxGkbxD+kjKI4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.27.16-k3s1 h1:dzGgZbap/7TFCBxD1NspYKKSRP+bL6N8fmPi+jLtLts= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.27.16-k3s1/go.mod h1:S+90/g/AT313nSBhhJrp7GXLVggOzlUomqeZvnNbi6Y= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.27.16-k3s1 h1:oFOoCtagjLKbo7NhwPsIF7BhpXrZ55fFAEKJzlj5xck= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.27.16-k3s1/go.mod h1:hkKXPcOyKWEz7zmQc/8wY8xCf7fHxQPagQWaCTfleg0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.27.16-k3s1 h1:anmOLKFTj/gmOc97rYKAf0N15D6S9lWo+TpNfI0BTZE= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.27.16-k3s1/go.mod h1:ZNYI7sfQyOV7DBzt65OdF4kdgm6zMlUAklbahM98QCc= +github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.27.16-k3s1 h1:ybKfkhUAcFAyYo/zVuGJp7OOtofn+LeSlWoed5mD7tU= +github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.27.16-k3s1/go.mod h1:llqJdNKyvckdsrqmSZdBTnKQcqdov4MG8AHrNjwyzB0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.27.16-k3s1 h1:B3YzptmQPdZdayze0dI747GGbhtdaDRmJp6DT09UFQc= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.27.16-k3s1/go.mod h1:ywjhL7dDJx5/Ws70LWdb7JhpIvHx1z7rk7Fnm92An9U= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.27.16-k3s1 h1:iBqbQBsPGpvcrybzjPS7YECc33rF36OOxHP4fOpnxtc= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.27.16-k3s1/go.mod h1:572lTEGrgw8Eeg2/vM5/tbGFLQ6VPzPvAV1cwr7HH6o= +github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.27.16-k3s1/go.mod h1:3zrB8vRPbcpGGFVd1YfHMfm2stYgIAMoI2QPUe0YrmE= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.27.16-k3s1 h1:sZ5ym4xse99Q3mfdjPbyBHlQzV4QiaDrnYlp6Pugo1c= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.27.16-k3s1/go.mod h1:FO91l+rMrmpAXrFZM1Ad0G53BfuHKtrzcAwtyUw7DtQ= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.27.16-k3s1 h1:t+2tP11me6E0bHi5c/uP2h8KucKANnltj+obMF0ruNA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.27.16-k3s1/go.mod h1:YqllO6ohcEX89/ePx58NJsZ5h7gXdyLr06N/Uwp0mgE= +github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.27.16-k3s1 h1:b8WB87iLHZT3v3X2nt6yl7q1+fARYCn+0JNkzgH1ZYA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.27.16-k3s1/go.mod h1:h+r/6tHitIBe3xh0hCgvdplD8mRZEJVg7IP8g7O45Pg= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.27.16-k3s1 h1:DDgv9ZUdKKADT5vooGixU3TEbrS5gtp2wGZl4uK+Hw4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.27.16-k3s1/go.mod h1:F5c6ylm4dnDebf1zhgC1GaNRJjPtdQ89VLyujdK+h7g= +github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.27.16-k3s1 h1:IRaVGnh2fY8ol2Xwn8NXWI8P5LXBI9srE0YhO7FXWys= +github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.27.16-k3s1/go.mod h1:axSKaScInHdu8DOm2oMtVn5XXFN7OitpK+EhooSCOTY= +github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.27.16-k3s1 h1:d1KMUm/vPrlvbBMjOGezaWQrM54ZV486Uw+Nn3ftUHE= +github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.27.16-k3s1/go.mod h1:GECh4mhMdx9avg++N+A1zzq8ZL3O1ywttWWmTcS9Sj8= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.27.16-k3s1 h1:3FSNiFdJkPW8R4zgWW9Ue6zb7gFcN/YcNiz29gEZSjA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.27.16-k3s1/go.mod h1:RBTjrm34Pa+ic57WHBqXCrySBy9fHoZAXr4iYTl0fc8= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.27.16-k3s1 h1:NpQmZKesc4TByuYIsxH6Cc24RVqQVsQ4XRORQpa/WN0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.27.16-k3s1/go.mod h1:9mnKdNbElTkRICL1XGAHk5zsXsyBfx6HUBGdXydGR60= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.27.16-k3s1 h1:MOiFNwvHY/uM2mpjTHETV9RezaaC3mRkQ0d/+sAGRBM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.27.16-k3s1/go.mod h1:wEQYtyJryiTju8PAgnWXnfpVLsRHgk1vd8eSU3U/EM0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.27.16-k3s1 h1:xWb6+fcd5k5jNXBYBoymtkagQHeqMimeBAIi/C4ISeI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.27.16-k3s1/go.mod h1:IZn62O7yycrrmgZyLmsb7TKEsTX522JeH88Ie/AARFs= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.27.16-k3s1 h1:v2a4l99QempzZc8D85olZHf8pRj+rEAHV/X/6DuK258= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.27.16-k3s1/go.mod h1:VS1/stRJkv1d+bhHoKK5MUETwxwFPX1K4mkyelCvYsY= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.27.16-k3s1 h1:2D9xFuxImsZuaSINC3Y1eekSFbLHKQ5wy4SiUlGk2Ps= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.27.16-k3s1/go.mod h1:MBqXCSWqjj+ntJoiSXBVXqeQ4Yaxm502+dwVJnO5d5s= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.27.16-k3s1 h1:TuZvb9niBPvZId0okCpfMJiNDO0cGMkJRLQNaXFa0+A= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.27.16-k3s1/go.mod h1:NJoK5HWfqxJPp3C3aDGTqPS5LO/QNaFM3tfUPa8/AFQ= +github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.27.16-k3s1 h1:h+udXwGjAvJZwnui/NxbxJim/PAhuwDPFj3/RREcsYk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.27.16-k3s1/go.mod h1:ruxTthLLPjlMUmm/FmzRWoLIGROIfr0alAYOzK4TAws= +github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.27.16-k3s1 h1:Lb9n+t2kL6AxaU1E+6iC1RXerjxrkGBTcyuomciXNaY= +github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.27.16-k3s1/go.mod h1:ZH6GownaMleqPWwtbyAdtK2P5LRbWkJs9m9XyB/BcVI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.27.16-k3s1 h1:6QheLeHrkPaw638OKLiRzSaSPm5yozwOLbTcz4OBLy0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.27.16-k3s1/go.mod h1:qBn/yIz2kGgQrNlMhLU2Dcajkc92AZkjIsvqr8q7ARY= +github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.27.16-k3s1 h1:/K4JYWhkMhxaC+5SYC/PNaA/owQToPFbJCPYu4z7+3c= +github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.27.16-k3s1/go.mod h1:tY0Mpldpp2QPbKDMRjU2iFmlvFV9LEKRfPNoOw21XYk= 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= @@ -1534,8 +1541,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.3.6 h1:iAFWeiFNra6tYlt4k+jINrK3hOxZ8mjW2S/9nA6sxKs= github.com/rancher/dynamiclistener v0.3.6/go.mod h1:VqBaJNi+bZmre0+gi+2Jb6jbn7ovHzRueW+M7QhVKsk= -github.com/rancher/lasso v0.0.0-20230830164424-d684fdeb6f29 h1:+kige/h8/LnzWgPjB5NUIHz/pWiW/lFpqcTUkN5uulY= -github.com/rancher/lasso v0.0.0-20230830164424-d684fdeb6f29/go.mod h1:kgk9kJVMj9FIrrXU0iyM6u/9Je4bEjPImqswkTVaKsQ= +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= @@ -1809,8 +1816,9 @@ go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= -go.etcd.io/bbolt v1.3.9 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= @@ -1940,8 +1948,8 @@ golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8= -golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= +golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -2117,8 +2125,8 @@ golang.org/x/tools v0.10.0/go.mod h1:UJwyiVBsOA2uwvK/e5OY3GTpDUJriEd+/YlqAwLPmyM golang.org/x/tools v0.11.0/go.mod h1:anzJrxPjNtfgiYQYirP2CPGzGLxrH2u2QBhn6Bf3qY8= golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0= -golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ= -golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg= +golang.org/x/tools v0.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY= +golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -2158,7 +2166,7 @@ google.golang.org/genproto/googleapis/api v0.0.0-20230526203410-71b5a4ffd15e/go. google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig= google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98/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/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= google.golang.org/genproto/googleapis/rpc v0.0.0-20230526203410-71b5a4ffd15e/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= @@ -2169,6 +2177,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/grpc v1.58.3 h1:BjnpXut1btbtgN/6sp+brB2Kbm2LjNXnidYujAVbSoQ= google.golang.org/grpc v1.58.3/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= From 0ad49563516cd6ded795f785d08a929dafbba7ac 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 cb0155ad1e..0844019b41 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