Compare commits

...

20 Commits

Author SHA1 Message Date
Kubernetes Publisher c47db193e4 Update dependencies to v0.25.15 tag 2023-10-21 01:28:58 +00:00
Kubernetes Publisher 3701b43121 Merge pull request #121125 from MadhavJivrajani/bump-x-net-125
[1.25][CVE-2023-39325] .: bump golang.org/x/net to v0.17.0

Kubernetes-commit: 3da6e3c67afa5accc945cb78f4793e391e4791f0
2023-10-12 13:31:29 +00:00
Madhav Jivrajani f1be7d35c0 .: 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: 3d980e0633d9043f1bc4e6a3141185fbece78183
2023-10-11 03:27:04 +05:30
Kubernetes Publisher 5409ca15a2 Merge pull request #118556 from puerco/bump-1.25-go-1.19.10
[release-1.25] releng/go: Update images, deps and ver to go 1.19.10

Kubernetes-commit: 8826d7ee3fb80fc4d85ad8e9e50cbab14233ecf9
2023-06-12 19:14:36 +00:00
Adolfo García Veytia (Puerco) f9d86dbc0a 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: 61254725a43ce127f1ffe99b0df766415e2e7aa8
2023-06-08 00:18:54 -06:00
Kubernetes Publisher 7723c17701 Merge pull request #117682 from kolyshkin/1.25-bump-runc-1.1.6
[1.25] vendor: bump runc to 1.1.6

Kubernetes-commit: c51f7edb0503277f1f8adb500c41b3d7051ee3b3
2023-05-06 02:39:47 +00:00
Kir Kolyshkin 578141a851 [1.25] vendor: bump runc to 1.1.6
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>

Kubernetes-commit: cc3bdb6e1e5b2f69f0cac5d5529ab67abf0c3d18
2023-04-28 17:03:58 -07:00
Kubernetes Publisher 6aec3ed7bc Merge pull request #115788 from liggitt/net-0.7.0-1.25
[1.25] Update golang.org/x/net to v0.7.0

Kubernetes-commit: 8972d2b73a497eb0d15615b24fa7ca82d5b38b86
2023-02-15 14:09:38 +00:00
Jordan Liggitt 6ca3fea022 Update golang.org/x/net to v0.7.0
Kubernetes-commit: fc043497d870b68ba35701a42c06071340b68bb2
2023-02-14 23:21:55 -05:00
Kubernetes Publisher cc4c381b22 Merge pull request #115641 from nckturner/pin-golang.org/x/net-to-v0.4.0-in-1.25
Pin golang.org/x/net to v0.4.0 in 1.25

Kubernetes-commit: 641272fbcf7a75a06fb55909b5514523271737ef
2023-02-10 19:00:54 +00:00
Nick Turner b9474f6e89 Pin golang.org/x/net to v0.4.0 in 1.25
Kubernetes-commit: cd5e3b8a1f65c464168093ef516726d3b603d011
2023-02-08 17:57:20 -08:00
Kubernetes Publisher 65e25dbe9e Merge pull request #114320 from liggitt/net-1.25
Update golang.org/x/net 1e63c2f

Kubernetes-commit: 6711e16058e842dae009f0263b8b313677cebbfb
2022-12-07 03:31:09 +00:00
Jordan Liggitt 7dd464b4c3 Update golang.org/x/net 1e63c2f
Includes fix for CVE-2022-41717

Kubernetes-commit: 73c3dcb6558eeeea9e77940dde525a81d7e0bc1d
2022-12-06 17:35:53 -05:00
Kubernetes Publisher d2a2d611dd Merge pull request #113425 from aimuz/automated-cherry-pick-of-#112693-upstream-release-1.25
Automated cherry pick of #112693: Fixed (CVE-2022-27664) Bump golang.org/x/net to

Kubernetes-commit: c8d0fbe009b48f96e36bba9c36e20dba79bfdd05
2022-11-16 02:36:26 +00:00
aimuz 04be77a2bb Fixed (CVE-2022-27664) Bump golang.org/x/net to v0.1.1-0.20221027164007-c63010009c80
Fixed https://pkg.go.dev/vuln/GO-2022-0969

Signed-off-by: aimuz <mr.imuz@gmail.com>

Kubernetes-commit: 9ab1a67d6769303b9c446c25f95d39a0a5218f32
2022-10-28 10:07:56 +08:00
Kubernetes Publisher 1c7d7a2dc2 Merge pull request #112808 from cheftako/automated-cherry-pick-of-#112689-upstream-release-1.25
Bump konnectivity-client to v0.0.33

Kubernetes-commit: e1d0471ec1272f959253ffa2ebee1d9caacd7de5
2022-10-07 08:15:57 +00:00
Walter Fender 666d2c1969 Updated vendor to the new preferred versions.
Added missing files.

Kubernetes-commit: 1bc43a0dd51fa9b5450d5f66b594892874501479
2022-09-30 19:01:34 -07:00
Kubernetes Publisher cb49f812bc Merge pull request #112161 from pohly/automated-cherry-pick-of-#112129-origin-release-1.25
Automated cherry pick of #112129: dependencies: update to ginkgo v2.1.6 and gomega v1.20.1

Kubernetes-commit: 325e65b5d13e37b384bdd08397381a48693013d7
2022-09-09 12:17:20 +00:00
Patrick Ohly ec438e14da dependencies: update to ginkgo v2.1.6 and gomega v1.20.1
Ginkgo v2.1.6 adds ginkgo.SuppressProgressReporting which is needed
to suppress too verbose output each time the ReportAfterEach of the custom
progress reporter is invoked.

Kubernetes-commit: a440c257a9119c899af18f424e8e4daeb0078564
2022-08-30 19:33:50 +02:00
Jordan Liggitt 00f77c8574 Update go.mod to go1.19
Kubernetes-commit: 00db9f02293a6e0325330b575bffb9e466406dfe
2022-08-10 19:17:04 +00:00
2 changed files with 21 additions and 22 deletions

20
go.mod
View File

@ -2,23 +2,23 @@
module k8s.io/kube-proxy
go 1.18
go 1.19
require (
k8s.io/apimachinery v0.0.0-20220804081135-41606c6745e1
k8s.io/component-base v0.0.0-20220804082219-8fceced72c0a
k8s.io/apimachinery v0.25.15
k8s.io/component-base v0.25.15
)
require (
github.com/go-logr/logr v1.2.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/go-cmp v0.5.6 // indirect
github.com/google/go-cmp v0.5.8 // indirect
github.com/google/gofuzz v1.1.0 // indirect
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.0.0-20220722155237-a158d28d115b // indirect
golang.org/x/text v0.3.7 // 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.70.1 // indirect
@ -29,8 +29,8 @@ require (
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20220804081333-c8f06018bfc8
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220804081135-41606c6745e1
k8s.io/client-go => k8s.io/client-go v0.0.0-20220804081630-55b6f70f8313
k8s.io/component-base => k8s.io/component-base v0.0.0-20220804082219-8fceced72c0a
k8s.io/api => k8s.io/api v0.25.15
k8s.io/apimachinery => k8s.io/apimachinery v0.25.15
k8s.io/client-go => k8s.io/client-go v0.25.15
k8s.io/component-base => k8s.io/component-base v0.25.15
)

23
go.sum
View File

@ -7,8 +7,8 @@ github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g=
github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@ -29,7 +29,7 @@ github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTd
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.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
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=
@ -41,8 +41,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.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0=
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
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=
@ -51,8 +51,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.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
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=
@ -60,7 +60,6 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
@ -70,10 +69,10 @@ 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-20220804081135-41606c6745e1 h1:58bJ/oy7vDSXeH8erpGLMDa5yLmaBii2cbLXqF4Nf/A=
k8s.io/apimachinery v0.0.0-20220804081135-41606c6745e1/go.mod h1:po5cjR38/yCh8KAM3TxGrc5OhKnCyGsg3KBfG8+KTJ4=
k8s.io/component-base v0.0.0-20220804082219-8fceced72c0a h1:OUKoyXDBXRNi5lsntWxnbnpei9vyZ99Q9ixrxwd3pgc=
k8s.io/component-base v0.0.0-20220804082219-8fceced72c0a/go.mod h1:yQ3nu91MwtIuJVzFwZYrZf5SbXViW3vUNhkg3e6fYBs=
k8s.io/apimachinery v0.25.15 h1:aMZXyxCdCJRIiLnV8isPJO/3z52zQIAK7dkfGOTy7+0=
k8s.io/apimachinery v0.25.15/go.mod h1:34oJjP2pnWhz64k0GETsMvDeAp2A2v+gKa/u3tV/+6k=
k8s.io/component-base v0.25.15 h1:kOXXrzt6ImZPYi1lKumt3VPrQzWMTdJcNcvUgh1ruQc=
k8s.io/component-base v0.25.15/go.mod h1:pmku8Srd/in6lyhXhXWv1hc2R8SFeDlDRchK+NjY2Us=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.70.1 h1:7aaoSdahviPmR+XkS7FyxlkkXs6tHISSG03RxleQAVQ=
k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=