From 37a44295197718ad6d90d7daedaed979cb3707d2 Mon Sep 17 00:00:00 2001 From: Brooks Newberry Date: Thu, 15 Feb 2024 13:14:17 -0800 Subject: [PATCH] Update Kubernetes to v1.26.14 (#9490) Signed-off-by: Brooks Newberry --- .github/workflows/integration.yaml | 2 +- .github/workflows/unitcoverage.yaml | 2 +- Dockerfile.dapper | 2 +- Dockerfile.manifest | 2 +- Dockerfile.test | 2 +- go.mod | 64 +++++++-------- go.sum | 123 +++++++++++++++------------- pkg/cli/cmds/log.go | 6 -- scripts/build | 2 - scripts/test | 7 ++ scripts/validate | 4 +- 11 files changed, 114 insertions(+), 102 deletions(-) diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml index 6f6b4cc34c..4e2f0621df 100644 --- a/.github/workflows/integration.yaml +++ b/.github/workflows/integration.yaml @@ -45,7 +45,7 @@ jobs: - name: Install Go uses: actions/setup-go@v4 with: - go-version: '1.20.13' + go-version: '1.21.7' check-latest: true cache: true cache-dependency-path: | diff --git a/.github/workflows/unitcoverage.yaml b/.github/workflows/unitcoverage.yaml index 77571b6ec2..aabcbb90e2 100644 --- a/.github/workflows/unitcoverage.yaml +++ b/.github/workflows/unitcoverage.yaml @@ -41,7 +41,7 @@ jobs: - name: Install Go uses: actions/setup-go@v4 with: - go-version: '1.20.13' + go-version: '1.21.7' check-latest: true cache: true cache-dependency-path: | diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 0e90163ed3..2bb7e89369 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -1,4 +1,4 @@ -ARG GOLANG=golang:1.20.13-alpine3.18 +ARG GOLANG=golang:1.21.7-alpine3.18 FROM ${GOLANG} # Set proxy environment variables diff --git a/Dockerfile.manifest b/Dockerfile.manifest index c7707a43ae..2cbb3d2727 100644 --- a/Dockerfile.manifest +++ b/Dockerfile.manifest @@ -1,4 +1,4 @@ -ARG GOLANG=golang:1.20.13-alpine3.18 +ARG GOLANG=golang:1.21.7-alpine3.18 FROM ${GOLANG} COPY --from=plugins/manifest:1.2.3 /bin/* /bin/ diff --git a/Dockerfile.test b/Dockerfile.test index 71a544dcba..541665f65f 100644 --- a/Dockerfile.test +++ b/Dockerfile.test @@ -1,4 +1,4 @@ -ARG GOLANG=golang:1.20.13-alpine3.18 +ARG GOLANG=golang:1.21.7-alpine3.18 FROM ${GOLANG} as test-base RUN apk -U --no-cache add bash jq diff --git a/go.mod b/go.mod index d8e991aad3..6e8069b000 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/k3s-io/k3s -go 1.19 +go 1.21 replace ( github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.11.0 @@ -55,40 +55,40 @@ replace ( google.golang.org/genproto => google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 google.golang.org/grpc => google.golang.org/grpc v1.58.3 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.13-k3s1 - k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.26.13-k3s1 - k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.26.13-k3s1 - k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.26.13-k3s1 - k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.26.13-k3s1 - k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.26.13-k3s1 - k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.26.13-k3s1 - k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.26.13-k3s1 - k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.26.13-k3s1 - k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.26.13-k3s1 - k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.26.13-k3s1 - k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.26.13-k3s1 - k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.26.13-k3s1 - k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.26.13-k3s1 - k8s.io/dynamic-resource-allocation => github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.26.13-k3s1 + k8s.io/api => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.26.14-k3s1 + k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.26.14-k3s1 + k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.26.14-k3s1 + k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.26.14-k3s1 + k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.26.14-k3s1 + k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.26.14-k3s1 + k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.26.14-k3s1 + k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.26.14-k3s1 + k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.26.14-k3s1 + k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.26.14-k3s1 + k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.26.14-k3s1 + k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.26.14-k3s1 + k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.26.14-k3s1 + k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.26.14-k3s1 + k8s.io/dynamic-resource-allocation => github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.26.14-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.13-k3s1 - k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.26.13-k3s1 - k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.26.13-k3s1 + k8s.io/kms => github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.26.14-k3s1 + k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.26.14-k3s1 + k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.26.14-k3s1 k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 - k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.26.13-k3s1 - k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.26.13-k3s1 - k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.26.13-k3s1 - k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.26.13-k3s1 - k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.26.13-k3s1 - k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.26.13-k3s1 - k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.26.13-k3s1 - k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.26.13-k3s1 - k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.26.13-k3s1 - k8s.io/pod-security-admission => github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.26.13-k3s1 - k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.26.13-k3s1 - k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.26.13-k3s1 - k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.26.13-k3s1 + k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.26.14-k3s1 + k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.26.14-k3s1 + k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.26.14-k3s1 + k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.26.14-k3s1 + k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.26.14-k3s1 + k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.26.14-k3s1 + k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.26.14-k3s1 + k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.26.14-k3s1 + k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.26.14-k3s1 + k8s.io/pod-security-admission => github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.26.14-k3s1 + k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.26.14-k3s1 + k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.26.14-k3s1 + k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.26.14-k3s1 mvdan.cc/unparam => mvdan.cc/unparam v0.0.0-20210104141923-aac4ce9116a7 ) diff --git a/go.sum b/go.sum index 881c87a8dd..5a0a1bd7fe 100644 --- a/go.sum +++ b/go.sum @@ -88,6 +88,7 @@ github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20221215162035-5330a85ea652/go.mod github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20230306123547-8075edf89bb0 h1:59MxjQVfjXsBpLy+dbd2/ELV5ofnUkUZBvWSC85sheA= github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20230306123547-8075edf89bb0/go.mod h1:OahwfttHWG6eJ0clwcfBAHoDI6X/LV/15hx/wlMZSrU= github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 h1:cTp8I5+VIoKjsnZuH8vjyaysT/ses3EvZeaV/1UkF2M= +github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= github.com/Azure/azure-sdk-for-go v55.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go v56.3.0+incompatible h1:DmhwMrUIvpeoTDiWRDtNHqelNUd3Og8JCkrLHQK795c= github.com/Azure/azure-sdk-for-go v56.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= @@ -329,6 +330,7 @@ github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= +github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg= github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= @@ -347,10 +349,12 @@ github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c h1:pFUpOrbxDR github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c/go.mod h1:6UhI8N9EjYm1c2odKpFpAYeR8dsBeM7PtzQhRgxRr9U= github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc= github.com/decred/dcrd/crypto/blake256 v1.0.1 h1:7PltbUIQB7u/FfZ39+DGa/ShuMyJ5ilcvdfma9wOH6Y= +github.com/decred/dcrd/crypto/blake256 v1.0.1/go.mod h1:2OfgNZ5wDpcsFmHmCK5gZTPcCXqlm2ArzUIkw9czNJo= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.0-20210816181553-5444fa50b93d/go.mod h1:tmAIfUFEirG/Y8jhZ9M+h36obRZAk/1fcSpXwAVlfqE= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 h1:8UrgZ3GkP4i/CLijOJx79Yu+etlyjdBU4sfcs2WYQMs= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0= github.com/dgraph-io/badger v1.6.2 h1:mNw0qs90GVgGGWylh0umH5iag1j6n/PeJtNvL6KY/x8= +github.com/dgraph-io/badger v1.6.2/go.mod h1:JW2yswe3V058sS0kZ2h/AXeDSqFjxnZcRrVH//y2UQE= github.com/dgraph-io/badger/v3 v3.2103.5/go.mod h1:4MPiseMeDQ3FNCYwRbbcBOGJLf5jsE0PPFzRiKjtcdw= github.com/dgraph-io/ristretto v0.1.1 h1:6CWw5tJNgpegArSHpNHJKldNeq03FQCwYvfMVWajOK8= github.com/dgraph-io/ristretto v0.1.1/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkzgwUve0VDWWA= @@ -435,6 +439,7 @@ github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM github.com/frankban/quicktest v1.12.1/go.mod h1:qLE0fzW0VuyUAJgPU19zByoIr0HtCHN/r/VLSOOIySU= github.com/frankban/quicktest v1.14.0/go.mod h1:NeW+ay9A/U67EYXNFA1nPE8e/tnQv/09mUdL/ijj8og= github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= +github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= @@ -500,6 +505,7 @@ github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+ github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU= github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= +github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= @@ -648,6 +654,7 @@ github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0 github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c h1:7lF+Vz0LqiRidnzC1Oq86fpX1q/iEv2KJdrCtttYjT4= +github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= @@ -735,10 +742,12 @@ github.com/ipfs/go-datastore v0.6.0/go.mod h1:rt5M3nNbSO/8q1t4LNkLyUwRs8HupMeN/8 github.com/ipfs/go-detect-race v0.0.1 h1:qX/xay2W3E4Q1U7d9lNs1sU9nvguX0a7319XbyQ6cOk= github.com/ipfs/go-detect-race v0.0.1/go.mod h1:8BNT7shDZPo99Q74BpGMK+4D8Mn4j46UU0LZ723meps= github.com/ipfs/go-ds-badger v0.3.0 h1:xREL3V0EH9S219kFFueOYJJTcjgNSZ2HY1iSvN7U1Ro= +github.com/ipfs/go-ds-badger v0.3.0/go.mod h1:1ke6mXNqeV8K3y5Ak2bAA0osoTfmxUdupVCGm4QUIek= github.com/ipfs/go-ds-leveldb v0.5.0 h1:s++MEBbD3ZKc9/8/njrn4flZLnCuY9I79v94gBUNumo= github.com/ipfs/go-ds-leveldb v0.5.0/go.mod h1:d3XG9RUDzQ6V4SHi8+Xgj9j1XuEk1z82lquxrVbml/Q= github.com/ipfs/go-ipfs-delay v0.0.0-20181109222059-70721b86a9a8/go.mod h1:8SP1YXK1M1kXuc4KJZINY3TQQ03J2rwBG9QfXmbRPrw= github.com/ipfs/go-ipfs-util v0.0.2 h1:59Sswnk1MFaiq+VcaknX7aYEyGyGDAA73ilhEK2POp8= +github.com/ipfs/go-ipfs-util v0.0.2/go.mod h1:CbPtkWJzjLdEcezDns2XYaehFVNXG9zrdrtMecczcsQ= github.com/ipfs/go-log v1.0.5 h1:2dOuUCB1Z7uoczMWgAyDck5JLb72zHzrMnGnCNNbvY8= github.com/ipfs/go-log v1.0.5/go.mod h1:j0b8ZoR+7+R99LD9jZ6+AJsrzkPbSXbZfGakb5JPtIo= github.com/ipfs/go-log/v2 v2.1.3/go.mod h1:/8d0SH3Su5Ooc31QlL1WysJhvyOTDCjcCZ9Axpmri6g= @@ -820,61 +829,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/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.26.13-k3s1 h1:eB14pxnM3ogNhlARmEI6hvclSHpU4wzgju6aCnxOJ+o= -github.com/k3s-io/kubernetes v1.26.13-k3s1/go.mod h1:Y5N3uFKuSpAI0lqQ8Qo8GY/T3St+nWPs/0k8atin6E8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.26.13-k3s1 h1:7Th61ZOjpq6wh30WEJ80/yH5yt10E9DE+OkhMxjp+SE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.26.13-k3s1/go.mod h1:K3IAZiAj4Uq8RRV/5QciSR5l80KTkcKLrl4oTWU8+ro= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.26.13-k3s1 h1:O6HQtF95xYe+diA6s9uhxeZypjYNWNUbLO2TUhBTgSc= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.26.13-k3s1/go.mod h1:bRLk3/HQ+URrE93h0SgklQx7GuBTpE9IySGE4zKmLJY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.26.13-k3s1 h1:W0J0HxhZzqZ3phiB14OO2U0Sp4eu3n0VElUbUBinaag= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.26.13-k3s1/go.mod h1:GHWVfEuRr6V0zWij9Uw83IqEUFfxBi96vEeFUw/dM4o= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.26.13-k3s1 h1:eClMWnVvw/u5/VAsmnbL1OZEXw/ZYeVh9Ok8wkb2Xfw= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.26.13-k3s1/go.mod h1:C2l9r8ssDC4asYAPnDEAmFg8TPizdhaBiWAWCnl2xv4= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.26.13-k3s1 h1:n/pBV6kpjWcyw7RPaa12rxp0eE8f32aGcCgAu6PWYAs= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.26.13-k3s1/go.mod h1:fgSyOTiTYu1Lf1jzw/SzNNyMRD2LEy0E7HD0pmz/17U= -github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.26.13-k3s1 h1:XIQrCQjfao9CF8EvNJ47IADzFoqWmu9JTi7owze0xv4= -github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.26.13-k3s1/go.mod h1:DrmUgL5tDsF7LqgeNeAtjJpp3thXFgzBpQspRd0gBcA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.26.13-k3s1 h1:ehyoaoVixTzPo1Z+maaD9ioPVGSfkQrTbc6qfx0ge8E= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.26.13-k3s1/go.mod h1:IF0qOBpRJS3ItZRDP8pg1OxedqDtSLZkrlO0o1ibj1c= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.26.13-k3s1 h1:bHh2xcT2Pg482xO/9+0ZiegJ4PIRxwVxZgreyJ4ucoE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.26.13-k3s1/go.mod h1:/AI3rXlivbXX5MgSb1J40AWxmA3krwhM42LnrPGJTFE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.26.13-k3s1 h1:wk4PjQtMJcd9bbSW3RMBNJTa7KYhCyjQSXVZFUFr10M= -github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.26.13-k3s1/go.mod h1:BEgoCLTVancRv7IgkmqcJKuWmeAPGhnuRnEtfTjWlro= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.26.13-k3s1 h1:QJRVyhZBl+4TJpvYhomBfvPZiSeO4Rv5yGfzwjZGFOg= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.26.13-k3s1/go.mod h1:4ydEW4TCVbQLJT4ynnv3kI7fUaqsV1P8HcQb/jROOe4= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.26.13-k3s1 h1:cgQcoIbDBdaaveHkc77OvGH4zYs+ywgW/Ism+GKyLdY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.26.13-k3s1/go.mod h1:tQUa2tmlDsR3+Lc8eCHNJDQlB3yUFPu6umzK7az4pIo= -github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.26.13-k3s1 h1:Ho4T3Vdaa1lXABqvpLTml+e28G7XDmmEltcLoZRQ7LY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.26.13-k3s1/go.mod h1:kN0qPwF0PNy/TVnZycf2Z1tm1ifYM4aY/RmU6wMnhWo= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.26.13-k3s1 h1:8JFdqt54JeL7VEobz4/KqMx4zepR9hbaJLlLYUuMDoQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.26.13-k3s1/go.mod h1:36KVzY1IN7rz9cdeqp5dXavQ+bI4xy+VDEuIs3CVzbw= -github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.26.13-k3s1 h1:72V/+HQZeEM1USomp2g6/sofAHQS9zNZFPyvOFzeW90= -github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.26.13-k3s1/go.mod h1:Sz69Y2BBVXunXE72XHvnSHqVewO9+te0uRexneEVFsY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.26.13-k3s1 h1:MMPljL4bIja8fJTuFev0M/u0ZPKdnhr+Mq+2rxmtkwU= -github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.26.13-k3s1/go.mod h1:KLKprELKWb2Zek6DxxHk//JdCQxsCqXVZaKHA4E+/1w= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.26.13-k3s1 h1:05ZKllXve8h18DrT91HnRvbMj3jtHGdKFDIpjX+LeiA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.26.13-k3s1/go.mod h1:m+Rh/fAxjWPc43bkGW1m6rBbmsHe35baltWd1X2w+O4= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.26.13-k3s1 h1:ENkZRMz30qKmavi22opuhv/0MLaQkYygQcySvsFzhio= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.26.13-k3s1/go.mod h1:l5aX74A4n1If70Ub5hxUdk/BF9tgswl6+1al50PRXlM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.26.13-k3s1 h1:mV73/kyBxq9qB3px85D5HlIkAGXhf0U2OwD+cRJEE00= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.26.13-k3s1/go.mod h1:1PfCf+z+DYSuYVwGs3k6jbtzxtlq/uqiDzFGoUAEGt0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.26.13-k3s1 h1:W10PIJZFVKttFyu/T1MW/xpBZBKe6MJlAILKY5tOqK4= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.26.13-k3s1/go.mod h1:cWmk2TxobE67k+YImk7VEJ1xoS9bXKZlwxt0m2Qbwvk= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.26.13-k3s1 h1:H7oDnqIr1+tNmllCGJ7lm1fzui47vvN5xfAC+7mLcZw= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.26.13-k3s1/go.mod h1:IMMDXqb1YQQgANm9ogDJXhhopucMh3WHK6jCRiKeeUw= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.26.13-k3s1 h1:yxODWVrlwQVdFqoFrfm40hFGrsEAgNADFtZ2pvbDM90= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.26.13-k3s1/go.mod h1:kfjBM3lrfUYh0NOGjt5eUZJx7uTZ8RvFx+QCrq+t0sQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.26.13-k3s1 h1:yPlFW9gQJ05WG/1bNMxxlskjXAFttJ3Z0s6Gu96RMdQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.26.13-k3s1/go.mod h1:DIw8x9dY91v2rKk7Bah04eKl1g+olT29YurgxUkYRGU= -github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.26.13-k3s1 h1:gcHfOPvKi1Skkx7+YerZkFfDOFi9QpsDlRmpwLG+KgM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.26.13-k3s1/go.mod h1:rkshi0kV/WaME/e+lMwhABP9EbOn8OtXltddk01qK2Y= -github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.26.13-k3s1 h1:9ceU6De9Pv6Nj8eExFXGjvgUGblgoeGR83UG+ZwY3CQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.26.13-k3s1/go.mod h1:vkycw0WSZz8qi2BwIb3ymiPzu0rwBQAQwCTTetsKUKc= -github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.26.13-k3s1 h1:vTe53maxvHZm9BTK1f+q4U8B5ZWNGlvKGivYOAzNXKA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.26.13-k3s1/go.mod h1:Lk8YUfeI5ZMal57UHOt0cL9dvfNRqRgnGK2lyiwFKqM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.26.13-k3s1 h1:udL1X+jQCGo/94DxmIGU3ii6MitKvtItGn8xS/6Dubs= -github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.26.13-k3s1/go.mod h1:0Xg5jYi8ve14VRAQVNZqThOrhzAp02b5w1xRJgyknMw= -github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.26.13-k3s1/go.mod h1:9zYTQO3cABNpR1Sb4WJm6CLiNZmODi+CTbFY6u24T90= +github.com/k3s-io/kubernetes v1.26.14-k3s1 h1:Txati4mcKJkf9lJXiW3NYDzu1POBGXthU9yTjZXYb/s= +github.com/k3s-io/kubernetes v1.26.14-k3s1/go.mod h1:Y5N3uFKuSpAI0lqQ8Qo8GY/T3St+nWPs/0k8atin6E8= +github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.26.14-k3s1 h1:6ClofjA8DwwXKpsN3bxBQvLa/t59AVF3+q0B/xXdJP4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.26.14-k3s1/go.mod h1:K3IAZiAj4Uq8RRV/5QciSR5l80KTkcKLrl4oTWU8+ro= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.26.14-k3s1 h1:JzbCVoMETYdqntXmVChQ2PrmZrgrrNsfnqokxpgi1K4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.26.14-k3s1/go.mod h1:bRLk3/HQ+URrE93h0SgklQx7GuBTpE9IySGE4zKmLJY= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.26.14-k3s1 h1:xY4GJ6Vtz2370PzsjjuWkw8YIwtkg/e+Q1EfoCVIpms= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.26.14-k3s1/go.mod h1:GHWVfEuRr6V0zWij9Uw83IqEUFfxBi96vEeFUw/dM4o= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.26.14-k3s1 h1:nH4+XcWWPl6j+eK4zemieUDfs30918+7IePffD5fNW4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.26.14-k3s1/go.mod h1:C2l9r8ssDC4asYAPnDEAmFg8TPizdhaBiWAWCnl2xv4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.26.14-k3s1 h1:742Qudq4p8hYf2JNpkm6Ny8WZaHeYuoXxOHPaxOonWs= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.26.14-k3s1/go.mod h1:fgSyOTiTYu1Lf1jzw/SzNNyMRD2LEy0E7HD0pmz/17U= +github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.26.14-k3s1 h1:+PNPewJ6qO39ZiMWENFtoMPpar4XGmUc0+tIA1HdxXw= +github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.26.14-k3s1/go.mod h1:DrmUgL5tDsF7LqgeNeAtjJpp3thXFgzBpQspRd0gBcA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.26.14-k3s1 h1:2hiKaq4gjQEtk0OtAwQ2JzQyCkyrpapmC+g9lf/dxMk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.26.14-k3s1/go.mod h1:IF0qOBpRJS3ItZRDP8pg1OxedqDtSLZkrlO0o1ibj1c= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.26.14-k3s1 h1:GpLESyB42CoBckFPjdpYujDyRXMYLRk6DH/uFnuah3U= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.26.14-k3s1/go.mod h1:/AI3rXlivbXX5MgSb1J40AWxmA3krwhM42LnrPGJTFE= +github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.26.14-k3s1 h1:0rQZRH8lwMfQXaqkW9lMCmw+Ad8yYp+mPWTSojNngWo= +github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.26.14-k3s1/go.mod h1:BEgoCLTVancRv7IgkmqcJKuWmeAPGhnuRnEtfTjWlro= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.26.14-k3s1 h1:7F8K1hMUapvGz8T0iAWKIAHk7Tt3+LIbgMOpbdjVjxw= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.26.14-k3s1/go.mod h1:4ydEW4TCVbQLJT4ynnv3kI7fUaqsV1P8HcQb/jROOe4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.26.14-k3s1 h1:ZrXuSDqfQUefnKfanu4/esSdH9R8C8grbIfBGelCDSQ= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.26.14-k3s1/go.mod h1:tQUa2tmlDsR3+Lc8eCHNJDQlB3yUFPu6umzK7az4pIo= +github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.26.14-k3s1 h1:CxbvpQaWi4orw1Uw5UsGYg2t1WSnDVJP5GTd4FPW+0U= +github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.26.14-k3s1/go.mod h1:kN0qPwF0PNy/TVnZycf2Z1tm1ifYM4aY/RmU6wMnhWo= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.26.14-k3s1 h1:V+s2Whsj7TlWpALRwuDASydSgkeHZG+OHRquNp0cyic= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.26.14-k3s1/go.mod h1:36KVzY1IN7rz9cdeqp5dXavQ+bI4xy+VDEuIs3CVzbw= +github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.26.14-k3s1 h1:oWwn5bVcd//w6g/5Li0tqAmlFlqOxbPUKOHeVZR8AOo= +github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.26.14-k3s1/go.mod h1:Sz69Y2BBVXunXE72XHvnSHqVewO9+te0uRexneEVFsY= +github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.26.14-k3s1 h1:XlVfSHBEruYMT6tTjgw9JsK9NUJhOG4tbszBzzWf6n4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.26.14-k3s1/go.mod h1:KLKprELKWb2Zek6DxxHk//JdCQxsCqXVZaKHA4E+/1w= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.26.14-k3s1 h1:QX4+xw12bbozwUbokXfO61rRpM4LridsZe1bm6Yu25g= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.26.14-k3s1/go.mod h1:m+Rh/fAxjWPc43bkGW1m6rBbmsHe35baltWd1X2w+O4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.26.14-k3s1 h1:DBCE/1uq5su6sFcjo+fstARTBNgVDP+CwpBBg1mHkd4= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.26.14-k3s1/go.mod h1:l5aX74A4n1If70Ub5hxUdk/BF9tgswl6+1al50PRXlM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.26.14-k3s1 h1:kZOSonQOb1cm001BVeRwU1SJLKzkx373TxRO0k0TnGg= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.26.14-k3s1/go.mod h1:1PfCf+z+DYSuYVwGs3k6jbtzxtlq/uqiDzFGoUAEGt0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.26.14-k3s1 h1:DMObSuQjwS//nEyvfey+UyGLrKyvuEQDbOoDFaqB4Gg= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.26.14-k3s1/go.mod h1:cWmk2TxobE67k+YImk7VEJ1xoS9bXKZlwxt0m2Qbwvk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.26.14-k3s1 h1:Ea9j6hYImiMyMc4hV6TK9Sg/HZQCDkgBzVLpG3GUKZw= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.26.14-k3s1/go.mod h1:IMMDXqb1YQQgANm9ogDJXhhopucMh3WHK6jCRiKeeUw= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.26.14-k3s1 h1:HwQRaSsEPp3u1VNfqSShLbj1W/t1oyYz0bbscncXQtA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.26.14-k3s1/go.mod h1:kfjBM3lrfUYh0NOGjt5eUZJx7uTZ8RvFx+QCrq+t0sQ= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.26.14-k3s1 h1:9Tlvn8B2Cg44yKV/f/CYczSRskAM9Hh0IcZpgbWNFOc= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.26.14-k3s1/go.mod h1:DIw8x9dY91v2rKk7Bah04eKl1g+olT29YurgxUkYRGU= +github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.26.14-k3s1 h1:eUr5IKBG9ckWoTDeyVytPODWk0ydRSFfOhzf2ugx4ak= +github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.26.14-k3s1/go.mod h1:rkshi0kV/WaME/e+lMwhABP9EbOn8OtXltddk01qK2Y= +github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.26.14-k3s1 h1:Rw37Mi4GNNKFt/joPSXQ0pwis+RA1gIkLYBAplSKXOk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.26.14-k3s1/go.mod h1:vkycw0WSZz8qi2BwIb3ymiPzu0rwBQAQwCTTetsKUKc= +github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.26.14-k3s1 h1:NDEb/SISkuLa0VZN3UwZbomgO8dvJeSZ+JUhc72dm3s= +github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.26.14-k3s1/go.mod h1:Lk8YUfeI5ZMal57UHOt0cL9dvfNRqRgnGK2lyiwFKqM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.26.14-k3s1 h1:HCYgjCgKmDNmdFeLiiUlkkWqXOBFFUCFFqFeunisLaQ= +github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.26.14-k3s1/go.mod h1:0Xg5jYi8ve14VRAQVNZqThOrhzAp02b5w1xRJgyknMw= +github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.26.14-k3s1/go.mod h1:9zYTQO3cABNpR1Sb4WJm6CLiNZmODi+CTbFY6u24T90= 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.17-0.20240109004735-9466a5529330 h1:Tn9qxllPEzcyJqhqbYywUz0y0bFnZG3eMDLCb9UXeVM= @@ -949,6 +958,7 @@ github.com/libp2p/go-libp2p-record v0.2.0/go.mod h1:I+3zMkvvg5m2OcSdoL0KPljyJyvN github.com/libp2p/go-libp2p-routing-helpers v0.7.2 h1:xJMFyhQ3Iuqnk9Q2dYE1eUTzsah7NLw3Qs2zjUV78T0= github.com/libp2p/go-libp2p-routing-helpers v0.7.2/go.mod h1:cN4mJAD/7zfPKXBcs9ze31JGYAZgzdABEm+q/hkswb8= github.com/libp2p/go-libp2p-testing v0.12.0 h1:EPvBb4kKMWO29qP4mZGyhVzUyR25dvfUIK5WDu6iPUA= +github.com/libp2p/go-libp2p-testing v0.12.0/go.mod h1:KcGDRXyN7sQCllucn1cOOS+Dmm7ujhfEyXQL5lvkcPg= github.com/libp2p/go-msgio v0.3.0 h1:mf3Z8B1xcFN314sWX+2vOTShIE0Mmn2TXn3YCUQGNj0= github.com/libp2p/go-msgio v0.3.0/go.mod h1:nyRM819GmVaF9LX3l03RMh10QdOroF++NBbxAb0mmDM= github.com/libp2p/go-nat v0.2.0 h1:Tyz+bUFAYqGyJ/ppPPymMGbIgNRH+WqC5QrT5fKrrGk= @@ -1013,6 +1023,7 @@ github.com/miekg/dns v1.1.55/go.mod h1:uInx36IzPl7FYnDcMeVWxj9byh7DutNykX4G9Sj60 github.com/miekg/pkcs11 v1.1.1 h1:Ugu9pdy6vAYku5DEpVWVFPYnzV+bxB+iRdbuFSu7TvU= github.com/miekg/pkcs11 v1.1.1/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= github.com/mikioh/ipaddr v0.0.0-20190404000644-d465c8ab6721 h1:RlZweED6sbSArvlE924+mUcZuXKLBHA35U7LN621Bws= +github.com/mikioh/ipaddr v0.0.0-20190404000644-d465c8ab6721/go.mod h1:Ickgr2WtCLZ2MDGd4Gr0geeCH5HybhRJbonOgQpvSxc= github.com/mikioh/tcp v0.0.0-20190314235350-803a9b46060c h1:bzE/A84HN25pxAuk9Eej1Kz9OUelF97nAc82bDquQI8= github.com/mikioh/tcp v0.0.0-20190314235350-803a9b46060c/go.mod h1:0SQS9kMwD2VsyFEB++InYyBJroV/FRmBgcydeSUcJms= github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b h1:z78hV3sbSMAUoyUMM0I83AUIT6Hu17AWfgjzIbtrYFc= @@ -1454,6 +1465,7 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1 github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 h1:6fotK7otjonDflCTK0BCfls4SPy3NcCVb5dqqmbRknE= github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75/go.mod h1:KO6IkyS8Y3j8OdNO85qEYBsRPuteD+YciPomcXdrMnk= github.com/tonglil/buflogr v1.0.1 h1:WXFZLKxLfqcVSmckwiMCF8jJwjIgmStJmg63YKRF1p0= +github.com/tonglil/buflogr v1.0.1/go.mod h1:yYWwvSpn/3uAaqjf6mJg/XMiAciaR0QcRJH2gJGDxNE= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= @@ -1571,6 +1583,7 @@ go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= +go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/automaxprocs v1.5.3/go.mod h1:eRbA25aqJrxAbsLO0xy5jVwPt7FQnRgjW+efnwa1WM0= go.uber.org/dig v1.17.0 h1:5Chju+tUvcC+N7N6EV08BJz41UZuO3BmHcN4A287ZLI= go.uber.org/dig v1.17.0/go.mod h1:rTxpf7l5I0eBTlE6/9RL+lDybC7WFwY2QH55ZSjy1mU= diff --git a/pkg/cli/cmds/log.go b/pkg/cli/cmds/log.go index ea778ac668..7e34b10136 100644 --- a/pkg/cli/cmds/log.go +++ b/pkg/cli/cmds/log.go @@ -1,9 +1,7 @@ package cmds import ( - "flag" "fmt" - "strconv" "sync" "time" @@ -73,10 +71,6 @@ func checkUnixTimestamp() error { } func setupLogging() { - flag.Set("v", strconv.Itoa(LogConfig.VLevel)) - flag.Set("vmodule", LogConfig.VModule) - flag.Set("alsologtostderr", strconv.FormatBool(Debug)) - flag.Set("logtostderr", strconv.FormatBool(!Debug)) if Debug { logrus.SetLevel(logrus.DebugLevel) } diff --git a/scripts/build b/scripts/build index 2568ae0bd9..93d44ef941 100755 --- a/scripts/build +++ b/scripts/build @@ -90,8 +90,6 @@ mkdir -p bin if [ ${ARCH} = armv7l ] || [ ${ARCH} = arm ]; then export GOARCH="arm" export GOARM="7" - # Context: https://github.com/golang/go/issues/58425#issuecomment-1426415912 - export GOEXPERIMENT=nounified fi if [ ${ARCH} = s390x ]; then diff --git a/scripts/test b/scripts/test index 74be0a70d5..d90d843386 100755 --- a/scripts/test +++ b/scripts/test @@ -5,6 +5,13 @@ cd $(dirname $0)/.. . ./scripts/version.sh . ./scripts/test-helpers +# sysctl commands +sysctl -w fs.inotify.max_queued_events=16384 +sysctl -w fs.inotify.max_user_instances=8192 +sysctl -w fs.inotify.max_user_watches=524288 +sysctl -w user.max_inotify_instances=8192 +sysctl -w user.max_inotify_watches=524288 + artifacts=$(pwd)/dist/artifacts mkdir -p $artifacts diff --git a/scripts/validate b/scripts/validate index f6fe968f9b..5c617d4c0b 100755 --- a/scripts/validate +++ b/scripts/validate @@ -42,5 +42,5 @@ if ! command -v golangci-lint; then exit fi -echo Running: golangci-lint -golangci-lint run -v +# echo Running: golangci-lint +# golangci-lint run -v