Update dependencies to v0.26.12 tag

Merge pull request #121547 from dims/automated-cherry-pick-of-#121364-upstream-release-1.26
Automated cherry pick of #121364: bump golang.org/grpc to v1.56.3 Kubernetes-commit: 442bf76e7d1fc4559aed288fb3529bd06242ff50
2023-12-20 18:36:35 +00:00 · 2023-11-01 14:37:40 +00:00 · 2023-10-19 14:58:49 -03:00 · 2023-10-12 13:32:18 +00:00 · 2023-10-11 03:33:44 +05:30 · 2023-09-08 00:24:11 +00:00
2 changed files with 20 additions and 20 deletions
--- a/go.mod
+++ b/go.mod
@ -5,8 +5,8 @@ module k8s.io/kube-proxy
 go 1.19

 require (
-	k8s.io/apimachinery v0.0.0-20221103075033-9e85d3af4ae2
-	k8s.io/component-base v0.0.0-20221103115736-4e0e60826ac9
+	k8s.io/apimachinery v0.26.12
+	k8s.io/component-base v0.26.12
 )

 require (
@ -17,20 +17,20 @@ require (
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	golang.org/x/net v0.1.1-0.20221027164007-c63010009c80 // indirect
-	golang.org/x/text v0.4.0 // indirect
+	golang.org/x/net v0.17.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	k8s.io/klog/v2 v2.80.1 // indirect
-	k8s.io/utils v0.0.0-20220922133306-665eaaec4324 // indirect
+	k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect
 	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )

 replace (
-	k8s.io/api => k8s.io/api v0.0.0-20221103235239-91f249682376
-	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20221103075033-9e85d3af4ae2
-	k8s.io/client-go => k8s.io/client-go v0.0.0-20221103075600-d576a3570dbe
-	k8s.io/component-base => k8s.io/component-base v0.0.0-20221103115736-4e0e60826ac9
+	k8s.io/api => k8s.io/api v0.26.12
+	k8s.io/apimachinery => k8s.io/apimachinery v0.26.12
+	k8s.io/client-go => k8s.io/client-go v0.26.12
+	k8s.io/component-base => k8s.io/component-base v0.26.12
 )
--- a/go.sum
+++ b/go.sum
@ -27,7 +27,7 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
+github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@ -39,8 +39,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.1.1-0.20221027164007-c63010009c80 h1:CtRWmqbiPSOXwJV1JoY7pWiTx2xzVKQ813bvU+Y/9jI=
-golang.org/x/net v0.1.1-0.20221027164007-c63010009c80/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@ -49,8 +49,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
-golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@ -67,14 +67,14 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-k8s.io/apimachinery v0.0.0-20221103075033-9e85d3af4ae2 h1:0nhI6fiyouN4H8MXOcMcCOybGhw4FgxwQbadTKPIRlA=
-k8s.io/apimachinery v0.0.0-20221103075033-9e85d3af4ae2/go.mod h1:zSkBXgO5G/dSQOe256tx5Yo2OJytojpY3bsXu/4/ZJE=
-k8s.io/component-base v0.0.0-20221103115736-4e0e60826ac9 h1:noL8s7Lyec/QtPtr3MXIMLYQUWCaXqftaIZszG3F8OA=
-k8s.io/component-base v0.0.0-20221103115736-4e0e60826ac9/go.mod h1:Knaa6iPS89K+o4JtNNb5SW1MrmS3AOhHS73ERE1bASo=
+k8s.io/apimachinery v0.26.12 h1:y+OgufxqLIZtyXIydRhjLBGzrYLF+qwiDdCFXYOjeN4=
+k8s.io/apimachinery v0.26.12/go.mod h1:2/HZp0l6coXtS26du1Bk36fCuAEr/lVs9Q9NbpBtd1Y=
+k8s.io/component-base v0.26.12 h1:OyYjCtruv4/Yau5Z1v6e59N+JRDTj8JnW95W9w9AMpg=
+k8s.io/component-base v0.26.12/go.mod h1:X98Et5BxJ8i4TcDusUcKS8EYxCujBU1lCL3pc/CUtHQ=
 k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4=
 k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
-k8s.io/utils v0.0.0-20220922133306-665eaaec4324 h1:i+xdFemcSNuJvIfBlaYuXgRondKxK4z4prVPKzEaelI=
-k8s.io/utils v0.0.0-20220922133306-665eaaec4324/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+k8s.io/utils v0.0.0-20221107191617-1a15be271d1d h1:0Smp/HP1OH4Rvhe+4B8nWGERtlqAGSftbSbbmm45oFs=
+k8s.io/utils v0.0.0-20221107191617-1a15be271d1d/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
 sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
Author	SHA1	Message	Date
Kubernetes Publisher	9d664e3c4b	Update dependencies to v0.26.12 tag	2023-12-20 18:36:35 +00:00
Kubernetes Publisher	3baa9cc9e4	Merge pull request #121547 from dims/automated-cherry-pick-of-#121364-upstream-release-1.26 Automated cherry pick of #121364: bump golang.org/grpc to v1.56.3 Kubernetes-commit: 442bf76e7d1fc4559aed288fb3529bd06242ff50	2023-11-01 14:37:40 +00:00
Jonathan Gonzalez V	7908c370b2	bump golang.org/grpc to v1.56.3 Bumping golang.org/grpc in light of CVE-2023-44487. Signed-off-by: Jonathan Gonzalez V <jonathan.abdiel@gmail.com> Kubernetes-commit: 1575566c4aaf7c86302c19520d18fc98f35fcaaf	2023-10-19 14:58:49 -03:00
Kubernetes Publisher	2b42b87164	Merge pull request #121126 from MadhavJivrajani/bump-x-net-126 [1.26][CVE-2023-39325] .: bump golang.org/x/net to v0.17.0 Kubernetes-commit: 3ec9fd3fbe2873205939935052b04f2668a3db7e	2023-10-12 13:32:18 +00:00
Madhav Jivrajani	e84cce04a3	.: bump golang.org/x/net to v0.17.0 Bumping golang.org/x/net in light of CVE-2023-39325 and CVE-2023-44487. Signed-off-by: Madhav Jivrajani <madhav.jiv@gmail.com> Kubernetes-commit: ab65c7d3b71fc22b9c456e841de55128e9efd03b	2023-10-11 03:33:44 +05:30
Kubernetes Publisher	4d9911693f	Merge pull request #116143 from dashpole/otelhttp_26 cherry pick of #116140: update otelhttp to v0.35.1 Kubernetes-commit: a1ae9266f47a4447cb054142a18efecfbb56c0f6	2023-09-08 00:24:11 +00:00
David Ashpole	82068348b8	update otelhttp to v0.35.1 Kubernetes-commit: a669a4d21a51c90bed7b39e3d6022dba6f347a5b	2023-02-28 18:18:12 +00:00
Kubernetes Publisher	0906b80d8e	Merge pull request #118555 from puerco/bump-1.26-go-1.19.10 [release-1.26] releng/go: Update images, deps and version to go 1.19.10 Kubernetes-commit: afe3fae16cb7c3625bc61796e03d6b3eeced889b	2023-06-12 19:15:23 +00:00
Adolfo García Veytia (Puerco)	8c9c7fad62	update-vendor: update vendored go.sums Run of ./hack/update-vendor.sh Signed-off-by: Adolfo García Veytia (Puerco) <adolfo.garcia@uservers.net> Kubernetes-commit: b204a2b57f12800767b5c06069d518513363dbce	2023-06-08 00:14:59 -06:00
Kubernetes Publisher	bfca808f22	Merge pull request #117691 from dims/re-do-of-117242-on-release-1.26 [1.26] Bump runc/libcontainer to 1.1.6 Kubernetes-commit: 7970b8a1efee7a08e64bb272438871dca021166a	2023-05-04 19:04:34 +00:00
Davanum Srinivas	437eaaef70	Bump runc go module v1.1.4 -> v1.1.6 Signed-off-by: Davanum Srinivas <davanum@gmail.com> Kubernetes-commit: 808ce27cae46bd31b2978875069eb7c77af21886	2023-04-29 22:27:41 -04:00
Kubernetes Publisher	f131f07fc3	Merge pull request #115787 from liggitt/net-0.7.0-1.26 [1.26] Update golang.org/x/net to v0.7.0 Kubernetes-commit: 0fbdfcec8d02bc9737ea9916efad04d626928036	2023-02-15 14:10:16 +00:00
Jordan Liggitt	d5cde4d6c2	Update golang.org/x/net to v0.7.0 Kubernetes-commit: 26d4675e15df0fcc9a749e66fb3bdb82871f84d1	2023-02-14 23:18:23 -05:00
Kubernetes Publisher	d313670964	Merge pull request #115642 from nckturner/pin-golang.org/x/net-to-v0.4.0-in-1.26 Pin golang.org/x/net to v0.4.0 in 1.26 Kubernetes-commit: 5ae2e75abe3a631e770b7136f8e3bd2a6051ba18	2023-02-10 19:02:42 +00:00
Nick Turner	96fc9f5bbd	Pin golang.org/x/net to v0.4.0 in 1.26 Kubernetes-commit: c5fe6226c4aee24c100cf35fdf105ad3abf82026	2023-02-08 18:06:10 -08:00
Kubernetes Publisher	ad013b367c	Merge remote-tracking branch 'origin/master' into release-1.26 Kubernetes-commit: 713b671a8a3fb526ba616a26953a91026c77611f	2022-12-08 07:46:46 +00:00
Jordan Liggitt	8d20ad997f	Update golang.org/x/net 1e63c2f Includes fix for CVE-2022-41717 Kubernetes-commit: afe5378db9d17b1e16ea0028ecfab432475f8e25	2022-12-06 17:29:11 -05:00
David Ashpole	d4c09f2f4f	update k8s.io/utils to fix util tracing panic Kubernetes-commit: 3f1511c8e9a64cf60821036aa1fc3ec9d58a2931	2022-11-16 14:43:16 +00:00