From 653dd61aaa2d0ef8bd83ac4dbc6d150dde792efc Mon Sep 17 00:00:00 2001 From: Brian Downs Date: Fri, 15 Mar 2024 17:30:15 -0700 Subject: [PATCH] Update to v1.28.8-k3s1 and Go 1.21.8 (#9746) --- Dockerfile.dapper | 2 +- Dockerfile.local | 2 +- Dockerfile.manifest | 2 +- Dockerfile.test | 2 +- go.mod | 94 +++++++++++++++++----------------- go.sum | 120 ++++++++++++++++++++++---------------------- 6 files changed, 111 insertions(+), 111 deletions(-) diff --git a/Dockerfile.dapper b/Dockerfile.dapper index a364d37d09..f04ce37501 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -1,4 +1,4 @@ -ARG GOLANG=golang:1.21.7-alpine3.18 +ARG GOLANG=golang:1.21.8-alpine3.18 FROM ${GOLANG} # Set proxy environment variables diff --git a/Dockerfile.local b/Dockerfile.local index b67eb3c1dd..9cbcfbbafa 100644 --- a/Dockerfile.local +++ b/Dockerfile.local @@ -1,4 +1,4 @@ -ARG GOLANG=golang:1.21.7-alpine3.18 +ARG GOLANG=golang:1.21.8-alpine3.18 FROM ${GOLANG} as infra ARG http_proxy=$http_proxy diff --git a/Dockerfile.manifest b/Dockerfile.manifest index 2cbb3d2727..f3820b5f9b 100644 --- a/Dockerfile.manifest +++ b/Dockerfile.manifest @@ -1,4 +1,4 @@ -ARG GOLANG=golang:1.21.7-alpine3.18 +ARG GOLANG=golang:1.21.8-alpine3.18 FROM ${GOLANG} COPY --from=plugins/manifest:1.2.3 /bin/* /bin/ diff --git a/Dockerfile.test b/Dockerfile.test index 0225d9ba3e..d335f005a0 100644 --- a/Dockerfile.test +++ b/Dockerfile.test @@ -1,4 +1,4 @@ -ARG GOLANG=golang:1.21.7-alpine3.18 +ARG GOLANG=golang:1.21.8-alpine3.18 FROM ${GOLANG} as test-base RUN apk -U --no-cache add bash jq diff --git a/go.mod b/go.mod index cfa0cd926b..dd2d8d0e2d 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ replace ( github.com/docker/docker => github.com/docker/docker v24.0.0-rc.2.0.20230801142700-69c9adb7d386+incompatible github.com/docker/libnetwork => github.com/docker/libnetwork v0.8.0-dev.2.0.20190624125649-f0e46a78ea34 github.com/emicklei/go-restful/v3 => github.com/emicklei/go-restful/v3 v3.9.0 - github.com/golang/protobuf => github.com/golang/protobuf v1.5.3 + github.com/golang/protobuf => github.com/golang/protobuf v1.5.4 github.com/googleapis/gax-go/v2 => github.com/googleapis/gax-go/v2 v2.12.0 github.com/juju/errors => github.com/k3s-io/nocode v0.0.0-20200630202308-cb097102c09f github.com/kubernetes-sigs/cri-tools => github.com/k3s-io/cri-tools v1.26.0-rc.0-k3s1 @@ -55,41 +55,41 @@ replace ( google.golang.org/genproto => google.golang.org/genproto v0.0.0-20230525234035-dd9d682886f9 google.golang.org/grpc => google.golang.org/grpc v1.58.3 gopkg.in/square/go-jose.v2 => gopkg.in/square/go-jose.v2 v2.6.0 - k8s.io/api => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.28.7-k3s1 - k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.28.7-k3s1 - k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.28.7-k3s1 - k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.28.7-k3s1 - k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.28.7-k3s1 - k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.28.7-k3s1 - k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.28.7-k3s1 - k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.28.7-k3s1 - k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.28.7-k3s1 - k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.28.7-k3s1 - k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.28.7-k3s1 - k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.28.7-k3s1 - k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.28.7-k3s1 - k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.28.7-k3s1 - k8s.io/dynamic-resource-allocation => github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.28.7-k3s1 - k8s.io/endpointslice => github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.28.7-k3s1 + k8s.io/api => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.28.8-k3s1 + k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.28.8-k3s1 + k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.28.8-k3s1 + k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.28.8-k3s1 + k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.28.8-k3s1 + k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.28.8-k3s1 + k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.28.8-k3s1 + k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.28.8-k3s1 + k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.28.8-k3s1 + k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.28.8-k3s1 + k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.28.8-k3s1 + k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.28.8-k3s1 + k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.28.8-k3s1 + k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.28.8-k3s1 + k8s.io/dynamic-resource-allocation => github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.28.8-k3s1 + k8s.io/endpointslice => github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.28.8-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.100.1-k3s1 // k3s-main - k8s.io/kms => github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.28.7-k3s1 - k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.28.7-k3s1 - k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.28.7-k3s1 + k8s.io/kms => github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.28.8-k3s1 + k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.28.8-k3s1 + k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.28.8-k3s1 k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 - k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.28.7-k3s1 - k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.28.7-k3s1 - k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.28.7-k3s1 - k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.28.7-k3s1 - k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.28.7-k3s1 - k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.28.7-k3s1 - k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.28.7-k3s1 - k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.28.7-k3s1 - k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.28.7-k3s1 - k8s.io/pod-security-admission => github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.28.7-k3s1 - k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.28.7-k3s1 - k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.28.7-k3s1 - k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.28.7-k3s1 + k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.28.8-k3s1 + k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.28.8-k3s1 + k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.28.8-k3s1 + k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.28.8-k3s1 + k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.28.8-k3s1 + k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.28.8-k3s1 + k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.28.8-k3s1 + k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.28.8-k3s1 + k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.28.8-k3s1 + k8s.io/pod-security-admission => github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.28.8-k3s1 + k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.28.8-k3s1 + k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.28.8-k3s1 + k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.28.8-k3s1 mvdan.cc/unparam => mvdan.cc/unparam v0.0.0-20210104141923-aac4ce9116a7 ) @@ -165,19 +165,19 @@ require ( google.golang.org/grpc v1.60.1 gopkg.in/yaml.v2 v2.4.0 inet.af/tcpproxy v0.0.0-20200125044825-b6bb9b5b8252 - k8s.io/api v0.28.7 - k8s.io/apimachinery v0.28.7 - k8s.io/apiserver v0.28.7 + k8s.io/api v0.28.8 + k8s.io/apimachinery v0.28.8 + k8s.io/apiserver v0.28.8 k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible - k8s.io/cloud-provider v0.28.7 + k8s.io/cloud-provider v0.28.8 k8s.io/cluster-bootstrap v0.0.0 - k8s.io/component-base v0.28.7 - k8s.io/component-helpers v0.28.7 + k8s.io/component-base v0.28.8 + k8s.io/component-helpers v0.28.8 k8s.io/cri-api v0.29.0-alpha.0 k8s.io/klog/v2 v2.100.1 k8s.io/kube-proxy v0.0.0 k8s.io/kubectl v0.25.0 - k8s.io/kubernetes v1.28.7 + k8s.io/kubernetes v1.28.8 k8s.io/utils v0.0.0-20230726121419-3b25d923346b sigs.k8s.io/yaml v1.4.0 @@ -360,7 +360,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v4 v4.5.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/google/btree v1.1.2 // indirect github.com/google/cel-go v0.16.1 // indirect github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect @@ -499,7 +499,7 @@ require ( google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect - google.golang.org/protobuf v1.32.0 // indirect + google.golang.org/protobuf v1.33.0 // indirect gopkg.in/gcfg.v1 v1.2.3 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect @@ -507,23 +507,23 @@ require ( gopkg.in/square/go-jose.v2 v2.6.0 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/apiextensions-apiserver v0.28.7 // indirect + k8s.io/apiextensions-apiserver v0.28.8 // indirect k8s.io/cli-runtime v0.22.2 // indirect - k8s.io/code-generator v0.28.7 // indirect + k8s.io/code-generator v0.28.8 // indirect k8s.io/controller-manager v0.25.4 // indirect k8s.io/csi-translation-lib v0.0.0 // indirect k8s.io/dynamic-resource-allocation v0.0.0 // indirect k8s.io/endpointslice v0.0.0 // indirect k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect k8s.io/kms v0.0.0 // indirect - k8s.io/kube-aggregator v0.28.7 // indirect + k8s.io/kube-aggregator v0.28.8 // indirect k8s.io/kube-controller-manager v0.0.0 // indirect k8s.io/kube-openapi v0.0.0-20230928205116-a78145627833 // indirect k8s.io/kube-scheduler v0.0.0 // indirect - k8s.io/kubelet v0.28.7 // indirect + k8s.io/kubelet v0.28.8 // indirect k8s.io/legacy-cloud-providers v0.0.0 // indirect k8s.io/metrics v0.0.0 // indirect - k8s.io/mount-utils v0.28.7 // indirect + k8s.io/mount-utils v0.28.8 // indirect k8s.io/pod-security-admission v0.0.0 // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect diff --git a/go.sum b/go.sum index 2d9431204e..3a259f7b9e 100644 --- a/go.sum +++ b/go.sum @@ -695,8 +695,8 @@ github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71 github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= @@ -967,62 +967,62 @@ github.com/k3s-io/klog/v2 v2.100.1-k3s1 h1:xb/Ta8dpQuIZueQEw2YTZUYrKoILdBmPiITVk github.com/k3s-io/klog/v2 v2.100.1-k3s1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= github.com/k3s-io/kube-router/v2 v2.0.1 h1:UCsdkQjSfOkVakixilRDDkG9yq775GBSKxBfsyUj8ng= github.com/k3s-io/kube-router/v2 v2.0.1/go.mod h1:4RaSEL+a50Yq85qIYyAb69bAQItcHrGbVo7uwCQZjfc= -github.com/k3s-io/kubernetes v1.28.7-k3s1 h1:2NB/swBi+I8y2SL3/ky80IugJNYCkoCtD4ySVROfQ+A= -github.com/k3s-io/kubernetes v1.28.7-k3s1/go.mod h1:0qpyGJTR3blkbQOmZA3Z0u1VDZJNxJM8ifLUVNJN0X8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.28.7-k3s1 h1:LL+eu1HDQoEyYm+8q9DbUm59XLLUxhMqpPc0hStFqpY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.28.7-k3s1/go.mod h1:Sm2VLvLC3R2b9bvJWr8df/kbqXhaUn4RDpx0UYSIYXM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.28.7-k3s1 h1:hZBeDElzDT7jfr729NAKKi74K3cZlyEXAQ/MyMhctJ8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.28.7-k3s1/go.mod h1:L4ZFHT96eflKbRuMU9cYQPZAfSyRsr+W0PDFPblI4iw= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.28.7-k3s1 h1:QRxGZLtJbvWy20OnBBrpC5maIbDBGFzVeZJEkAEjfp0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.28.7-k3s1/go.mod h1:vMuvn7r72iDh6ULt5htfD/o8o7wtmEyfOSbgfy1ZVzk= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.28.7-k3s1 h1:dh4ofqTTJjZeMYcUH1RljfQ8sN3GXODBgnnj9ODKuag= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.28.7-k3s1/go.mod h1:1zllrfiFQcUHk/q4yEOSM+Jb0A/Needo3siJCm/wEeg= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.28.7-k3s1 h1:KcnVP44sU2RkFL0QQIxWeZfWPsaLpHe+VJKTHTcDs3c= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.28.7-k3s1/go.mod h1:R1SbbpBCyxAuq9Mdg0L+W5kvFGJ5DGOJBjtKI9AzWn0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.28.7-k3s1 h1:HCOA51U8VKPiJu3jZt3TKZ44nboGLrzcC6Scy/9zwsA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.28.7-k3s1/go.mod h1:cnlexB4/WwaiHrb9/T/y+ffCymBezk2RStCfszyQQZ8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.28.7-k3s1 h1:Tyvuw+jCRwvKIXV1Lk4PL+7uwgbs/f1/gncW2oTQM+I= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.28.7-k3s1/go.mod h1:3cWC56/nGXqU1L3IzKmGItgCQZgutpLYLTpV8dtnbCM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.28.7-k3s1 h1:YldhRaa+Dwe5YLiC5LK4T3iFyizLSnRfS8Gk7BjmYcQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.28.7-k3s1/go.mod h1:vvv3MYj2S9gmQhj9NxZiAqnZ+xb7yhkzjubsQAL5pf0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.28.7-k3s1 h1:UDLnkdxq6AEZD3dyo1FRS938SOWVtXNo5yMRMyITpWA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.28.7-k3s1/go.mod h1:Sux8Ia6ov4XzGV74JptxrFnzJFaTMVIHr9fLqza5Zd4= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.28.7-k3s1 h1:a4xv3LVny5D0d0e1+O+IaINzjauCVqTlsXO35ek2CRE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.28.7-k3s1/go.mod h1:xrRhKyw0w4bLOCrgfQ/wymSF0Us9AgjhOrgE4l+m2XM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.28.7-k3s1 h1:R998zYjdPpR/oiOSaTTZ95qlNOvOy3gt/Zg6XEEBBpU= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.28.7-k3s1/go.mod h1:bA1vmq9GJcA4fXvDkwhVbfe40wEaIvl4xP4W4EA2JoI= -github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.28.7-k3s1 h1:UF/sGm+BeUMol2InWpBkQRNkLetX2KNoZYaJoeBv8Wc= -github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.28.7-k3s1/go.mod h1:hOxnSskI6Saao7GuYfRzLCcQoDkaP5x895i1XDYlMJA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.28.7-k3s1 h1:J3jnNNhsbEk8TkoG+EoPtdyJ1JwmyzVoPFmRx4KoXoA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.28.7-k3s1/go.mod h1:0+ySIyuiKp/Qj/HIRGNZCJaB4UPRUtmH+8NryP6LTVM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.28.7-k3s1 h1:1dejrWTLQNUEhHHP1pfOeGUvtp8PEi5Zu3l/xZYRmRQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.28.7-k3s1/go.mod h1:H4Y3uRhpMh2Y6yoknL4gS2Sq9p5wQaSSxcnxpKZTveA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.28.7-k3s1 h1:EVvmNEKFLQavgQml80rbXGL4GhHfZd13deKLXSy4Yfw= -github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.28.7-k3s1/go.mod h1:Bql78VE5hO2xSfRkYMd+NgjtVvLujpujSfq+2hIvnm8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.28.7-k3s1 h1:Q1WZBYnrfasymSF6Jgf+nAlaesdalDmPM32WQyxp7hc= -github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.28.7-k3s1/go.mod h1:vO4gjg7YM9HU1rM46Lvkmp4ilUAHoMROz6HyP5dGn4s= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.28.7-k3s1 h1:Mlx94Q+X2te2G8WO68DOT8RH824qGs2OlLLmj1wtbOA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.28.7-k3s1/go.mod h1:ExxaT1NGJ8RtKpYro0BtueJ6x7F9AhZuMXmglO1KTAA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.28.7-k3s1 h1:boIkMvbirEmGW1VDUTIpgXeYjNnkbgQilAtVP/9+04Y= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.28.7-k3s1/go.mod h1:+9/sEfeiefLlTuY4HWKdXQCuyq73mVUBVmoo9578bM8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.28.7-k3s1 h1:f716CSBJqazSHrUy7rXBTe8oMj8mDEM+5LV1Y1/FM1c= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.28.7-k3s1/go.mod h1:GuwDTvD5sW9wVFFLFVn8howX5gt2+bnOwJ3jncgyZn8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.28.7-k3s1 h1:WkISIZ3DISWdzxxBK4WM5eF0HiSSHC36wApOIs5kstc= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.28.7-k3s1/go.mod h1:e4iO/NmYhzCeZXn3YRUClYe5AblADtiNOkE7awXin3g= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.28.7-k3s1 h1:n35Qk70019yIynV7+XM8oaJifh27EYX+T7Vv2TuViqs= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.28.7-k3s1/go.mod h1:o50EQimzRPx0VGyYx85q/tl6YAlPzXtQeoXt9cMvJ6s= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.28.7-k3s1 h1:Qlx06Mza9jrpOBjVThanEb+w8tFyXy76HTRzzDWP+ww= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.28.7-k3s1/go.mod h1:KpuMup2jqPBtIcVanOv5HA/Diptl6g8qKZQiwY4QqdY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.28.7-k3s1 h1:wmoE6/MJJ3vTNq2MGW78oOxGf1IAsi7OwcfswCVNdcg= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.28.7-k3s1/go.mod h1:YLv6dnG4dSAkF0KI1kJLAL2cPOi/ekDLlp3kGF31uzA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.28.7-k3s1 h1:Ud7/JYMpKLDFV8EH/z8E0A5jyqvvIjb8/sLhb3nN8bU= -github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.28.7-k3s1/go.mod h1:wQ66B3hb4A5LNbvyUlLZvYY2Cwb1e54xnP1AUnCFgBY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.28.7-k3s1 h1:ERTxqCC7gRE0c6z/IZX4TFH6SPdEIKtcHHazbkuCS9U= -github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.28.7-k3s1/go.mod h1:hwxlaLrFP44Ssd7WJYuDvC69AbW+HUIX8WC4IXP00/o= -github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.28.7-k3s1 h1:ShL43v3Wk9CoBdjhI/EX7ia7yRhUlGLRhYaW/wZxs4I= -github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.28.7-k3s1/go.mod h1:5PdgbwaRYVOsemnlOXEnfioxi3NXOOmYzoQ77f4vRG4= -github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.28.7-k3s1 h1:IP6y8g6soerxa4NX7esQkeQoWXX8LVs8lqzseORrM50= -github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.28.7-k3s1/go.mod h1:1aaIBYBX54SDNPiQDNMgUFIz7dgW67jDHxvK56xuJow= +github.com/k3s-io/kubernetes v1.28.8-k3s1 h1:cWGcyuTKJzD21xm/wvB9e+hkuxjhj9O5F1fHAg52oYc= +github.com/k3s-io/kubernetes v1.28.8-k3s1/go.mod h1:wCrpSADfrhs/gz2vBbN0O2DG2FLS5VyFK7lzwxJg26o= +github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.28.8-k3s1 h1:7nyPbxpuBExiwBjJ0SlAe38//G5BB35geqGr3W/lfrI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.28.8-k3s1/go.mod h1:XfbCPnVG6u5G4jz8vn9tbEZnjNA3B7zB0OHrVtz73pU= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.28.8-k3s1 h1:6WmffaLyAjaRvIIhc5irJLUWZ/FQDKLi8zU8yuhqPhE= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.28.8-k3s1/go.mod h1:M2xamGrLVrvIy0s8tBKI0hQlsYTbeoPziH3Z/M7DA30= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.28.8-k3s1 h1:KLcMCP6hn3PDHL5FgQgv+K7BBinog1AWcb/nvCCcpSs= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.28.8-k3s1/go.mod h1:z2W7uOP7+vZLz0WP6kGazQtW3Jp7/27uL7BnmiPHCcY= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.28.8-k3s1 h1:kE979v/YyFCvzvdAvsBeUJBnwYCSLOKnqopTqD6+/Hc= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.28.8-k3s1/go.mod h1:4o05jOycCYB+kHLTddIEdOIfKQPsrMtqflaKpFMF6Bg= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.28.8-k3s1 h1:9VdOmuGBmL1cFXnDRtOoY1HW0PBHpGEXv0AAadDx4Wk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.28.8-k3s1/go.mod h1:hehb+KAQYd+hHYw4HVBvEzjYkCvGGzHU3+1ULQkg8vo= +github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.28.8-k3s1 h1:S1lO6Kip+1wi0UUXc2GRPO0L0NLau7kX5JRpREKgU54= +github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.28.8-k3s1/go.mod h1:zQOc8T22KDEjUO3+sgPYHq1ci4OtsSfHX06SjL5ISSk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.28.8-k3s1 h1:L5ZUkBReICzwXAHUX91qpsvREgOer6d2WZYyNsqFj+o= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.28.8-k3s1/go.mod h1:PlaVE3d59z0QzaLK08icwrePX25uXpw/S0osYPA41kA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.28.8-k3s1 h1:JneMLW+lSYzVI8zaveVEM+JnGPXc9ToiE0qLLaU0P9A= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.28.8-k3s1/go.mod h1:vvv3MYj2S9gmQhj9NxZiAqnZ+xb7yhkzjubsQAL5pf0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.28.8-k3s1 h1:nVhV599khe8oWSI2Wd7Pd5fZh0AFttu2x2mNEHMtYKk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.28.8-k3s1/go.mod h1:N6W8V5hn4hfD+xaos59o6VRmSgUkDghuVKSFkaJhsqs= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.28.8-k3s1 h1:dknfs6G67iiec9WV/F4waOH2xRKzu7ajrFr93P8i1FI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.28.8-k3s1/go.mod h1:IcH8jsNPGxIuXfRSc3Nv13G6ubX6EGr2ryK9F6ULlXI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.28.8-k3s1 h1:SbYL1G4KtvBjtBRtmfgrl1IomHxHzYNsgnh4JxMg0gA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.28.8-k3s1/go.mod h1:3YPMPiTjy4Q6HUUhGiTWHEP0NLKilZMSI4dtKKr4238= +github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.28.8-k3s1 h1:pLACgmG7O/9G4SYi4cg10/sNxmSzl6u6Vr1dQoE2snU= +github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.28.8-k3s1/go.mod h1:blC4bv0qBjEkF9qucY1LeNnnNPII1rOcHUYJQp4DETA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.28.8-k3s1 h1:9wFl5PCq7m9PeLFufS1w1MUVA7C7zlkyMg2rM4x/oBg= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.28.8-k3s1/go.mod h1:ShOO+6OjR0zAXglu99x257cQ/xSRPxl/nZBCZCz1bNA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.28.8-k3s1 h1:VRJwzGTyTzMxWI1oU21uTRQqydALMkZHbbpAS9WiYvk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.28.8-k3s1/go.mod h1:H4Y3uRhpMh2Y6yoknL4gS2Sq9p5wQaSSxcnxpKZTveA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.28.8-k3s1 h1:Qoo/qdaLxGpKC2mOhpa3V6ZNg3m9fGXJE8nOPw6tGHs= +github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.28.8-k3s1/go.mod h1:gp5Jnr04paUjMJNpmmUnaUVWCaNhpxWrri8eI5hmHpo= +github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.28.8-k3s1 h1:Pso2dR7LB4pZtLLN1b5VwtsMVf2UpzrREyM9C8X5quY= +github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.28.8-k3s1/go.mod h1:iH/7ScCaotjWCLblX5Pw/YNcazZr/8LjTg/zzm/xohw= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.28.8-k3s1 h1:Q71c3idYZLTxyrfE2v3rta2TJ5atALWy2rsTED3JSgc= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.28.8-k3s1/go.mod h1:W4lRbhdStX6BxvDT0OeWAYrJM1je7ZHeibMnJO06WJk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.28.8-k3s1 h1:sy038r9630063RvIu7IVRl1AHtc6nvDNcv8F2+leESU= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.28.8-k3s1/go.mod h1:RKa6GJHmeirXih82kDWgzZPVR0H1G8iQ9sG49aFvN1c= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.28.8-k3s1 h1:FbiHIWLIx61p660ooYZM0OXYYQurwkETuo4+7a9ikEc= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.28.8-k3s1/go.mod h1:GuwDTvD5sW9wVFFLFVn8howX5gt2+bnOwJ3jncgyZn8= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.28.8-k3s1 h1:dJKZEEV8pPxkZIjqP5AYKDcHb1xZ9UOxIKN+iyp+Xi0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.28.8-k3s1/go.mod h1:mrOsqAf9127ec/EY3+jmfRA+ZDyFev+XrEIO2aQl4KY= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.28.8-k3s1 h1:dWt807j+F/6ZBe6lYSCUG+SQDRkYTxUG6BZkTxYHwOI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.28.8-k3s1/go.mod h1:o50EQimzRPx0VGyYx85q/tl6YAlPzXtQeoXt9cMvJ6s= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.28.8-k3s1 h1:NplDyetF9UYhw1wj4kJgY53rtkt9qqui9aYCUglbWYo= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.28.8-k3s1/go.mod h1:IGtBShRd9wrmPLp+8zknuLKoiXNG+jf9IwQjT/ie6+w= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.28.8-k3s1 h1:CXQm6BZrqO6wcsDrcrQi4K3CmnB6sjbKfdNkQ79PRdc= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.28.8-k3s1/go.mod h1:GwCUf5WrKXTeZY0G3gpNE4HUPJOiY74HnFGouRxlc90= +github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.28.8-k3s1 h1:yh/4IHwA4BJN4AIP7jzYGkYsiHGZ0eyNvy0IE87oQWQ= +github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.28.8-k3s1/go.mod h1:32byF00LhX8ZQvu0+sC8t2lSPr6EbTZWsHPlzeECg5E= +github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.28.8-k3s1 h1:/f5JkWaX1a30jCcWTxT4yl1VanuRrTKOIBN0TXw2ECk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.28.8-k3s1/go.mod h1:yKzKmc6u0H+1MOyEKbcQnq7e4xv/aRbJP1gyr2fvaPs= +github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.28.8-k3s1 h1:ASBB9splSq5dXd+MUF7z7R5Yxo2HtI1O3Ghxly+dI6M= +github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.28.8-k3s1/go.mod h1:5PdgbwaRYVOsemnlOXEnfioxi3NXOOmYzoQ77f4vRG4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.28.8-k3s1 h1:Jju/8aFlt4Eps8VHi8i6v5YMB0wbVUfvhHAGRWon3D4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.28.8-k3s1/go.mod h1:1TpIEM7lxz3bLNgJMQvhm4ff6MSghgMdLrJPukdIaUA= 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.18-k3s4 h1:CjAH/z8oD5MGTnUbyUTotTgzSBKm/1J+REjJTmAtH04= @@ -2098,8 +2098,8 @@ google.golang.org/protobuf v1.29.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqw google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= -google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=