From 06a6f1b09901eeb19815be5b94a6b100376224a6 Mon Sep 17 00:00:00 2001 From: Nick Turner Date: Wed, 8 Feb 2023 17:57:20 -0800 Subject: [PATCH] Pin golang.org/x/net to v0.4.0 in 1.25 Kubernetes-commit: cd5e3b8a1f65c464168093ef516726d3b603d011 --- go.mod | 19 ++++++++++--------- go.sum | 12 ++---------- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/go.mod b/go.mod index 723cb126..eb6fb391 100644 --- a/go.mod +++ b/go.mod @@ -5,10 +5,10 @@ module k8s.io/sample-controller go 1.19 require ( - k8s.io/api v0.0.0-20221207015936-be0bf1dc3a1b - k8s.io/apimachinery v0.0.0-20221207015236-526d075b19f9 - k8s.io/client-go v0.0.0-20221207022047-b2883ba878c4 - k8s.io/code-generator v0.0.0-20221207014637-08edc9c26591 + k8s.io/api v0.0.0 + k8s.io/apimachinery v0.0.0 + k8s.io/client-go v0.0.0 + k8s.io/code-generator v0.0.0 k8s.io/klog/v2 v2.70.1 ) @@ -38,7 +38,7 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/spf13/pflag v1.0.5 // indirect golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect - golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10 // indirect + golang.org/x/net v0.4.0 // indirect golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect golang.org/x/sys v0.3.0 // indirect golang.org/x/term v0.3.0 // indirect @@ -59,8 +59,9 @@ require ( ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20221207015936-be0bf1dc3a1b - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20221207015236-526d075b19f9 - k8s.io/client-go => k8s.io/client-go v0.0.0-20221207022047-b2883ba878c4 - k8s.io/code-generator => k8s.io/code-generator v0.0.0-20221207014637-08edc9c26591 + k8s.io/api => ../api + k8s.io/apimachinery => ../apimachinery + k8s.io/client-go => ../client-go + k8s.io/code-generator => ../code-generator + k8s.io/sample-controller => ../sample-controller ) diff --git a/go.sum b/go.sum index 7979917f..461db20c 100644 --- a/go.sum +++ b/go.sum @@ -257,8 +257,8 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -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.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU= +golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= 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-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -469,14 +469,6 @@ 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.0.0-20221207015936-be0bf1dc3a1b h1:SBgSsDsdFZbBSt+TMVAgk8OUkvV6f5cGUruytlHLCFo= -k8s.io/api v0.0.0-20221207015936-be0bf1dc3a1b/go.mod h1:YvZpuHvl+0aLny0+c5KuNrTfHfg3tZD+HDjQTLGxv3E= -k8s.io/apimachinery v0.0.0-20221207015236-526d075b19f9 h1:2NBWv9juNrLv5jYWe1VDMo0Tv0JETLrTniwM5dL2SPM= -k8s.io/apimachinery v0.0.0-20221207015236-526d075b19f9/go.mod h1:1S2i1QHkmxc8+EZCIxe/fX5hpldVXk4gvnJInMEb8D4= -k8s.io/client-go v0.0.0-20221207022047-b2883ba878c4 h1:kVsfgS31oNfGZqqURb+H3OrcRB3+Zi4femXmzDpaXog= -k8s.io/client-go v0.0.0-20221207022047-b2883ba878c4/go.mod h1:0w1GFTVywsqLqr0oSdRPuws3XkkCkIXUpZZpf7Fc4yI= -k8s.io/code-generator v0.0.0-20221207014637-08edc9c26591 h1:Dh/ADZ7eCZsuyBIhHchCebSX4ed1VR6/9ZhZagt/w1c= -k8s.io/code-generator v0.0.0-20221207014637-08edc9c26591/go.mod h1:aDxzxJynLKQkaa117y0FFcgZ5jG8+GobxZ2JUntmvKk= k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 h1:TT1WdmqqXareKxZ/oNXEUSwKlLiHzPMyB0t8BaFeBYI= k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=