Merge pull request #106568 from liggitt/json-fieldpath

include field paths in unknown/duplicate errors

Kubernetes-commit: 66ca4b0a70a3d43c45603ba441b2a368dcb38722
This commit is contained in:
Kubernetes Publisher 2021-12-13 09:09:58 -08:00
commit c8df6737b5
2 changed files with 19 additions and 19 deletions

18
go.mod
View File

@ -43,22 +43,22 @@ require (
google.golang.org/grpc v1.40.0 google.golang.org/grpc v1.40.0
gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/natefinch/lumberjack.v2 v2.0.0
gopkg.in/square/go-jose.v2 v2.2.2 gopkg.in/square/go-jose.v2 v2.2.2
k8s.io/api v0.0.0-20211210171938-b3fcc5e80fda k8s.io/api v0.0.0-20211213171716-0820d150f9ee
k8s.io/apimachinery v0.0.0-20211210171608-6df201a29764 k8s.io/apimachinery v0.0.0-20211213171520-e65876e14280
k8s.io/client-go v0.0.0-20211210172425-80a3c86bdd29 k8s.io/client-go v0.0.0-20211213171958-056a9de35397
k8s.io/component-base v0.0.0-20211210173208-05e41eda7006 k8s.io/component-base v0.0.0-20211213172503-a583eb047fc3
k8s.io/klog/v2 v2.30.0 k8s.io/klog/v2 v2.30.0
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65
k8s.io/utils v0.0.0-20211208161948-7d6a63dca704 k8s.io/utils v0.0.0-20211208161948-7d6a63dca704
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.27 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.27
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 sigs.k8s.io/structured-merge-diff/v4 v4.1.2
sigs.k8s.io/yaml v1.2.0 sigs.k8s.io/yaml v1.2.0
) )
replace ( replace (
k8s.io/api => k8s.io/api v0.0.0-20211210171938-b3fcc5e80fda k8s.io/api => k8s.io/api v0.0.0-20211213171716-0820d150f9ee
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211210171608-6df201a29764 k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211213171520-e65876e14280
k8s.io/client-go => k8s.io/client-go v0.0.0-20211210172425-80a3c86bdd29 k8s.io/client-go => k8s.io/client-go v0.0.0-20211213171958-056a9de35397
k8s.io/component-base => k8s.io/component-base v0.0.0-20211210173208-05e41eda7006 k8s.io/component-base => k8s.io/component-base v0.0.0-20211213172503-a583eb047fc3
) )

20
go.sum
View File

@ -953,14 +953,14 @@ 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-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.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/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-20211210171938-b3fcc5e80fda h1:i/EgAwGxmVVIGsJWCCe04Wi07baXnEvPMQC4NiWz83g= k8s.io/api v0.0.0-20211213171716-0820d150f9ee h1:/v+7rD7h8qwNabJfpXzvxuE1pY6wcJODhRknvg+nQi4=
k8s.io/api v0.0.0-20211210171938-b3fcc5e80fda/go.mod h1:NFlXrk1vJE3TgCy35AgIeIYbYw0tF2sD6MAxgf6Mc4o= k8s.io/api v0.0.0-20211213171716-0820d150f9ee/go.mod h1:vmCvbkzTfBQjlMNSgh69E+3vHHcFdYVCXF20g8xtEaE=
k8s.io/apimachinery v0.0.0-20211210171608-6df201a29764 h1:37q05/gV1lmVaF0BfBc5CKdGyImfp7cf5eT1dagHC+Y= k8s.io/apimachinery v0.0.0-20211213171520-e65876e14280 h1:1Vi6MSKuJbfiiUckP6GaHTGYZtqayWlyf/JItZRH8Rg=
k8s.io/apimachinery v0.0.0-20211210171608-6df201a29764/go.mod h1:Sgx1X9PR8YlVvfP6GtAQzCsmgWEbdpNReyoB9ZtVAgA= k8s.io/apimachinery v0.0.0-20211213171520-e65876e14280/go.mod h1:YpCy0BWvwSGZKMwmvPxCsfFJfl6vAwQdfVnPOJoUT2E=
k8s.io/client-go v0.0.0-20211210172425-80a3c86bdd29 h1:Kn26kCC59h4tBjJKBQIrUQxCno7GFZNJXPSzZbBEPUk= k8s.io/client-go v0.0.0-20211213171958-056a9de35397 h1:r8OCAcStmrtTkTbJ94aO1/ei8igULFXLxVIOqjkP2ro=
k8s.io/client-go v0.0.0-20211210172425-80a3c86bdd29/go.mod h1:CS1iPu1PmkicnXqZm7aQNnL/gpE275dJGbK6b+ccB6I= k8s.io/client-go v0.0.0-20211213171958-056a9de35397/go.mod h1:EVC+GVlZGw9DXTNTB4NNrkWW1RooGd68qdccMwD/H68=
k8s.io/component-base v0.0.0-20211210173208-05e41eda7006 h1:ohOxjpiL6HvcxeYtVnEm+8RG02RCAg3e6+g7OoONpTQ= k8s.io/component-base v0.0.0-20211213172503-a583eb047fc3 h1:K3ZTf3OYaOLrr/RE7ZgWtbrczS12HFfGKRu/ZwhPHLU=
k8s.io/component-base v0.0.0-20211210173208-05e41eda7006/go.mod h1:RpilITV87yrVsK9XCZ/JsNagRCJmhblk6jKQsRGnW1M= k8s.io/component-base v0.0.0-20211213172503-a583eb047fc3/go.mod h1:quIoI70UO6Tq1RMH7eIHKN9sK0Y9hgz9NiDJTPY1wH4=
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
@ -976,8 +976,8 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.27 h1:KQOkVzXrLNb0EP6W0FD6u3CCPAwgXFYwZitbj7K0P0Y= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.27 h1:KQOkVzXrLNb0EP6W0FD6u3CCPAwgXFYwZitbj7K0P0Y=
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.27/go.mod h1:tq2nT0Kx7W+/f2JVE+zxYtUhdjuELJkVpNz+x/QN5R4= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.27/go.mod h1:tq2nT0Kx7W+/f2JVE+zxYtUhdjuELJkVpNz+x/QN5R4=
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 h1:fD1pz4yfdADVNfFmcP2aBEtudwUQ1AlLnRBALr33v3s= sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 h1:kDi4JBNAsJWfz1aEXhO8Jg87JJaPNLh5tIzYHgStQ9Y=
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs= sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY=
sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 h1:Hr/htKFmJEbtMgS/UD0N+gtgctAqz81t3nu+sPzynno= sigs.k8s.io/structured-merge-diff/v4 v4.1.2 h1:Hr/htKFmJEbtMgS/UD0N+gtgctAqz81t3nu+sPzynno=
sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4=