From 3b3d2d222b99eff950eb54b0aa85dd49fffd4a18 Mon Sep 17 00:00:00 2001 From: Derek Nola Date: Tue, 25 Jan 2022 09:16:20 -0800 Subject: [PATCH] [Engine-1.21] Update to v1.21.9 (#5005) * Backport #4861 Signed-off-by: Derek Nola * Update tags to k3s-io for v1.21.9 Signed-off-by: Derek Nola --- Dockerfile.dapper | 2 +- Makefile | 5 --- go.mod | 76 +++++++++++++++---------------- go.sum | 111 +++++++++++++++++++++++----------------------- 4 files changed, 94 insertions(+), 100 deletions(-) diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 74cc30230c..12e2ef646e 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -42,7 +42,7 @@ ENV SELINUX $SELINUX ENV DAPPER_RUN_ARGS --privileged -v k3s-cache:/go/src/github.com/rancher/k3s/.cache -v trivy-cache:/root/.cache/trivy ENV DAPPER_ENV REPO TAG DRONE_TAG IMAGE_NAME SKIP_VALIDATE GCLOUD_AUTH GITHUB_TOKEN GOLANG ENV DAPPER_SOURCE /go/src/github.com/rancher/k3s/ -ENV DAPPER_OUTPUT ./bin ./dist ./build/out +ENV DAPPER_OUTPUT ./bin ./dist ./build/out ./build/static ./pkg/static ./pkg/deploy ENV DAPPER_DOCKER_SOCKET true ENV HOME ${DAPPER_SOURCE} ENV CROSS true diff --git a/Makefile b/Makefile index a1dc61fc5e..d18f7c1884 100644 --- a/Makefile +++ b/Makefile @@ -22,11 +22,6 @@ release: .PHONY: $(TARGETS) -.PHONY: generate -generate: build/data - ./scripts/download - go generate - build/data: mkdir -p $@ diff --git a/go.mod b/go.mod index 254c78b9df..e9f2c406f0 100644 --- a/go.mod +++ b/go.mod @@ -36,36 +36,36 @@ replace ( google.golang.org/genproto => google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884 google.golang.org/grpc => google.golang.org/grpc v1.27.1 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.21.8-k3s1 - k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.21.8-k3s1 - k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.21.8-k3s1 - k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.21.8-k3s1 - k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.21.8-k3s1 - k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.21.8-k3s1 - k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.21.8-k3s1 - k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.21.8-k3s1 - k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.21.8-k3s1 - k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.21.8-k3s1 - k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.21.8-k3s1 - k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.21.8-k3s1 - k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.21.8-k3s1 - k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.21.8-k3s1 + k8s.io/api => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.21.9-k3s1 + k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.21.9-k3s1 + k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.21.9-k3s1 + k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.21.9-k3s1 + k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.21.9-k3s1 + k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.21.9-k3s1 + k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.21.9-k3s1 + k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.21.9-k3s1 + k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.21.9-k3s1 + k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.21.9-k3s1 + k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.21.9-k3s1 + k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.21.9-k3s1 + k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.21.9-k3s1 + k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.21.9-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.9.0-k3s2 // k3s-main - k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.21.8-k3s1 - k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.21.8-k3s1 - k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.21.8-k3s1 - k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.21.8-k3s1 - k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.21.8-k3s1 - k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.21.8-k3s1 - k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.21.8-k3s1 - k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.21.8-k3s1 - k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.21.8-k3s1 - k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.21.8-k3s1 - k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.21.8-k3s1 - k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.21.8-k3s1 - k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.21.8-k3s1 - k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.21.8-k3s1 + k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.21.9-k3s1 + k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.21.9-k3s1 + k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.21.9-k3s1 + k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.21.9-k3s1 + k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.21.9-k3s1 + k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.21.9-k3s1 + k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.21.9-k3s1 + k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.21.9-k3s1 + k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.21.9-k3s1 + k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.21.9-k3s1 + k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.21.9-k3s1 + k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.21.9-k3s1 + k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.21.9-k3s1 + k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.21.9-k3s1 mvdan.cc/unparam => mvdan.cc/unparam v0.0.0-20210104141923-aac4ce9116a7 ) @@ -91,7 +91,7 @@ require ( github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golangplus/testing v1.0.0 // indirect github.com/google/btree v1.0.1 // indirect - github.com/google/cadvisor v0.39.0 + github.com/google/cadvisor v0.39.3 github.com/google/uuid v1.2.0 github.com/gorilla/mux v1.8.0 github.com/gorilla/websocket v1.4.2 @@ -136,18 +136,18 @@ require ( google.golang.org/grpc v1.41.0 gopkg.in/yaml.v2 v2.4.0 inet.af/tcpproxy v0.0.0-20200125044825-b6bb9b5b8252 - k8s.io/api v0.21.8 - k8s.io/apimachinery v0.21.8 - k8s.io/apiserver v0.21.8 + k8s.io/api v0.21.9 + k8s.io/apimachinery v0.21.9 + k8s.io/apiserver v0.21.9 k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible - k8s.io/cloud-provider v0.21.8 - k8s.io/component-base v0.21.8 - k8s.io/controller-manager v0.21.8 // indirect - k8s.io/cri-api v0.21.8 + k8s.io/cloud-provider v0.21.9 + k8s.io/component-base v0.21.9 + k8s.io/controller-manager v0.21.9 // indirect + k8s.io/cri-api v0.21.9 k8s.io/klog v1.0.0 k8s.io/klog/v2 v2.9.0 - k8s.io/kubectl v0.21.8 - k8s.io/kubernetes v1.21.8 + k8s.io/kubectl v0.21.9 + k8s.io/kubernetes v1.21.9 k8s.io/utils v0.0.0-20210521133846-da695404a2bc sigs.k8s.io/yaml v1.2.0 ) diff --git a/go.sum b/go.sum index 7d7c693b7d..473fe71a99 100644 --- a/go.sum +++ b/go.sum @@ -436,8 +436,8 @@ github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Z github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= -github.com/google/cadvisor v0.39.0 h1:jai6dmBP9QAYluNGqU18yVUTw6uuyAW0AqtZIjvl8Qg= -github.com/google/cadvisor v0.39.0/go.mod h1:rjQFmK4jPCpxeUdLq9bYhNFFsjgGOtpnDmDeap0+nsw= +github.com/google/cadvisor v0.39.3 h1:Z04WmZQWsdZKxAdtqE8h68zyfpCu9LimRyDg3GOmrbc= +github.com/google/cadvisor v0.39.3/go.mod h1:kN93gpdevu+bpS227TyHVZyCU5bbqCzTj5T9drl34MI= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -595,55 +595,55 @@ github.com/k3s-io/klog v1.0.0-k3s2 h1:yyvD2bQbxG7m85/pvNctLX2bUDmva5kOBvuZ77tTGB github.com/k3s-io/klog v1.0.0-k3s2/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= github.com/k3s-io/klog/v2 v2.9.0-k3s2 h1:8Dzu3wGPFMo1mPEobSEpkHWH+HXqgFXp8R7FbcdgE8k= github.com/k3s-io/klog/v2 v2.9.0-k3s2/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= -github.com/k3s-io/kubernetes v1.21.8-k3s1 h1:QFt1ZyeYLYTrPBpfeemeEg5KHmfgi/Lc4Ib3tE5kzkM= -github.com/k3s-io/kubernetes v1.21.8-k3s1/go.mod h1:Fm7yqAUkZTbq0O/uwtzMdFY7nmmnxRrVdM2wjng3/2w= -github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.21.8-k3s1 h1:acuJenmWAo1mn0M6gRq+dR40GUaRPD+ZHUgleEm3EH4= -github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.21.8-k3s1/go.mod h1:DKjoC7WTLvupppdmb5jEvRDPQENLZqz/stEUs19TOOc= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.21.8-k3s1 h1:jPD2B9R0mTOT7g0mhKJewjot1mU0f6nzMS+k1ACGyXc= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.21.8-k3s1/go.mod h1:F2W0VMpGMHAuroMmJkY+/D6cc2TrytkL2DmNJb+2MLw= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.21.8-k3s1 h1:UBlpJ3F0G3lxoCwElmMAtgCAXpU1GgU4bfOsylT6Da0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.21.8-k3s1/go.mod h1:fZqIhYNtZTcd+dUu+gIGCaeGiwJfwdPu5MGttScTy6Q= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.21.8-k3s1 h1:hs/L2T2TBuXRdVTDEI7p5yIb24Oy+FLLxzCNg9ihURw= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.21.8-k3s1/go.mod h1:D7XDsBGylI+uPPmF1rUUrCmXlBAYv0fjWVsjPjc2jnc= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.21.8-k3s1 h1:2YDIT+WIKyPvLSDIrvSlnozDbUHwGDVGYxq1amHmxS0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.21.8-k3s1/go.mod h1:6LOylTtK4otLqnWPfNTqDsuv8UBJPc9/TdrBUlzU1/M= -github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.21.8-k3s1 h1:b+lm9JfcNVNORW1ApQ/IuLaQbvFIeLcRTVFY7MrUjzQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.21.8-k3s1/go.mod h1:gnPepHhUjt1avSxFSknqmQJsagerQRdT5Iv4oe9DUwE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.21.8-k3s1 h1:uReHRwSr91+Tg+VoV04uwgQjB7FifZGS3lcJld9/26w= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.21.8-k3s1/go.mod h1:0d4syrihIH4bLPaxkVylAcq3RPnmQxy5xKZIZUsLdx4= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.21.8-k3s1 h1:cBd1uKC7lVWTcBwjtrQNOc3gUd7HcnMhLMml3sMczlY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.21.8-k3s1/go.mod h1:GesL7UUjYCAvxEJANbK4ou9nteXGxMZeI7IBuW+LO0k= -github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.21.8-k3s1 h1:fGr5405BeM0gpTiIXRJ4XgHYb7ArblWg7vg2nEexpNg= -github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.21.8-k3s1/go.mod h1:S/MMPKqmRUlFN2nL99pbk8eBydIJwKhgW0vvEexDwZc= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.21.8-k3s1 h1:AW4eu6aDBqRgkTQd7YyueQpyp3O+DpqNwTg8H72CfDU= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.21.8-k3s1/go.mod h1:NM0e+gVPU7aXP57jZXwrRMCSihjz+ZiPx9vCwibyoxk= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.21.8-k3s1 h1:mApK7CsKg+he3kwQ72AXb4FbDh3kpwl4ncoI0c7bv7g= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.21.8-k3s1/go.mod h1:hhr21Lfip4vHneWxaSmd20NYbNeN6ev8H08K0yr5Y0U= -github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.21.8-k3s1 h1:IwDGkZ1eoCHtHLpV4hkrdyTmmo10sZu1utdiCFBYOhQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.21.8-k3s1/go.mod h1:riEm64eqi9L6ANyj6EoXirRMh+7hziTJJSfs7U6wMiA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.21.8-k3s1 h1:VJQp5Xb/Twsfl/tVpb8rj3BclmVgWA/hjrY1VFe/tHI= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.21.8-k3s1/go.mod h1:dAcNDRLSXJltUstDg3rB9A2uDrTMQjR2pLg5QWnMt84= -github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.21.8-k3s1 h1:GsjxuVqARMzqYEgDT+cIqWEuDAVJqRHSDuFHKwaWsFo= -github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.21.8-k3s1/go.mod h1:mS+uRrOptcYqC6ePTYfP0/5qbIKjFUFY6NwgffdzhDI= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.21.8-k3s1 h1:PkJffix9BkIlU0qlxk2ReGik01n5UIp5ULLSbZ/pj6Y= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.21.8-k3s1/go.mod h1:py9DzqvaKfUGU4izW2uyWwIRZWn1/2EOuHyXFn+7iKs= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.21.8-k3s1 h1:2x9yXb7VaRWqNz0VW2BqhdPjJ/CUAG7AEOrwnT2eHoc= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.21.8-k3s1/go.mod h1:46iKO45TZat/zvPyqe8TjLLrTS/U/nGB92Ft63PEPF0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.21.8-k3s1 h1:QlD9qHZ4Sl4kbUVoTOCztj9EYoG6yX8HS3dEWqsb9r0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.21.8-k3s1/go.mod h1:6mEp02ABsuOeeBuUrrol78v9LYysX7Z8CZOMFlkPOOI= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.21.8-k3s1 h1:ptrFhQ+WS02rqeuldEDZdsOdhLlBlgbAtJ2PkESxSFk= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.21.8-k3s1/go.mod h1:xZnfOrGTta6rB9IWNKl82yzWKpMSUXVmyGHRilQ9kzM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.21.8-k3s1 h1:WiLoa/EZOUvUXuDcA1QxYBgiylIClsjoh5AKbXvW1gU= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.21.8-k3s1/go.mod h1:6atiJKMW52yKTr5Py3wF6N3hFF52rb6uReuloneuE18= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.21.8-k3s1 h1:2RzS6JRNC2pwUYk3PmzdlWtTs9xqQItF7qyZyCcEOnE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.21.8-k3s1/go.mod h1:PZXwcGfyWnifOqf9n6MXkuxPqFPwn4n3ypi2LvoaeB4= -github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.21.8-k3s1 h1:7nWhffgDgQfiLQBnABZZGaaNG3pLu7Jz5dkC9ll80kw= -github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.21.8-k3s1/go.mod h1:VdiQgpHlDmw8TGVe7n8rWpOrNa16CGEdLdHCl6k/E4I= -github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.21.8-k3s1 h1:yAxf9798Zuev5xnkp62+MSBvIgwbDMo4Jx8ihOFZV2k= -github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.21.8-k3s1/go.mod h1:/SknInvlq+Fm+vrO/Z7JYHjxwIsxAl32mAI9tUH/lGY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.21.8-k3s1 h1:3sqr3psp1WUtrVprlqyOE77Ph+CLMl3msh+rxAom0l4= -github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.21.8-k3s1/go.mod h1:EycBBK7+p/RjTpXnAYKqgD8to0E702DIhluqnkmoFR8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.21.8-k3s1/go.mod h1:paVpDpi6QV+jXw3p0TnwnmNwoZz2Ms8rS7pN2wcsZLc= +github.com/k3s-io/kubernetes v1.21.9-k3s1 h1:kPg1IH/Xm2KC+4udGpf6nhZoawx7scU5uMwNx+/6To8= +github.com/k3s-io/kubernetes v1.21.9-k3s1/go.mod h1:Geaml5c7zUhD1AMWiFNes5XGqDdTw7PaYfgSmnUNcRU= +github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.21.9-k3s1 h1:M3YqZUEsRZGww4NOcWbUvk71VPWDHsIq+/rkurds9ZI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.21.9-k3s1/go.mod h1:DKjoC7WTLvupppdmb5jEvRDPQENLZqz/stEUs19TOOc= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.21.9-k3s1 h1:CpO8lgbvZefg4cn9p8FwMEkZVd0E5vUzNqNNVX5W8WA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.21.9-k3s1/go.mod h1:V4AdHEECsnPxz8M6EBP+YY/PTAczD2yt2+xqjApuNHQ= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.21.9-k3s1 h1:RQ3/b/4pcNw9MxBjKS1dbGk5ps1DeavVxaObUGzblnc= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.21.9-k3s1/go.mod h1:aVaP/KVss5NzWRk5UTAU+W9Iui51b9Wt5lsx0hRpW6s= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.21.9-k3s1 h1:Z4jFTb2iUfQkakFZK6cXLY1ziC3kXs3y6MlDxbzNYTc= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.21.9-k3s1/go.mod h1:2TCEkB1fQjvhurcrbGi7+KEjy9GWFWnt5x+aZFgMyD8= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.21.9-k3s1 h1:MOXupTGHIO8ksHDfjG4MLLO+ZaDeAD2vPgkC5A4Goa0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.21.9-k3s1/go.mod h1:6LOylTtK4otLqnWPfNTqDsuv8UBJPc9/TdrBUlzU1/M= +github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.21.9-k3s1 h1:cQp51EJMiI0ufO5/fz04ttxPjooe/2EDH5KQt6nKsWI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.21.9-k3s1/go.mod h1:FkOETc0rgxTAbjjWgg6zKNhiQ1rC3DhjT8wxUKRMia4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.21.9-k3s1 h1:QTaNJIZE34DeO6j0kUT5vO/SdlNboBn14VBhhL0Hx+o= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.21.9-k3s1/go.mod h1:0d4syrihIH4bLPaxkVylAcq3RPnmQxy5xKZIZUsLdx4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.21.9-k3s1 h1:JL4TEfsRD3KnHfrAnxSsv0KLsTOoquzjRYFGwuIiiGE= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.21.9-k3s1/go.mod h1:GesL7UUjYCAvxEJANbK4ou9nteXGxMZeI7IBuW+LO0k= +github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.21.9-k3s1 h1:joyRcabg/no49GTnoJqJvQAMxmxCaE6rpdAUXte93P4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.21.9-k3s1/go.mod h1:t5VtFj+1A8ahXDhcpFLlgGQnpk5EUeTwofu1gg3Q4GY= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.21.9-k3s1 h1:QTDE8osLzEozjR0md2aQQSvMMJvaeKyFbjbhbDzNzaI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.21.9-k3s1/go.mod h1:NM0e+gVPU7aXP57jZXwrRMCSihjz+ZiPx9vCwibyoxk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.21.9-k3s1 h1:/Yrp/mf4ICW4GeF+V1dbGRKwR9mHXRdidaf3keg8wdY= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.21.9-k3s1/go.mod h1:hhr21Lfip4vHneWxaSmd20NYbNeN6ev8H08K0yr5Y0U= +github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.21.9-k3s1 h1:mRQJGLdeHV1VxuGmV8QU6ECKRWtRv6oGKTKqaWynbg4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.21.9-k3s1/go.mod h1:riEm64eqi9L6ANyj6EoXirRMh+7hziTJJSfs7U6wMiA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.21.9-k3s1 h1:V/xP2kygpR8m3gPRHFWRfC84J0497uVhNEB1Jya6WOo= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.21.9-k3s1/go.mod h1:dAcNDRLSXJltUstDg3rB9A2uDrTMQjR2pLg5QWnMt84= +github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.21.9-k3s1 h1:wgcS1LS4QxyKrAhL2bgDGHOFhUF1Ea4G6j7taEDmgm0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.21.9-k3s1/go.mod h1:mS+uRrOptcYqC6ePTYfP0/5qbIKjFUFY6NwgffdzhDI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.21.9-k3s1 h1:s4IGlK8ZHCiI9YRtp2mvOOhXuytUG49vfrltOkzVp/M= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.21.9-k3s1/go.mod h1:w2t21Rzm4QK5HgX5O9TUrV4Z7veGJWFZ2CO/AIUkeqU= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.21.9-k3s1 h1:hzTtiz+bNz6IHPo9Cvy9JssK7PeS7iCAgOHHNYXp3bo= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.21.9-k3s1/go.mod h1:46iKO45TZat/zvPyqe8TjLLrTS/U/nGB92Ft63PEPF0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.21.9-k3s1 h1:WX2eH1w+jcoL88HBTIUELr5/kzDA3XD8Stz/t632CTM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.21.9-k3s1/go.mod h1:6mEp02ABsuOeeBuUrrol78v9LYysX7Z8CZOMFlkPOOI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.21.9-k3s1 h1:7foVvD3a4Jb4HCcHCkFHhZy04vA3AJIQNs6qg12XPWM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.21.9-k3s1/go.mod h1:xZnfOrGTta6rB9IWNKl82yzWKpMSUXVmyGHRilQ9kzM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.21.9-k3s1 h1:z29T69yjCyEaDk0SOJboMxSfLf9I8thalrr3VYOc0KA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.21.9-k3s1/go.mod h1:6atiJKMW52yKTr5Py3wF6N3hFF52rb6uReuloneuE18= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.21.9-k3s1 h1:DpkVZE9vWQaVes+G7dYNIU3GyYzY1Me9q1zeSZUaDXE= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.21.9-k3s1/go.mod h1:PZXwcGfyWnifOqf9n6MXkuxPqFPwn4n3ypi2LvoaeB4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.21.9-k3s1 h1:ydGHH763xreawD6zWVAFRR7KaHhKiMs53QuUga+H9DU= +github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.21.9-k3s1/go.mod h1:VdiQgpHlDmw8TGVe7n8rWpOrNa16CGEdLdHCl6k/E4I= +github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.21.9-k3s1 h1:5r9RzJdiwAfq+o9te0cougHhTaTQ4j2Sy8Lc51xdyoI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.21.9-k3s1/go.mod h1:/SknInvlq+Fm+vrO/Z7JYHjxwIsxAl32mAI9tUH/lGY= +github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.21.9-k3s1 h1:u3uxC7w/V6OObpQUeXzm7DFRa3F+JQq3CPjyGsbQciA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.21.9-k3s1/go.mod h1:EycBBK7+p/RjTpXnAYKqgD8to0E702DIhluqnkmoFR8= +github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.21.9-k3s1/go.mod h1:paVpDpi6QV+jXw3p0TnwnmNwoZz2Ms8rS7pN2wcsZLc= github.com/k3s-io/protobuf v1.4.3-k3s1 h1:gduXrSm/6KkbTuctP6bASYqKQ/tyC/PNYqxBmJnk4Tc= github.com/k3s-io/protobuf v1.4.3-k3s1/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/karrick/godirwalk v1.16.1 h1:DynhcF+bztK8gooS0+NDJFrdNZjJ3gzVzC545UNA9iw= @@ -754,7 +754,6 @@ github.com/moby/ipvs v1.0.1/go.mod h1:2pngiyseZbIKXNv7hsKj3O9UEz30c53MT9005gt2hx github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc= github.com/moby/spdystream v0.2.0 h1:cjW1zVyyoiM0T7b6UoySUFqzXMoqRckQtXwGPiBhOM8= github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= -github.com/moby/sys/mountinfo v0.4.0/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= github.com/moby/sys/mountinfo v0.4.1 h1:1O+1cHA1aujwEwwVMa2Xm2l+gIpUHyd3+D+d7LZh1kM= github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= github.com/moby/sys/symlink v0.1.0 h1:MTFZ74KtNI6qQQpuBxU+uKCim4WtOMokr03hCfJcazE= @@ -1385,8 +1384,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.22 h1:fmRfl9WJ4ApJn7LxNuED4m0t18qivVQOxP6aAYG9J6c= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.27 h1:KQOkVzXrLNb0EP6W0FD6u3CCPAwgXFYwZitbj7K0P0Y= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.27/go.mod h1:tq2nT0Kx7W+/f2JVE+zxYtUhdjuELJkVpNz+x/QN5R4= sigs.k8s.io/cli-utils v0.16.0/go.mod h1:9Jqm9K2W6ShhCxsEuaz6HSRKKOXigPUx3ZfypGgxBLY= sigs.k8s.io/controller-runtime v0.4.0/go.mod h1:ApC79lpY3PHW9xj/w9pj+lYkLgwAAUZwfXkME1Lajns= sigs.k8s.io/kustomize/api v0.8.8 h1:G2z6JPSSjtWWgMeWSoHdXqyftJNmMmyxXpwENGoOtGE= @@ -1398,8 +1397,8 @@ sigs.k8s.io/kustomize/kyaml v0.4.0/go.mod h1:XJL84E6sOFeNrQ7CADiemc1B0EjIxHo3OhW sigs.k8s.io/kustomize/kyaml v0.10.17 h1:4zrV0ym5AYa0e512q7K3Wp1u7mzoWW0xR3UHJcGWGIg= sigs.k8s.io/kustomize/kyaml v0.10.17/go.mod h1:mlQFagmkm1P+W4lZJbJ/yaxMd8PqMRSC4cPcfUVt5Hg= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= -sigs.k8s.io/structured-merge-diff/v4 v4.1.2 h1:Hr/htKFmJEbtMgS/UD0N+gtgctAqz81t3nu+sPzynno= -sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= +sigs.k8s.io/structured-merge-diff/v4 v4.2.1 h1:bKCqE9GvQ5tiVHn5rfn1r+yao3aLQEaLzkkmAkf+A6Y= +sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= sigs.k8s.io/testing_frameworks v0.1.2/go.mod h1:ToQrwSC3s8Xf/lADdZp3Mktcql9CG0UAmdJG9th5i0w= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=