Merge pull request #120327 from liggitt/json-patch

Revert to json-patch 4.12.0

Kubernetes-commit: 34aaf2b972c95c7a3591d8d49c798dba348ee5c9
This commit is contained in:
Kubernetes Publisher 2023-08-31 17:06:30 -07:00
commit 42ff987dc3
2 changed files with 22 additions and 22 deletions

26
go.mod
View File

@ -5,9 +5,9 @@ module k8s.io/kube-controller-manager
go 1.20
require (
k8s.io/apimachinery v0.0.0-20230829153926-1629459297c7
k8s.io/cloud-provider v0.0.0-20230829165832-869bfa56b9b1
k8s.io/controller-manager v0.0.0-20230829165342-9f7546d38c1b
k8s.io/apimachinery v0.0.0-20230901041540-0d057e543013
k8s.io/cloud-provider v0.0.0-20230901081224-4b81b289a1c4
k8s.io/controller-manager v0.0.0-20230901080318-c917325a83f5
)
require (
@ -23,7 +23,7 @@ require (
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/component-base v0.0.0-20230829160507-62d4fd038129 // indirect
k8s.io/component-base v0.0.0-20230901051635-6a97c85314ee // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
@ -31,13 +31,13 @@ require (
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20230829154641-e4c14aa9116e
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230829153926-1629459297c7
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20230829161328-f4c85a1be019
k8s.io/client-go => k8s.io/client-go v0.0.0-20230829155512-fb2e66896540
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20230829165832-869bfa56b9b1
k8s.io/component-base => k8s.io/component-base v0.0.0-20230829160507-62d4fd038129
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20230829160644-be278b214101
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20230829165342-9f7546d38c1b
k8s.io/kms => k8s.io/kms v0.0.0-20230829160816-bf80c44ed005
k8s.io/api => k8s.io/api v0.0.0-20230901043045-d68a18351c00
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230901041540-0d057e543013
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20230901054518-e74fcfcb78ed
k8s.io/client-go => k8s.io/client-go v0.0.0-20230901044724-5e5ba6b91d64
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20230901081224-4b81b289a1c4
k8s.io/component-base => k8s.io/component-base v0.0.0-20230901051635-6a97c85314ee
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20230901052700-b3425863cef8
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20230901080318-c917325a83f5
k8s.io/kms => k8s.io/kms v0.0.0-20230901053518-2b0cdaf495d2
)

18
go.sum
View File

@ -73,15 +73,15 @@ 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/api v0.0.0-20230829154641-e4c14aa9116e h1:BVY2iTTPzV3R2Hpu51fy/4kDZNRsKBmZkTGJDieBGBA=
k8s.io/apimachinery v0.0.0-20230829153926-1629459297c7 h1:3he8k/dembshwJ/8nGuNC6Qthn2Upqj/a0L/WTSqUcI=
k8s.io/apimachinery v0.0.0-20230829153926-1629459297c7/go.mod h1:LkMtcf2c+zA4y/1KVt6Rvq6PGUwloMb8aHpFdmQQtrc=
k8s.io/cloud-provider v0.0.0-20230829165832-869bfa56b9b1 h1:fZfmdlyb/C8tzr7DvvXTLt2BjEae8NugAuEUa7Zcb5U=
k8s.io/cloud-provider v0.0.0-20230829165832-869bfa56b9b1/go.mod h1:UVsi83eGxYSCay8nx9FiysPHWEA4gco62MvJCfxOdjA=
k8s.io/component-base v0.0.0-20230829160507-62d4fd038129 h1:8IcGaxQzFIj4f8aYQm8/1mxrw9zo6R364LQQdWbXKT8=
k8s.io/component-base v0.0.0-20230829160507-62d4fd038129/go.mod h1:OyNsWuybbLfrkxKqXR1DlCO8cbHDgMIvYtiqXsGO1qw=
k8s.io/controller-manager v0.0.0-20230829165342-9f7546d38c1b h1:eKMUusD3lmqNnNaQ0N/s22xCZwmOVekCVZp4ISJANTo=
k8s.io/controller-manager v0.0.0-20230829165342-9f7546d38c1b/go.mod h1:xBwC8jW08jO5z6PZ18tdbaYZp4Va6e2UcmPwzBDCOyE=
k8s.io/api v0.0.0-20230901043045-d68a18351c00 h1:plDl2FaMrSOtZgQQfiE4PwlUH1sTuQ92EY7aMnxRciI=
k8s.io/apimachinery v0.0.0-20230901041540-0d057e543013 h1:SWrddEv3aWWseUfiT42ziJUc8Gck/2Iqltz0Z+ctTB8=
k8s.io/apimachinery v0.0.0-20230901041540-0d057e543013/go.mod h1:4XSLsQ98qjSQA9IF1M+KnXoc+E7kiualOL0cx3GFYZI=
k8s.io/cloud-provider v0.0.0-20230901081224-4b81b289a1c4 h1:Z1TZNZtDVFDVXqw/8SaW5g+f3QusiNHcIo5Y2nG0+3k=
k8s.io/cloud-provider v0.0.0-20230901081224-4b81b289a1c4/go.mod h1:HFM2/9iI9Wgtq2rtxukrH2/5BOayjmqvQZgQvMx2K+I=
k8s.io/component-base v0.0.0-20230901051635-6a97c85314ee h1:Anwc25j0e3xg4JVrZ5eYm38LYFPWENftQc17unJmRn8=
k8s.io/component-base v0.0.0-20230901051635-6a97c85314ee/go.mod h1:yBM3yqVHGaf3rugDRYf5C5JHw/gT2E3MCfyCEErkVVQ=
k8s.io/controller-manager v0.0.0-20230901080318-c917325a83f5 h1:xvGdnqzcJl/y7jdr1Uy4XisAByYnTiAG6bvY39euUa0=
k8s.io/controller-manager v0.0.0-20230901080318-c917325a83f5/go.mod h1:9gjkdA8MDC2n1nm1n7vK/DXiDZX1dla22MxskQNRZRw=
k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk=