From 2e70aa37885c7ea89be2e25a251424ecd133338b Mon Sep 17 00:00:00 2001 From: Maciek Pytel Date: Fri, 24 Mar 2023 13:12:36 +0100 Subject: [PATCH 1/3] Update go to 1.19.7 This follows go version update by kubernetes 1.25 --- builder/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/Dockerfile b/builder/Dockerfile index 6f7bf98a9d9e..ad02bdb5bd72 100644 --- a/builder/Dockerfile +++ b/builder/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.19 +FROM golang:1.19.7 LABEL maintainer="Marcin Wielgus " ENV GOPATH /gopath/ From 6c4c6b8b95d2fed5711ecebf622591f70723142a Mon Sep 17 00:00:00 2001 From: Maciek Pytel Date: Fri, 24 Mar 2023 14:06:19 +0100 Subject: [PATCH 2/3] Update vendor to Kubernetes 1.25.8 --- cluster-autoscaler/go.mod | 82 +- cluster-autoscaler/go.sum | 80 +- .../vendor/golang.org/x/net/html/parse.go | 2 +- .../vendor/golang.org/x/net/html/token.go | 49 +- .../vendor/golang.org/x/net/http2/flow.go | 88 +- .../vendor/golang.org/x/net/http2/frame.go | 11 +- .../golang.org/x/net/http2/hpack/hpack.go | 81 +- .../vendor/golang.org/x/net/http2/server.go | 105 +-- .../golang.org/x/net/http2/transport.go | 88 +- .../golang.org/x/net/trace/histogram.go | 2 +- .../vendor/golang.org/x/net/websocket/hybi.go | 2 +- .../golang.org/x/net/websocket/websocket.go | 7 +- .../golang.org/x/sys/cpu/cpu_gccgo_x86.c | 1 + .../golang.org/x/sys/cpu/cpu_linux_arm64.go | 44 +- .../vendor/golang.org/x/sys/cpu/endian_big.go | 11 + .../golang.org/x/sys/cpu/endian_little.go | 11 + .../vendor/golang.org/x/sys/cpu/parse.go | 43 + .../x/sys/cpu/proc_cpuinfo_linux.go | 54 ++ .../vendor/golang.org/x/sys/unix/gccgo.go | 4 +- .../vendor/golang.org/x/sys/unix/gccgo_c.c | 4 +- .../vendor/golang.org/x/sys/unix/ioctl.go | 4 +- .../vendor/golang.org/x/sys/unix/mkall.sh | 4 +- .../golang.org/x/sys/unix/syscall_darwin.go | 1 + .../x/sys/unix/syscall_dragonfly.go | 1 + .../golang.org/x/sys/unix/syscall_freebsd.go | 1 + .../x/sys/unix/syscall_freebsd_386.go | 9 +- .../x/sys/unix/syscall_freebsd_amd64.go | 9 +- .../x/sys/unix/syscall_freebsd_arm.go | 9 +- .../x/sys/unix/syscall_freebsd_arm64.go | 9 +- .../x/sys/unix/syscall_freebsd_riscv64.go | 9 +- .../golang.org/x/sys/unix/syscall_hurd.go | 22 + .../golang.org/x/sys/unix/syscall_hurd_386.go | 29 + .../golang.org/x/sys/unix/syscall_linux.go | 51 +- .../golang.org/x/sys/unix/syscall_netbsd.go | 15 + .../golang.org/x/sys/unix/syscall_openbsd.go | 1 + .../x/sys/unix/syscall_openbsd_libc.go | 4 +- .../golang.org/x/sys/unix/syscall_solaris.go | 1 + .../golang.org/x/sys/unix/syscall_unix.go | 57 +- .../golang.org/x/sys/unix/timestruct.go | 2 +- .../vendor/golang.org/x/sys/unix/xattr_bsd.go | 9 +- .../golang.org/x/sys/unix/zerrors_linux.go | 30 +- .../x/sys/unix/zerrors_linux_386.go | 1 + .../x/sys/unix/zerrors_linux_amd64.go | 1 + .../x/sys/unix/zerrors_linux_arm.go | 1 + .../x/sys/unix/zerrors_linux_arm64.go | 1 + .../x/sys/unix/zerrors_linux_loong64.go | 1 + .../x/sys/unix/zerrors_linux_mips.go | 1 + .../x/sys/unix/zerrors_linux_mips64.go | 1 + .../x/sys/unix/zerrors_linux_mips64le.go | 1 + .../x/sys/unix/zerrors_linux_mipsle.go | 1 + .../x/sys/unix/zerrors_linux_ppc.go | 1 + .../x/sys/unix/zerrors_linux_ppc64.go | 1 + .../x/sys/unix/zerrors_linux_ppc64le.go | 1 + .../x/sys/unix/zerrors_linux_riscv64.go | 1 + .../x/sys/unix/zerrors_linux_s390x.go | 1 + .../x/sys/unix/zerrors_linux_sparc64.go | 1 + .../x/sys/unix/zerrors_openbsd_386.go | 356 ++++++-- .../x/sys/unix/zerrors_openbsd_amd64.go | 189 +++- .../x/sys/unix/zerrors_openbsd_arm.go | 348 ++++++-- .../x/sys/unix/zerrors_openbsd_arm64.go | 160 +++- .../x/sys/unix/zerrors_openbsd_mips64.go | 95 +- .../x/sys/unix/zsyscall_dragonfly_amd64.go | 10 + .../x/sys/unix/zsyscall_freebsd_386.go | 10 + .../x/sys/unix/zsyscall_freebsd_amd64.go | 10 + .../x/sys/unix/zsyscall_freebsd_arm.go | 10 + .../x/sys/unix/zsyscall_freebsd_arm64.go | 10 + .../x/sys/unix/zsyscall_freebsd_riscv64.go | 10 + .../golang.org/x/sys/unix/zsyscall_linux.go | 11 + .../x/sys/unix/zsyscall_netbsd_386.go | 10 + .../x/sys/unix/zsyscall_netbsd_amd64.go | 10 + .../x/sys/unix/zsyscall_netbsd_arm.go | 10 + .../x/sys/unix/zsyscall_netbsd_arm64.go | 10 + .../x/sys/unix/zsyscall_openbsd_386.go | 14 + .../x/sys/unix/zsyscall_openbsd_386.s | 137 +-- .../x/sys/unix/zsyscall_openbsd_amd64.go | 14 + .../x/sys/unix/zsyscall_openbsd_amd64.s | 137 +-- .../x/sys/unix/zsyscall_openbsd_arm.go | 14 + .../x/sys/unix/zsyscall_openbsd_arm.s | 137 +-- .../x/sys/unix/zsyscall_openbsd_arm64.go | 14 + .../x/sys/unix/zsyscall_openbsd_arm64.s | 137 +-- .../x/sys/unix/zsyscall_openbsd_mips64.go | 812 +++++++++++++++--- .../x/sys/unix/zsyscall_openbsd_mips64.s | 669 +++++++++++++++ .../x/sys/unix/zsyscall_openbsd_ppc64.go | 14 + .../x/sys/unix/zsyscall_openbsd_ppc64.s | 6 + .../x/sys/unix/zsyscall_openbsd_riscv64.go | 14 + .../x/sys/unix/zsyscall_openbsd_riscv64.s | 137 +-- .../x/sys/unix/zsyscall_solaris_amd64.go | 13 + .../x/sys/unix/zsysctl_openbsd_386.go | 51 +- .../x/sys/unix/zsysctl_openbsd_amd64.go | 17 +- .../x/sys/unix/zsysctl_openbsd_arm.go | 51 +- .../x/sys/unix/zsysctl_openbsd_arm64.go | 11 +- .../x/sys/unix/zsysctl_openbsd_mips64.go | 3 +- .../x/sys/unix/zsysnum_openbsd_mips64.go | 1 + .../golang.org/x/sys/unix/ztypes_linux.go | 217 ++++- .../x/sys/unix/ztypes_netbsd_386.go | 84 ++ .../x/sys/unix/ztypes_netbsd_amd64.go | 84 ++ .../x/sys/unix/ztypes_netbsd_arm.go | 84 ++ .../x/sys/unix/ztypes_netbsd_arm64.go | 84 ++ .../x/sys/unix/ztypes_openbsd_386.go | 97 +-- .../x/sys/unix/ztypes_openbsd_amd64.go | 33 +- .../x/sys/unix/ztypes_openbsd_arm.go | 9 +- .../x/sys/unix/ztypes_openbsd_arm64.go | 9 +- .../x/sys/unix/ztypes_openbsd_mips64.go | 9 +- .../x/sys/windows/syscall_windows.go | 14 +- .../pkg/endpoints/handlers/delete.go | 10 +- .../k8s.io/client-go/transport/cache.go | 2 +- .../k8s.io/component-base/metrics/metric.go | 20 - .../kubernetes/pkg/api/v1/resource/helpers.go | 2 +- .../kubernetes/pkg/kubelet/stats/provider.go | 5 - .../kubernetes/pkg/probe/dialer_others.go | 42 + .../kubernetes/pkg/probe/dialer_windows.go | 42 + .../k8s.io/kubernetes/pkg/probe/http/http.go | 4 + .../k8s.io/kubernetes/pkg/probe/tcp/tcp.go | 6 +- .../kubernetes/pkg/proxy/winkernel/hns.go | 20 + .../kubernetes/pkg/proxy/winkernel/proxier.go | 14 +- .../pkg/scheduler/framework/interface.go | 3 + .../framework/plugins/nodevolumelimits/csi.go | 6 +- .../framework/plugins/volumebinding/binder.go | 9 +- .../scheduler/framework/runtime/framework.go | 4 + .../internal/queue/scheduling_queue.go | 77 +- .../kubernetes/pkg/scheduler/scheduler.go | 9 +- .../kubernetes/pkg/volume/csi/csi_mounter.go | 29 + .../kubernetes/pkg/volume/csi/csi_plugin.go | 42 - cluster-autoscaler/vendor/modules.txt | 94 +- 124 files changed, 4229 insertions(+), 1658 deletions(-) create mode 100644 cluster-autoscaler/vendor/golang.org/x/sys/cpu/endian_big.go create mode 100644 cluster-autoscaler/vendor/golang.org/x/sys/cpu/endian_little.go create mode 100644 cluster-autoscaler/vendor/golang.org/x/sys/cpu/parse.go create mode 100644 cluster-autoscaler/vendor/golang.org/x/sys/cpu/proc_cpuinfo_linux.go create mode 100644 cluster-autoscaler/vendor/golang.org/x/sys/unix/syscall_hurd.go create mode 100644 cluster-autoscaler/vendor/golang.org/x/sys/unix/syscall_hurd_386.go create mode 100644 cluster-autoscaler/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.s create mode 100644 cluster-autoscaler/vendor/k8s.io/kubernetes/pkg/probe/dialer_others.go create mode 100644 cluster-autoscaler/vendor/k8s.io/kubernetes/pkg/probe/dialer_windows.go diff --git a/cluster-autoscaler/go.mod b/cluster-autoscaler/go.mod index ed3686c94332..16b2a7fe2707 100644 --- a/cluster-autoscaler/go.mod +++ b/cluster-autoscaler/go.mod @@ -27,23 +27,23 @@ require ( github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.0 golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd - golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10 + golang.org/x/net v0.7.0 golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 google.golang.org/api v0.60.0 google.golang.org/grpc v1.47.0 google.golang.org/protobuf v1.28.0 gopkg.in/gcfg.v1 v1.2.0 gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.25.6 - k8s.io/apimachinery v0.25.6 - k8s.io/apiserver v0.25.6 - k8s.io/client-go v0.25.6 - k8s.io/cloud-provider v0.25.6 - k8s.io/component-base v0.25.6 - k8s.io/component-helpers v0.25.6 + k8s.io/api v0.25.8 + k8s.io/apimachinery v0.25.8 + k8s.io/apiserver v0.25.8 + k8s.io/client-go v0.25.8 + k8s.io/cloud-provider v0.25.8 + k8s.io/component-base v0.25.8 + k8s.io/component-helpers v0.25.8 k8s.io/klog/v2 v2.70.1 k8s.io/kubelet v0.24.1 - k8s.io/kubernetes v1.25.6 + k8s.io/kubernetes v1.25.8 k8s.io/legacy-cloud-providers v0.0.0 k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed sigs.k8s.io/cloud-provider-azure v1.24.2 @@ -163,9 +163,9 @@ require ( go.uber.org/multierr v1.6.0 // indirect go.uber.org/zap v1.19.0 // indirect golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect - golang.org/x/sys v0.3.0 // indirect - golang.org/x/term v0.3.0 // indirect - golang.org/x/text v0.5.0 // indirect + golang.org/x/sys v0.5.0 // indirect + golang.org/x/term v0.5.0 // indirect + golang.org/x/text v0.7.0 // indirect golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect @@ -174,12 +174,12 @@ require ( gopkg.in/warnings.v0 v0.1.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/cri-api v0.0.0 // indirect - k8s.io/csi-translation-lib v0.25.6 // indirect + k8s.io/csi-translation-lib v0.25.8 // indirect k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect k8s.io/kube-proxy v0.0.0 // indirect k8s.io/kube-scheduler v0.0.0 // indirect k8s.io/kubectl v0.0.0 // indirect - k8s.io/mount-utils v0.25.6 // indirect + k8s.io/mount-utils v0.25.8 // 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/structured-merge-diff/v4 v4.2.3 // indirect @@ -192,56 +192,56 @@ replace github.com/digitalocean/godo => github.com/digitalocean/godo v1.27.0 replace github.com/rancher/go-rancher => github.com/rancher/go-rancher v0.1.0 -replace k8s.io/api => k8s.io/api v0.25.6 +replace k8s.io/api => k8s.io/api v0.25.8 -replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.25.6 +replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.25.8 -replace k8s.io/apimachinery => k8s.io/apimachinery v0.25.7-rc.0 +replace k8s.io/apimachinery => k8s.io/apimachinery v0.25.8 -replace k8s.io/apiserver => k8s.io/apiserver v0.25.6 +replace k8s.io/apiserver => k8s.io/apiserver v0.25.8 -replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.25.6 +replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.25.8 -replace k8s.io/client-go => k8s.io/client-go v0.25.6 +replace k8s.io/client-go => k8s.io/client-go v0.25.8 -replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.25.6 +replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.25.8 -replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.25.6 +replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.25.8 -replace k8s.io/code-generator => k8s.io/code-generator v0.25.7-rc.0 +replace k8s.io/code-generator => k8s.io/code-generator v0.25.8 -replace k8s.io/component-base => k8s.io/component-base v0.25.6 +replace k8s.io/component-base => k8s.io/component-base v0.25.8 -replace k8s.io/component-helpers => k8s.io/component-helpers v0.25.6 +replace k8s.io/component-helpers => k8s.io/component-helpers v0.25.8 -replace k8s.io/controller-manager => k8s.io/controller-manager v0.25.6 +replace k8s.io/controller-manager => k8s.io/controller-manager v0.25.8 -replace k8s.io/cri-api => k8s.io/cri-api v0.25.7-rc.0 +replace k8s.io/cri-api => k8s.io/cri-api v0.25.8 -replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.25.6 +replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.25.8 -replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.25.6 +replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.25.8 -replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.25.6 +replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.25.8 -replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.25.6 +replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.25.8 -replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.25.6 +replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.25.8 -replace k8s.io/kubectl => k8s.io/kubectl v0.25.6 +replace k8s.io/kubectl => k8s.io/kubectl v0.25.8 -replace k8s.io/kubelet => k8s.io/kubelet v0.25.6 +replace k8s.io/kubelet => k8s.io/kubelet v0.25.8 -replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.25.6 +replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.25.8 -replace k8s.io/metrics => k8s.io/metrics v0.25.6 +replace k8s.io/metrics => k8s.io/metrics v0.25.8 -replace k8s.io/mount-utils => k8s.io/mount-utils v0.25.7-rc.0 +replace k8s.io/mount-utils => k8s.io/mount-utils v0.25.8 -replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.25.6 +replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.25.8 -replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.25.6 +replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.25.8 -replace k8s.io/sample-controller => k8s.io/sample-controller v0.25.6 +replace k8s.io/sample-controller => k8s.io/sample-controller v0.25.8 -replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.25.6 +replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.25.8 diff --git a/cluster-autoscaler/go.sum b/cluster-autoscaler/go.sum index 2d09ae4715ec..fa95fd8b9a24 100644 --- a/cluster-autoscaler/go.sum +++ b/cluster-autoscaler/go.sum @@ -751,8 +751,8 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10 h1:Frnccbp+ok2GkUS2tC84yAq/U9Vg+0sIO7aRL3T4Xnc= -golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= +golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= +golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -855,11 +855,11 @@ golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ= -golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.3.0 h1:qoo4akIqOcDME5bhc/NgxUdovd6BSS2uMsVjB56q1xI= -golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= +golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -868,8 +868,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM= -golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1122,44 +1122,44 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.25.6 h1:LwDY2H6kD/3R8TekJYYaJWOdekNdXDO44eVpX6sNtJA= -k8s.io/api v0.25.6/go.mod h1:bVp01KUcl8VUHFBTJMOknWNo7XvR0cMbeTTuFg1zCUs= -k8s.io/apimachinery v0.25.7-rc.0 h1:WdM6Htzhqa/L6QdXwhJ29gs22JSNYeZsThRbwa3YJmc= -k8s.io/apimachinery v0.25.7-rc.0/go.mod h1:1S2i1QHkmxc8+EZCIxe/fX5hpldVXk4gvnJInMEb8D4= -k8s.io/apiserver v0.25.6 h1:32mn8HAlsEl1tpuiVmhAl0YCVkOugjybsJ6l6kf0c8k= -k8s.io/apiserver v0.25.6/go.mod h1:IEp2B2/FvQ8GmdspscUoUS0iFF/GGc6NVrJ/cTM4OaA= -k8s.io/client-go v0.25.6 h1:CHxACHi0DijmlYyUR7ooZoXnD5P8jYLgBHcxp775x/U= -k8s.io/client-go v0.25.6/go.mod h1:s9mMAGFYiH3Z66j7BESzu0GEradT9GQ2LjFf/YRrnyc= -k8s.io/cloud-provider v0.25.6 h1:xxJg78XIeotzLRaXlk8HgZ+OsOWy5uBmDCkErGtgkl0= -k8s.io/cloud-provider v0.25.6/go.mod h1:CHXlDObyf8hE7sKxSuzbHi5lA/zHjkgEdT46r+wwvLU= -k8s.io/component-base v0.25.6 h1:v3ci6FbXFcxpjyQJaaLq0MgzT3vyFzwUDWtO+KRv9Bk= -k8s.io/component-base v0.25.6/go.mod h1:k7DfcfJ8cOI6A2xTCfU5LxsnXV+lWw1ME8cRCHzIh6o= -k8s.io/component-helpers v0.25.6 h1:OHTT22as3x7DUeMD4SrsuLTjSU0ywfVALiz2pDOXaWo= -k8s.io/component-helpers v0.25.6/go.mod h1:TbxdooEyf6EgMtx/5WayyChEXY6uTgZs59T1FwLL/Nw= -k8s.io/cri-api v0.25.7-rc.0 h1:5R0I/sgV1amVdk03qHnFxQ2isccwq7005dJ09Nyxay8= -k8s.io/cri-api v0.25.7-rc.0/go.mod h1:fg+6ctfBFAUYnKfjmYqUVXwq6A788L0ZvNooI405Nek= -k8s.io/csi-translation-lib v0.25.6 h1:MnMgkTkhYfkyq4r9Bcem3TCjxZdlbSoyphZygJqoToE= -k8s.io/csi-translation-lib v0.25.6/go.mod h1:bZrHetdvxNkS65y8VhivbiYxELnpIjVLpmcD94hi404= +k8s.io/api v0.25.8 h1:pcbnWkCcmjNhp6OEKqR+ojO0CJydpOOw7WiWedjLJAU= +k8s.io/api v0.25.8/go.mod h1:FaJqAtI13XOERtpLOQTkW3SiSf0lqsUohYqaxCyHI18= +k8s.io/apimachinery v0.25.8 h1:c4kI9xm0U5nid8sBpBvM+2VHlv4Af8KnbhZIodZF/54= +k8s.io/apimachinery v0.25.8/go.mod h1:ZTl0drTQaFi5gMM3snYI5tWV1XJmRH1gfnDx2QCLsxk= +k8s.io/apiserver v0.25.8 h1:ZTYdLdouAu8D6h9QavMaQZiAV+EfWK87VGdOyb6RZMQ= +k8s.io/apiserver v0.25.8/go.mod h1:IJ1r0vqXxwa+3QbrxAHWqdmoGZnVDDMzWtIK9ju3maI= +k8s.io/client-go v0.25.8 h1:PruqsI6qccbowI5wjeNosyE1BiKViChRWVOvCZtYnXY= +k8s.io/client-go v0.25.8/go.mod h1:Wiu5CQCaOqWugLrdvl04HK90P0QMc4oxQ3BXoJGjD+A= +k8s.io/cloud-provider v0.25.8 h1:CCbiMqv2HxHyJCNwmfDKWeEf/jZH5HfXNtGqLrEPAGI= +k8s.io/cloud-provider v0.25.8/go.mod h1:pLrVEero4Uj4ul3HUhHQYdL6WOVRyEpUFLzFFkubAiQ= +k8s.io/component-base v0.25.8 h1:lQ5Ouw7lupdpXn5slRjAeHnlMK/aAEbPf9jjSWbOD3c= +k8s.io/component-base v0.25.8/go.mod h1:MkC9Lz4fXoGOgB2WhFBU4zjiviIEeJS3sVhTxX9vt6s= +k8s.io/component-helpers v0.25.8 h1:jTi68SNaCis1s4//S7CXOtmzIOqhiY5CUroZuD2+OEg= +k8s.io/component-helpers v0.25.8/go.mod h1:+EZENL02v1dJXJvAYXZfAldATLviWL7Y/K3Pw8LB3MU= +k8s.io/cri-api v0.25.8 h1:OwV/xxklUdm3MhvVwXD49cXcywSpICjFKMTgRSHZixc= +k8s.io/cri-api v0.25.8/go.mod h1:ZOI0K9rvD6KaGFndOpvW+zp/fJvudDbkAl26ZBHh2wY= +k8s.io/csi-translation-lib v0.25.8 h1:0rGNRl9wakFnAa9FTnMo1VaQ8OnHshkdfIuL3PdPPho= +k8s.io/csi-translation-lib v0.25.8/go.mod h1:d7paiab+sYjBGHHCl5EqwmTgnsYKyJHrKhjyBolySTM= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.70.1 h1:7aaoSdahviPmR+XkS7FyxlkkXs6tHISSG03RxleQAVQ= k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 h1:MQ8BAZPZlWk3S9K4a9NCkIFQtZShWqoha7snGixVgEA= k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU= -k8s.io/kube-proxy v0.25.6 h1:vG8Zg8xMFOGg2gnEkmYuSU/RJ4waIOW6Ti6/Y8at26M= -k8s.io/kube-proxy v0.25.6/go.mod h1:uMzY4OdkcMQ+sNAnze9iyKdff035UfCDc1k6dLOjj8Q= -k8s.io/kube-scheduler v0.25.6 h1:Wbxc1u8I6CWhi48vINZl1AJ9R7LEKX5PAqJomlknd7I= -k8s.io/kube-scheduler v0.25.6/go.mod h1:F9lTr2v2oipN7lB+BCxa34oLSFwXwr6FmxGRV0g+y7E= -k8s.io/kubectl v0.25.6 h1:uGoNw4vF+O62NTwRqM40gMCEI5ujw2g0ocT6dDPt55c= -k8s.io/kubectl v0.25.6/go.mod h1:sqtVRxDlZdaSusmLVysYo8S7h4mB/Fe8YWvt2KCle3k= -k8s.io/kubelet v0.25.6 h1:rZntZUVRlZ1nys1C9QBPJ2drzy6Mq67yfgmDlFzrQHw= -k8s.io/kubelet v0.25.6/go.mod h1:9WkLVxmmUnlartfgYuARK9ipdm+mNpoW0MwH1/qLpn0= -k8s.io/kubernetes v1.25.6 h1:3zBcz3I4CXKnzR/K37Kzjtmu4O+/5XV/tUCa7gSiJG4= -k8s.io/kubernetes v1.25.6/go.mod h1:iB7lKyWeYg8+Oi5EPDEfdMtmae8BvjzziSpek2CcBe4= -k8s.io/legacy-cloud-providers v0.25.6 h1:r0b+6jCmB7YiF79xrUTTFUJ40Q85wxhe4yhQ9/cIVMg= -k8s.io/legacy-cloud-providers v0.25.6/go.mod h1:ZtK3T00xgiAgj9yhRQWtK20Pf/EufTXk2EKg6DTIUnE= -k8s.io/mount-utils v0.25.7-rc.0 h1:qPDJBuuVvpQNpz4Zx2fANkWRondG/5BHiMAUy0zpPGs= -k8s.io/mount-utils v0.25.7-rc.0/go.mod h1:Eqb/IPZnzLiL6/Fv6hwxq6HAr+HPCxMutQrItylgO68= +k8s.io/kube-proxy v0.25.8 h1:0VxbBqT/UqX0OXbuFtsCaKUpLmBegl/OiYu6fIEWarQ= +k8s.io/kube-proxy v0.25.8/go.mod h1:4KswEcoRCC9yTC+Rv3Iw55dWi7cP13U6qjeAClesgLs= +k8s.io/kube-scheduler v0.25.8 h1:ca/VA1dOj0CbSt0aLOn2H6oPugWNZweHjvKC5W6XOeo= +k8s.io/kube-scheduler v0.25.8/go.mod h1:PYy8rH9NOH6sj/fB7ETh0baXsjOtJBxK4A71WYsGkeo= +k8s.io/kubectl v0.25.8 h1:i6nlpU5LQyg9J19mKihJo1oE7FE7+Zg1cF4TOpJQmEQ= +k8s.io/kubectl v0.25.8/go.mod h1:IPmVLfTvFIZKl0vwyl0LkegIbk2jsnaVmkpDgDymCPI= +k8s.io/kubelet v0.25.8 h1:dUHuo4+cUxVXaXppF6QDyFz1RzhVV6Uc6k1wBHljDqA= +k8s.io/kubelet v0.25.8/go.mod h1:wOL7p4vIkJFjGz2G2og/UBjAdjj1+brlNtKEA7yYvuw= +k8s.io/kubernetes v1.25.8 h1:RQ3Rf3aScxhg/xDT1GebWFHOtYodM83Q/Yxvgku39G4= +k8s.io/kubernetes v1.25.8/go.mod h1:mEIT8S9Ir6R4R8N6VLmfxcNFAmGU2hEtV780TuPYlug= +k8s.io/legacy-cloud-providers v0.25.8 h1:lceqQ0nCNC+Z8fTvFIvjAqxvdITeDGRiPBh02LolFqo= +k8s.io/legacy-cloud-providers v0.25.8/go.mod h1:TgV6vZZABeeWrGTLQhozXoJinGhIIE/OynLx55/WpLI= +k8s.io/mount-utils v0.25.8 h1:qbeRzYuGKDCii73XQDscEGk2NWSEO6hWd+E/xf/Xo7U= +k8s.io/mount-utils v0.25.8/go.mod h1:vojU37mpuNwtcRmJiVso5mgFvdo5wI8No6RLp2O1yhg= k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed h1:jAne/RjBTyawwAy0utX5eqigAwz/lQhTmy+Hr/Cpue4= k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= diff --git a/cluster-autoscaler/vendor/golang.org/x/net/html/parse.go b/cluster-autoscaler/vendor/golang.org/x/net/html/parse.go index 291c91908d78..46a89eda6c19 100644 --- a/cluster-autoscaler/vendor/golang.org/x/net/html/parse.go +++ b/cluster-autoscaler/vendor/golang.org/x/net/html/parse.go @@ -184,7 +184,7 @@ func (p *parser) clearStackToContext(s scope) { } } -// parseGenericRawTextElements implements the generic raw text element parsing +// parseGenericRawTextElement implements the generic raw text element parsing // algorithm defined in 12.2.6.2. // https://html.spec.whatwg.org/multipage/parsing.html#parsing-elements-that-contain-only-text // TODO: Since both RAWTEXT and RCDATA states are treated as tokenizer's part diff --git a/cluster-autoscaler/vendor/golang.org/x/net/html/token.go b/cluster-autoscaler/vendor/golang.org/x/net/html/token.go index ae24a6fdf4a4..50f7c6aac8de 100644 --- a/cluster-autoscaler/vendor/golang.org/x/net/html/token.go +++ b/cluster-autoscaler/vendor/golang.org/x/net/html/token.go @@ -598,6 +598,11 @@ scriptDataDoubleEscapeEnd: // readComment reads the next comment token starting with "") return + } else if c == '-' { + dashCount = 1 + beginning = false + continue } } } @@ -645,6 +649,35 @@ func (z *Tokenizer) readComment() { } } +func (z *Tokenizer) calculateAbruptCommentDataEnd() int { + raw := z.Raw() + const prefixLen = len("