github/sample-controller
github/sample-controller
3
0
Fork 0
mirror of https://github.com/kubernetes/sample-controller.git synced 2024-10-06 07:42:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #120327 from liggitt/json-patch

Browse Source 
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 45f365e46d
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
go.mod
View File

@ -5,9 +5,9 @@ module k8s.io/sample-controller
go 1.20
require (
k8s.io/api v0.0.0-20230829154641-e4c14aa9116e
k8s.io/apimachinery v0.0.0-20230829153926-1629459297c7
k8s.io/client-go v0.0.0-20230829155512-fb2e66896540
k8s.io/api v0.0.0-20230901043045-d68a18351c00
k8s.io/apimachinery v0.0.0-20230901041540-0d057e543013
k8s.io/client-go v0.0.0-20230901044724-5e5ba6b91d64
k8s.io/code-generator v0.0.0-20230829153205-3ba1295f0ae7
k8s.io/klog/v2 v2.100.1
)
@ -15,7 +15,7 @@ require (
require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
@ -58,8 +58,8 @@ 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/client-go => k8s.io/client-go v0.0.0-20230829155512-fb2e66896540
k8s.io/api => k8s.io/api v0.0.0-20230901043045-d68a18351c00
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230901041540-0d057e543013
k8s.io/client-go => k8s.io/client-go v0.0.0-20230901044724-5e5ba6b91d64
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20230829153205-3ba1295f0ae7
)

16
go.sum
View File

@ -4,8 +4,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE=
github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U=
github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84=
github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
@ -143,12 +143,12 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
k8s.io/api v0.0.0-20230829154641-e4c14aa9116e h1:BVY2iTTPzV3R2Hpu51fy/4kDZNRsKBmZkTGJDieBGBA=
k8s.io/api v0.0.0-20230829154641-e4c14aa9116e/go.mod h1:sfW/lMh+MIVRxYTAAHGTRUGpa4PjN3L6UdC0DpS3IqU=
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/client-go v0.0.0-20230829155512-fb2e66896540 h1:EI6S6tjULyEgbxxiSh4eFWLGgAH4vUXGc2o4Ae2a18g=
k8s.io/client-go v0.0.0-20230829155512-fb2e66896540/go.mod h1:ssd27Gny11/2WuLSmSKRRGxUwEib6v0qGiHcMwZS5EI=
k8s.io/api v0.0.0-20230901043045-d68a18351c00 h1:plDl2FaMrSOtZgQQfiE4PwlUH1sTuQ92EY7aMnxRciI=
k8s.io/api v0.0.0-20230901043045-d68a18351c00/go.mod h1:qunKCI5HG1/XacwNcIwUHAFWPw6hFmIP5fb13hHJARM=
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/client-go v0.0.0-20230901044724-5e5ba6b91d64 h1:33kcwhVZBpBQ62AGlcCwolDgA8wOGuVLfhHBqh8gJ1E=
k8s.io/client-go v0.0.0-20230901044724-5e5ba6b91d64/go.mod h1:G0tP68oMXxgJnZv7d81fi115Hw9QymSbdptKK8BuyAc=
k8s.io/code-generator v0.0.0-20230829153205-3ba1295f0ae7 h1:ANvrasruO00U786Qqptb1ZKXeWaMaKf9x4/wbLWFFuM=
k8s.io/code-generator v0.0.0-20230829153205-3ba1295f0ae7/go.mod h1:c/ghbV8rZxs5zxJlEz6CyGMZBMJsxT4pdQQeMBrSL0A=
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d h1:U9tB195lKdzwqicbJvyJeOXV7Klv+wNAWENRnXEGi08=