From 28028f8601264497b80a96a32a68612dba2bedef Mon Sep 17 00:00:00 2001 From: Matt Trachier Date: Fri, 16 Sep 2022 13:41:04 -0500 Subject: [PATCH] Update to v1.25.1 (#6140) * Update to v1.25.1 * bump go version Signed-off-by: matttrach --- .github/workflows/integration.yaml | 2 +- .github/workflows/unitcoverage.yaml | 2 +- Dockerfile.dapper | 2 +- Dockerfile.manifest | 2 +- Dockerfile.test | 4 +- go.mod | 86 ++++++++++----------- go.sum | 114 ++++++++++++++-------------- 7 files changed, 106 insertions(+), 106 deletions(-) diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml index 5e2f7e093a..65ef34b634 100644 --- a/.github/workflows/integration.yaml +++ b/.github/workflows/integration.yaml @@ -47,7 +47,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: '1.18.1' + go-version: '1.19.1' - name: Checkout uses: actions/checkout@v2 with: diff --git a/.github/workflows/unitcoverage.yaml b/.github/workflows/unitcoverage.yaml index c4ad304ea3..4515623cef 100644 --- a/.github/workflows/unitcoverage.yaml +++ b/.github/workflows/unitcoverage.yaml @@ -33,7 +33,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: '1.18.1' + go-version: '1.19.1' - name: Checkout uses: actions/checkout@v2 with: diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 7b73411280..3192b9c311 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -1,4 +1,4 @@ -ARG GOLANG=golang:1.19.0-alpine3.15 +ARG GOLANG=golang:1.19.1-alpine3.15 FROM ${GOLANG} ARG http_proxy=$http_proxy diff --git a/Dockerfile.manifest b/Dockerfile.manifest index 648dc2022f..9f3c8abb7a 100644 --- a/Dockerfile.manifest +++ b/Dockerfile.manifest @@ -1,4 +1,4 @@ -ARG GOLANG=golang:1.18.1-alpine3.15 +ARG GOLANG=golang:1.19.1-alpine3.15 FROM ${GOLANG} COPY --from=plugins/manifest:1.2.3 /bin/* /bin/ diff --git a/Dockerfile.test b/Dockerfile.test index 4271679280..37ad9dfd2c 100644 --- a/Dockerfile.test +++ b/Dockerfile.test @@ -1,4 +1,4 @@ -ARG GOLANG=golang:1.18.1-alpine3.15 +ARG GOLANG=golang:1.19.1-alpine3.15 FROM ${GOLANG} as test-base RUN apk -U --no-cache add bash jq @@ -33,4 +33,4 @@ RUN OS=linux; \ ENV TEST_CLEANUP true ENTRYPOINT ["./scripts/entry.sh"] -CMD ["test"] \ No newline at end of file +CMD ["test"] diff --git a/go.mod b/go.mod index e230b5c0b3..dfdf967546 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.0-k3s1 - k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.25.0-k3s1 - k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.25.0-k3s1 - k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.25.0-k3s1 - k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.25.0-k3s1 - k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.25.0-k3s1 - k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.25.0-k3s1 - k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.25.0-k3s1 - k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.25.0-k3s1 - k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.25.0-k3s1 - k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.25.0-k3s1 - k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.25.0-k3s1 - k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.25.0-k3s1 - k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.25.0-k3s1 + k8s.io/api => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.25.1-k3s1 + k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.25.1-k3s1 + k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.25.1-k3s1 + k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.25.1-k3s1 + k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.25.1-k3s1 + k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.25.1-k3s1 + k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.25.1-k3s1 + k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.25.1-k3s1 + k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.25.1-k3s1 + k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.25.1-k3s1 + k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.25.1-k3s1 + k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.25.1-k3s1 + k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.25.1-k3s1 + k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.25.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.60.1-k3s1 // k3s-main - k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.25.0-k3s1 - k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.25.0-k3s1 - k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.25.0-k3s1 - k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.25.0-k3s1 - k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.25.0-k3s1 - k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.25.0-k3s1 - k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.25.0-k3s1 - k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.25.0-k3s1 - k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.25.0-k3s1 - k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.25.0-k3s1 - k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.25.0-k3s1 - k8s.io/pod-security-admission => github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.25.0-k3s1 - k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.25.0-k3s1 - k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.25.0-k3s1 - k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.25.0-k3s1 + k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.25.1-k3s1 + k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.25.1-k3s1 + k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.25.1-k3s1 + k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.25.1-k3s1 + k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.25.1-k3s1 + k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.25.1-k3s1 + k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.25.1-k3s1 + k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.25.1-k3s1 + k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.25.1-k3s1 + k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.25.1-k3s1 + k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.25.1-k3s1 + k8s.io/pod-security-admission => github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.25.1-k3s1 + k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.25.1-k3s1 + k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.25.1-k3s1 + k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.25.1-k3s1 mvdan.cc/unparam => mvdan.cc/unparam v0.0.0-20210104141923-aac4ce9116a7 ) @@ -93,8 +93,8 @@ require ( github.com/mattn/go-sqlite3 v1.14.8 github.com/minio/minio-go/v7 v7.0.33 github.com/natefinch/lumberjack v2.0.0+incompatible - github.com/onsi/ginkgo/v2 v2.1.4 - github.com/onsi/gomega v1.20.0 + github.com/onsi/ginkgo/v2 v2.1.6 + github.com/onsi/gomega v1.20.1 github.com/opencontainers/runc v1.1.4 github.com/opencontainers/selinux v1.10.1 github.com/otiai10/copy v1.7.0 @@ -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.0 - k8s.io/apimachinery v0.25.0 - k8s.io/apiserver v0.25.0 + k8s.io/api v0.25.1 + k8s.io/apimachinery v0.25.1 + k8s.io/apiserver v0.25.1 k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible - k8s.io/cloud-provider v0.25.0 - k8s.io/component-base v0.25.0 - k8s.io/component-helpers v0.25.0 - k8s.io/cri-api v0.25.0 + k8s.io/cloud-provider v0.25.1 + k8s.io/component-base v0.25.1 + k8s.io/component-helpers v0.25.1 + k8s.io/cri-api v0.25.1 k8s.io/klog v1.0.0 - k8s.io/kubectl v0.25.0 - k8s.io/kubernetes v1.25.0 + k8s.io/kubectl v0.25.1 + k8s.io/kubernetes v1.25.1 k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed sigs.k8s.io/yaml v1.3.0 ) @@ -234,7 +234,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.4 // indirect + github.com/google/cel-go v0.12.5 // indirect github.com/google/gnostic v0.5.7-v3refs // indirect github.com/google/go-cmp v0.5.8 // indirect github.com/google/go-containerregistry v0.6.1-0.20211111182346-7a6ee45528a9 // 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.0 // indirect + k8s.io/controller-manager v0.25.1 // 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,7 +399,7 @@ require ( k8s.io/kubelet v0.0.0 // indirect k8s.io/legacy-cloud-providers v0.0.0 // indirect k8s.io/metrics v0.0.0 // indirect - k8s.io/mount-utils v0.25.0 // indirect + k8s.io/mount-utils v0.25.1 // 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/json v0.0.0-20220713155537-f223a00ba0e2 // indirect diff --git a/go.sum b/go.sum index e29d208cab..8eb979f03a 100644 --- a/go.sum +++ b/go.sum @@ -447,7 +447,6 @@ github.com/golang-jwt/jwt/v4 v4.2.0 h1:besgBTC8w8HjP6NzQdxwKH9Z5oQMZ24ThTrHp3cZ8 github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -478,8 +477,8 @@ 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.44.1 h1:hsAxDZOY+5xSCXH12d/G9cxYTfP+32cMT3J7aatrgDY= github.com/google/cadvisor v0.44.1/go.mod h1:GQ9KQfz0iNHQk3D6ftzJWK4TXabfIgM10Oy3FkR+Gzg= -github.com/google/cel-go v0.12.4 h1:YINKfuHZ8n72tPOqSPZBwGiDpew2CJS48mdM5W8LZQU= -github.com/google/cel-go v0.12.4/go.mod h1:Av7CU6r6X3YmcHR9GXqVDaEJYfEtSxl6wvIjUQTriCw= +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/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= @@ -680,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.0-k3s1 h1:U0NtMgKfbQ8A5o8/Ja1S7B/Myi2MZmt2T1QoTviQ+p0= -github.com/k3s-io/kubernetes v1.25.0-k3s1/go.mod h1:UdtILd5Zg1vGZvShiO1EYOqmjzM2kZOG1hzwQnM5JxY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.25.0-k3s1 h1:Mfr8Oz74QmMDRCWaxXxFEQC+um/g/3kIWA8Q7i1aL/g= -github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.25.0-k3s1/go.mod h1:tBOwA+MDf3hOu1T4XQhvV96FggbjZyHzS5/VFF2n+XQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.25.0-k3s1 h1:Y9dvZaWGxiORAGfJxACP6/kX3jnR3aXxlP0l7huQnq8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.25.0-k3s1/go.mod h1:xw4cPWyGN/m13X8hrXxFjm1UO0cT9mctpdSlhmgMsUo= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.25.0-k3s1 h1:wNJat4otJRz0DhM5ufc8Mm0TqjC9F2O91jprmgrymhM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.25.0-k3s1/go.mod h1:hZTJ4qD2ZkIZMccsUOiY18bA2cmGqQVOmrDELR0QhcU= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.25.0-k3s1 h1:Iw7TFmwbvOohGhjpRDgX3+VZ4kCa4LYvu1UgIYoXPcc= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.25.0-k3s1/go.mod h1:83nYPh6wFp/bmikguAta6uP7+kTJub0mRhEmBInBX/A= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.25.0-k3s1 h1:G1o9YA3eLCQTwUt7FFdIV6KbtT1DpcdV+5ysHfRlbUM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.25.0-k3s1/go.mod h1:WxDp/JgEx/nEEFEPY4GE54voNfGV8+I9WaPyC8Rw7zI= -github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.25.0-k3s1 h1:gaM8bIZLx330U5uqxlX3bCHY0E/HOcF5PHRlCY1JiKA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.25.0-k3s1/go.mod h1:Igxc4Ao8T3XXDRGBP9lugEYQOkwhz3UtGyN1Mk1CfiY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.25.0-k3s1 h1:25ZaODxopAsCF1+HK7FfzDeqGz3ymLDzOmdn5J1l3rs= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.25.0-k3s1/go.mod h1:QiVqDwsvSZxFLdaFpymXxGqgTl2xoZ1jJZNfRDAfCe0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.25.0-k3s1 h1:HHUd1bw9lhR0U6EYmxi3dIPp+t+pZlxgejuyx5mhyvU= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.25.0-k3s1/go.mod h1:kQtEocKbT8p/hQHM9UeC7PRY5Nqsnkg0VeQTg/B/qgU= -github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.25.0-k3s1 h1:SmGyBBjoHmKIv2ZagteVpIl9FWpVjEY5QI0HU7cfJCI= -github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.25.0-k3s1/go.mod h1:Dyk+UQuY4NDPCzTwAvEfp7wuphIesylHU9pBgoJrtgo= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.25.0-k3s1 h1:UJIzr3xW9gbHmGLQxtPlNtiMOWWkIjz8ItNYQYItdxk= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.25.0-k3s1/go.mod h1:TYa8EuYoshIHV8VWXuW+uKj89Nyms6Ch8ngqLdBfmCo= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.25.0-k3s1 h1:9IRjxrRKHoUWSdweU2GoaS6P0ZzVXRiCcsQjb4c1Saw= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.25.0-k3s1/go.mod h1:KIZ/2pzaCIRrP3WNaE58bYJB//2YkfF/JMpJJH5tQI0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.25.0-k3s1 h1:0BDohvZGawtl/ZYgGWrICWlMNgZeZd2rm52NqrEQ2M8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.25.0-k3s1/go.mod h1:qlSB479QVn61EyMrwuLi7gP8S6ZJDSIjdQZ+Sb0x5rE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.25.0-k3s1 h1:iiJcBO7fe6eWlBYKh7JlBfkw1fOJM6P6odqJfjJk89c= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.25.0-k3s1/go.mod h1:fTud+mLeql7ZnYPVkB1x7nAqAd0CkLNZtvvPUHDyZuE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.25.0-k3s1 h1:dtCYTIzqqbezeD6GGgqiBWoJAmyUmilA5aYK8IYTE+E= -github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.25.0-k3s1/go.mod h1:aFc9omOWDcTcj1O7UMNVO1M2ncZ/962NOz1fey7Kz/Y= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.25.0-k3s1 h1:mLHDfHWTzA6g9M0VZPtwJ+KVCqKChI0DaZwe6qJfl34= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.25.0-k3s1/go.mod h1:stj8Td14/RKRzQLDHPyrnM64SfAbQDb7DOKAlh2B8MM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.25.0-k3s1 h1:UI4ZojUgjwlTnw2e/vhqVm1Sn3C5Xjr7sB1xOEB2PPQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.25.0-k3s1/go.mod h1:XkGYt1v3TsRhw2YhJCDINgdiOHpr1wW1HcXhLGwfSx4= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.25.0-k3s1 h1:Ng0mTEi25Kl3eMqmAiKyG1Z6Paq+C/U9LEuuSCy/aTY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.25.0-k3s1/go.mod h1:AAFcICuBaprlRXR7ZB+F7UnkQcnaKPPmlgzrf1wudsY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.25.0-k3s1 h1:vh07LWycNnx4xjh4/5JR3593H5Xqu52N6mvTvo4/Sgo= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.25.0-k3s1/go.mod h1:uydnObIGNqpewcCnarNnGxn/pISCjGH0SGfBtb/XbV4= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.25.0-k3s1 h1:/Qi0fVZAHGgjuhnALBrZmirZXFRKDIPa0f5d9RBuYxo= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.25.0-k3s1/go.mod h1:wRhAGi4JwkIg+/TBY0W6oJ15GgKWrLXEtW0xxteOhY8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.25.0-k3s1 h1:AfRcdUMMSLGHkLAfk/ylS4NOOJmYYUrJCJdVG9onjVI= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.25.0-k3s1/go.mod h1:Faoe29h/mRVcxB17ZooAWN/8A/PPjx4trb9TzLibHyU= -github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.25.0-k3s1 h1:GP3Gt/BVe5RXdFK2IEd7Y9NcjTqA16DnO0iF1FQIQ3Y= -github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.25.0-k3s1/go.mod h1:+G+wabMtSVivqu4cgdHNmJ5dX+K7utAMxtrWOYGFEKw= -github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.25.0-k3s1 h1:umrv0zGB8MwPJtGlr8UQ3zjwKDDozTf3SaWml5oGaZA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.25.0-k3s1/go.mod h1:Y07EKEfFv0zP/ve4a5Z/pl1duD1AEf8D1GEmCQSLtmw= -github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.25.0-k3s1 h1:ViCdrRYu/3T9MrKqdDGK05SMf7eyDOkmto/h0f5O5zQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.25.0-k3s1/go.mod h1:YxtPi+a+eiz9JvIICzyaK9r9FfPb1BIx/rowusM2tGU= -github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.25.0-k3s1 h1:4VNH85jAempQdYRrtxenFkXaC7gYP0vSqucS5WezfFM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.25.0-k3s1/go.mod h1:q4irkosDJyBJK8DrUAkv90tQPJCm7tTtc9xBs8LA7lg= -github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.25.0-k3s1/go.mod h1:P2a0100cm0iPku4uSWrVgsORBJ6OAgitl70MwIhNPts= +github.com/k3s-io/kubernetes v1.25.1-k3s1 h1:SJ2SZjBNyH8Qj8VC6axBtmr89GSkfcvKlGqEg9co7FI= +github.com/k3s-io/kubernetes v1.25.1-k3s1/go.mod h1:OlhMy4mww2SLr1KtdV1vC014/MwfYlts/C66gtnDkKE= +github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.25.1-k3s1 h1:+X6BwovIOePO7l0v1ypabpL8x5KrBTQQ+wMR1jFk7O4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.25.1-k3s1/go.mod h1:wvMgOM5Av+A4jB2697Nd/g3aPCgj8YEVsmJpGmfopZk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.25.1-k3s1 h1:yOomllu3YN2UB65KltZdh9sJODLDqwU9RmZtktdEJCA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.25.1-k3s1/go.mod h1:wvUiiJ1cSEmgkaIPwANpAy/opBm7PU8KndyDyjrJ0KQ= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.25.1-k3s1 h1:ILplSJvAJAPv08XXKVi/iUPBo8wBGDXlBfVHbiir5hU= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.25.1-k3s1/go.mod h1:vM6raI5G7nvbTN88iIRp57Iyr+JqMS3EdMZR+hmvI74= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.25.1-k3s1 h1:qtyQN3rbQHbTmPtNVfGy3yTQdJuyNiw3OjEM4tQ/Idc= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.25.1-k3s1/go.mod h1:IEYLN7rCUDUYW+KNk6COLKJ7ZmRptpWSzvvlZilPuIA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.25.1-k3s1 h1:JvEJucMjqm3N5Z1HmvamSzjDVXjXeAsx4C5+TJ7FmsM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.25.1-k3s1/go.mod h1:inWX+hRBFEmY9BWjjz3258LXo0sFhq3mlMS/zLqosAc= +github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.25.1-k3s1 h1:dsY/+f8xdaziencQdiQx9uMx2M2D1K/AciuIfjZDUzg= +github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.25.1-k3s1/go.mod h1:WPKhWQ8eR2VxuPXxJqSQLDwWi0gh5mHw7BxxvP+dhFU= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.25.1-k3s1 h1:sqp1Ez6O8cvzCDx1WoVmfrNFGuOD+gK8Tnb77Ypdt8s= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.25.1-k3s1/go.mod h1:bjCFUvxddDW+FeuAol8sOtXK02etI6NYHdbmfrGpbDI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.25.1-k3s1 h1:wWev2rHBnicGsnCpFMplUlY7YS5HmGnA2EEHBdrqvbc= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.25.1-k3s1/go.mod h1:kQtEocKbT8p/hQHM9UeC7PRY5Nqsnkg0VeQTg/B/qgU= +github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.25.1-k3s1 h1:HJzk8jmHiluvoGiCNtnOJKNsEegEn6HwYNMgZ8prdZ4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.25.1-k3s1/go.mod h1:Vu0aQHjOEoSgpw8/vZZWv8bBnYFiTypdvFZC0iB8rxI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.25.1-k3s1 h1:27WkDK/0c1M5feJxBRWPCuhAhN67l0wU/Eg0Nrl8qHE= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.25.1-k3s1/go.mod h1:jkPkm8xMLsXfuFcsom7s/2j/8Wd1+c8k0CaNm0m/xGw= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.25.1-k3s1 h1:WvlAMRCLACFmoDsiY/ErX1Gb4cY+nuDfP0PuDNZZiPQ= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.25.1-k3s1/go.mod h1:4UjptCN6e4loBUfs0h1R7kevZfGg1cMW1DiMdHNv7oY= +github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.25.1-k3s1 h1:dNmirjhEdJ5CvM1AdpHaQwAwArHMqhk57ybEFBZ/IpU= +github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.25.1-k3s1/go.mod h1:sU/Wg23n3eEY+zH1l7uKk6i/XG07FddteJQmX/v6mi4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.25.1-k3s1 h1:EDPpHy4+I6KUnJA7uWh75fVKyhkzKtzcMqc3DMF8TiE= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.25.1-k3s1/go.mod h1:2LFpaWXEd8PJYF1xnz46lCU4xfbg3O3YHgkLU+ZPIZ0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.25.1-k3s1 h1:oOFQn7B1e23p7uwF7fiKyKpxPea/NmlJZz9a70jv/Qk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.25.1-k3s1/go.mod h1:aFc9omOWDcTcj1O7UMNVO1M2ncZ/962NOz1fey7Kz/Y= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.25.1-k3s1 h1:GTzAOC5U3+rsHORXWvLAhu62AKx9OV6fFgzWaCi0RK8= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.25.1-k3s1/go.mod h1:0aKg89lhJONBYW7H3kHg4kjn85W/awEO97OKAt9LJTM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.25.1-k3s1 h1:diWghbIpUmnS261uBPwiFBUtCmekrdEYDCiI/0ZZ8wE= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.25.1-k3s1/go.mod h1:XkGYt1v3TsRhw2YhJCDINgdiOHpr1wW1HcXhLGwfSx4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.25.1-k3s1 h1:SWLIKBldVFggsaUITphhD+3rDta4S7YllupiDNN8bvI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.25.1-k3s1/go.mod h1:5GZH00/YrMKONtqNvexlj7ziy2bp8x3khtUdGZvXwUw= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.25.1-k3s1 h1:NFZ/YtJRMkkJUNl0dZdZukDQmRtLAFGU4FaRsKiV2Zg= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.25.1-k3s1/go.mod h1:pbpOZITqscSg+osCNe6WnboJFzEEWZsG9jh1qzjluDg= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.25.1-k3s1 h1:sz5ryxZPdur979Zzg2M8A2XTnCV1mcOoOCLNTRfgb9g= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.25.1-k3s1/go.mod h1:049xURDos4SNMOjwu5DtpYHDAbIULQFkQJB5SxwOW/c= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.25.1-k3s1 h1:ouDZzS3Rzpxhmc/V8o9xchFVSCD0O++KQTiu4DYHQrY= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.25.1-k3s1/go.mod h1:G0TM5PU+ALqSGPjSXZB5wOpOWApdNkCBwMD3r1v0z0o= +github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.25.1-k3s1 h1:dGSegFjLekQjZaucITyi9Svm08PiDsKRCKmiXo31NhE= +github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.25.1-k3s1/go.mod h1:FO33IO/BAupssNt4gSsA6SlL7c7ZAxx6Zzjox8wkI2I= +github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.25.1-k3s1 h1:ubY61If0++mfHBpKvhetqniRqy5ipYTBiMnJiaG3JLU= +github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.25.1-k3s1/go.mod h1:bT9UtMfmBcP6wNpelKpMzUrjRB07e6hX5BHt6B6HF/E= +github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.25.1-k3s1 h1:iAYEpE8qc0TUIHonq4qS1do01yuu7E8luZGajpAaL6k= +github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.25.1-k3s1/go.mod h1:YxtPi+a+eiz9JvIICzyaK9r9FfPb1BIx/rowusM2tGU= +github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.25.1-k3s1 h1:is/922P3uzLmxQ+IDGcEdD/WkNdTKVBiOxSPlSUQUUY= +github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.25.1-k3s1/go.mod h1:a7g+y/kbzRIjglPHuoC4Kl3ME4JLpSeZ3X15nF3egSM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.25.1-k3s1/go.mod h1:Ve5QCbplxzZPn8/7SPTpcGqFpk28UfMQgfbp1AM19ZI= 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= @@ -924,8 +923,9 @@ github.com/onsi/ginkgo v1.13.0/go.mod h1:+REjRxOmWfHCjfv9TTWB1jD1Frx4XydAD3zm1ls github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= -github.com/onsi/ginkgo/v2 v2.1.4 h1:GNapqRSid3zijZ9H77KrgVG4/8KqiyRsxcSxe+7ApXY= github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU= +github.com/onsi/ginkgo/v2 v2.1.6 h1:Fx2POJZfKRQcM1pH49qSZiYeu319wji004qX+GDovrU= +github.com/onsi/ginkgo/v2 v2.1.6/go.mod h1:MEH45j8TBi6u9BMogfbp0stKC5cdGjumZj5Y7AG4VIk= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.3.0/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= @@ -936,8 +936,8 @@ github.com/onsi/gomega v1.15.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+t github.com/onsi/gomega v1.16.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= -github.com/onsi/gomega v1.20.0 h1:8W0cWlwFkflGPLltQvLRB7ZVD5HuP6ng320w2IS245Q= -github.com/onsi/gomega v1.20.0/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo= +github.com/onsi/gomega v1.20.1 h1:PA/3qinGoukvymdIDV8pii6tiZgC8kbmJO6Z5+b002Q= +github.com/onsi/gomega v1.20.1/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=