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
parent 1b12406cb5
commit b450289c8c
2 changed files with 30 additions and 16 deletions

31
go.mod
View File

@ -31,15 +31,15 @@ require (
github.com/stretchr/testify v1.7.0
golang.org/x/sys v0.0.0-20211019181941-9d821ace8654
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/cli-runtime v0.0.0
k8s.io/client-go v0.0.0
k8s.io/component-base v0.0.0
k8s.io/component-helpers v0.0.0
k8s.io/api v0.0.0-20211213171716-0820d150f9ee
k8s.io/apimachinery v0.0.0-20211213171520-e65876e14280
k8s.io/cli-runtime v0.0.0-20211213173919-7521450cf418
k8s.io/client-go v0.0.0-20211213171958-056a9de35397
k8s.io/component-base v0.0.0-20211213172503-a583eb047fc3
k8s.io/component-helpers v0.0.0-20211213172604-8b3953eba17e
k8s.io/klog/v2 v2.30.0
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65
k8s.io/metrics v0.0.0
k8s.io/metrics v0.0.0-20211213173812-faa52952390b
k8s.io/utils v0.0.0-20211208161948-7d6a63dca704
sigs.k8s.io/kustomize/kustomize/v4 v4.4.1
sigs.k8s.io/kustomize/kyaml v0.13.0
@ -47,13 +47,12 @@ require (
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/cli-runtime => ../cli-runtime
k8s.io/client-go => ../client-go
k8s.io/code-generator => ../code-generator
k8s.io/component-base => ../component-base
k8s.io/component-helpers => ../component-helpers
k8s.io/kubectl => ../kubectl
k8s.io/metrics => ../metrics
k8s.io/api => k8s.io/api v0.0.0-20211213171716-0820d150f9ee
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211213171520-e65876e14280
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20211213173919-7521450cf418
k8s.io/client-go => k8s.io/client-go v0.0.0-20211213171958-056a9de35397
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20211211051323-05a01c0d31e8
k8s.io/component-base => k8s.io/component-base v0.0.0-20211213172503-a583eb047fc3
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20211213172604-8b3953eba17e
k8s.io/metrics => k8s.io/metrics v0.0.0-20211213173812-faa52952390b
)

15
go.sum
View File

@ -911,6 +911,19 @@ 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-20211213171716-0820d150f9ee h1:/v+7rD7h8qwNabJfpXzvxuE1pY6wcJODhRknvg+nQi4=
k8s.io/api v0.0.0-20211213171716-0820d150f9ee/go.mod h1:vmCvbkzTfBQjlMNSgh69E+3vHHcFdYVCXF20g8xtEaE=
k8s.io/apimachinery v0.0.0-20211213171520-e65876e14280 h1:1Vi6MSKuJbfiiUckP6GaHTGYZtqayWlyf/JItZRH8Rg=
k8s.io/apimachinery v0.0.0-20211213171520-e65876e14280/go.mod h1:YpCy0BWvwSGZKMwmvPxCsfFJfl6vAwQdfVnPOJoUT2E=
k8s.io/cli-runtime v0.0.0-20211213173919-7521450cf418 h1:Zq6mshf2Hoib2zVJnpZjPTrBzAGZOo0fEIpZvANiCI8=
k8s.io/cli-runtime v0.0.0-20211213173919-7521450cf418/go.mod h1:apDwCPzQAGyyUdTswkT4VhDm7mmfXylRjeHCuxHVa4A=
k8s.io/client-go v0.0.0-20211213171958-056a9de35397 h1:r8OCAcStmrtTkTbJ94aO1/ei8igULFXLxVIOqjkP2ro=
k8s.io/client-go v0.0.0-20211213171958-056a9de35397/go.mod h1:EVC+GVlZGw9DXTNTB4NNrkWW1RooGd68qdccMwD/H68=
k8s.io/code-generator v0.0.0-20211211051323-05a01c0d31e8/go.mod h1:j797cqOuNe8S+wDEmZTY/gPIpqEwIrQU0dK5hVEiTrA=
k8s.io/component-base v0.0.0-20211213172503-a583eb047fc3 h1:K3ZTf3OYaOLrr/RE7ZgWtbrczS12HFfGKRu/ZwhPHLU=
k8s.io/component-base v0.0.0-20211213172503-a583eb047fc3/go.mod h1:quIoI70UO6Tq1RMH7eIHKN9sK0Y9hgz9NiDJTPY1wH4=
k8s.io/component-helpers v0.0.0-20211213172604-8b3953eba17e h1:k4LErUnmOAS8Pvp18VBsyK/0r890narVc3fHD8grSFY=
k8s.io/component-helpers v0.0.0-20211213172604-8b3953eba17e/go.mod h1:oxboAjjzYMWyCyozm4r0Tbn0qx0uvDBLOsWwEBCOff8=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
k8s.io/gengo v0.0.0-20211115164449-b448ea381d54/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
@ -921,6 +934,8 @@ k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw=
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 h1:E3J9oCLlaobFUqsjG9DfKbP2BmgwBL2p7pn0A3dG9W4=
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk=
k8s.io/metrics v0.0.0-20211213173812-faa52952390b h1:xrX9QwAEGQY0NQrb7YmfKnEglwoQtTfrKRyokrQjKOA=
k8s.io/metrics v0.0.0-20211213173812-faa52952390b/go.mod h1:KKSJzVrZKtmlrhIuhUu41r9LHIf8SHZxAIjEPq2XeLs=
k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
k8s.io/utils v0.0.0-20211208161948-7d6a63dca704 h1:ZKMMxTvduyf5WUtREOqg5LiXaN1KO/+0oOQPRFrClpo=
k8s.io/utils v0.0.0-20211208161948-7d6a63dca704/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=