From f10af367c3c96863c081ada4018e94e085c9404d Mon Sep 17 00:00:00 2001 From: Brooks Newberry Date: Thu, 19 Jan 2023 07:56:32 -0800 Subject: [PATCH] Update to v1.26.1-k3s1 (#6774) --- .github/workflows/integration.yaml | 2 +- .github/workflows/unitcoverage.yaml | 2 +- Dockerfile.dapper | 2 +- Dockerfile.manifest | 2 +- Dockerfile.test | 2 +- go.mod | 84 +++++++++---------- go.sum | 121 ++++++++++++++-------------- 7 files changed, 107 insertions(+), 108 deletions(-) diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml index 35594168c6..45b5394506 100644 --- a/.github/workflows/integration.yaml +++ b/.github/workflows/integration.yaml @@ -39,7 +39,7 @@ jobs: - name: Install Go uses: actions/setup-go@v3 with: - go-version: '1.19.3' + go-version: '1.19.5' check-latest: true cache: true cache-dependency-path: | diff --git a/.github/workflows/unitcoverage.yaml b/.github/workflows/unitcoverage.yaml index c5fa2907c2..290b06d9c8 100644 --- a/.github/workflows/unitcoverage.yaml +++ b/.github/workflows/unitcoverage.yaml @@ -41,7 +41,7 @@ jobs: - name: Install Go uses: actions/setup-go@v3 with: - go-version: '1.19.3' + go-version: '1.19.5' check-latest: true cache: true cache-dependency-path: | diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 962189c09f..8157f21ddf 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -1,4 +1,4 @@ -ARG GOLANG=golang:1.19.4-alpine3.17 +ARG GOLANG=golang:1.19.5-alpine3.17 FROM ${GOLANG} ARG http_proxy=$http_proxy diff --git a/Dockerfile.manifest b/Dockerfile.manifest index e28d213e4c..dfb320db97 100644 --- a/Dockerfile.manifest +++ b/Dockerfile.manifest @@ -1,4 +1,4 @@ -ARG GOLANG=golang:1.19.4-alpine3.17 +ARG GOLANG=golang:1.19.5-alpine3.17 FROM ${GOLANG} COPY --from=plugins/manifest:1.2.3 /bin/* /bin/ diff --git a/Dockerfile.test b/Dockerfile.test index 3c1a3068cf..0d88213b18 100644 --- a/Dockerfile.test +++ b/Dockerfile.test @@ -1,4 +1,4 @@ -ARG GOLANG=golang:1.19.4-alpine3.17 +ARG GOLANG=golang:1.19.5-alpine3.17 FROM ${GOLANG} as test-base RUN apk -U --no-cache add bash jq diff --git a/go.mod b/go.mod index d785fe5c01..ffcc55fb23 100644 --- a/go.mod +++ b/go.mod @@ -50,39 +50,39 @@ 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.26.0-k3s1 - k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.26.0-k3s1 - k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.26.0-k3s1 - k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.26.0-k3s1 - k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.26.0-k3s1 - k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.26.0-k3s1 - k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.26.0-k3s1 - k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.26.0-k3s1 - k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.26.0-k3s1 - k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.26.0-k3s1 - k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.26.0-k3s1 - k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.26.0-k3s1 - k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.26.0-k3s1 - k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.26.0-k3s1 - k8s.io/dynamic-resource-allocation => github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.26.0-k3s1 + k8s.io/api => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.26.1-k3s1 + k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.26.1-k3s1 + k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.26.1-k3s1 + k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.26.1-k3s1 + k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.26.1-k3s1 + k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.26.1-k3s1 + k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.26.1-k3s1 + k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.26.1-k3s1 + k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.26.1-k3s1 + k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.26.1-k3s1 + k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.26.1-k3s1 + k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.26.1-k3s1 + k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.26.1-k3s1 + k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.26.1-k3s1 + k8s.io/dynamic-resource-allocation => github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.26.1-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.80.1-k3s1 // k3s-main - k8s.io/kms => github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.26.0-k3s1 - k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.26.0-k3s1 - k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.26.0-k3s1 - k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.26.0-k3s1 - k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.26.0-k3s1 - k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.26.0-k3s1 - k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.26.0-k3s1 - k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.26.0-k3s1 - k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.26.0-k3s1 - k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.26.0-k3s1 - k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.26.0-k3s1 - k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.26.0-k3s1 - k8s.io/pod-security-admission => github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.26.0-k3s1 - k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.26.0-k3s1 - k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.26.0-k3s1 - k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.26.0-k3s1 + k8s.io/kms => github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.26.1-k3s1 + k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.26.1-k3s1 + k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.26.1-k3s1 + k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.26.1-k3s1 + k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.26.1-k3s1 + k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.26.1-k3s1 + k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.26.1-k3s1 + k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.26.1-k3s1 + k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.26.1-k3s1 + k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.26.1-k3s1 + k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.26.1-k3s1 + k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.26.1-k3s1 + k8s.io/pod-security-admission => github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.26.1-k3s1 + k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.26.1-k3s1 + k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.26.1-k3s1 + k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.26.1-k3s1 mvdan.cc/unparam => mvdan.cc/unparam v0.0.0-20210104141923-aac4ce9116a7 ) @@ -147,17 +147,17 @@ require ( google.golang.org/grpc v1.50.1 gopkg.in/yaml.v2 v2.4.0 inet.af/tcpproxy v0.0.0-20200125044825-b6bb9b5b8252 - k8s.io/api v0.26.0 - k8s.io/apimachinery v0.26.0 - k8s.io/apiserver v0.26.0 + k8s.io/api v0.26.1 + k8s.io/apimachinery v0.26.1 + k8s.io/apiserver v0.26.1 k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible - k8s.io/cloud-provider v0.26.0 - k8s.io/component-base v0.26.0 - k8s.io/component-helpers v0.26.0 - k8s.io/cri-api v0.26.0 + k8s.io/cloud-provider v0.26.1 + k8s.io/component-base v0.26.1 + k8s.io/component-helpers v0.26.1 + k8s.io/cri-api v0.26.1 k8s.io/klog v1.0.0 k8s.io/kubectl v0.25.0 - k8s.io/kubernetes v1.26.0 + k8s.io/kubernetes v1.26.1 k8s.io/utils v0.0.0-20221107191617-1a15be271d1d sigs.k8s.io/yaml v1.3.0 ) @@ -254,7 +254,7 @@ require ( github.com/golang/mock v1.6.0 // indirect github.com/golang/protobuf v1.5.2 // indirect github.com/google/btree v1.0.1 // indirect - github.com/google/cel-go v0.12.5 // indirect + github.com/google/cel-go v0.12.6 // indirect github.com/google/gnostic v0.5.7-v3refs // indirect github.com/google/go-cmp v0.5.9 // indirect github.com/google/go-containerregistry v0.7.0 // indirect @@ -411,9 +411,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.26.0 // indirect + k8s.io/mount-utils v0.26.1 // indirect k8s.io/pod-security-admission v0.0.0 // indirect - sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33 // indirect + sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35 // 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 e0bdc92662..b43e6faaec 100644 --- a/go.sum +++ b/go.sum @@ -418,8 +418,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/cel-go v0.12.5 h1:DmzaiSgoaqGCjtpPQWl26/gND+yRpim56H1jCVev6d8= -github.com/google/cel-go v0.12.5/go.mod h1:Jk7ljRzLBhkmiAwBoUxB1sZSCVBAzkqPF25olK/iRDw= +github.com/google/cel-go v0.12.6 h1:kjeKudqV0OygrAqA9fX6J55S8gj+Jre2tckIm5RoG4M= +github.com/google/cel-go v0.12.6/go.mod h1:Jk7ljRzLBhkmiAwBoUxB1sZSCVBAzkqPF25olK/iRDw= github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54= github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -620,61 +620,61 @@ github.com/k3s-io/klog/v2 v2.80.1-k3s1 h1:mGMXURxxmabQurmtRhXuQTJ9jC0pvIhESSxRSy github.com/k3s-io/klog/v2 v2.80.1-k3s1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= github.com/k3s-io/kube-router v1.5.2-0.20221026101626-e01045262706 h1:69mODM8rQwFqKxw7nNUCq62MVBpoCOgMZ6tFThnZvgc= github.com/k3s-io/kube-router v1.5.2-0.20221026101626-e01045262706/go.mod h1:qwtM4SC13qwpq56JjKZ/Hm6m7MCu3OiU/9sVYvmrycg= -github.com/k3s-io/kubernetes v1.26.0-k3s1 h1:SXL8s82yHNE4KBTKFDBh9ZoYOXQNeWFWEhFv5RE6/N8= -github.com/k3s-io/kubernetes v1.26.0-k3s1/go.mod h1:z0aCJwn6DxzB/dDiWLbQaJO5jWOR2qoaCMnmSAx45XM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.26.0-k3s1 h1:w5XN5OeKP2DNYKbXom9tf5XzCCrd393ortP22tVFaY8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.26.0-k3s1/go.mod h1:FLLO2b8iBkYCBkxOABmlb0WHke27Um1x1IhWVvYWW08= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.26.0-k3s1 h1:RrmaVyMGQm5QfbkvBHvNa4VO9+Aj/BUSqVhcPHeyKkA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.26.0-k3s1/go.mod h1:dk8h2SjDUDHuoZHLxYwVctDGgjB2QF91PAh5t4YHTOE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.26.0-k3s1 h1:PkmzG6M3fRrm/bl7PxvRx4D7aSDfxiOE8mjDX1AQJK0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.26.0-k3s1/go.mod h1:tBz0Hr5jrRS2+mF92vCQ06122hcPTIkWMbPEXxk8Q4k= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.26.0-k3s1 h1:L2F7GsEce3opsliCAOeMF1XuCA/clmqcgjjBMdC21DQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.26.0-k3s1/go.mod h1:uuknkTX85K3bEPbG+xJZ4p04MF75E2BFI/Ee6Uc3SFU= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.26.0-k3s1 h1:zK1kSF822k7mPNaCHNbVePGCm/YzoOiXIdE0x2GiRA4= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.26.0-k3s1/go.mod h1:BCk56XtVmh0HeoqLdEr/TevUCtPLI1zutUuHGpcsWJs= -github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.26.0-k3s1 h1:pGHifEkbGGeNRKAN37SlKbidp/bvOGA9pD3DFY8aPHs= -github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.26.0-k3s1/go.mod h1:D/B6NWYyVY+egClz7ELFBoVAcm+hD5/bOt+fpKRhqoA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.26.0-k3s1 h1:j3ZPoKGZYSyDCrq/NTz4FuuoJamsyXM/HMjZfXf32NI= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.26.0-k3s1/go.mod h1:7iKQOlamS5+LeeJ1SyPWGVTDWqbEEXVFwhpEoC360Hs= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.26.0-k3s1 h1:b0/StUnO65Eo58035bTIkBeRZwcJRO3rCjYXf7VycZo= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.26.0-k3s1/go.mod h1:H7AF4SC5q7MnArCKE5YPw88fXG7gBarVfDsNzLHW0hQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.26.0-k3s1 h1:X3pLc0ezmkobXKrAai95HsdCHVN+VptsijtAOD3JbCM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.26.0-k3s1/go.mod h1:kN0vliGcT1fRM/iUBoBAPJLma9TiTKHu5jNeJqIH3xg= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.26.0-k3s1 h1:D6w3yD08qG1GEal/Ji9/lxMmlH+WR7t2Azl+3ehTTCA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.26.0-k3s1/go.mod h1:tErc+2xAYuozzEfZgB4zyPpuaswvjFqOGJ/d7wL6MOg= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.26.0-k3s1 h1:XcobnJwPLL/Qq+CKS/QMdV9RfmPfK7Wq8rTfugsaZeY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.26.0-k3s1/go.mod h1:TRgcK5vUMwoC673WjIpSNbYV+Q9iaxBaEpZqC/JUlCI= -github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.26.0-k3s1 h1:PG4V8LgMT2n6O7GfVWPa3c6KxXBv6iICzoRoEhLHUkk= -github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.26.0-k3s1/go.mod h1:3Rv1RmHjHVQQGtIruCns7Ly5CRvH+tbJ4PAXv+RSxuw= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.26.0-k3s1 h1:exxB+LHu6x/n8HikZcTXwDP10DhfWmeUQ9HRIfEdQHE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.26.0-k3s1/go.mod h1:UHA0kp7zlBcwGz49a13Ym/onXUdKIM9PRhSXDTl5qSE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.26.0-k3s1 h1:/qOvV/ivAZAjcIu3KAEVAGqzFzfMv9oViLSxEwtgeZk= -github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.26.0-k3s1/go.mod h1:r+of8qWyFUpoYSodPns4JE3QrhQPrlWksGXXO3ir7BI= -github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.26.0-k3s1 h1:KbaH8Wer3dKnd8jeVspW6nu+05r9pg5emQYvYsy2B7g= -github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.26.0-k3s1/go.mod h1:SaN0EKdFDjcL3huY7xteJOJAi74k7UHONktGL3eU3kw= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.26.0-k3s1 h1:pUIffjtgKNy/K8UhvJtIXaxURh1oWV16a+a8W7SXsGE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.26.0-k3s1/go.mod h1:aX3FtLqoLXBu785fjclYoQi+rVGMuHWlDZG8mUGokno= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.26.0-k3s1 h1:89KPkCHS2lbxgoTSn7wag80SHugF8MRZcnx2BoYVeh8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.26.0-k3s1/go.mod h1:l0usgF213dFprGrpaOnJMHnMDb08ZUQLwHaxWYVsHLU= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.26.0-k3s1 h1:m4U8E5fPSGXuqpL3A6xzCrm63wUGyXelKUc/VkpggkA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.26.0-k3s1/go.mod h1:6/c9bs7nbvujQi5NM2L6nEInSS3M5l/P614+ozpBX4I= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.26.0-k3s1 h1:YSsbsAIym90tNE33oWOLph8U1sHYl/31csPMdS8w75I= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.26.0-k3s1/go.mod h1:q4dnrkOvY8Axf2G+Io4MZN9XYolmNxrpON8Mn2XKLZY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.26.0-k3s1 h1:plM6j2d9OzvS0H83BAggFKlSRDu4c8sJk+XgEV0b2dI= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.26.0-k3s1/go.mod h1:CMvt2NIkeIN7LsEiPCDzMIHwYO1XNhtS3ROXpSXIJx0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.26.0-k3s1 h1:YRH/nMM/7PWzuo5E9XdbkW4kCGitVW2ik4KxA6YfyGs= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.26.0-k3s1/go.mod h1:xq4pyzCvLXWL3IeC/ElKA0JmgMIMw8dUM/ujuVs//W4= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.26.0-k3s1 h1:b6AGZrmDbXIWm3+enbrMTYCcGtdgWPuCwW4NnKc7S8Y= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.26.0-k3s1/go.mod h1:AqcEFiBS/Z0QfAiTf63wFOwLtQY34DOpaVQmuvhl4wE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.26.0-k3s1 h1:02AhweUDwzsrfpgeO5OqAq1W44zszhTQDGfjwz22e5c= -github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.26.0-k3s1/go.mod h1:GaZIJClO3K4tTI39ri1h67MnQazynCSeAMzgs/f5AcI= -github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.26.0-k3s1 h1:E8N4o4MT5zMeX5GFjrmhCe9MF5FSt+LHQq7BnNHnN2s= -github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.26.0-k3s1/go.mod h1:VrEQhIEoozRKzzJoOrqUZqWyUxQBlyQyLOcOX5i3TOI= -github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.26.0-k3s1 h1:MTMKAtE8f52Gj29n++PZB7cTVB39SWfIdZv7ZUCobrE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.26.0-k3s1/go.mod h1:AUJD2sA/Mxuap3aYcD8/VVBAnd743Rc2bE4Zt450DA0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.26.0-k3s1 h1:Cog3B7YLikJPUIegAMv0yKdo8Mb+m/4fH+CE/6EN+n0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.26.0-k3s1/go.mod h1:TUtGp/p5v1DOlnqgHtMOxRrdh8kUdbrbqRJ8OSnJ5so= -github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.26.0-k3s1/go.mod h1:JaTJgV51jRplTscxgRJ36Db4RQC2cQB5yWuZfzccVws= +github.com/k3s-io/kubernetes v1.26.1-k3s1 h1:DZMsEDUHTKH9VZdpQJkYTnZeYzDDzP8HxTc1QDa44F0= +github.com/k3s-io/kubernetes v1.26.1-k3s1/go.mod h1:dEfAfGVZBOr2uZLeVazLPj/8E+t8jYFbQqCiBudkB8o= +github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.26.1-k3s1 h1:M4L0jsG9n5nenmPJQMxAU2XYUF86sNZbl/yve0rLK7A= +github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.26.1-k3s1/go.mod h1:FLLO2b8iBkYCBkxOABmlb0WHke27Um1x1IhWVvYWW08= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.26.1-k3s1 h1:DBJyKjz6vODpAWYA3CC5YvTLr9+a06yVHeC6f7HK96U= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.26.1-k3s1/go.mod h1:YYs9kENhGnnZfAIJKbFqmMqi3alEenqgq1YPWUHZ4ps= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.26.1-k3s1 h1:OuPm+pOcR526gTdsp6VZz76mH1sWJPfdL7rCBY1+14M= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.26.1-k3s1/go.mod h1:tBz0Hr5jrRS2+mF92vCQ06122hcPTIkWMbPEXxk8Q4k= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.26.1-k3s1 h1:v7hkHwcM7LXzCD/v57KINTAgYFAKJ3j0YSCLdW6oXyg= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.26.1-k3s1/go.mod h1:XWJqqCguKrLSvB9bRONBg7GRg5jkr9mVQ5Yeahs7k5Y= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.26.1-k3s1 h1:POO5b3Z8yroLj/pCtCRQRHT/CaeAM6gXmq+bmnk8l2Y= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.26.1-k3s1/go.mod h1:BCk56XtVmh0HeoqLdEr/TevUCtPLI1zutUuHGpcsWJs= +github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.26.1-k3s1 h1:n8EXbKj8w3qp01eKsG7Ria+ypq2SEASx/ZMmHQj42n4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.26.1-k3s1/go.mod h1:D/B6NWYyVY+egClz7ELFBoVAcm+hD5/bOt+fpKRhqoA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.26.1-k3s1 h1:1/BGbZEN5sTRnzM3rBp3IKlV5xeB0nPVLgypqp+nTQc= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.26.1-k3s1/go.mod h1:EONL1w67hM9XHsezjBrCYl3eb5SjmUvNZMrq//345yU= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.26.1-k3s1 h1:ydpm8YR+QaOqfvdvugWch10g95nqa3voQ3FDkejxh4U= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.26.1-k3s1/go.mod h1:H7AF4SC5q7MnArCKE5YPw88fXG7gBarVfDsNzLHW0hQ= +github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.26.1-k3s1 h1:to+vs0Yz+z+mVd2k5cqKQdRoj5nyEyOruRU2Ggk9wcY= +github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.26.1-k3s1/go.mod h1:kN0vliGcT1fRM/iUBoBAPJLma9TiTKHu5jNeJqIH3xg= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.26.1-k3s1 h1:LoKZgiPc3l5W5W11Km0oRGaDdbpaNzcy7GXyWWC7PXM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.26.1-k3s1/go.mod h1:dVM+AcOUqN422QCTzRKgr19aYGmb5zoNbH7EF4d4jHU= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.26.1-k3s1 h1:2T8UoRR0CNyVoUjofQuAPpoktr54ryBIANK8UOAT3Og= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.26.1-k3s1/go.mod h1:TRgcK5vUMwoC673WjIpSNbYV+Q9iaxBaEpZqC/JUlCI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.26.1-k3s1 h1:OJdR/7GGNdy8UwUURzNh4o6xTPLvfqvg5pf6wUtjkdM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.26.1-k3s1/go.mod h1:zJrJpGuNLYVIsiOcox90221REJtczrYExUxvMAGkibo= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.26.1-k3s1 h1:EXuwyPzP7L+K7Z7R4Yj5tl392c7FQft4EtSlndzjOuo= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.26.1-k3s1/go.mod h1:UHA0kp7zlBcwGz49a13Ym/onXUdKIM9PRhSXDTl5qSE= +github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.26.1-k3s1 h1:aSiM/qjaPJJOvogwJgxDtqDu9IXIcmkp5ZXVPy8dAjo= +github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.26.1-k3s1/go.mod h1:r+of8qWyFUpoYSodPns4JE3QrhQPrlWksGXXO3ir7BI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.26.1-k3s1 h1:VVl3vs1eAEq6TgVjvMzecNj8Mf3O87sDxVlQ52TRdXo= +github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.26.1-k3s1/go.mod h1:SaN0EKdFDjcL3huY7xteJOJAi74k7UHONktGL3eU3kw= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.26.1-k3s1 h1:nGUwRYsSvecmp+G5P3En4GQbToPxftN4cvK3myDwF88= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.26.1-k3s1/go.mod h1:aX3FtLqoLXBu785fjclYoQi+rVGMuHWlDZG8mUGokno= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.26.1-k3s1 h1:lfVAdrUFUeOyakmJp9JcQnzJPP6XrqL2S0QKWo/cuBg= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.26.1-k3s1/go.mod h1:FV8XetM8Sc8O+9Kb6GZ6jfz9Sjxy+oKRTeGPNagTXzU= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.26.1-k3s1 h1:FdrYCHHgzpTRl4awLhPQky3EPHU0Oxw+dLl9EWesxpY= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.26.1-k3s1/go.mod h1:6/c9bs7nbvujQi5NM2L6nEInSS3M5l/P614+ozpBX4I= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.26.1-k3s1 h1:Bj5givpA5qb95l9VqeWrYhe2BHp/MQW0a1ElHH1+yY4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.26.1-k3s1/go.mod h1:q4dnrkOvY8Axf2G+Io4MZN9XYolmNxrpON8Mn2XKLZY= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.26.1-k3s1 h1:FWi98Yxad9Nwc59FLquhAGmXDoFnEAX1XauL+ZtZWqc= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.26.1-k3s1/go.mod h1:CMvt2NIkeIN7LsEiPCDzMIHwYO1XNhtS3ROXpSXIJx0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.26.1-k3s1 h1:ONFa9YakuTUJVS6ivVeU6aFNhteVQKxayJ2kdzbEkg4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.26.1-k3s1/go.mod h1:xq4pyzCvLXWL3IeC/ElKA0JmgMIMw8dUM/ujuVs//W4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.26.1-k3s1 h1:ft0JtqIJXCOnhGpQ2PZTqdgu2u+XGbJmh3bIue6cfCg= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.26.1-k3s1/go.mod h1:AqcEFiBS/Z0QfAiTf63wFOwLtQY34DOpaVQmuvhl4wE= +github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.26.1-k3s1 h1:FZ/CvFA5D5s4njB59XSWM+9UR124STCgsT5FnM+OM/8= +github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.26.1-k3s1/go.mod h1:GaZIJClO3K4tTI39ri1h67MnQazynCSeAMzgs/f5AcI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.26.1-k3s1 h1:Gto7h+jUO6iUc0OFyG7fT7dMPGSKtQFp01F0xwg0QKI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.26.1-k3s1/go.mod h1:VrEQhIEoozRKzzJoOrqUZqWyUxQBlyQyLOcOX5i3TOI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.26.1-k3s1 h1:PPUsNnW2VGqoP6yX7Ah4psfY839XG/Qb3rzvxCZ5f/c= +github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.26.1-k3s1/go.mod h1:AUJD2sA/Mxuap3aYcD8/VVBAnd743Rc2bE4Zt450DA0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.26.1-k3s1 h1:4scxBwYjpbiQuwEKhxNseV0CczN0QCsKBFAVw4kSZ9M= +github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.26.1-k3s1/go.mod h1:JObq+od46WSJ9X2QXMqyGKPHbM8f7/PxFVPpJ/TzLlg= +github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.26.1-k3s1/go.mod h1:Ot3GlDHn3XaRrql0Trh4+Yb5vjNkSwliolWXzCKGIoc= github.com/k3s-io/stargz-snapshotter v0.13.0-k3s1 h1:Kxs7Y1kayAX3hr3X+rkSBCaDwaWR/OfbWy+oESiBnN0= github.com/k3s-io/stargz-snapshotter v0.13.0-k3s1/go.mod h1:k+OjA93AK1owz6DgNIpxuiepp/SGrSZ0HX6lWjA3CVI= github.com/karrick/godirwalk v1.17.0 h1:b4kY7nqDdioR/6qnbHQyDvmA17u5G1cZ6J+CZXwSWoI= @@ -1151,9 +1151,8 @@ 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/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= +go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA= go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= -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= @@ -1471,8 +1470,8 @@ k8s.io/utils v0.0.0-20221107191617-1a15be271d1d/go.mod h1:OLgZIPagt7ERELqWJFomSt rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= 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.33 h1:LYqFq+6Cj2D0gFfrJvL7iElD4ET6ir3VDdhDdTK7rgc= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33/go.mod h1:soWkSNf2tZC7aMibXEqVhCd73GOY5fJikn8qbdzemB0= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35 h1:+xBL5uTc+BkPBwmMi3vYfUJjq+N3K+H6PXeETwf5cPI= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35/go.mod h1:WxjusMwXlKzfAs4p9km6XJRndVt2FROgMVCE4cdohFo= sigs.k8s.io/cli-utils v0.27.0/go.mod h1:8ll2fyx+bzjbwmwUnKBQU+2LDbMDsxy44DiDZ+drALg= sigs.k8s.io/controller-runtime v0.10.1/go.mod h1:CQp8eyUQZ/Q7PJvnIrB6/hgfTC1kBkGylwsLgOQi1WY= sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=