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 e74fcfcb78
2 changed files with 23 additions and 23 deletions

22
go.mod
View File

@ -8,7 +8,7 @@ require (
github.com/coreos/go-oidc v2.2.1+incompatible
github.com/coreos/go-systemd/v22 v22.5.0
github.com/emicklei/go-restful/v3 v3.9.0
github.com/evanphx/json-patch v5.6.0+incompatible
github.com/evanphx/json-patch v4.12.0+incompatible
github.com/fsnotify/fsnotify v1.6.0
github.com/gogo/protobuf v1.3.2
github.com/google/cel-go v0.17.6
@ -41,12 +41,12 @@ require (
google.golang.org/protobuf v1.31.0
gopkg.in/natefinch/lumberjack.v2 v2.2.1
gopkg.in/square/go-jose.v2 v2.6.0
k8s.io/api v0.0.0-20230829154641-e4c14aa9116e
k8s.io/apimachinery v0.0.0-20230901041540-de716d7ff9f3
k8s.io/client-go v0.0.0-20230829155512-fb2e66896540
k8s.io/component-base v0.0.0-20230829160507-62d4fd038129
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/component-base v0.0.0-20230901051635-6a97c85314ee
k8s.io/klog/v2 v2.100.1
k8s.io/kms v0.0.0-20230829160816-bf80c44ed005
k8s.io/kms v0.0.0-20230901053518-2b0cdaf495d2
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2
@ -126,9 +126,9 @@ 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/client-go => k8s.io/client-go v0.0.0-20230829155512-fb2e66896540
k8s.io/component-base => k8s.io/component-base v0.0.0-20230829160507-62d4fd038129
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/client-go => k8s.io/client-go v0.0.0-20230901044724-5e5ba6b91d64
k8s.io/component-base => k8s.io/component-base v0.0.0-20230901051635-6a97c85314ee
k8s.io/kms => k8s.io/kms v0.0.0-20230901053518-2b0cdaf495d2
)

24
go.sum
View File

@ -91,8 +91,8 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m
github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
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/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk=
github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
@ -670,18 +670,18 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
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/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/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/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/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
k8s.io/kms v0.0.0-20230829160816-bf80c44ed005 h1:44rd/BO7J8FXfq389mghcy32XRZMdCifJTfupwLusHQ=
k8s.io/kms v0.0.0-20230829160816-bf80c44ed005/go.mod h1:8bZArsum/B0iZ5i9zN4qz6t2kTe3xJIHrs4f9md7ydA=
k8s.io/kms v0.0.0-20230901053518-2b0cdaf495d2 h1:Xvchxi67lLGX2X8dWRbIrZYTn8WUv/5s4uGBR1J/orc=
k8s.io/kms v0.0.0-20230901053518-2b0cdaf495d2/go.mod h1:GPPo8y41rMzjwBG8eLnx3kIWoaypq8PrkiegZRJ0sP8=
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/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk=