From 64403978cdd4d098fa31cf3a6978a80e74327e2a Mon Sep 17 00:00:00 2001 From: Matt Trachier Date: Thu, 13 Oct 2022 19:26:57 -0500 Subject: [PATCH] Update to v1.25.3-k3s1 (#6269) Signed-off-by: matttrach --- .github/workflows/integration.yaml | 2 +- .github/workflows/unitcoverage.yaml | 2 +- Dockerfile.dapper | 2 +- Dockerfile.manifest | 2 +- Dockerfile.test | 2 +- go.mod | 86 ++++++++++----------- go.sum | 116 ++++++++++++++-------------- 7 files changed, 107 insertions(+), 105 deletions(-) diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml index f3c27d138a..79af25a50e 100644 --- a/.github/workflows/integration.yaml +++ b/.github/workflows/integration.yaml @@ -35,7 +35,7 @@ jobs: - name: Install Go uses: actions/setup-go@v3 with: - go-version: '1.19.1' + go-version: '1.19.2' check-latest: true cache: true cache-dependency-path: | diff --git a/.github/workflows/unitcoverage.yaml b/.github/workflows/unitcoverage.yaml index 1dbf163ca9..4d26e26f80 100644 --- a/.github/workflows/unitcoverage.yaml +++ b/.github/workflows/unitcoverage.yaml @@ -37,7 +37,7 @@ jobs: - name: Install Go uses: actions/setup-go@v3 with: - go-version: '1.19.1' + go-version: '1.19.2' check-latest: true cache: true cache-dependency-path: | diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 3192b9c311..e70dfc6ba4 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -1,4 +1,4 @@ -ARG GOLANG=golang:1.19.1-alpine3.15 +ARG GOLANG=golang:1.19.2-alpine3.15 FROM ${GOLANG} ARG http_proxy=$http_proxy diff --git a/Dockerfile.manifest b/Dockerfile.manifest index 9f3c8abb7a..b8b64b40f7 100644 --- a/Dockerfile.manifest +++ b/Dockerfile.manifest @@ -1,4 +1,4 @@ -ARG GOLANG=golang:1.19.1-alpine3.15 +ARG GOLANG=golang:1.19.2-alpine3.15 FROM ${GOLANG} COPY --from=plugins/manifest:1.2.3 /bin/* /bin/ diff --git a/Dockerfile.test b/Dockerfile.test index 37ad9dfd2c..8c8e1b0844 100644 --- a/Dockerfile.test +++ b/Dockerfile.test @@ -1,4 +1,4 @@ -ARG GOLANG=golang:1.19.1-alpine3.15 +ARG GOLANG=golang:1.19.2-alpine3.15 FROM ${GOLANG} as test-base RUN apk -U --no-cache add bash jq diff --git a/go.mod b/go.mod index 1ef59f35be..69e0da438d 100644 --- a/go.mod +++ b/go.mod @@ -31,37 +31,37 @@ replace ( google.golang.org/genproto => google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 google.golang.org/grpc => google.golang.org/grpc v1.40.0 gopkg.in/square/go-jose.v2 => gopkg.in/square/go-jose.v2 v2.2.2 - k8s.io/api => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.25.2-k3s1 - k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.25.2-k3s1 - k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.25.2-k3s1 - k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.25.2-k3s1 - k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.25.2-k3s1 - k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.25.2-k3s1 - k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.25.2-k3s1 - k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.25.2-k3s1 - k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.25.2-k3s1 - k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.25.2-k3s1 - k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.25.2-k3s1 - k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.25.2-k3s1 - k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.25.2-k3s1 - k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.25.2-k3s1 + k8s.io/api => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.25.3-k3s1 + k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.25.3-k3s1 + k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.25.3-k3s1 + k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.25.3-k3s1 + k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.25.3-k3s1 + k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.25.3-k3s1 + k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.25.3-k3s1 + k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.25.3-k3s1 + k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.25.3-k3s1 + k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.25.3-k3s1 + k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.25.3-k3s1 + k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.25.3-k3s1 + k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.25.3-k3s1 + k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.25.3-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.60.1-k3s1 // k3s-main - k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.25.2-k3s1 - k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.25.2-k3s1 - k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.25.2-k3s1 - k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.25.2-k3s1 - k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.25.2-k3s1 - k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.25.2-k3s1 - k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.25.2-k3s1 - k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.25.2-k3s1 - k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.25.2-k3s1 - k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.25.2-k3s1 - k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.25.2-k3s1 - k8s.io/pod-security-admission => github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.25.2-k3s1 - k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.25.2-k3s1 - k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.25.2-k3s1 - k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.25.2-k3s1 + k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.25.3-k3s1 + k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.25.3-k3s1 + k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.25.3-k3s1 + k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.25.3-k3s1 + k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.25.3-k3s1 + k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.25.3-k3s1 + k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.25.3-k3s1 + k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.25.3-k3s1 + k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.25.3-k3s1 + k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.25.3-k3s1 + k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.25.3-k3s1 + k8s.io/pod-security-admission => github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.25.3-k3s1 + k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.25.3-k3s1 + k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.25.3-k3s1 + k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.25.3-k3s1 mvdan.cc/unparam => mvdan.cc/unparam v0.0.0-20210104141923-aac4ce9116a7 ) @@ -107,7 +107,7 @@ require ( github.com/robfig/cron/v3 v3.0.1 github.com/rootless-containers/rootlesskit v1.0.1 github.com/sirupsen/logrus v1.9.0 - github.com/stretchr/testify v1.7.1 + github.com/stretchr/testify v1.8.0 github.com/urfave/cli v1.22.9 github.com/vishvananda/netlink v1.2.1-beta.2 github.com/yl2chen/cidranger v1.0.2 @@ -124,17 +124,17 @@ require ( google.golang.org/grpc v1.47.0 gopkg.in/yaml.v2 v2.4.0 inet.af/tcpproxy v0.0.0-20200125044825-b6bb9b5b8252 - k8s.io/api v0.25.2 - k8s.io/apimachinery v0.25.2 - k8s.io/apiserver v0.25.2 + k8s.io/api v0.25.3 + k8s.io/apimachinery v0.25.3 + k8s.io/apiserver v0.25.3 k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible - k8s.io/cloud-provider v0.25.2 - k8s.io/component-base v0.25.2 - k8s.io/component-helpers v0.25.2 - k8s.io/cri-api v0.25.2 + k8s.io/cloud-provider v0.25.3 + k8s.io/component-base v0.25.3 + k8s.io/component-helpers v0.25.3 + k8s.io/cri-api v0.25.3 k8s.io/klog v1.0.0 - k8s.io/kubectl v0.25.2 - k8s.io/kubernetes v1.25.2 + k8s.io/kubectl v0.25.3 + k8s.io/kubernetes v1.25.3 k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed sigs.k8s.io/yaml v1.3.0 ) @@ -326,7 +326,7 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980 // indirect github.com/stoewer/go-strcase v1.2.0 // indirect - github.com/stretchr/objx v0.2.0 // indirect + github.com/stretchr/objx v0.4.0 // indirect github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect github.com/tchap/go-patricia v2.3.0+incompatible // indirect github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect @@ -387,7 +387,7 @@ require ( k8s.io/cli-runtime v0.22.2 // indirect k8s.io/cluster-bootstrap v0.0.0 // indirect k8s.io/code-generator v0.24.0 // indirect - k8s.io/controller-manager v0.25.2 // indirect + k8s.io/controller-manager v0.25.3 // indirect k8s.io/csi-translation-lib v0.0.0 // indirect k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect k8s.io/klog/v2 v2.70.1 // indirect @@ -399,9 +399,9 @@ 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.25.2 // indirect + k8s.io/mount-utils v0.25.3 // indirect k8s.io/pod-security-admission v0.0.0 // indirect - sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.32 // indirect + sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33 // indirect sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect sigs.k8s.io/kustomize/api v0.12.1 // indirect sigs.k8s.io/kustomize/kustomize/v4 v4.5.7 // indirect diff --git a/go.sum b/go.sum index ea244a0017..7725521085 100644 --- a/go.sum +++ b/go.sum @@ -679,57 +679,57 @@ github.com/k3s-io/klog/v2 v2.60.1-k3s1 h1:C1hsMF1Eo6heGVQzts6cZ+rDZAReSiOBUxsYMu github.com/k3s-io/klog/v2 v2.60.1-k3s1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= github.com/k3s-io/kube-router v1.5.1-0.20220630214451-a43bcd8511d2 h1:AMTXNbNnFDCO6OeLUbG9OONyBLHMYUcolU5T66xHkbk= github.com/k3s-io/kube-router v1.5.1-0.20220630214451-a43bcd8511d2/go.mod h1:qwtM4SC13qwpq56JjKZ/Hm6m7MCu3OiU/9sVYvmrycg= -github.com/k3s-io/kubernetes v1.25.2-k3s1 h1:ps0qXdKdQmxJ1Y3T6Ykm3EsfdG3LhoZXB61t4LPkcvA= -github.com/k3s-io/kubernetes v1.25.2-k3s1/go.mod h1:OlhMy4mww2SLr1KtdV1vC014/MwfYlts/C66gtnDkKE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.25.2-k3s1 h1:/J6MWo5W0jTSMjcuySJohGoj6A3m2fO9UOdqRahSRDE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.25.2-k3s1/go.mod h1:wvMgOM5Av+A4jB2697Nd/g3aPCgj8YEVsmJpGmfopZk= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.25.2-k3s1 h1:loGGtOvOEm6X7GFjR4rqb3XiSYI+q1LobZuFDI7QGwg= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.25.2-k3s1/go.mod h1:wvUiiJ1cSEmgkaIPwANpAy/opBm7PU8KndyDyjrJ0KQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.25.2-k3s1 h1:K8/ezFxiJTyWBKnFMC05CtK2GbsXBFUM7Xt7byqh3Fo= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.25.2-k3s1/go.mod h1:vM6raI5G7nvbTN88iIRp57Iyr+JqMS3EdMZR+hmvI74= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.25.2-k3s1 h1:Vf6QsUaRPM91mimbzkpJ4Fn1llmJMV+dpfiWaoju0mI= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.25.2-k3s1/go.mod h1:IEYLN7rCUDUYW+KNk6COLKJ7ZmRptpWSzvvlZilPuIA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.25.2-k3s1 h1:SUPQxUpgBZSGOHAXYQBinyyiFSjQIYKkZLMLzM9mEp0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.25.2-k3s1/go.mod h1:inWX+hRBFEmY9BWjjz3258LXo0sFhq3mlMS/zLqosAc= -github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.25.2-k3s1 h1:bPo4sIbzHpOt0y5R1Qw/OFEaQU1EZww2hFP+PoIzu/8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.25.2-k3s1/go.mod h1:WPKhWQ8eR2VxuPXxJqSQLDwWi0gh5mHw7BxxvP+dhFU= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.25.2-k3s1 h1:F5IsEqHS+qfeVQArUqL9I8J4IJQfRFBXF8kVYMYMeI4= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.25.2-k3s1/go.mod h1:bjCFUvxddDW+FeuAol8sOtXK02etI6NYHdbmfrGpbDI= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.25.2-k3s1 h1:evPMcxQkHI4nWhDPBKjI+x/RMb3076E7w9+xvApibx0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.25.2-k3s1/go.mod h1:kQtEocKbT8p/hQHM9UeC7PRY5Nqsnkg0VeQTg/B/qgU= -github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.25.2-k3s1 h1:RYISVBsJGMPI/kZ6q0VZ3ARDmwyErAuFRnmuvtk75xM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.25.2-k3s1/go.mod h1:Vu0aQHjOEoSgpw8/vZZWv8bBnYFiTypdvFZC0iB8rxI= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.25.2-k3s1 h1:qhRwqF9mKJnGdGh+Ho879aVrbff/bJzWSjOO/xbjoh4= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.25.2-k3s1/go.mod h1:jkPkm8xMLsXfuFcsom7s/2j/8Wd1+c8k0CaNm0m/xGw= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.25.2-k3s1 h1:AS3LIJB7nDnY963V06faSTSP74U/RCLfixL6s0tzQPg= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.25.2-k3s1/go.mod h1:4UjptCN6e4loBUfs0h1R7kevZfGg1cMW1DiMdHNv7oY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.25.2-k3s1 h1:+waSuBTDWYRPrGGHt6ljEYed91gqshsD854JnnBDETA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.25.2-k3s1/go.mod h1:sU/Wg23n3eEY+zH1l7uKk6i/XG07FddteJQmX/v6mi4= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.25.2-k3s1 h1:yL0HoPTig5BaSzNwz8RJSssp1Q3CHE4I5C9r/fOcuc8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.25.2-k3s1/go.mod h1:2LFpaWXEd8PJYF1xnz46lCU4xfbg3O3YHgkLU+ZPIZ0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.25.2-k3s1 h1:TXTi0271UgTECf2pv14BfcGRPf64W7q5FJdD7xAgr78= -github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.25.2-k3s1/go.mod h1:aFc9omOWDcTcj1O7UMNVO1M2ncZ/962NOz1fey7Kz/Y= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.25.2-k3s1 h1:I8nziwNhPO51EfZdPIvQ+moIjP8anlhhvYHmBDPPNTY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.25.2-k3s1/go.mod h1:0aKg89lhJONBYW7H3kHg4kjn85W/awEO97OKAt9LJTM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.25.2-k3s1 h1:iVmmXoqVvtL8/CGBJZinmyA+vi0ueoa+wnk7ZA4iPyE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.25.2-k3s1/go.mod h1:XkGYt1v3TsRhw2YhJCDINgdiOHpr1wW1HcXhLGwfSx4= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.25.2-k3s1 h1:S2nuxGcuNTAjiCdbCj5V5PDrez9qZg1jm306U0/z55w= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.25.2-k3s1/go.mod h1:5GZH00/YrMKONtqNvexlj7ziy2bp8x3khtUdGZvXwUw= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.25.2-k3s1 h1:9NpkXCaY8sBR8qprkV9M0yzAhC0y1DxJ1O4dHgfNw0Y= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.25.2-k3s1/go.mod h1:pbpOZITqscSg+osCNe6WnboJFzEEWZsG9jh1qzjluDg= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.25.2-k3s1 h1:1wgtWb/7jNW7wtJKRT+JSPJiA1GoSS0CoX8JvDXL9x8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.25.2-k3s1/go.mod h1:049xURDos4SNMOjwu5DtpYHDAbIULQFkQJB5SxwOW/c= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.25.2-k3s1 h1:z2tcGR9RQOutSlDB7AW1PR8yWJHtJlKqOv7t7jCZkYU= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.25.2-k3s1/go.mod h1:G0TM5PU+ALqSGPjSXZB5wOpOWApdNkCBwMD3r1v0z0o= -github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.25.2-k3s1 h1:kRphBF4w2XiEcw5n+Oy8zTTFoIEORkz1UgL7xaLfcwI= -github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.25.2-k3s1/go.mod h1:FO33IO/BAupssNt4gSsA6SlL7c7ZAxx6Zzjox8wkI2I= -github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.25.2-k3s1 h1:QUPbKqqeH09vfuF/EVrSi2Gp1zq8Sm6j4jfL0g5ubH0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.25.2-k3s1/go.mod h1:bT9UtMfmBcP6wNpelKpMzUrjRB07e6hX5BHt6B6HF/E= -github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.25.2-k3s1 h1:5rHeZ9OMKGH7QXO0i8kv3QWRDTdm63OLdhl8WJIU1YE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.25.2-k3s1/go.mod h1:YxtPi+a+eiz9JvIICzyaK9r9FfPb1BIx/rowusM2tGU= -github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.25.2-k3s1 h1:6hQVaWCJz19RCT0jDzNt28cU+M+mP+yIuqb6inCQCRc= -github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.25.2-k3s1/go.mod h1:a7g+y/kbzRIjglPHuoC4Kl3ME4JLpSeZ3X15nF3egSM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.25.2-k3s1/go.mod h1:Ve5QCbplxzZPn8/7SPTpcGqFpk28UfMQgfbp1AM19ZI= +github.com/k3s-io/kubernetes v1.25.3-k3s1 h1:8f7YI1oy1SfUgLChqLrdzg1SrqS8Oh9K3Bm9JgOpB9A= +github.com/k3s-io/kubernetes v1.25.3-k3s1/go.mod h1:lvEY+3iJhh+sGIK1LorGkI56rW0eLGsfalnp68wQwYU= +github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.25.3-k3s1 h1:UQi6J9KXQgx0c3WqvJ3wqU8XIgpORzaK269oWbV782g= +github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.25.3-k3s1/go.mod h1:wjRFTXXZymwTTM1+dzztXh20Ujp21kJSfdUIz7N5IKY= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.25.3-k3s1 h1:3Le71FCvRqYxqmiZXM2pCRSmxvXc+j91HB73iCbnmiQ= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.25.3-k3s1/go.mod h1:rlHPlyHmZ+P2BeqS3Zod24q+zS2JVZ4KcRi4wRjfR4g= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.25.3-k3s1 h1:+QGSogtFxBTYZMONTPSxZSjlINUh0scPgV8MPmg/Gi4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.25.3-k3s1/go.mod h1:H4xpF1hftG+e4p/Gh9Z3Z+lgRIfWU+ixFP2Mqd6ZqJw= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.25.3-k3s1 h1:hDWHHqQUISkxDv34HkfohYiOdFpK8ukiVmV1iPB9r/s= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.25.3-k3s1/go.mod h1:gpLtc297xJg44+C/jttW5ZDNnCTp+JiVmeFCKjxKk/8= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.25.3-k3s1 h1:5oS4fUN+C41z+pXnOevKGxYTokiqz8YEPdKYzCtES3I= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.25.3-k3s1/go.mod h1:JV7sp4PCFf8PRZ6aJc67/aiQyhF3DggqJsq5az5ZMO4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.25.3-k3s1 h1:X850ybfskUAglx7vHfWWeb2JrJI+qZi0IqAKZsSzcNQ= +github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.25.3-k3s1/go.mod h1:pyRKsq9uUmpchY0VDoMChkIHcTU2PWz2L9SW7ZbIxaI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.25.3-k3s1 h1:3jc1nHYafdkTPHjZa78OOCdwsP148ECqYtsNlmwu3FM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.25.3-k3s1/go.mod h1:NPc228CI/24ePftLz0NA7HPkc3lus5T99BwYHPXiTho= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.25.3-k3s1 h1:d/Aqb0Eroh8W7JMk5uh04EobaRsvW7I2Em47SfjJ3N0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.25.3-k3s1/go.mod h1:XoaROISKxlHYNLfzGtFkEizsn1BiUynQU7fj+RYD+1c= +github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.25.3-k3s1 h1:NgE373nmrMOzsziHffn0SLlK1xFsFM38fQ4OUDWIWs8= +github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.25.3-k3s1/go.mod h1:5bEIk1BBY5UHGsZjHTNAZdtM1+4twQb/B2O8B7vqJTI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.25.3-k3s1 h1:tHFrC8ETq+o/Tfe7CH1ivTV/Zz3WpFPaB7iYVxuR6fE= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.25.3-k3s1/go.mod h1:hDStPwnclwHN5HEz0o8Zf8daFpZGE2ZsnUIgx5e5Z4M= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.25.3-k3s1 h1:WPn+xTfakDJxGvweL4pT8BE+ywg1SCWpaMdRZX4cT0U= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.25.3-k3s1/go.mod h1:4UjptCN6e4loBUfs0h1R7kevZfGg1cMW1DiMdHNv7oY= +github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.25.3-k3s1 h1:h/dVlH2EFtMFgHiLZ5KPnMyklB29Wcg+hRxcmmmCeL0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.25.3-k3s1/go.mod h1:AwNQ21OAxFMkw57sbLhIefr7uhRCgoscLoQQembtQ7k= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.25.3-k3s1 h1:2HVc+dAi3CANIzqGxWyLQaEfEx09Lm0x11L4G5fyo54= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.25.3-k3s1/go.mod h1:ttX089LC/ZXNRGycQWkSdAD7iUMfC7M/HAtUocN0JXU= +github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.25.3-k3s1 h1:+GgzPyhyGAUV6zlR71ip7iudHoAeIH2CoIbKi/qaX4g= +github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.25.3-k3s1/go.mod h1:MckRs2LMf6uVe5Dc/VHn2pojefo8K0VvsnFHYaIQlpg= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.25.3-k3s1 h1:k6Cuk4zCga2V8jgPK+wsU7ETfjo2j7w6ObLHWAAW9w8= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.25.3-k3s1/go.mod h1:7BlImxwC/exXwYlzdFcDrU5971WbLqPkxrLdCi0Wrbg= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.25.3-k3s1 h1:niRhtf04m0MFNANIfPgzxpv/VN3odiwPyZ31/rXgVBg= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.25.3-k3s1/go.mod h1:XkGYt1v3TsRhw2YhJCDINgdiOHpr1wW1HcXhLGwfSx4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.25.3-k3s1 h1:OScmatISYAp9mZmI11Xvk1y1gww6iqnpD9l0AldPeLM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.25.3-k3s1/go.mod h1:5GZH00/YrMKONtqNvexlj7ziy2bp8x3khtUdGZvXwUw= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.25.3-k3s1 h1:0Z/lPtkfXB7dYEVwN5PJaUrnsn08s/K3z1mPjUf7DEY= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.25.3-k3s1/go.mod h1:pbpOZITqscSg+osCNe6WnboJFzEEWZsG9jh1qzjluDg= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.25.3-k3s1 h1:eulTBSSZizpJi41cg3tWwJTjvCvSH+L/x8sMzuHK0k0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.25.3-k3s1/go.mod h1:yXeGpCulm686/gh5Kn8fTeZ1Y6Ee4XSsVLB3X+tudpQ= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.25.3-k3s1 h1:uSSQ3LkRfplIlrrouEnH5mZzs1EAOZd3+cIKt4ljDDo= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.25.3-k3s1/go.mod h1:G0TM5PU+ALqSGPjSXZB5wOpOWApdNkCBwMD3r1v0z0o= +github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.25.3-k3s1 h1:YYNvk4HmaEPvamJKIoeE9hXWkOyebvuiN4Y3E68Sbws= +github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.25.3-k3s1/go.mod h1:/D56oDpSC+5GMgC5U451GWPmaO7K+elp47XlXkf7DO8= +github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.25.3-k3s1 h1:9JQR9GmgMYs9IWiSbLGhZgyYxEH8g6D6gRJSDpeiFpY= +github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.25.3-k3s1/go.mod h1:+8o4FADtQ3BMWV/P5C0365mucwzzf78/LOPsrVmQXGw= +github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.25.3-k3s1 h1:zsEb6BH3UmED/O6fkWafp12T5duLANKZvplYJIIuFp0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.25.3-k3s1/go.mod h1:RdND6kf45dn+BhLsd5rFKLA5kchAyjaL9Ag/kY3PWbc= +github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.25.3-k3s1 h1:zRreQ6DqreN9TvbD2zTtzdclf+sjLoJH0L1rekOmMuc= +github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.25.3-k3s1/go.mod h1:UXa1SCtlt+sdjF4COcwEsWS4SA2pqktxmZKHQRqyy+c= +github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.25.3-k3s1/go.mod h1:Uf/5aiSpuf/56f2iVq/HsQlBGerTbxYkf5k3XiRMK+E= github.com/karrick/godirwalk v1.16.1 h1:DynhcF+bztK8gooS0+NDJFrdNZjJ3gzVzC545UNA9iw= github.com/karrick/godirwalk v1.16.1/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= @@ -1105,8 +1105,9 @@ github.com/stoewer/go-strcase v1.2.0 h1:Z2iHWqGXH00XYgqDmNgQbIBxf3wrNq0F3feEy0ai github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.3-0.20181224173747-660f15d67dbb/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= @@ -1114,8 +1115,9 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 h1:kdXcSzyDtseVEc4yCz2qF8ZrQvIDBJLl4S1c3GCXmoI= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= @@ -1241,8 +1243,9 @@ go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/goleak v1.1.10 h1:z+mqJhf6ss6BSfSM671tgKyZBFPTTJM+HLxnhPC3wu0= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= +go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= +go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= @@ -1281,7 +1284,6 @@ golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRu golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug= golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= @@ -1596,8 +1598,8 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8 rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.32 h1:2WjukG7txtEsbXsSKWtTibCdsyYAhcu6KFnttyDdZOQ= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.32/go.mod h1:fEO7lRTdivWO2qYVCVG7dEADOMo/MLDCVr8So2g88Uw= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33 h1:LYqFq+6Cj2D0gFfrJvL7iElD4ET6ir3VDdhDdTK7rgc= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33/go.mod h1:soWkSNf2tZC7aMibXEqVhCd73GOY5fJikn8qbdzemB0= sigs.k8s.io/cli-utils v0.16.0/go.mod h1:9Jqm9K2W6ShhCxsEuaz6HSRKKOXigPUx3ZfypGgxBLY= sigs.k8s.io/cli-utils v0.27.0/go.mod h1:8ll2fyx+bzjbwmwUnKBQU+2LDbMDsxy44DiDZ+drALg= sigs.k8s.io/controller-runtime v0.4.0/go.mod h1:ApC79lpY3PHW9xj/w9pj+lYkLgwAAUZwfXkME1Lajns=