kubernetes
/
kubectl
mirror of https://github.com/kubernetes/kubectl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
parent 2a258862e4 fbb786d1e3
commit 30772740ee
2 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
go.mod
View File

@ -9,7 +9,7 @@ require (
github.com/chai2010/gettext-go v1.0.2
github.com/daviddengcn/go-colortext v1.0.0
github.com/docker/distribution v2.8.2+incompatible
github.com/evanphx/json-patch v5.6.0+incompatible
github.com/evanphx/json-patch v4.12.0+incompatible
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d
github.com/fatih/camelcase v1.0.0
github.com/fvbommel/sortorder v1.1.0
@ -30,15 +30,15 @@ require (
github.com/stretchr/testify v1.8.2
golang.org/x/sys v0.10.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.0.0-20230829154641-e4c14aa9116e
k8s.io/apimachinery v0.0.0-20230901041540-de716d7ff9f3
k8s.io/cli-runtime v0.0.0-20230829163043-12b75d0beb04
k8s.io/client-go v0.0.0-20230829155512-fb2e66896540
k8s.io/component-base v0.0.0-20230829160507-62d4fd038129
k8s.io/component-helpers v0.0.0-20230829160644-be278b214101
k8s.io/api v0.0.0-20230901043045-d68a18351c00
k8s.io/apimachinery v0.0.0-20230901041540-0d057e543013
k8s.io/cli-runtime v0.0.0-20230901070915-634e4246f62f
k8s.io/client-go v0.0.0-20230901044724-5e5ba6b91d64
k8s.io/component-base v0.0.0-20230901051635-6a97c85314ee
k8s.io/component-helpers v0.0.0-20230901052700-b3425863cef8
k8s.io/klog/v2 v2.100.1
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9
k8s.io/metrics v0.0.0-20230829162857-4e5763c60a15
k8s.io/metrics v0.0.0-20230901065924-4f34532f858a
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd
sigs.k8s.io/kustomize/kustomize/v5 v5.0.4-0.20230601165947-6ce0bf390ce3
@ -95,12 +95,12 @@ require (
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20230829154641-e4c14aa9116e
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230901041540-de716d7ff9f3
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20230829163043-12b75d0beb04
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/cli-runtime => k8s.io/cli-runtime v0.0.0-20230901070915-634e4246f62f
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
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/metrics => k8s.io/metrics v0.0.0-20230829162857-4e5763c60a15
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/metrics => k8s.io/metrics v0.0.0-20230901065924-4f34532f858a
)

32
go.sum
View File

@ -26,8 +26,8 @@ github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhF
github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
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/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d h1:105gxyaGwCFad8crR9dcMQWvV9Hvulu6hwUh4tWPJnM=
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4=
github.com/fatih/camelcase v1.0.0 h1:hxNvNX/xYBp0ovncs8WyWZrOrpBNub/JfaMvbURyft8=
@ -273,24 +273,24 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
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-20230901041540-de716d7ff9f3 h1:udAUT0Ja7eV1+TP7/ccynjN3FgnuCIyzNBBhjfIuFyM=
k8s.io/apimachinery v0.0.0-20230901041540-de716d7ff9f3/go.mod h1:LkMtcf2c+zA4y/1KVt6Rvq6PGUwloMb8aHpFdmQQtrc=
k8s.io/cli-runtime v0.0.0-20230829163043-12b75d0beb04 h1:Ully0AdOKvWYdKcY10K18DFUTyEwBJszs8eRk0GlEno=
k8s.io/cli-runtime v0.0.0-20230829163043-12b75d0beb04/go.mod h1:ETi+6EkyhgMcM14g+Toh5FHnN/PD2VOaM+V9Kmkm7p8=
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/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/component-helpers v0.0.0-20230829160644-be278b214101 h1:fVFUx/o9QMEOF0e6GLU+xED+mXLPXVP/+g+nl9N6jUc=
k8s.io/component-helpers v0.0.0-20230829160644-be278b214101/go.mod h1:9FSM8OgEjjlBQIc3by6gdgydFYG0l86hnWVsMhim+CA=
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/cli-runtime v0.0.0-20230901070915-634e4246f62f h1:8hZTDKUT/GEfyEYLCko9bQRntv9nWvAP6/El1T7uvws=
k8s.io/cli-runtime v0.0.0-20230901070915-634e4246f62f/go.mod h1:D1xvIOWRR7r68+qx+gjCt6xEJps7tY5OBzaIqhVCocU=
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/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/component-helpers v0.0.0-20230901052700-b3425863cef8 h1:OwenOHg8hcDdXVlsaWx0a9EtgZKsDhD6hLQm8hoOvb8=
k8s.io/component-helpers v0.0.0-20230901052700-b3425863cef8/go.mod h1:NUFR7AgP54HnlZ8uy1ybR7oe9T9W90/xHmM/vI4nu1o=
k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ=
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM=
k8s.io/metrics v0.0.0-20230829162857-4e5763c60a15 h1:56bfCovzT5q9wWftoK/fsr41CDsRN2SwB8PQ6TL/o3Y=
k8s.io/metrics v0.0.0-20230829162857-4e5763c60a15/go.mod h1:zFSmaDRUFfUZZW48ONIVGKqoo8batscvLSrucRKEYak=
k8s.io/metrics v0.0.0-20230901065924-4f34532f858a h1:1jMePa+ZCnWfhDVFkGl3d2HUC2N50G+yiSOzySXRb5c=
k8s.io/metrics v0.0.0-20230901065924-4f34532f858a/go.mod h1:QSV31BHTY4q/Qt3c1nxxpZ8QHIYbT5qdREBnJuI1bpw=
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk=
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=