Update kube-openapi to afdc3dddf62d31f5e3868d699379c571a6007920
This commit is contained in:
parent
3835c7aecd
commit
736123f447
4
go.mod
4
go.mod
@ -113,7 +113,7 @@ require (
|
|||||||
k8s.io/kms v0.0.0
|
k8s.io/kms v0.0.0
|
||||||
k8s.io/kube-aggregator v0.0.0
|
k8s.io/kube-aggregator v0.0.0
|
||||||
k8s.io/kube-controller-manager v0.0.0
|
k8s.io/kube-controller-manager v0.0.0
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d
|
||||||
k8s.io/kube-proxy v0.0.0
|
k8s.io/kube-proxy v0.0.0
|
||||||
k8s.io/kube-scheduler v0.0.0
|
k8s.io/kube-scheduler v0.0.0
|
||||||
k8s.io/kubectl v0.0.0
|
k8s.io/kubectl v0.0.0
|
||||||
@ -239,7 +239,7 @@ require (
|
|||||||
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
|
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
|
||||||
gopkg.in/warnings.v0 v0.1.1 // indirect
|
gopkg.in/warnings.v0 v0.1.1 // indirect
|
||||||
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1 // indirect
|
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1 // indirect
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
|
||||||
sigs.k8s.io/kustomize/api v0.12.1 // indirect
|
sigs.k8s.io/kustomize/api v0.12.1 // indirect
|
||||||
sigs.k8s.io/kustomize/kustomize/v4 v4.5.7 // indirect
|
sigs.k8s.io/kustomize/kustomize/v4 v4.5.7 // indirect
|
||||||
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
|
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
|
||||||
|
8
go.sum
8
go.sum
@ -1255,8 +1255,8 @@ k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
|
|||||||
k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
||||||
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
||||||
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a h1:s6zvHjyDQX1NtVT88pvw2tddqhqY0Bz0Gbnn+yctsFU=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d h1:VcFq5n7wCJB2FQMCIHfC+f+jNcGgNMar1uKd6rVlifU=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a/go.mod h1:/BYxry62FuDzmI+i9B+X2pqfySRmSOW2ARmj5Zbqhj0=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY=
|
||||||
k8s.io/system-validators v1.8.0 h1:tq05tdO9zdJZnNF3SXrq6LE7Knc/KfJm5wk68467JDg=
|
k8s.io/system-validators v1.8.0 h1:tq05tdO9zdJZnNF3SXrq6LE7Knc/KfJm5wk68467JDg=
|
||||||
k8s.io/system-validators v1.8.0/go.mod h1:gP1Ky+R9wtrSiFbrpEPwWMeYz9yqyy1S/KOh0Vci7WI=
|
k8s.io/system-validators v1.8.0/go.mod h1:gP1Ky+R9wtrSiFbrpEPwWMeYz9yqyy1S/KOh0Vci7WI=
|
||||||
k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
|
k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
|
||||||
@ -1267,8 +1267,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.1.1 h1:MB1zkK+WMOmfLxEpjr1wEmkpcIhZC7kfTkZ0stg5bog=
|
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1 h1:MB1zkK+WMOmfLxEpjr1wEmkpcIhZC7kfTkZ0stg5bog=
|
||||||
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1/go.mod h1:/4NLd21PQY0B+H+X0aDZdwUiVXYJQl/2NXA5KVtDiP4=
|
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1/go.mod h1:/4NLd21PQY0B+H+X0aDZdwUiVXYJQl/2NXA5KVtDiP4=
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
||||||
sigs.k8s.io/kustomize/api v0.12.1 h1:7YM7gW3kYBwtKvoY216ZzY+8hM+lV53LUayghNRJ0vM=
|
sigs.k8s.io/kustomize/api v0.12.1 h1:7YM7gW3kYBwtKvoY216ZzY+8hM+lV53LUayghNRJ0vM=
|
||||||
sigs.k8s.io/kustomize/api v0.12.1/go.mod h1:y3JUhimkZkR6sbLNwfJHxvo1TCLwuwm14sCYnkH6S1s=
|
sigs.k8s.io/kustomize/api v0.12.1/go.mod h1:y3JUhimkZkR6sbLNwfJHxvo1TCLwuwm14sCYnkH6S1s=
|
||||||
sigs.k8s.io/kustomize/kustomize/v4 v4.5.7 h1:cDW6AVMl6t/SLuQaezMET8hgnadZGIAr8tUrxFVOrpg=
|
sigs.k8s.io/kustomize/kustomize/v4 v4.5.7 h1:cDW6AVMl6t/SLuQaezMET8hgnadZGIAr8tUrxFVOrpg=
|
||||||
|
@ -32,7 +32,7 @@ require (
|
|||||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||||
k8s.io/klog/v2 v2.90.1 // indirect
|
k8s.io/klog/v2 v2.90.1 // indirect
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
|
||||||
sigs.k8s.io/yaml v1.3.0 // indirect
|
sigs.k8s.io/yaml v1.3.0 // indirect
|
||||||
)
|
)
|
||||||
|
4
staging/src/k8s.io/api/go.sum
generated
4
staging/src/k8s.io/api/go.sum
generated
@ -95,8 +95,8 @@ k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
|||||||
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
||||||
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
|
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
|
||||||
|
@ -30,9 +30,9 @@ require (
|
|||||||
k8s.io/code-generator v0.0.0
|
k8s.io/code-generator v0.0.0
|
||||||
k8s.io/component-base v0.0.0
|
k8s.io/component-base v0.0.0
|
||||||
k8s.io/klog/v2 v2.90.1
|
k8s.io/klog/v2 v2.90.1
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3
|
||||||
sigs.k8s.io/yaml v1.3.0
|
sigs.k8s.io/yaml v1.3.0
|
||||||
)
|
)
|
||||||
|
@ -747,8 +747,8 @@ k8s.io/gengo v0.0.0-20220902162205-c0856e24416d/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAE
|
|||||||
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=
|
||||||
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
||||||
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a h1:s6zvHjyDQX1NtVT88pvw2tddqhqY0Bz0Gbnn+yctsFU=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d h1:VcFq5n7wCJB2FQMCIHfC+f+jNcGgNMar1uKd6rVlifU=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a/go.mod h1:/BYxry62FuDzmI+i9B+X2pqfySRmSOW2ARmj5Zbqhj0=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
||||||
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
||||||
@ -756,8 +756,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.1.1 h1:MB1zkK+WMOmfLxEpjr1wEmkpcIhZC7kfTkZ0stg5bog=
|
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1 h1:MB1zkK+WMOmfLxEpjr1wEmkpcIhZC7kfTkZ0stg5bog=
|
||||||
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1/go.mod h1:/4NLd21PQY0B+H+X0aDZdwUiVXYJQl/2NXA5KVtDiP4=
|
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1/go.mod h1:/4NLd21PQY0B+H+X0aDZdwUiVXYJQl/2NXA5KVtDiP4=
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
||||||
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
|
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
|
||||||
|
@ -23,9 +23,9 @@ require (
|
|||||||
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8
|
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8
|
||||||
gopkg.in/inf.v0 v0.9.1
|
gopkg.in/inf.v0 v0.9.1
|
||||||
k8s.io/klog/v2 v2.90.1
|
k8s.io/klog/v2 v2.90.1
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3
|
||||||
sigs.k8s.io/yaml v1.3.0
|
sigs.k8s.io/yaml v1.3.0
|
||||||
)
|
)
|
||||||
|
8
staging/src/k8s.io/apimachinery/go.sum
generated
8
staging/src/k8s.io/apimachinery/go.sum
generated
@ -193,12 +193,12 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh
|
|||||||
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||||
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
||||||
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a h1:s6zvHjyDQX1NtVT88pvw2tddqhqY0Bz0Gbnn+yctsFU=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d h1:VcFq5n7wCJB2FQMCIHfC+f+jNcGgNMar1uKd6rVlifU=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a/go.mod h1:/BYxry62FuDzmI+i9B+X2pqfySRmSOW2ARmj5Zbqhj0=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
||||||
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
|
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
|
||||||
|
@ -48,10 +48,10 @@ require (
|
|||||||
k8s.io/component-base v0.0.0
|
k8s.io/component-base v0.0.0
|
||||||
k8s.io/klog/v2 v2.90.1
|
k8s.io/klog/v2 v2.90.1
|
||||||
k8s.io/kms v0.0.0
|
k8s.io/kms v0.0.0
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491
|
||||||
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1
|
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3
|
||||||
sigs.k8s.io/yaml v1.3.0
|
sigs.k8s.io/yaml v1.3.0
|
||||||
)
|
)
|
||||||
|
8
staging/src/k8s.io/apiserver/go.sum
generated
8
staging/src/k8s.io/apiserver/go.sum
generated
@ -876,8 +876,8 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
|
|||||||
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/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
||||||
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a h1:s6zvHjyDQX1NtVT88pvw2tddqhqY0Bz0Gbnn+yctsFU=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d h1:VcFq5n7wCJB2FQMCIHfC+f+jNcGgNMar1uKd6rVlifU=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a/go.mod h1:/BYxry62FuDzmI+i9B+X2pqfySRmSOW2ARmj5Zbqhj0=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
||||||
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
||||||
@ -885,8 +885,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.1.1 h1:MB1zkK+WMOmfLxEpjr1wEmkpcIhZC7kfTkZ0stg5bog=
|
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1 h1:MB1zkK+WMOmfLxEpjr1wEmkpcIhZC7kfTkZ0stg5bog=
|
||||||
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1/go.mod h1:/4NLd21PQY0B+H+X0aDZdwUiVXYJQl/2NXA5KVtDiP4=
|
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1/go.mod h1:/4NLd21PQY0B+H+X0aDZdwUiVXYJQl/2NXA5KVtDiP4=
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
||||||
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
|
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
|
||||||
|
@ -18,7 +18,7 @@ require (
|
|||||||
k8s.io/api v0.0.0
|
k8s.io/api v0.0.0
|
||||||
k8s.io/apimachinery v0.0.0
|
k8s.io/apimachinery v0.0.0
|
||||||
k8s.io/client-go v0.0.0
|
k8s.io/client-go v0.0.0
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491
|
||||||
sigs.k8s.io/kustomize/api v0.12.1
|
sigs.k8s.io/kustomize/api v0.12.1
|
||||||
sigs.k8s.io/kustomize/kyaml v0.13.9
|
sigs.k8s.io/kustomize/kyaml v0.13.9
|
||||||
@ -63,7 +63,7 @@ require (
|
|||||||
gopkg.in/inf.v0 v0.9.1 // indirect
|
gopkg.in/inf.v0 v0.9.1 // indirect
|
||||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||||
k8s.io/klog/v2 v2.90.1 // indirect
|
k8s.io/klog/v2 v2.90.1 // indirect
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
|
||||||
)
|
)
|
||||||
|
|
||||||
|
8
staging/src/k8s.io/cli-runtime/go.sum
generated
8
staging/src/k8s.io/cli-runtime/go.sum
generated
@ -489,15 +489,15 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
|
|||||||
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/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
||||||
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a h1:s6zvHjyDQX1NtVT88pvw2tddqhqY0Bz0Gbnn+yctsFU=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d h1:VcFq5n7wCJB2FQMCIHfC+f+jNcGgNMar1uKd6rVlifU=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a/go.mod h1:/BYxry62FuDzmI+i9B+X2pqfySRmSOW2ARmj5Zbqhj0=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
||||||
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
||||||
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
|
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/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
||||||
sigs.k8s.io/kustomize/api v0.12.1 h1:7YM7gW3kYBwtKvoY216ZzY+8hM+lV53LUayghNRJ0vM=
|
sigs.k8s.io/kustomize/api v0.12.1 h1:7YM7gW3kYBwtKvoY216ZzY+8hM+lV53LUayghNRJ0vM=
|
||||||
sigs.k8s.io/kustomize/api v0.12.1/go.mod h1:y3JUhimkZkR6sbLNwfJHxvo1TCLwuwm14sCYnkH6S1s=
|
sigs.k8s.io/kustomize/api v0.12.1/go.mod h1:y3JUhimkZkR6sbLNwfJHxvo1TCLwuwm14sCYnkH6S1s=
|
||||||
sigs.k8s.io/kustomize/kyaml v0.13.9 h1:Qz53EAaFFANyNgyOEJbT/yoIHygK40/ZcvU3rgry2Tk=
|
sigs.k8s.io/kustomize/kyaml v0.13.9 h1:Qz53EAaFFANyNgyOEJbT/yoIHygK40/ZcvU3rgry2Tk=
|
||||||
|
@ -27,9 +27,9 @@ require (
|
|||||||
k8s.io/api v0.0.0
|
k8s.io/api v0.0.0
|
||||||
k8s.io/apimachinery v0.0.0
|
k8s.io/apimachinery v0.0.0
|
||||||
k8s.io/klog/v2 v2.90.1
|
k8s.io/klog/v2 v2.90.1
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3
|
||||||
sigs.k8s.io/yaml v1.3.0
|
sigs.k8s.io/yaml v1.3.0
|
||||||
)
|
)
|
||||||
|
8
staging/src/k8s.io/client-go/go.sum
generated
8
staging/src/k8s.io/client-go/go.sum
generated
@ -475,15 +475,15 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
|
|||||||
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/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
||||||
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a h1:s6zvHjyDQX1NtVT88pvw2tddqhqY0Bz0Gbnn+yctsFU=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d h1:VcFq5n7wCJB2FQMCIHfC+f+jNcGgNMar1uKd6rVlifU=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a/go.mod h1:/BYxry62FuDzmI+i9B+X2pqfySRmSOW2ARmj5Zbqhj0=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
||||||
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
||||||
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
|
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/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
||||||
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
|
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
|
||||||
|
@ -100,9 +100,9 @@ require (
|
|||||||
gopkg.in/yaml.v2 v2.4.0 // indirect
|
gopkg.in/yaml.v2 v2.4.0 // indirect
|
||||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||||
k8s.io/kms v0.0.0 // indirect
|
k8s.io/kms v0.0.0 // indirect
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a // indirect
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d // indirect
|
||||||
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1 // indirect
|
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1 // indirect
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
|
||||||
sigs.k8s.io/yaml v1.3.0 // indirect
|
sigs.k8s.io/yaml v1.3.0 // indirect
|
||||||
)
|
)
|
||||||
|
8
staging/src/k8s.io/cloud-provider/go.sum
generated
8
staging/src/k8s.io/cloud-provider/go.sum
generated
@ -710,8 +710,8 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
|
|||||||
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/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
||||||
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a h1:s6zvHjyDQX1NtVT88pvw2tddqhqY0Bz0Gbnn+yctsFU=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d h1:VcFq5n7wCJB2FQMCIHfC+f+jNcGgNMar1uKd6rVlifU=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a/go.mod h1:/BYxry62FuDzmI+i9B+X2pqfySRmSOW2ARmj5Zbqhj0=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
||||||
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
||||||
@ -719,8 +719,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.1.1 h1:MB1zkK+WMOmfLxEpjr1wEmkpcIhZC7kfTkZ0stg5bog=
|
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1 h1:MB1zkK+WMOmfLxEpjr1wEmkpcIhZC7kfTkZ0stg5bog=
|
||||||
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1/go.mod h1:/4NLd21PQY0B+H+X0aDZdwUiVXYJQl/2NXA5KVtDiP4=
|
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1/go.mod h1:/4NLd21PQY0B+H+X0aDZdwUiVXYJQl/2NXA5KVtDiP4=
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
||||||
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
|
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
|
||||||
|
@ -28,7 +28,7 @@ require (
|
|||||||
gopkg.in/yaml.v2 v2.4.0 // indirect
|
gopkg.in/yaml.v2 v2.4.0 // indirect
|
||||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
|
||||||
)
|
)
|
||||||
|
|
||||||
|
4
staging/src/k8s.io/cluster-bootstrap/go.sum
generated
4
staging/src/k8s.io/cluster-bootstrap/go.sum
generated
@ -82,8 +82,8 @@ k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
|||||||
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
||||||
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
|
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
|
||||||
|
@ -8,7 +8,7 @@ require (
|
|||||||
k8s.io/api v0.0.0
|
k8s.io/api v0.0.0
|
||||||
k8s.io/apimachinery v0.0.0
|
k8s.io/apimachinery v0.0.0
|
||||||
k8s.io/client-go v0.0.0
|
k8s.io/client-go v0.0.0
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -45,7 +45,7 @@ require (
|
|||||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||||
k8s.io/klog/v2 v2.90.1 // indirect
|
k8s.io/klog/v2 v2.90.1 // indirect
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
|
||||||
sigs.k8s.io/yaml v1.3.0 // indirect
|
sigs.k8s.io/yaml v1.3.0 // indirect
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -459,15 +459,15 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
|
|||||||
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/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
||||||
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a h1:s6zvHjyDQX1NtVT88pvw2tddqhqY0Bz0Gbnn+yctsFU=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d h1:VcFq5n7wCJB2FQMCIHfC+f+jNcGgNMar1uKd6rVlifU=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a/go.mod h1:/BYxry62FuDzmI+i9B+X2pqfySRmSOW2ARmj5Zbqhj0=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
||||||
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
||||||
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
|
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/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
||||||
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
|
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
|
||||||
|
@ -11,7 +11,7 @@ require (
|
|||||||
gopkg.in/yaml.v2 v2.4.0
|
gopkg.in/yaml.v2 v2.4.0
|
||||||
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d
|
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d
|
||||||
k8s.io/klog/v2 v2.90.1
|
k8s.io/klog/v2 v2.90.1
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
|
5
staging/src/k8s.io/code-generator/go.sum
generated
5
staging/src/k8s.io/code-generator/go.sum
generated
@ -186,8 +186,9 @@ k8s.io/gengo v0.0.0-20220902162205-c0856e24416d/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAE
|
|||||||
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=
|
||||||
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
||||||
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a h1:s6zvHjyDQX1NtVT88pvw2tddqhqY0Bz0Gbnn+yctsFU=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d h1:VcFq5n7wCJB2FQMCIHfC+f+jNcGgNMar1uKd6rVlifU=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a/go.mod h1:/BYxry62FuDzmI+i9B+X2pqfySRmSOW2ARmj5Zbqhj0=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY=
|
||||||
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
||||||
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
|
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
|
||||||
|
@ -28,7 +28,7 @@ require (
|
|||||||
k8s.io/client-go v0.0.0
|
k8s.io/client-go v0.0.0
|
||||||
k8s.io/klog/v2 v2.90.1
|
k8s.io/klog/v2 v2.90.1
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
@ -77,7 +77,7 @@ require (
|
|||||||
gopkg.in/yaml.v2 v2.4.0 // indirect
|
gopkg.in/yaml.v2 v2.4.0 // indirect
|
||||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||||
k8s.io/api v0.0.0 // indirect
|
k8s.io/api v0.0.0 // indirect
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a // indirect
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d // indirect
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
|
||||||
sigs.k8s.io/yaml v1.3.0 // indirect
|
sigs.k8s.io/yaml v1.3.0 // indirect
|
||||||
)
|
)
|
||||||
|
8
staging/src/k8s.io/component-base/go.sum
generated
8
staging/src/k8s.io/component-base/go.sum
generated
@ -656,15 +656,15 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
|
|||||||
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/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
||||||
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a h1:s6zvHjyDQX1NtVT88pvw2tddqhqY0Bz0Gbnn+yctsFU=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d h1:VcFq5n7wCJB2FQMCIHfC+f+jNcGgNMar1uKd6rVlifU=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a/go.mod h1:/BYxry62FuDzmI+i9B+X2pqfySRmSOW2ARmj5Zbqhj0=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
||||||
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
||||||
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
|
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/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
||||||
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
|
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
|
||||||
|
@ -43,8 +43,8 @@ require (
|
|||||||
gopkg.in/inf.v0 v0.9.1 // indirect
|
gopkg.in/inf.v0 v0.9.1 // indirect
|
||||||
gopkg.in/yaml.v2 v2.4.0 // indirect
|
gopkg.in/yaml.v2 v2.4.0 // indirect
|
||||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a // indirect
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d // indirect
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
|
||||||
sigs.k8s.io/yaml v1.3.0 // indirect
|
sigs.k8s.io/yaml v1.3.0 // indirect
|
||||||
)
|
)
|
||||||
|
8
staging/src/k8s.io/component-helpers/go.sum
generated
8
staging/src/k8s.io/component-helpers/go.sum
generated
@ -459,15 +459,15 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
|
|||||||
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/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
||||||
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a h1:s6zvHjyDQX1NtVT88pvw2tddqhqY0Bz0Gbnn+yctsFU=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d h1:VcFq5n7wCJB2FQMCIHfC+f+jNcGgNMar1uKd6rVlifU=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a/go.mod h1:/BYxry62FuDzmI+i9B+X2pqfySRmSOW2ARmj5Zbqhj0=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
||||||
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
||||||
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
|
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/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
||||||
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
|
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
|
||||||
|
@ -93,9 +93,9 @@ require (
|
|||||||
gopkg.in/inf.v0 v0.9.1 // indirect
|
gopkg.in/inf.v0 v0.9.1 // indirect
|
||||||
gopkg.in/yaml.v2 v2.4.0 // indirect
|
gopkg.in/yaml.v2 v2.4.0 // indirect
|
||||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a // indirect
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d // indirect
|
||||||
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1 // indirect
|
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1 // indirect
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
|
||||||
sigs.k8s.io/yaml v1.3.0 // indirect
|
sigs.k8s.io/yaml v1.3.0 // indirect
|
||||||
)
|
)
|
||||||
|
8
staging/src/k8s.io/controller-manager/go.sum
generated
8
staging/src/k8s.io/controller-manager/go.sum
generated
@ -701,8 +701,8 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
|
|||||||
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/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
||||||
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a h1:s6zvHjyDQX1NtVT88pvw2tddqhqY0Bz0Gbnn+yctsFU=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d h1:VcFq5n7wCJB2FQMCIHfC+f+jNcGgNMar1uKd6rVlifU=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a/go.mod h1:/BYxry62FuDzmI+i9B+X2pqfySRmSOW2ARmj5Zbqhj0=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
||||||
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
||||||
@ -710,8 +710,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.1.1 h1:MB1zkK+WMOmfLxEpjr1wEmkpcIhZC7kfTkZ0stg5bog=
|
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1 h1:MB1zkK+WMOmfLxEpjr1wEmkpcIhZC7kfTkZ0stg5bog=
|
||||||
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1/go.mod h1:/4NLd21PQY0B+H+X0aDZdwUiVXYJQl/2NXA5KVtDiP4=
|
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1/go.mod h1:/4NLd21PQY0B+H+X0aDZdwUiVXYJQl/2NXA5KVtDiP4=
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
||||||
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
|
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
|
||||||
|
@ -27,7 +27,7 @@ require (
|
|||||||
gopkg.in/yaml.v2 v2.4.0 // indirect
|
gopkg.in/yaml.v2 v2.4.0 // indirect
|
||||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
|
||||||
)
|
)
|
||||||
|
|
||||||
|
4
staging/src/k8s.io/csi-translation-lib/go.sum
generated
4
staging/src/k8s.io/csi-translation-lib/go.sum
generated
@ -80,8 +80,8 @@ k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
|||||||
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
||||||
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
|
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
|
||||||
|
@ -48,9 +48,9 @@ require (
|
|||||||
gopkg.in/inf.v0 v0.9.1 // indirect
|
gopkg.in/inf.v0 v0.9.1 // indirect
|
||||||
gopkg.in/yaml.v2 v2.4.0 // indirect
|
gopkg.in/yaml.v2 v2.4.0 // indirect
|
||||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a // indirect
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d // indirect
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
|
||||||
sigs.k8s.io/yaml v1.3.0 // indirect
|
sigs.k8s.io/yaml v1.3.0 // indirect
|
||||||
)
|
)
|
||||||
|
@ -496,15 +496,15 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
|
|||||||
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/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
||||||
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a h1:s6zvHjyDQX1NtVT88pvw2tddqhqY0Bz0Gbnn+yctsFU=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d h1:VcFq5n7wCJB2FQMCIHfC+f+jNcGgNMar1uKd6rVlifU=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a/go.mod h1:/BYxry62FuDzmI+i9B+X2pqfySRmSOW2ARmj5Zbqhj0=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
||||||
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
||||||
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
|
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/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
||||||
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
|
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
|
||||||
|
@ -20,7 +20,7 @@ require (
|
|||||||
k8s.io/code-generator v0.0.0
|
k8s.io/code-generator v0.0.0
|
||||||
k8s.io/component-base v0.0.0
|
k8s.io/component-base v0.0.0
|
||||||
k8s.io/klog/v2 v2.90.1
|
k8s.io/klog/v2 v2.90.1
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3
|
||||||
)
|
)
|
||||||
@ -103,7 +103,7 @@ require (
|
|||||||
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
|
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
|
||||||
k8s.io/kms v0.0.0 // indirect
|
k8s.io/kms v0.0.0 // indirect
|
||||||
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1 // indirect
|
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1 // indirect
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
|
||||||
sigs.k8s.io/yaml v1.3.0 // indirect
|
sigs.k8s.io/yaml v1.3.0 // indirect
|
||||||
)
|
)
|
||||||
|
|
||||||
|
8
staging/src/k8s.io/kube-aggregator/go.sum
generated
8
staging/src/k8s.io/kube-aggregator/go.sum
generated
@ -714,8 +714,8 @@ k8s.io/gengo v0.0.0-20220902162205-c0856e24416d/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAE
|
|||||||
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=
|
||||||
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
||||||
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a h1:s6zvHjyDQX1NtVT88pvw2tddqhqY0Bz0Gbnn+yctsFU=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d h1:VcFq5n7wCJB2FQMCIHfC+f+jNcGgNMar1uKd6rVlifU=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a/go.mod h1:/BYxry62FuDzmI+i9B+X2pqfySRmSOW2ARmj5Zbqhj0=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
||||||
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
||||||
@ -723,8 +723,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.1.1 h1:MB1zkK+WMOmfLxEpjr1wEmkpcIhZC7kfTkZ0stg5bog=
|
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1 h1:MB1zkK+WMOmfLxEpjr1wEmkpcIhZC7kfTkZ0stg5bog=
|
||||||
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1/go.mod h1:/4NLd21PQY0B+H+X0aDZdwUiVXYJQl/2NXA5KVtDiP4=
|
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1/go.mod h1:/4NLd21PQY0B+H+X0aDZdwUiVXYJQl/2NXA5KVtDiP4=
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
||||||
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
|
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
|
||||||
|
@ -27,7 +27,7 @@ require (
|
|||||||
k8s.io/component-base v0.0.0 // indirect
|
k8s.io/component-base v0.0.0 // indirect
|
||||||
k8s.io/klog/v2 v2.90.1 // indirect
|
k8s.io/klog/v2 v2.90.1 // indirect
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -78,8 +78,8 @@ k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
|||||||
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
||||||
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
|
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
|
||||||
|
@ -26,7 +26,7 @@ require (
|
|||||||
gopkg.in/yaml.v2 v2.4.0 // indirect
|
gopkg.in/yaml.v2 v2.4.0 // indirect
|
||||||
k8s.io/klog/v2 v2.90.1 // indirect
|
k8s.io/klog/v2 v2.90.1 // indirect
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
|
||||||
sigs.k8s.io/yaml v1.3.0 // indirect
|
sigs.k8s.io/yaml v1.3.0 // indirect
|
||||||
)
|
)
|
||||||
|
4
staging/src/k8s.io/kube-proxy/go.sum
generated
4
staging/src/k8s.io/kube-proxy/go.sum
generated
@ -79,8 +79,8 @@ k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
|||||||
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
||||||
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
|
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
|
||||||
|
@ -25,7 +25,7 @@ require (
|
|||||||
gopkg.in/yaml.v2 v2.4.0 // indirect
|
gopkg.in/yaml.v2 v2.4.0 // indirect
|
||||||
k8s.io/klog/v2 v2.90.1 // indirect
|
k8s.io/klog/v2 v2.90.1 // indirect
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
|
||||||
)
|
)
|
||||||
|
|
||||||
|
4
staging/src/k8s.io/kube-scheduler/go.sum
generated
4
staging/src/k8s.io/kube-scheduler/go.sum
generated
@ -72,8 +72,8 @@ k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
|||||||
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
||||||
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
|
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
|
||||||
|
@ -37,10 +37,10 @@ require (
|
|||||||
k8s.io/component-base v0.0.0
|
k8s.io/component-base v0.0.0
|
||||||
k8s.io/component-helpers v0.0.0
|
k8s.io/component-helpers v0.0.0
|
||||||
k8s.io/klog/v2 v2.90.1
|
k8s.io/klog/v2 v2.90.1
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d
|
||||||
k8s.io/metrics v0.0.0
|
k8s.io/metrics v0.0.0
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd
|
||||||
sigs.k8s.io/kustomize/kustomize/v4 v4.5.7
|
sigs.k8s.io/kustomize/kustomize/v4 v4.5.7
|
||||||
sigs.k8s.io/kustomize/kyaml v0.13.9
|
sigs.k8s.io/kustomize/kyaml v0.13.9
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3
|
||||||
|
8
staging/src/k8s.io/kubectl/go.sum
generated
8
staging/src/k8s.io/kubectl/go.sum
generated
@ -533,15 +533,15 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
|
|||||||
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/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
||||||
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a h1:s6zvHjyDQX1NtVT88pvw2tddqhqY0Bz0Gbnn+yctsFU=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d h1:VcFq5n7wCJB2FQMCIHfC+f+jNcGgNMar1uKd6rVlifU=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a/go.mod h1:/BYxry62FuDzmI+i9B+X2pqfySRmSOW2ARmj5Zbqhj0=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
||||||
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
||||||
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
|
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/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
||||||
sigs.k8s.io/kustomize/api v0.12.1 h1:7YM7gW3kYBwtKvoY216ZzY+8hM+lV53LUayghNRJ0vM=
|
sigs.k8s.io/kustomize/api v0.12.1 h1:7YM7gW3kYBwtKvoY216ZzY+8hM+lV53LUayghNRJ0vM=
|
||||||
sigs.k8s.io/kustomize/api v0.12.1/go.mod h1:y3JUhimkZkR6sbLNwfJHxvo1TCLwuwm14sCYnkH6S1s=
|
sigs.k8s.io/kustomize/api v0.12.1/go.mod h1:y3JUhimkZkR6sbLNwfJHxvo1TCLwuwm14sCYnkH6S1s=
|
||||||
sigs.k8s.io/kustomize/kustomize/v4 v4.5.7 h1:cDW6AVMl6t/SLuQaezMET8hgnadZGIAr8tUrxFVOrpg=
|
sigs.k8s.io/kustomize/kustomize/v4 v4.5.7 h1:cDW6AVMl6t/SLuQaezMET8hgnadZGIAr8tUrxFVOrpg=
|
||||||
|
@ -40,7 +40,7 @@ require (
|
|||||||
gopkg.in/yaml.v2 v2.4.0 // indirect
|
gopkg.in/yaml.v2 v2.4.0 // indirect
|
||||||
k8s.io/klog/v2 v2.90.1 // indirect
|
k8s.io/klog/v2 v2.90.1 // indirect
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
|
||||||
sigs.k8s.io/yaml v1.3.0 // indirect
|
sigs.k8s.io/yaml v1.3.0 // indirect
|
||||||
)
|
)
|
||||||
|
4
staging/src/k8s.io/kubelet/go.sum
generated
4
staging/src/k8s.io/kubelet/go.sum
generated
@ -558,8 +558,8 @@ k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt
|
|||||||
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
||||||
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
|
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/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
||||||
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
|
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
|
||||||
|
@ -89,8 +89,8 @@ require (
|
|||||||
gopkg.in/warnings.v0 v0.1.1 // indirect
|
gopkg.in/warnings.v0 v0.1.1 // indirect
|
||||||
gopkg.in/yaml.v2 v2.4.0 // indirect
|
gopkg.in/yaml.v2 v2.4.0 // indirect
|
||||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a // indirect
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d // indirect
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
|
||||||
)
|
)
|
||||||
|
|
||||||
|
8
staging/src/k8s.io/legacy-cloud-providers/go.sum
generated
8
staging/src/k8s.io/legacy-cloud-providers/go.sum
generated
@ -809,15 +809,15 @@ honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
|
|||||||
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.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
||||||
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a h1:s6zvHjyDQX1NtVT88pvw2tddqhqY0Bz0Gbnn+yctsFU=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d h1:VcFq5n7wCJB2FQMCIHfC+f+jNcGgNMar1uKd6rVlifU=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a/go.mod h1:/BYxry62FuDzmI+i9B+X2pqfySRmSOW2ARmj5Zbqhj0=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
||||||
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
||||||
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
|
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/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
||||||
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
|
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
|
||||||
|
@ -49,9 +49,9 @@ require (
|
|||||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||||
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
|
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
|
||||||
k8s.io/klog/v2 v2.90.1 // indirect
|
k8s.io/klog/v2 v2.90.1 // indirect
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a // indirect
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d // indirect
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
|
||||||
sigs.k8s.io/yaml v1.3.0 // indirect
|
sigs.k8s.io/yaml v1.3.0 // indirect
|
||||||
)
|
)
|
||||||
|
8
staging/src/k8s.io/metrics/go.sum
generated
8
staging/src/k8s.io/metrics/go.sum
generated
@ -468,15 +468,15 @@ k8s.io/gengo v0.0.0-20220902162205-c0856e24416d/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAE
|
|||||||
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=
|
||||||
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
||||||
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a h1:s6zvHjyDQX1NtVT88pvw2tddqhqY0Bz0Gbnn+yctsFU=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d h1:VcFq5n7wCJB2FQMCIHfC+f+jNcGgNMar1uKd6rVlifU=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a/go.mod h1:/BYxry62FuDzmI+i9B+X2pqfySRmSOW2ARmj5Zbqhj0=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
||||||
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
||||||
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
|
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/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
||||||
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
|
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
|
||||||
|
@ -32,7 +32,7 @@ require (
|
|||||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||||
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
|
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
|
||||||
k8s.io/klog/v2 v2.90.1 // indirect
|
k8s.io/klog/v2 v2.90.1 // indirect
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a // indirect
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d // indirect
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
|
||||||
sigs.k8s.io/yaml v1.3.0 // indirect
|
sigs.k8s.io/yaml v1.3.0 // indirect
|
||||||
)
|
)
|
||||||
|
@ -166,8 +166,9 @@ k8s.io/gengo v0.0.0-20220902162205-c0856e24416d/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAE
|
|||||||
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=
|
||||||
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
||||||
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a h1:s6zvHjyDQX1NtVT88pvw2tddqhqY0Bz0Gbnn+yctsFU=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d h1:VcFq5n7wCJB2FQMCIHfC+f+jNcGgNMar1uKd6rVlifU=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a/go.mod h1:/BYxry62FuDzmI+i9B+X2pqfySRmSOW2ARmj5Zbqhj0=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY=
|
||||||
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
||||||
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
|
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
|
||||||
|
@ -97,9 +97,9 @@ require (
|
|||||||
gopkg.in/yaml.v2 v2.4.0 // indirect
|
gopkg.in/yaml.v2 v2.4.0 // indirect
|
||||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||||
k8s.io/kms v0.0.0 // indirect
|
k8s.io/kms v0.0.0 // indirect
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a // indirect
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d // indirect
|
||||||
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1 // indirect
|
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1 // indirect
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
|
||||||
)
|
)
|
||||||
|
|
||||||
|
8
staging/src/k8s.io/pod-security-admission/go.sum
generated
8
staging/src/k8s.io/pod-security-admission/go.sum
generated
@ -704,8 +704,8 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
|
|||||||
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/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
||||||
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a h1:s6zvHjyDQX1NtVT88pvw2tddqhqY0Bz0Gbnn+yctsFU=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d h1:VcFq5n7wCJB2FQMCIHfC+f+jNcGgNMar1uKd6rVlifU=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a/go.mod h1:/BYxry62FuDzmI+i9B+X2pqfySRmSOW2ARmj5Zbqhj0=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
||||||
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
||||||
@ -713,8 +713,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.1.1 h1:MB1zkK+WMOmfLxEpjr1wEmkpcIhZC7kfTkZ0stg5bog=
|
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1 h1:MB1zkK+WMOmfLxEpjr1wEmkpcIhZC7kfTkZ0stg5bog=
|
||||||
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1/go.mod h1:/4NLd21PQY0B+H+X0aDZdwUiVXYJQl/2NXA5KVtDiP4=
|
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1/go.mod h1:/4NLd21PQY0B+H+X0aDZdwUiVXYJQl/2NXA5KVtDiP4=
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
||||||
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
|
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
|
||||||
|
@ -12,7 +12,7 @@ require (
|
|||||||
k8s.io/client-go v0.0.0
|
k8s.io/client-go v0.0.0
|
||||||
k8s.io/code-generator v0.0.0
|
k8s.io/code-generator v0.0.0
|
||||||
k8s.io/component-base v0.0.0
|
k8s.io/component-base v0.0.0
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3
|
||||||
)
|
)
|
||||||
@ -100,7 +100,7 @@ require (
|
|||||||
k8s.io/klog/v2 v2.90.1 // indirect
|
k8s.io/klog/v2 v2.90.1 // indirect
|
||||||
k8s.io/kms v0.0.0 // indirect
|
k8s.io/kms v0.0.0 // indirect
|
||||||
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1 // indirect
|
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1 // indirect
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
|
||||||
sigs.k8s.io/yaml v1.3.0 // indirect
|
sigs.k8s.io/yaml v1.3.0 // indirect
|
||||||
)
|
)
|
||||||
|
|
||||||
|
8
staging/src/k8s.io/sample-apiserver/go.sum
generated
8
staging/src/k8s.io/sample-apiserver/go.sum
generated
@ -712,8 +712,8 @@ k8s.io/gengo v0.0.0-20220902162205-c0856e24416d/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAE
|
|||||||
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=
|
||||||
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
||||||
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a h1:s6zvHjyDQX1NtVT88pvw2tddqhqY0Bz0Gbnn+yctsFU=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d h1:VcFq5n7wCJB2FQMCIHfC+f+jNcGgNMar1uKd6rVlifU=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a/go.mod h1:/BYxry62FuDzmI+i9B+X2pqfySRmSOW2ARmj5Zbqhj0=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
||||||
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
||||||
@ -721,8 +721,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.1.1 h1:MB1zkK+WMOmfLxEpjr1wEmkpcIhZC7kfTkZ0stg5bog=
|
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1 h1:MB1zkK+WMOmfLxEpjr1wEmkpcIhZC7kfTkZ0stg5bog=
|
||||||
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1/go.mod h1:/4NLd21PQY0B+H+X0aDZdwUiVXYJQl/2NXA5KVtDiP4=
|
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1/go.mod h1:/4NLd21PQY0B+H+X0aDZdwUiVXYJQl/2NXA5KVtDiP4=
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
||||||
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
|
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
|
||||||
|
@ -57,9 +57,9 @@ require (
|
|||||||
k8s.io/api v0.0.0 // indirect
|
k8s.io/api v0.0.0 // indirect
|
||||||
k8s.io/apimachinery v0.0.0 // indirect
|
k8s.io/apimachinery v0.0.0 // indirect
|
||||||
k8s.io/klog/v2 v2.90.1 // indirect
|
k8s.io/klog/v2 v2.90.1 // indirect
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a // indirect
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d // indirect
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
|
||||||
sigs.k8s.io/kustomize/api v0.12.1 // indirect
|
sigs.k8s.io/kustomize/api v0.12.1 // indirect
|
||||||
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
|
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
|
||||||
|
8
staging/src/k8s.io/sample-cli-plugin/go.sum
generated
8
staging/src/k8s.io/sample-cli-plugin/go.sum
generated
@ -489,15 +489,15 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
|
|||||||
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/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
||||||
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a h1:s6zvHjyDQX1NtVT88pvw2tddqhqY0Bz0Gbnn+yctsFU=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d h1:VcFq5n7wCJB2FQMCIHfC+f+jNcGgNMar1uKd6rVlifU=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a/go.mod h1:/BYxry62FuDzmI+i9B+X2pqfySRmSOW2ARmj5Zbqhj0=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
||||||
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
||||||
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
|
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/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
||||||
sigs.k8s.io/kustomize/api v0.12.1 h1:7YM7gW3kYBwtKvoY216ZzY+8hM+lV53LUayghNRJ0vM=
|
sigs.k8s.io/kustomize/api v0.12.1 h1:7YM7gW3kYBwtKvoY216ZzY+8hM+lV53LUayghNRJ0vM=
|
||||||
sigs.k8s.io/kustomize/api v0.12.1/go.mod h1:y3JUhimkZkR6sbLNwfJHxvo1TCLwuwm14sCYnkH6S1s=
|
sigs.k8s.io/kustomize/api v0.12.1/go.mod h1:y3JUhimkZkR6sbLNwfJHxvo1TCLwuwm14sCYnkH6S1s=
|
||||||
sigs.k8s.io/kustomize/kyaml v0.13.9 h1:Qz53EAaFFANyNgyOEJbT/yoIHygK40/ZcvU3rgry2Tk=
|
sigs.k8s.io/kustomize/kyaml v0.13.9 h1:Qz53EAaFFANyNgyOEJbT/yoIHygK40/ZcvU3rgry2Tk=
|
||||||
|
@ -49,9 +49,9 @@ require (
|
|||||||
gopkg.in/yaml.v2 v2.4.0 // indirect
|
gopkg.in/yaml.v2 v2.4.0 // indirect
|
||||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||||
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
|
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a // indirect
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d // indirect
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
|
||||||
sigs.k8s.io/yaml v1.3.0 // indirect
|
sigs.k8s.io/yaml v1.3.0 // indirect
|
||||||
)
|
)
|
||||||
|
8
staging/src/k8s.io/sample-controller/go.sum
generated
8
staging/src/k8s.io/sample-controller/go.sum
generated
@ -473,15 +473,15 @@ k8s.io/gengo v0.0.0-20220902162205-c0856e24416d/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAE
|
|||||||
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=
|
||||||
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
||||||
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a h1:s6zvHjyDQX1NtVT88pvw2tddqhqY0Bz0Gbnn+yctsFU=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d h1:VcFq5n7wCJB2FQMCIHfC+f+jNcGgNMar1uKd6rVlifU=
|
||||||
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a/go.mod h1:/BYxry62FuDzmI+i9B+X2pqfySRmSOW2ARmj5Zbqhj0=
|
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
||||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
||||||
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
||||||
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
|
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/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
|
||||||
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
||||||
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
|
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
|
||||||
|
19
vendor/k8s.io/kube-openapi/pkg/handler/handler.go
generated
vendored
19
vendor/k8s.io/kube-openapi/pkg/handler/handler.go
generated
vendored
@ -19,7 +19,6 @@ package handler
|
|||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"crypto/sha512"
|
"crypto/sha512"
|
||||||
"encoding/json"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
"strconv"
|
"strconv"
|
||||||
@ -39,6 +38,12 @@ import (
|
|||||||
"k8s.io/kube-openapi/pkg/validation/spec"
|
"k8s.io/kube-openapi/pkg/validation/spec"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
subTypeProtobufDeprecated = "com.github.proto-openapi.spec.v2@v1.0+protobuf"
|
||||||
|
subTypeProtobuf = "com.github.proto-openapi.spec.v2.v1.0+protobuf"
|
||||||
|
subTypeJSON = "json"
|
||||||
|
)
|
||||||
|
|
||||||
func computeETag(data []byte) string {
|
func computeETag(data []byte) string {
|
||||||
if data == nil {
|
if data == nil {
|
||||||
return ""
|
return ""
|
||||||
@ -100,7 +105,7 @@ func (o *OpenAPIService) UpdateSpec(openapiSpec *spec.Swagger) (err error) {
|
|||||||
o.rwMutex.Lock()
|
o.rwMutex.Lock()
|
||||||
defer o.rwMutex.Unlock()
|
defer o.rwMutex.Unlock()
|
||||||
o.jsonCache = o.jsonCache.New(func() ([]byte, error) {
|
o.jsonCache = o.jsonCache.New(func() ([]byte, error) {
|
||||||
return json.Marshal(openapiSpec)
|
return openapiSpec.MarshalJSON()
|
||||||
})
|
})
|
||||||
o.protoCache = o.protoCache.New(func() ([]byte, error) {
|
o.protoCache = o.protoCache.New(func() ([]byte, error) {
|
||||||
json, err := o.jsonCache.Get()
|
json, err := o.jsonCache.Get()
|
||||||
@ -145,10 +150,12 @@ func (o *OpenAPIService) RegisterOpenAPIVersionedService(servePath string, handl
|
|||||||
accepted := []struct {
|
accepted := []struct {
|
||||||
Type string
|
Type string
|
||||||
SubType string
|
SubType string
|
||||||
|
ReturnedContentType string
|
||||||
GetDataAndETag func() ([]byte, string, time.Time, error)
|
GetDataAndETag func() ([]byte, string, time.Time, error)
|
||||||
}{
|
}{
|
||||||
{"application", "json", o.getSwaggerBytes},
|
{"application", subTypeJSON, "application/" + subTypeJSON, o.getSwaggerBytes},
|
||||||
{"application", "com.github.proto-openapi.spec.v2@v1.0+protobuf", o.getSwaggerPbBytes},
|
{"application", subTypeProtobufDeprecated, "application/" + subTypeProtobuf, o.getSwaggerPbBytes},
|
||||||
|
{"application", subTypeProtobuf, "application/" + subTypeProtobuf, o.getSwaggerPbBytes},
|
||||||
}
|
}
|
||||||
|
|
||||||
handler.Handle(servePath, gziphandler.GzipHandler(http.HandlerFunc(
|
handler.Handle(servePath, gziphandler.GzipHandler(http.HandlerFunc(
|
||||||
@ -167,7 +174,6 @@ func (o *OpenAPIService) RegisterOpenAPIVersionedService(servePath string, handl
|
|||||||
if clause.SubType != accepts.SubType && clause.SubType != "*" {
|
if clause.SubType != accepts.SubType && clause.SubType != "*" {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
// serve the first matching media type in the sorted clause list
|
// serve the first matching media type in the sorted clause list
|
||||||
data, etag, lastModified, err := accepts.GetDataAndETag()
|
data, etag, lastModified, err := accepts.GetDataAndETag()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -178,6 +184,9 @@ func (o *OpenAPIService) RegisterOpenAPIVersionedService(servePath string, handl
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Set Content-Type header in the reponse
|
||||||
|
w.Header().Set("Content-Type", accepts.ReturnedContentType)
|
||||||
|
|
||||||
// ETag must be enclosed in double quotes: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/ETag
|
// ETag must be enclosed in double quotes: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/ETag
|
||||||
w.Header().Set("Etag", strconv.Quote(etag))
|
w.Header().Set("Etag", strconv.Quote(etag))
|
||||||
// ServeContent will take care of caching using eTag.
|
// ServeContent will take care of caching using eTag.
|
||||||
|
14
vendor/k8s.io/kube-openapi/pkg/handler3/handler.go
generated
vendored
14
vendor/k8s.io/kube-openapi/pkg/handler3/handler.go
generated
vendored
@ -40,7 +40,8 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
subTypeProtobuf = "com.github.proto-openapi.spec.v3@v1.0+protobuf"
|
subTypeProtobufDeprecated = "com.github.proto-openapi.spec.v3@v1.0+protobuf"
|
||||||
|
subTypeProtobuf = "com.github.proto-openapi.spec.v3.v1.0+protobuf"
|
||||||
subTypeJSON = "json"
|
subTypeJSON = "json"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -140,7 +141,7 @@ func (o *OpenAPIService) getSingleGroupBytes(getType string, group string) ([]by
|
|||||||
}
|
}
|
||||||
etagBytes, err := v.etagCache.Get()
|
etagBytes, err := v.etagCache.Get()
|
||||||
return specBytes, string(etagBytes), v.lastModified, err
|
return specBytes, string(etagBytes), v.lastModified, err
|
||||||
} else if getType == subTypeProtobuf {
|
} else if getType == subTypeProtobuf || getType == subTypeProtobufDeprecated {
|
||||||
specPb, err := v.pbCache.Get()
|
specPb, err := v.pbCache.Get()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, "", v.lastModified, err
|
return nil, "", v.lastModified, err
|
||||||
@ -200,9 +201,11 @@ func (o *OpenAPIService) HandleGroupVersion(w http.ResponseWriter, r *http.Reque
|
|||||||
accepted := []struct {
|
accepted := []struct {
|
||||||
Type string
|
Type string
|
||||||
SubType string
|
SubType string
|
||||||
|
ReturnedContentType string
|
||||||
}{
|
}{
|
||||||
{"application", subTypeJSON},
|
{"application", subTypeJSON, "application/" + subTypeJSON},
|
||||||
{"application", subTypeProtobuf},
|
{"application", subTypeProtobuf, "application/" + subTypeProtobuf},
|
||||||
|
{"application", subTypeProtobufDeprecated, "application/" + subTypeProtobuf},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, clause := range clauses {
|
for _, clause := range clauses {
|
||||||
@ -217,6 +220,9 @@ func (o *OpenAPIService) HandleGroupVersion(w http.ResponseWriter, r *http.Reque
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
// Set Content-Type header in the reponse
|
||||||
|
w.Header().Set("Content-Type", accepts.ReturnedContentType)
|
||||||
|
|
||||||
// ETag must be enclosed in double quotes: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/ETag
|
// ETag must be enclosed in double quotes: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/ETag
|
||||||
w.Header().Set("Etag", strconv.Quote(etag))
|
w.Header().Set("Etag", strconv.Quote(etag))
|
||||||
|
|
||||||
|
4
vendor/k8s.io/kube-openapi/pkg/internal/flags.go
generated
vendored
4
vendor/k8s.io/kube-openapi/pkg/internal/flags.go
generated
vendored
@ -18,3 +18,7 @@ package internal
|
|||||||
|
|
||||||
// Used by tests to selectively disable experimental JSON unmarshaler
|
// Used by tests to selectively disable experimental JSON unmarshaler
|
||||||
var UseOptimizedJSONUnmarshaling bool = true
|
var UseOptimizedJSONUnmarshaling bool = true
|
||||||
|
var UseOptimizedJSONUnmarshalingV3 bool = true
|
||||||
|
|
||||||
|
// Used by tests to selectively disable experimental JSON marshaler
|
||||||
|
var UseOptimizedJSONMarshaling bool = true
|
||||||
|
65
vendor/k8s.io/kube-openapi/pkg/internal/serialization.go
generated
vendored
Normal file
65
vendor/k8s.io/kube-openapi/pkg/internal/serialization.go
generated
vendored
Normal file
@ -0,0 +1,65 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2023 The Kubernetes Authors.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package internal
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/go-openapi/jsonreference"
|
||||||
|
jsonv2 "k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json"
|
||||||
|
)
|
||||||
|
|
||||||
|
// DeterministicMarshal calls the jsonv2 library with the deterministic
|
||||||
|
// flag in order to have stable marshaling.
|
||||||
|
func DeterministicMarshal(in any) ([]byte, error) {
|
||||||
|
return jsonv2.MarshalOptions{Deterministic: true}.Marshal(jsonv2.EncodeOptions{}, in)
|
||||||
|
}
|
||||||
|
|
||||||
|
// JSONRefFromMap populates a json reference object if the map v contains a $ref key.
|
||||||
|
func JSONRefFromMap(jsonRef *jsonreference.Ref, v map[string]interface{}) error {
|
||||||
|
if v == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if vv, ok := v["$ref"]; ok {
|
||||||
|
if str, ok := vv.(string); ok {
|
||||||
|
ref, err := jsonreference.New(str)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
*jsonRef = ref
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// SanitizeExtensions sanitizes the input map such that non extension
|
||||||
|
// keys (non x-*, X-*) keys are dropped from the map. Returns the new
|
||||||
|
// modified map, or nil if the map is now empty.
|
||||||
|
func SanitizeExtensions(e map[string]interface{}) map[string]interface{} {
|
||||||
|
for k := range e {
|
||||||
|
if !IsExtensionKey(k) {
|
||||||
|
delete(e, k)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(e) == 0 {
|
||||||
|
e = nil
|
||||||
|
}
|
||||||
|
return e
|
||||||
|
}
|
||||||
|
|
||||||
|
// IsExtensionKey returns true if the input string is of format x-* or X-*
|
||||||
|
func IsExtensionKey(k string) bool {
|
||||||
|
return len(k) > 1 && (k[0] == 'x' || k[0] == 'X') && k[1] == '-'
|
||||||
|
}
|
@ -34,6 +34,13 @@ type MarshalOptions struct {
|
|||||||
// unknown JSON object members.
|
// unknown JSON object members.
|
||||||
DiscardUnknownMembers bool
|
DiscardUnknownMembers bool
|
||||||
|
|
||||||
|
// Deterministic specifies that the same input value will be serialized
|
||||||
|
// as the exact same output bytes. Different processes of
|
||||||
|
// the same program will serialize equal values to the same bytes,
|
||||||
|
// but different versions of the same program are not guaranteed
|
||||||
|
// to produce the exact same sequence of bytes.
|
||||||
|
Deterministic bool
|
||||||
|
|
||||||
// formatDepth is the depth at which we respect the format flag.
|
// formatDepth is the depth at which we respect the format flag.
|
||||||
formatDepth int
|
formatDepth int
|
||||||
// format is custom formatting for the value at the specified depth.
|
// format is custom formatting for the value at the specified depth.
|
||||||
|
@ -62,7 +62,7 @@ func unmarshalValueAny(uo UnmarshalOptions, dec *Decoder) (any, error) {
|
|||||||
}
|
}
|
||||||
return dec.stringCache.make(val), nil
|
return dec.stringCache.make(val), nil
|
||||||
case '0':
|
case '0':
|
||||||
fv, _ := parseFloat(val, 64) // ignore error since readValue gaurantees val is valid
|
fv, _ := parseFloat(val, 64) // ignore error since readValue guarantees val is valid
|
||||||
return fv, nil
|
return fv, nil
|
||||||
default:
|
default:
|
||||||
panic("BUG: invalid kind: " + k.String())
|
panic("BUG: invalid kind: " + k.String())
|
||||||
@ -99,6 +99,7 @@ func marshalObjectAny(mo MarshalOptions, enc *Encoder, obj map[string]any) error
|
|||||||
if !enc.options.AllowInvalidUTF8 {
|
if !enc.options.AllowInvalidUTF8 {
|
||||||
enc.tokens.last.disableNamespace()
|
enc.tokens.last.disableNamespace()
|
||||||
}
|
}
|
||||||
|
if !mo.Deterministic || len(obj) <= 1 {
|
||||||
for name, val := range obj {
|
for name, val := range obj {
|
||||||
if err := enc.WriteToken(String(name)); err != nil {
|
if err := enc.WriteToken(String(name)); err != nil {
|
||||||
return err
|
return err
|
||||||
@ -107,6 +108,24 @@ func marshalObjectAny(mo MarshalOptions, enc *Encoder, obj map[string]any) error
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
names := getStrings(len(obj))
|
||||||
|
var i int
|
||||||
|
for name := range obj {
|
||||||
|
(*names)[i] = name
|
||||||
|
i++
|
||||||
|
}
|
||||||
|
names.Sort()
|
||||||
|
for _, name := range *names {
|
||||||
|
if err := enc.WriteToken(String(name)); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := marshalValueAny(mo, enc, obj[name]); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
putStrings(names)
|
||||||
|
}
|
||||||
if err := enc.WriteToken(ObjectEnd); err != nil {
|
if err := enc.WriteToken(ObjectEnd); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -5,6 +5,7 @@
|
|||||||
package json
|
package json
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"bytes"
|
||||||
"encoding/base32"
|
"encoding/base32"
|
||||||
"encoding/base64"
|
"encoding/base64"
|
||||||
"encoding/hex"
|
"encoding/hex"
|
||||||
@ -12,6 +13,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"math"
|
"math"
|
||||||
"reflect"
|
"reflect"
|
||||||
|
"sort"
|
||||||
"strconv"
|
"strconv"
|
||||||
"sync"
|
"sync"
|
||||||
)
|
)
|
||||||
@ -228,13 +230,7 @@ func makeBytesArshaler(t reflect.Type, fncs *arshaler) *arshaler {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
val := enc.UnusedBuffer()
|
val := enc.UnusedBuffer()
|
||||||
var b []byte
|
b := va.Bytes()
|
||||||
if va.Kind() == reflect.Array {
|
|
||||||
// TODO(https://go.dev/issue/47066): Avoid reflect.Value.Slice.
|
|
||||||
b = va.Slice(0, va.Len()).Bytes()
|
|
||||||
} else {
|
|
||||||
b = va.Bytes()
|
|
||||||
}
|
|
||||||
n := len(`"`) + encodedLen(len(b)) + len(`"`)
|
n := len(`"`) + encodedLen(len(b)) + len(`"`)
|
||||||
if cap(val) < n {
|
if cap(val) < n {
|
||||||
val = make([]byte, n)
|
val = make([]byte, n)
|
||||||
@ -248,19 +244,19 @@ func makeBytesArshaler(t reflect.Type, fncs *arshaler) *arshaler {
|
|||||||
}
|
}
|
||||||
unmarshalDefault := fncs.unmarshal
|
unmarshalDefault := fncs.unmarshal
|
||||||
fncs.unmarshal = func(uo UnmarshalOptions, dec *Decoder, va addressableValue) error {
|
fncs.unmarshal = func(uo UnmarshalOptions, dec *Decoder, va addressableValue) error {
|
||||||
decode, decodedLen := decodeBase64, decodedLenBase64
|
decode, decodedLen, encodedLen := decodeBase64, decodedLenBase64, encodedLenBase64
|
||||||
if uo.format != "" && uo.formatDepth == dec.tokens.depth() {
|
if uo.format != "" && uo.formatDepth == dec.tokens.depth() {
|
||||||
switch uo.format {
|
switch uo.format {
|
||||||
case "base64":
|
case "base64":
|
||||||
decode, decodedLen = decodeBase64, decodedLenBase64
|
decode, decodedLen, encodedLen = decodeBase64, decodedLenBase64, encodedLenBase64
|
||||||
case "base64url":
|
case "base64url":
|
||||||
decode, decodedLen = decodeBase64URL, decodedLenBase64URL
|
decode, decodedLen, encodedLen = decodeBase64URL, decodedLenBase64URL, encodedLenBase64URL
|
||||||
case "base32":
|
case "base32":
|
||||||
decode, decodedLen = decodeBase32, decodedLenBase32
|
decode, decodedLen, encodedLen = decodeBase32, decodedLenBase32, encodedLenBase32
|
||||||
case "base32hex":
|
case "base32hex":
|
||||||
decode, decodedLen = decodeBase32Hex, decodedLenBase32Hex
|
decode, decodedLen, encodedLen = decodeBase32Hex, decodedLenBase32Hex, encodedLenBase32Hex
|
||||||
case "base16", "hex":
|
case "base16", "hex":
|
||||||
decode, decodedLen = decodeBase16, decodedLenBase16
|
decode, decodedLen, encodedLen = decodeBase16, decodedLenBase16, encodedLenBase16
|
||||||
case "array":
|
case "array":
|
||||||
uo.format = ""
|
uo.format = ""
|
||||||
return unmarshalDefault(uo, dec, va)
|
return unmarshalDefault(uo, dec, va)
|
||||||
@ -290,23 +286,28 @@ func makeBytesArshaler(t reflect.Type, fncs *arshaler) *arshaler {
|
|||||||
n--
|
n--
|
||||||
}
|
}
|
||||||
n = decodedLen(n)
|
n = decodedLen(n)
|
||||||
var b []byte
|
b := va.Bytes()
|
||||||
if va.Kind() == reflect.Array {
|
if va.Kind() == reflect.Array {
|
||||||
// TODO(https://go.dev/issue/47066): Avoid reflect.Value.Slice.
|
|
||||||
b = va.Slice(0, va.Len()).Bytes()
|
|
||||||
if n != len(b) {
|
if n != len(b) {
|
||||||
err := fmt.Errorf("decoded base64 length of %d mismatches array length of %d", n, len(b))
|
err := fmt.Errorf("decoded base64 length of %d mismatches array length of %d", n, len(b))
|
||||||
return &SemanticError{action: "unmarshal", JSONKind: k, GoType: t, Err: err}
|
return &SemanticError{action: "unmarshal", JSONKind: k, GoType: t, Err: err}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
b = va.Bytes()
|
|
||||||
if b == nil || cap(b) < n {
|
if b == nil || cap(b) < n {
|
||||||
b = make([]byte, n)
|
b = make([]byte, n)
|
||||||
} else {
|
} else {
|
||||||
b = b[:n]
|
b = b[:n]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if _, err := decode(b, val); err != nil {
|
n2, err := decode(b, val)
|
||||||
|
if err == nil && len(val) != encodedLen(n2) {
|
||||||
|
// TODO(https://go.dev/issue/53845): RFC 4648, section 3.3,
|
||||||
|
// specifies that non-alphabet characters must be rejected.
|
||||||
|
// Unfortunately, the "base32" and "base64" packages allow
|
||||||
|
// '\r' and '\n' characters by default.
|
||||||
|
err = errors.New("illegal data at input byte " + strconv.Itoa(bytes.IndexAny(val, "\r\n")))
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
return &SemanticError{action: "unmarshal", JSONKind: k, GoType: t, Err: err}
|
return &SemanticError{action: "unmarshal", JSONKind: k, GoType: t, Err: err}
|
||||||
}
|
}
|
||||||
if va.Kind() == reflect.Slice {
|
if va.Kind() == reflect.Slice {
|
||||||
@ -412,7 +413,7 @@ func makeUintArshaler(t reflect.Type) *arshaler {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
x := math.Float64frombits(uint64(va.Uint()))
|
x := math.Float64frombits(va.Uint())
|
||||||
return enc.writeNumber(x, rawUintNumber, mo.StringifyNumbers)
|
return enc.writeNumber(x, rawUintNumber, mo.StringifyNumbers)
|
||||||
}
|
}
|
||||||
fncs.unmarshal = func(uo UnmarshalOptions, dec *Decoder, va addressableValue) error {
|
fncs.unmarshal = func(uo UnmarshalOptions, dec *Decoder, va addressableValue) error {
|
||||||
@ -450,7 +451,7 @@ func makeUintArshaler(t reflect.Type) *arshaler {
|
|||||||
err := fmt.Errorf("cannot parse %q as unsigned integer: %w", val, strconv.ErrRange)
|
err := fmt.Errorf("cannot parse %q as unsigned integer: %w", val, strconv.ErrRange)
|
||||||
return &SemanticError{action: "unmarshal", JSONKind: k, GoType: t, Err: err}
|
return &SemanticError{action: "unmarshal", JSONKind: k, GoType: t, Err: err}
|
||||||
}
|
}
|
||||||
va.SetUint(uint64(n))
|
va.SetUint(n)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
return &SemanticError{action: "unmarshal", JSONKind: k, GoType: t}
|
return &SemanticError{action: "unmarshal", JSONKind: k, GoType: t}
|
||||||
@ -549,23 +550,9 @@ func makeFloatArshaler(t reflect.Type) *arshaler {
|
|||||||
return &fncs
|
return &fncs
|
||||||
}
|
}
|
||||||
|
|
||||||
var mapIterPool = sync.Pool{
|
|
||||||
New: func() any { return new(reflect.MapIter) },
|
|
||||||
}
|
|
||||||
|
|
||||||
func getMapIter(mv reflect.Value) *reflect.MapIter {
|
|
||||||
iter := mapIterPool.Get().(*reflect.MapIter)
|
|
||||||
iter.Reset(mv)
|
|
||||||
return iter
|
|
||||||
}
|
|
||||||
func putMapIter(iter *reflect.MapIter) {
|
|
||||||
iter.Reset(reflect.Value{}) // allow underlying map to be garbage collected
|
|
||||||
mapIterPool.Put(iter)
|
|
||||||
}
|
|
||||||
|
|
||||||
func makeMapArshaler(t reflect.Type) *arshaler {
|
func makeMapArshaler(t reflect.Type) *arshaler {
|
||||||
// NOTE: The logic below disables namespaces for tracking duplicate names
|
// NOTE: The logic below disables namespaces for tracking duplicate names
|
||||||
// when handling map keys with a unique represention.
|
// when handling map keys with a unique representation.
|
||||||
|
|
||||||
// NOTE: Values retrieved from a map are not addressable,
|
// NOTE: Values retrieved from a map are not addressable,
|
||||||
// so we shallow copy the values to make them addressable and
|
// so we shallow copy the values to make them addressable and
|
||||||
@ -641,14 +628,9 @@ func makeMapArshaler(t reflect.Type) *arshaler {
|
|||||||
enc.tokens.last.disableNamespace()
|
enc.tokens.last.disableNamespace()
|
||||||
}
|
}
|
||||||
|
|
||||||
// NOTE: Map entries are serialized in a non-deterministic order.
|
switch {
|
||||||
// Users that need stable output should call RawValue.Canonicalize.
|
case !mo.Deterministic || n <= 1:
|
||||||
// TODO(go1.19): Remove use of a sync.Pool with reflect.MapIter.
|
for iter := va.Value.MapRange(); iter.Next(); {
|
||||||
// Calling reflect.Value.MapRange no longer allocates.
|
|
||||||
// See https://go.dev/cl/400675.
|
|
||||||
iter := getMapIter(va.Value)
|
|
||||||
defer putMapIter(iter)
|
|
||||||
for iter.Next() {
|
|
||||||
k.SetIterKey(iter)
|
k.SetIterKey(iter)
|
||||||
if err := marshalKey(mko, enc, k); err != nil {
|
if err := marshalKey(mko, enc, k); err != nil {
|
||||||
// TODO: If err is errMissingName, then wrap it as a
|
// TODO: If err is errMissingName, then wrap it as a
|
||||||
@ -661,6 +643,63 @@ func makeMapArshaler(t reflect.Type) *arshaler {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
case !nonDefaultKey && t.Key().Kind() == reflect.String:
|
||||||
|
names := getStrings(n)
|
||||||
|
for i, iter := 0, va.Value.MapRange(); i < n && iter.Next(); i++ {
|
||||||
|
k.SetIterKey(iter)
|
||||||
|
(*names)[i] = k.String()
|
||||||
|
}
|
||||||
|
names.Sort()
|
||||||
|
for _, name := range *names {
|
||||||
|
if err := enc.WriteToken(String(name)); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
// TODO(https://go.dev/issue/57061): Use v.SetMapIndexOf.
|
||||||
|
k.SetString(name)
|
||||||
|
v.Set(va.MapIndex(k.Value))
|
||||||
|
if err := marshalVal(mo, enc, v); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
putStrings(names)
|
||||||
|
default:
|
||||||
|
type member struct {
|
||||||
|
name string // unquoted name
|
||||||
|
key addressableValue
|
||||||
|
}
|
||||||
|
members := make([]member, n)
|
||||||
|
keys := reflect.MakeSlice(reflect.SliceOf(t.Key()), n, n)
|
||||||
|
for i, iter := 0, va.Value.MapRange(); i < n && iter.Next(); i++ {
|
||||||
|
// Marshal the member name.
|
||||||
|
k := addressableValue{keys.Index(i)} // indexed slice element is always addressable
|
||||||
|
k.SetIterKey(iter)
|
||||||
|
if err := marshalKey(mko, enc, k); err != nil {
|
||||||
|
// TODO: If err is errMissingName, then wrap it as a
|
||||||
|
// SemanticError since this key type cannot be serialized
|
||||||
|
// as a JSON string.
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
name := enc.unwriteOnlyObjectMemberName()
|
||||||
|
members[i] = member{name, k}
|
||||||
|
}
|
||||||
|
// TODO: If AllowDuplicateNames is enabled, then sort according
|
||||||
|
// to reflect.Value as well if the names are equal.
|
||||||
|
// See internal/fmtsort.
|
||||||
|
// TODO(https://go.dev/issue/47619): Use slices.SortFunc instead.
|
||||||
|
sort.Slice(members, func(i, j int) bool {
|
||||||
|
return lessUTF16(members[i].name, members[j].name)
|
||||||
|
})
|
||||||
|
for _, member := range members {
|
||||||
|
if err := enc.WriteToken(String(member.name)); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
// TODO(https://go.dev/issue/57061): Use v.SetMapIndexOf.
|
||||||
|
v.Set(va.MapIndex(member.key.Value))
|
||||||
|
if err := marshalVal(mo, enc, v); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if err := enc.WriteToken(ObjectEnd); err != nil {
|
if err := enc.WriteToken(ObjectEnd); err != nil {
|
||||||
return err
|
return err
|
||||||
@ -856,7 +895,7 @@ func makeStructArshaler(t reflect.Type) *arshaler {
|
|||||||
// 2. The object namespace is guaranteed to be disabled.
|
// 2. The object namespace is guaranteed to be disabled.
|
||||||
// 3. The object name is guaranteed to be valid and pre-escaped.
|
// 3. The object name is guaranteed to be valid and pre-escaped.
|
||||||
// 4. There is no need to flush the buffer (for unwrite purposes).
|
// 4. There is no need to flush the buffer (for unwrite purposes).
|
||||||
// 5. There is no possibility of an error occuring.
|
// 5. There is no possibility of an error occurring.
|
||||||
if optimizeCommon {
|
if optimizeCommon {
|
||||||
// Append any delimiters or optional whitespace.
|
// Append any delimiters or optional whitespace.
|
||||||
if enc.tokens.last.length() > 0 {
|
if enc.tokens.last.length() > 0 {
|
||||||
@ -996,7 +1035,7 @@ func makeStructArshaler(t reflect.Type) *arshaler {
|
|||||||
|
|
||||||
if fields.inlinedFallback == nil {
|
if fields.inlinedFallback == nil {
|
||||||
// Skip unknown value since we have no place to store it.
|
// Skip unknown value since we have no place to store it.
|
||||||
if err := dec.skipValue(); err != nil {
|
if err := dec.SkipValue(); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
@ -5,6 +5,7 @@
|
|||||||
package json
|
package json
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"bytes"
|
||||||
"errors"
|
"errors"
|
||||||
"reflect"
|
"reflect"
|
||||||
)
|
)
|
||||||
@ -89,35 +90,61 @@ func marshalInlinedFallbackAll(mo MarshalOptions, enc *Encoder, va addressableVa
|
|||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
} else {
|
} else {
|
||||||
if v.Len() == 0 {
|
m := v // must be a map[string]V
|
||||||
|
n := m.Len()
|
||||||
|
if n == 0 {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
m := v
|
mk := newAddressableValue(stringType)
|
||||||
mv := newAddressableValue(m.Type().Elem())
|
mv := newAddressableValue(m.Type().Elem())
|
||||||
for iter := m.MapRange(); iter.Next(); {
|
marshalKey := func(mk addressableValue) error {
|
||||||
b, err := appendString(enc.UnusedBuffer(), iter.Key().String(), !enc.options.AllowInvalidUTF8, nil)
|
b, err := appendString(enc.UnusedBuffer(), mk.String(), !enc.options.AllowInvalidUTF8, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if insertUnquotedName != nil {
|
if insertUnquotedName != nil {
|
||||||
isVerbatim := consumeSimpleString(b) == len(b)
|
isVerbatim := bytes.IndexByte(b, '\\') < 0
|
||||||
name := unescapeStringMayCopy(b, isVerbatim)
|
name := unescapeStringMayCopy(b, isVerbatim)
|
||||||
if !insertUnquotedName(name) {
|
if !insertUnquotedName(name) {
|
||||||
return &SyntacticError{str: "duplicate name " + string(b) + " in object"}
|
return &SyntacticError{str: "duplicate name " + string(b) + " in object"}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if err := enc.WriteValue(b); err != nil {
|
return enc.WriteValue(b)
|
||||||
return err
|
|
||||||
}
|
}
|
||||||
|
marshalVal := f.fncs.marshal
|
||||||
mv.Set(iter.Value())
|
|
||||||
marshal := f.fncs.marshal
|
|
||||||
if mo.Marshalers != nil {
|
if mo.Marshalers != nil {
|
||||||
marshal, _ = mo.Marshalers.lookup(marshal, mv.Type())
|
marshalVal, _ = mo.Marshalers.lookup(marshalVal, mv.Type())
|
||||||
}
|
}
|
||||||
if err := marshal(mo, enc, mv); err != nil {
|
if !mo.Deterministic || n <= 1 {
|
||||||
|
for iter := m.MapRange(); iter.Next(); {
|
||||||
|
mk.SetIterKey(iter)
|
||||||
|
if err := marshalKey(mk); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
mv.Set(iter.Value())
|
||||||
|
if err := marshalVal(mo, enc, mv); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
names := getStrings(n)
|
||||||
|
for i, iter := 0, m.Value.MapRange(); i < n && iter.Next(); i++ {
|
||||||
|
mk.SetIterKey(iter)
|
||||||
|
(*names)[i] = mk.String()
|
||||||
|
}
|
||||||
|
names.Sort()
|
||||||
|
for _, name := range *names {
|
||||||
|
mk.SetString(name)
|
||||||
|
if err := marshalKey(mk); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
// TODO(https://go.dev/issue/57061): Use mv.SetMapIndexOf.
|
||||||
|
mv.Set(m.MapIndex(mk.Value))
|
||||||
|
if err := marshalVal(mo, enc, mv); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
putStrings(names)
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@ -162,7 +189,7 @@ func unmarshalInlinedFallbackNext(uo UnmarshalOptions, dec *Decoder, va addressa
|
|||||||
} else {
|
} else {
|
||||||
name := string(unquotedName) // TODO: Intern this?
|
name := string(unquotedName) // TODO: Intern this?
|
||||||
|
|
||||||
m := v
|
m := v // must be a map[string]V
|
||||||
if m.IsNil() {
|
if m.IsNil() {
|
||||||
m.Set(reflect.MakeMap(m.Type()))
|
m.Set(reflect.MakeMap(m.Type()))
|
||||||
}
|
}
|
||||||
|
@ -21,8 +21,8 @@ var (
|
|||||||
)
|
)
|
||||||
|
|
||||||
// MarshalerV1 is implemented by types that can marshal themselves.
|
// MarshalerV1 is implemented by types that can marshal themselves.
|
||||||
// It is recommended that types implement MarshalerV2 unless
|
// It is recommended that types implement MarshalerV2 unless the implementation
|
||||||
// the implementation is trying to avoid a hard dependency on this package.
|
// is trying to avoid a hard dependency on the "jsontext" package.
|
||||||
//
|
//
|
||||||
// It is recommended that implementations return a buffer that is safe
|
// It is recommended that implementations return a buffer that is safe
|
||||||
// for the caller to retain and potentially mutate.
|
// for the caller to retain and potentially mutate.
|
||||||
|
@ -5,6 +5,7 @@
|
|||||||
package json
|
package json
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"reflect"
|
"reflect"
|
||||||
"strings"
|
"strings"
|
||||||
@ -85,25 +86,39 @@ func makeTimeArshaler(fncs *arshaler, t reflect.Type) *arshaler {
|
|||||||
fncs.nonDefault = true
|
fncs.nonDefault = true
|
||||||
fncs.marshal = func(mo MarshalOptions, enc *Encoder, va addressableValue) error {
|
fncs.marshal = func(mo MarshalOptions, enc *Encoder, va addressableValue) error {
|
||||||
format := time.RFC3339Nano
|
format := time.RFC3339Nano
|
||||||
|
isRFC3339 := true
|
||||||
if mo.format != "" && mo.formatDepth == enc.tokens.depth() {
|
if mo.format != "" && mo.formatDepth == enc.tokens.depth() {
|
||||||
var err error
|
var err error
|
||||||
format, err = checkTimeFormat(mo.format)
|
format, isRFC3339, err = checkTimeFormat(mo.format)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return &SemanticError{action: "marshal", GoType: t, Err: err}
|
return &SemanticError{action: "marshal", GoType: t, Err: err}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
tt := va.Interface().(time.Time)
|
tt := va.Interface().(time.Time)
|
||||||
if y := tt.Year(); y < 0 || y >= 10000 {
|
|
||||||
// RFC 3339 is clear that years are 4 digits exactly.
|
|
||||||
// See https://go.dev/issue/4556#c15 for more discussion.
|
|
||||||
err := fmt.Errorf("year %d outside of range [0,9999]", y)
|
|
||||||
return &SemanticError{action: "marshal", GoType: t, Err: err}
|
|
||||||
}
|
|
||||||
b := enc.UnusedBuffer()
|
b := enc.UnusedBuffer()
|
||||||
b = append(b, '"')
|
b = append(b, '"')
|
||||||
b = tt.AppendFormat(b, format)
|
b = tt.AppendFormat(b, format)
|
||||||
b = append(b, '"')
|
b = append(b, '"')
|
||||||
|
if isRFC3339 {
|
||||||
|
// Not all Go timestamps can be represented as valid RFC 3339.
|
||||||
|
// Explicitly check for these edge cases.
|
||||||
|
// See https://go.dev/issue/4556 and https://go.dev/issue/54580.
|
||||||
|
var err error
|
||||||
|
switch b := b[len(`"`) : len(b)-len(`"`)]; {
|
||||||
|
case b[len("9999")] != '-': // year must be exactly 4 digits wide
|
||||||
|
err = errors.New("year outside of range [0,9999]")
|
||||||
|
case b[len(b)-1] != 'Z':
|
||||||
|
c := b[len(b)-len("Z07:00")]
|
||||||
|
if ('0' <= c && c <= '9') || parseDec2(b[len(b)-len("07:00"):]) >= 24 {
|
||||||
|
err = errors.New("timezone hour outside of range [0,23]")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return &SemanticError{action: "marshal", GoType: t, Err: err}
|
||||||
|
}
|
||||||
|
return enc.WriteValue(b) // RFC 3339 never needs JSON escaping
|
||||||
|
}
|
||||||
// The format may contain special characters that need escaping.
|
// The format may contain special characters that need escaping.
|
||||||
// Verify that the result is a valid JSON string (common case),
|
// Verify that the result is a valid JSON string (common case),
|
||||||
// otherwise escape the string correctly (slower case).
|
// otherwise escape the string correctly (slower case).
|
||||||
@ -113,10 +128,11 @@ func makeTimeArshaler(fncs *arshaler, t reflect.Type) *arshaler {
|
|||||||
return enc.WriteValue(b)
|
return enc.WriteValue(b)
|
||||||
}
|
}
|
||||||
fncs.unmarshal = func(uo UnmarshalOptions, dec *Decoder, va addressableValue) error {
|
fncs.unmarshal = func(uo UnmarshalOptions, dec *Decoder, va addressableValue) error {
|
||||||
format := time.RFC3339Nano
|
format := time.RFC3339
|
||||||
|
isRFC3339 := true
|
||||||
if uo.format != "" && uo.formatDepth == dec.tokens.depth() {
|
if uo.format != "" && uo.formatDepth == dec.tokens.depth() {
|
||||||
var err error
|
var err error
|
||||||
format, err = checkTimeFormat(uo.format)
|
format, isRFC3339, err = checkTimeFormat(uo.format)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return &SemanticError{action: "unmarshal", GoType: t, Err: err}
|
return &SemanticError{action: "unmarshal", GoType: t, Err: err}
|
||||||
}
|
}
|
||||||
@ -136,6 +152,29 @@ func makeTimeArshaler(fncs *arshaler, t reflect.Type) *arshaler {
|
|||||||
case '"':
|
case '"':
|
||||||
val = unescapeStringMayCopy(val, flags.isVerbatim())
|
val = unescapeStringMayCopy(val, flags.isVerbatim())
|
||||||
tt2, err := time.Parse(format, string(val))
|
tt2, err := time.Parse(format, string(val))
|
||||||
|
if isRFC3339 && err == nil {
|
||||||
|
// TODO(https://go.dev/issue/54580): RFC 3339 specifies
|
||||||
|
// the exact grammar of a valid timestamp. However,
|
||||||
|
// the parsing functionality in "time" is too loose and
|
||||||
|
// incorrectly accepts invalid timestamps as valid.
|
||||||
|
// Remove these manual checks when "time" checks it for us.
|
||||||
|
newParseError := func(layout, value, layoutElem, valueElem, message string) error {
|
||||||
|
return &time.ParseError{Layout: layout, Value: value, LayoutElem: layoutElem, ValueElem: valueElem, Message: message}
|
||||||
|
}
|
||||||
|
switch {
|
||||||
|
case val[len("2006-01-02T")+1] == ':': // hour must be two digits
|
||||||
|
err = newParseError(format, string(val), "15", string(val[len("2006-01-02T"):][:1]), "")
|
||||||
|
case val[len("2006-01-02T15:04:05")] == ',': // sub-second separator must be a period
|
||||||
|
err = newParseError(format, string(val), ".", ",", "")
|
||||||
|
case val[len(val)-1] != 'Z':
|
||||||
|
switch {
|
||||||
|
case parseDec2(val[len(val)-len("07:00"):]) >= 24: // timezone hour must be in range
|
||||||
|
err = newParseError(format, string(val), "Z07:00", string(val[len(val)-len("Z07:00"):]), ": timezone hour out of range")
|
||||||
|
case parseDec2(val[len(val)-len("00"):]) >= 60: // timezone minute must be in range
|
||||||
|
err = newParseError(format, string(val), "Z07:00", string(val[len(val)-len("Z07:00"):]), ": timezone minute out of range")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return &SemanticError{action: "unmarshal", JSONKind: k, GoType: t, Err: err}
|
return &SemanticError{action: "unmarshal", JSONKind: k, GoType: t, Err: err}
|
||||||
}
|
}
|
||||||
@ -149,48 +188,54 @@ func makeTimeArshaler(fncs *arshaler, t reflect.Type) *arshaler {
|
|||||||
return fncs
|
return fncs
|
||||||
}
|
}
|
||||||
|
|
||||||
func checkTimeFormat(format string) (string, error) {
|
func checkTimeFormat(format string) (string, bool, error) {
|
||||||
// We assume that an exported constant in the time package will
|
// We assume that an exported constant in the time package will
|
||||||
// always start with an uppercase ASCII letter.
|
// always start with an uppercase ASCII letter.
|
||||||
if len(format) > 0 && 'A' <= format[0] && format[0] <= 'Z' {
|
if len(format) > 0 && 'A' <= format[0] && format[0] <= 'Z' {
|
||||||
switch format {
|
switch format {
|
||||||
case "ANSIC":
|
case "ANSIC":
|
||||||
return time.ANSIC, nil
|
return time.ANSIC, false, nil
|
||||||
case "UnixDate":
|
case "UnixDate":
|
||||||
return time.UnixDate, nil
|
return time.UnixDate, false, nil
|
||||||
case "RubyDate":
|
case "RubyDate":
|
||||||
return time.RubyDate, nil
|
return time.RubyDate, false, nil
|
||||||
case "RFC822":
|
case "RFC822":
|
||||||
return time.RFC822, nil
|
return time.RFC822, false, nil
|
||||||
case "RFC822Z":
|
case "RFC822Z":
|
||||||
return time.RFC822Z, nil
|
return time.RFC822Z, false, nil
|
||||||
case "RFC850":
|
case "RFC850":
|
||||||
return time.RFC850, nil
|
return time.RFC850, false, nil
|
||||||
case "RFC1123":
|
case "RFC1123":
|
||||||
return time.RFC1123, nil
|
return time.RFC1123, false, nil
|
||||||
case "RFC1123Z":
|
case "RFC1123Z":
|
||||||
return time.RFC1123Z, nil
|
return time.RFC1123Z, false, nil
|
||||||
case "RFC3339":
|
case "RFC3339":
|
||||||
return time.RFC3339, nil
|
return time.RFC3339, true, nil
|
||||||
case "RFC3339Nano":
|
case "RFC3339Nano":
|
||||||
return time.RFC3339Nano, nil
|
return time.RFC3339Nano, true, nil
|
||||||
case "Kitchen":
|
case "Kitchen":
|
||||||
return time.Kitchen, nil
|
return time.Kitchen, false, nil
|
||||||
case "Stamp":
|
case "Stamp":
|
||||||
return time.Stamp, nil
|
return time.Stamp, false, nil
|
||||||
case "StampMilli":
|
case "StampMilli":
|
||||||
return time.StampMilli, nil
|
return time.StampMilli, false, nil
|
||||||
case "StampMicro":
|
case "StampMicro":
|
||||||
return time.StampMicro, nil
|
return time.StampMicro, false, nil
|
||||||
case "StampNano":
|
case "StampNano":
|
||||||
return time.StampNano, nil
|
return time.StampNano, false, nil
|
||||||
default:
|
default:
|
||||||
// Reject any format that is an exported Go identifier in case
|
// Reject any format that is an exported Go identifier in case
|
||||||
// new format constants are added to the time package.
|
// new format constants are added to the time package.
|
||||||
if strings.TrimFunc(format, isLetterOrDigit) == "" {
|
if strings.TrimFunc(format, isLetterOrDigit) == "" {
|
||||||
return "", fmt.Errorf("undefined format layout: %v", format)
|
return "", false, fmt.Errorf("undefined format layout: %v", format)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return format, nil
|
return format, false, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// parseDec2 parses b as an unsigned, base-10, 2-digit number.
|
||||||
|
// It panics if len(b) < 2. The result is undefined if digits are not base-10.
|
||||||
|
func parseDec2(b []byte) byte {
|
||||||
|
return 10*(b[0]-'0') + (b[1] - '0')
|
||||||
}
|
}
|
||||||
|
12
vendor/k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json/decode.go
generated
vendored
12
vendor/k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json/decode.go
generated
vendored
@ -347,9 +347,9 @@ func (d *Decoder) PeekKind() Kind {
|
|||||||
return next
|
return next
|
||||||
}
|
}
|
||||||
|
|
||||||
// skipValue is semantically equivalent to calling ReadValue and discarding
|
// SkipValue is semantically equivalent to calling ReadValue and discarding
|
||||||
// the result except that memory is not wasted trying to hold the entire result.
|
// the result except that memory is not wasted trying to hold the entire result.
|
||||||
func (d *Decoder) skipValue() error {
|
func (d *Decoder) SkipValue() error {
|
||||||
switch d.PeekKind() {
|
switch d.PeekKind() {
|
||||||
case '{', '[':
|
case '{', '[':
|
||||||
// For JSON objects and arrays, keep skipping all tokens
|
// For JSON objects and arrays, keep skipping all tokens
|
||||||
@ -374,7 +374,7 @@ func (d *Decoder) skipValue() error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// ReadToken reads the next Token, advancing the read offset.
|
// ReadToken reads the next Token, advancing the read offset.
|
||||||
// The returned token is only valid until the next Peek or Read call.
|
// The returned token is only valid until the next Peek, Read, or Skip call.
|
||||||
// It returns io.EOF if there are no more tokens.
|
// It returns io.EOF if there are no more tokens.
|
||||||
func (d *Decoder) ReadToken() (Token, error) {
|
func (d *Decoder) ReadToken() (Token, error) {
|
||||||
// Determine the next kind.
|
// Determine the next kind.
|
||||||
@ -585,7 +585,7 @@ func (f valueFlags) isCanonical() bool { return f&stringNonCanonical == 0 }
|
|||||||
|
|
||||||
// ReadValue returns the next raw JSON value, advancing the read offset.
|
// ReadValue returns the next raw JSON value, advancing the read offset.
|
||||||
// The value is stripped of any leading or trailing whitespace.
|
// The value is stripped of any leading or trailing whitespace.
|
||||||
// The returned value is only valid until the next Peek or Read call and
|
// The returned value is only valid until the next Peek, Read, or Skip call and
|
||||||
// may not be mutated while the Decoder remains in use.
|
// may not be mutated while the Decoder remains in use.
|
||||||
// If the decoder is currently at the end token for an object or array,
|
// If the decoder is currently at the end token for an object or array,
|
||||||
// then it reports a SyntacticError and the internal state remains unchanged.
|
// then it reports a SyntacticError and the internal state remains unchanged.
|
||||||
@ -1013,7 +1013,7 @@ func (d *Decoder) InputOffset() int64 {
|
|||||||
// UnreadBuffer returns the data remaining in the unread buffer,
|
// UnreadBuffer returns the data remaining in the unread buffer,
|
||||||
// which may contain zero or more bytes.
|
// which may contain zero or more bytes.
|
||||||
// The returned buffer must not be mutated while Decoder continues to be used.
|
// The returned buffer must not be mutated while Decoder continues to be used.
|
||||||
// The buffer contents are valid until the next Peek or Read call.
|
// The buffer contents are valid until the next Peek, Read, or Skip call.
|
||||||
func (d *Decoder) UnreadBuffer() []byte {
|
func (d *Decoder) UnreadBuffer() []byte {
|
||||||
return d.unreadBuffer()
|
return d.unreadBuffer()
|
||||||
}
|
}
|
||||||
@ -1213,7 +1213,7 @@ func consumeStringResumable(flags *valueFlags, b []byte, resumeOffset int, valid
|
|||||||
return n, &SyntacticError{str: "invalid escape sequence " + strconv.Quote(string(b[n:n+6])) + " within string"}
|
return n, &SyntacticError{str: "invalid escape sequence " + strconv.Quote(string(b[n:n+6])) + " within string"}
|
||||||
}
|
}
|
||||||
// Only certain control characters can use the \uFFFF notation
|
// Only certain control characters can use the \uFFFF notation
|
||||||
// for canonical formating (per RFC 8785, section 3.2.2.2.).
|
// for canonical formatting (per RFC 8785, section 3.2.2.2.).
|
||||||
switch v1 {
|
switch v1 {
|
||||||
// \uFFFF notation not permitted for these characters.
|
// \uFFFF notation not permitted for these characters.
|
||||||
case '\b', '\f', '\n', '\r', '\t':
|
case '\b', '\f', '\n', '\r', '\t':
|
||||||
|
24
vendor/k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json/encode.go
generated
vendored
24
vendor/k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json/encode.go
generated
vendored
@ -347,6 +347,30 @@ func (e *Encoder) unwriteEmptyObjectMember(prevName *string) bool {
|
|||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// unwriteOnlyObjectMemberName unwrites the only object member name
|
||||||
|
// and returns the unquoted name.
|
||||||
|
func (e *Encoder) unwriteOnlyObjectMemberName() string {
|
||||||
|
if last := e.tokens.last; !last.isObject() || last.length() != 1 {
|
||||||
|
panic("BUG: must be called on an object after writing first name")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Unwrite the name and whitespace.
|
||||||
|
b := trimSuffixString(e.buf)
|
||||||
|
isVerbatim := bytes.IndexByte(e.buf[len(b):], '\\') < 0
|
||||||
|
name := string(unescapeStringMayCopy(e.buf[len(b):], isVerbatim))
|
||||||
|
e.buf = trimSuffixWhitespace(b)
|
||||||
|
|
||||||
|
// Undo state changes.
|
||||||
|
e.tokens.last.decrement()
|
||||||
|
if !e.options.AllowDuplicateNames {
|
||||||
|
if e.tokens.last.isActiveNamespace() {
|
||||||
|
e.namespaces.last().removeLast()
|
||||||
|
}
|
||||||
|
e.names.clearLast()
|
||||||
|
}
|
||||||
|
return name
|
||||||
|
}
|
||||||
|
|
||||||
func trimSuffixWhitespace(b []byte) []byte {
|
func trimSuffixWhitespace(b []byte) []byte {
|
||||||
// NOTE: The arguments and logic are kept simple to keep this inlineable.
|
// NOTE: The arguments and logic are kept simple to keep this inlineable.
|
||||||
n := len(b) - 1
|
n := len(b) - 1
|
||||||
|
32
vendor/k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json/pools.go
generated
vendored
32
vendor/k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json/pools.go
generated
vendored
@ -8,6 +8,7 @@ import (
|
|||||||
"bytes"
|
"bytes"
|
||||||
"io"
|
"io"
|
||||||
"math/bits"
|
"math/bits"
|
||||||
|
"sort"
|
||||||
"sync"
|
"sync"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -148,3 +149,34 @@ func putStreamingDecoder(d *Decoder) {
|
|||||||
streamingDecoderPool.Put(d)
|
streamingDecoderPool.Put(d)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var stringsPools = &sync.Pool{New: func() any { return new(stringSlice) }}
|
||||||
|
|
||||||
|
type stringSlice []string
|
||||||
|
|
||||||
|
// getStrings returns a non-nil pointer to a slice with length n.
|
||||||
|
func getStrings(n int) *stringSlice {
|
||||||
|
s := stringsPools.Get().(*stringSlice)
|
||||||
|
if cap(*s) < n {
|
||||||
|
*s = make([]string, n)
|
||||||
|
}
|
||||||
|
*s = (*s)[:n]
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
|
||||||
|
func putStrings(s *stringSlice) {
|
||||||
|
if cap(*s) > 1<<10 {
|
||||||
|
*s = nil // avoid pinning arbitrarily large amounts of memory
|
||||||
|
}
|
||||||
|
stringsPools.Put(s)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sort sorts the string slice according to RFC 8785, section 3.2.3.
|
||||||
|
func (ss *stringSlice) Sort() {
|
||||||
|
// TODO(https://go.dev/issue/47619): Use slices.SortFunc instead.
|
||||||
|
sort.Sort(ss)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (ss *stringSlice) Len() int { return len(*ss) }
|
||||||
|
func (ss *stringSlice) Less(i, j int) bool { return lessUTF16((*ss)[i], (*ss)[j]) }
|
||||||
|
func (ss *stringSlice) Swap(i, j int) { (*ss)[i], (*ss)[j] = (*ss)[j], (*ss)[i] }
|
||||||
|
4
vendor/k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json/state.go
generated
vendored
4
vendor/k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json/state.go
generated
vendored
@ -721,7 +721,7 @@ func (s *uintSet) has(i uint) bool {
|
|||||||
return s.lo.has(i)
|
return s.lo.has(i)
|
||||||
} else {
|
} else {
|
||||||
i -= 64
|
i -= 64
|
||||||
iHi, iLo := int(i/64), uint(i%64)
|
iHi, iLo := int(i/64), i%64
|
||||||
return iHi < len(s.hi) && s.hi[iHi].has(iLo)
|
return iHi < len(s.hi) && s.hi[iHi].has(iLo)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -735,7 +735,7 @@ func (s *uintSet) insert(i uint) bool {
|
|||||||
return !has
|
return !has
|
||||||
} else {
|
} else {
|
||||||
i -= 64
|
i -= 64
|
||||||
iHi, iLo := int(i/64), uint(i%64)
|
iHi, iLo := int(i/64), i%64
|
||||||
if iHi >= len(s.hi) {
|
if iHi >= len(s.hi) {
|
||||||
s.hi = append(s.hi, make([]uintSet64, iHi+1-len(s.hi))...)
|
s.hi = append(s.hi, make([]uintSet64, iHi+1-len(s.hi))...)
|
||||||
s.hi = s.hi[:cap(s.hi)]
|
s.hi = s.hi[:cap(s.hi)]
|
||||||
|
10
vendor/k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json/token.go
generated
vendored
10
vendor/k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json/token.go
generated
vendored
@ -112,7 +112,7 @@ func Bool(b bool) Token {
|
|||||||
return False
|
return False
|
||||||
}
|
}
|
||||||
|
|
||||||
// String construct a Token representing a JSON string.
|
// String constructs a Token representing a JSON string.
|
||||||
// The provided string should contain valid UTF-8, otherwise invalid characters
|
// The provided string should contain valid UTF-8, otherwise invalid characters
|
||||||
// may be mangled as the Unicode replacement character.
|
// may be mangled as the Unicode replacement character.
|
||||||
func String(s string) Token {
|
func String(s string) Token {
|
||||||
@ -225,7 +225,7 @@ func (t Token) appendString(dst []byte, validateUTF8, preserveRaw bool, escapeRu
|
|||||||
}
|
}
|
||||||
|
|
||||||
// String returns the unescaped string value for a JSON string.
|
// String returns the unescaped string value for a JSON string.
|
||||||
// For other JSON kinds, this returns the raw JSON represention.
|
// For other JSON kinds, this returns the raw JSON representation.
|
||||||
func (t Token) String() string {
|
func (t Token) String() string {
|
||||||
// This is inlinable to take advantage of "function outlining".
|
// This is inlinable to take advantage of "function outlining".
|
||||||
// This avoids an allocation for the string(b) conversion
|
// This avoids an allocation for the string(b) conversion
|
||||||
@ -373,10 +373,10 @@ func (t Token) Int() int64 {
|
|||||||
case 'i':
|
case 'i':
|
||||||
return int64(t.num)
|
return int64(t.num)
|
||||||
case 'u':
|
case 'u':
|
||||||
if uint64(t.num) > maxInt64 {
|
if t.num > maxInt64 {
|
||||||
return maxInt64
|
return maxInt64
|
||||||
}
|
}
|
||||||
return int64(uint64(t.num))
|
return int64(t.num)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -425,7 +425,7 @@ func (t Token) Uint() uint64 {
|
|||||||
// Handle exact integer value.
|
// Handle exact integer value.
|
||||||
switch t.str[0] {
|
switch t.str[0] {
|
||||||
case 'u':
|
case 'u':
|
||||||
return uint64(t.num)
|
return t.num
|
||||||
case 'i':
|
case 'i':
|
||||||
if int64(t.num) < minUint64 {
|
if int64(t.num) < minUint64 {
|
||||||
return minUint64
|
return minUint64
|
||||||
|
50
vendor/k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json/value.go
generated
vendored
50
vendor/k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json/value.go
generated
vendored
@ -263,7 +263,7 @@ func reorderObjects(d *Decoder, scratch *[]byte) {
|
|||||||
afterValue := d.InputOffset()
|
afterValue := d.InputOffset()
|
||||||
|
|
||||||
if isSorted && len(*members) > 0 {
|
if isSorted && len(*members) > 0 {
|
||||||
isSorted = lessUTF16(prevName, name)
|
isSorted = lessUTF16(prevName, []byte(name))
|
||||||
}
|
}
|
||||||
*members = append(*members, memberName{name, beforeName, afterValue})
|
*members = append(*members, memberName{name, beforeName, afterValue})
|
||||||
prevName = name
|
prevName = name
|
||||||
@ -317,7 +317,7 @@ func reorderObjects(d *Decoder, scratch *[]byte) {
|
|||||||
// to the UTF-16 codepoints of the UTF-8 encoded input strings.
|
// to the UTF-16 codepoints of the UTF-8 encoded input strings.
|
||||||
// This implements the ordering specified in RFC 8785, section 3.2.3.
|
// This implements the ordering specified in RFC 8785, section 3.2.3.
|
||||||
// The inputs must be valid UTF-8, otherwise this may panic.
|
// The inputs must be valid UTF-8, otherwise this may panic.
|
||||||
func lessUTF16(x, y []byte) bool {
|
func lessUTF16[Bytes []byte | string](x, y Bytes) bool {
|
||||||
// NOTE: This is an optimized, allocation-free implementation
|
// NOTE: This is an optimized, allocation-free implementation
|
||||||
// of lessUTF16Simple in fuzz_test.go. FuzzLessUTF16 verifies that the
|
// of lessUTF16Simple in fuzz_test.go. FuzzLessUTF16 verifies that the
|
||||||
// two implementations agree on the result of comparing any two strings.
|
// two implementations agree on the result of comparing any two strings.
|
||||||
@ -326,8 +326,13 @@ func lessUTF16(x, y []byte) bool {
|
|||||||
return ('\u0000' <= r && r <= '\uD7FF') || ('\uE000' <= r && r <= '\uFFFF')
|
return ('\u0000' <= r && r <= '\uD7FF') || ('\uE000' <= r && r <= '\uFFFF')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var invalidUTF8 bool
|
||||||
|
x0, y0 := x, y
|
||||||
for {
|
for {
|
||||||
if len(x) == 0 || len(y) == 0 {
|
if len(x) == 0 || len(y) == 0 {
|
||||||
|
if len(x) == len(y) && invalidUTF8 {
|
||||||
|
return string(x0) < string(y0)
|
||||||
|
}
|
||||||
return len(x) < len(y)
|
return len(x) < len(y)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -341,35 +346,36 @@ func lessUTF16(x, y []byte) bool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Decode next pair of runes as UTF-8.
|
// Decode next pair of runes as UTF-8.
|
||||||
rx, nx := utf8.DecodeRune(x)
|
// TODO(https://go.dev/issue/56948): Use a generic implementation
|
||||||
ry, ny := utf8.DecodeRune(y)
|
// of utf8.DecodeRune, or rely on a compiler optimization to statically
|
||||||
switch {
|
// hide the cost of a type switch (https://go.dev/issue/57072).
|
||||||
|
var rx, ry rune
|
||||||
// Both runes encode as either a single or surrogate pair
|
var nx, ny int
|
||||||
// of UTF-16 codepoints.
|
switch any(x).(type) {
|
||||||
case isUTF16Self(rx) == isUTF16Self(ry):
|
case string:
|
||||||
if rx != ry {
|
rx, nx = utf8.DecodeRuneInString(string(x))
|
||||||
return rx < ry
|
ry, ny = utf8.DecodeRuneInString(string(y))
|
||||||
|
case []byte:
|
||||||
|
rx, nx = utf8.DecodeRune([]byte(x))
|
||||||
|
ry, ny = utf8.DecodeRune([]byte(y))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
selfx := isUTF16Self(rx)
|
||||||
|
selfy := isUTF16Self(ry)
|
||||||
|
switch {
|
||||||
// The x rune is a single UTF-16 codepoint, while
|
// The x rune is a single UTF-16 codepoint, while
|
||||||
// the y rune is a surrogate pair of UTF-16 codepoints.
|
// the y rune is a surrogate pair of UTF-16 codepoints.
|
||||||
case isUTF16Self(rx):
|
case selfx && !selfy:
|
||||||
ry, _ := utf16.EncodeRune(ry)
|
ry, _ = utf16.EncodeRune(ry)
|
||||||
if rx != ry {
|
|
||||||
return rx < ry
|
|
||||||
}
|
|
||||||
panic("BUG: invalid UTF-8") // implies rx is an unpaired surrogate half
|
|
||||||
|
|
||||||
// The y rune is a single UTF-16 codepoint, while
|
// The y rune is a single UTF-16 codepoint, while
|
||||||
// the x rune is a surrogate pair of UTF-16 codepoints.
|
// the x rune is a surrogate pair of UTF-16 codepoints.
|
||||||
case isUTF16Self(ry):
|
case selfy && !selfx:
|
||||||
rx, _ := utf16.EncodeRune(rx)
|
rx, _ = utf16.EncodeRune(rx)
|
||||||
|
}
|
||||||
if rx != ry {
|
if rx != ry {
|
||||||
return rx < ry
|
return rx < ry
|
||||||
}
|
}
|
||||||
panic("BUG: invalid UTF-8") // implies ry is an unpaired surrogate half
|
invalidUTF8 = invalidUTF8 || (rx == utf8.RuneError && nx == 1) || (ry == utf8.RuneError && ny == 1)
|
||||||
}
|
|
||||||
x, y = x[nx:], y[ny:]
|
x, y = x[nx:], y[ny:]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
20
vendor/k8s.io/kube-openapi/pkg/spec3/encoding.go
generated
vendored
20
vendor/k8s.io/kube-openapi/pkg/spec3/encoding.go
generated
vendored
@ -18,7 +18,10 @@ package spec3
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
|
||||||
"github.com/go-openapi/swag"
|
"github.com/go-openapi/swag"
|
||||||
|
"k8s.io/kube-openapi/pkg/internal"
|
||||||
|
jsonv2 "k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json"
|
||||||
"k8s.io/kube-openapi/pkg/validation/spec"
|
"k8s.io/kube-openapi/pkg/validation/spec"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -41,6 +44,9 @@ func (e *Encoding) MarshalJSON() ([]byte, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (e *Encoding) UnmarshalJSON(data []byte) error {
|
func (e *Encoding) UnmarshalJSON(data []byte) error {
|
||||||
|
if internal.UseOptimizedJSONUnmarshalingV3 {
|
||||||
|
return jsonv2.Unmarshal(data, e)
|
||||||
|
}
|
||||||
if err := json.Unmarshal(data, &e.EncodingProps); err != nil {
|
if err := json.Unmarshal(data, &e.EncodingProps); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -50,6 +56,20 @@ func (e *Encoding) UnmarshalJSON(data []byte) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (e *Encoding) UnmarshalNextJSON(opts jsonv2.UnmarshalOptions, dec *jsonv2.Decoder) error {
|
||||||
|
var x struct {
|
||||||
|
spec.Extensions
|
||||||
|
EncodingProps
|
||||||
|
}
|
||||||
|
if err := opts.UnmarshalNext(dec, &x); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
e.Extensions = internal.SanitizeExtensions(x.Extensions)
|
||||||
|
e.EncodingProps = x.EncodingProps
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
type EncodingProps struct {
|
type EncodingProps struct {
|
||||||
// Content Type for encoding a specific property
|
// Content Type for encoding a specific property
|
||||||
ContentType string `json:"contentType,omitempty"`
|
ContentType string `json:"contentType,omitempty"`
|
||||||
|
23
vendor/k8s.io/kube-openapi/pkg/spec3/example.go
generated
vendored
23
vendor/k8s.io/kube-openapi/pkg/spec3/example.go
generated
vendored
@ -20,6 +20,9 @@ import (
|
|||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
|
||||||
"github.com/go-openapi/swag"
|
"github.com/go-openapi/swag"
|
||||||
|
"k8s.io/kube-openapi/pkg/internal"
|
||||||
|
jsonv2 "k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json"
|
||||||
|
|
||||||
"k8s.io/kube-openapi/pkg/validation/spec"
|
"k8s.io/kube-openapi/pkg/validation/spec"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -49,6 +52,9 @@ func (e *Example) MarshalJSON() ([]byte, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (e *Example) UnmarshalJSON(data []byte) error {
|
func (e *Example) UnmarshalJSON(data []byte) error {
|
||||||
|
if internal.UseOptimizedJSONUnmarshalingV3 {
|
||||||
|
return jsonv2.Unmarshal(data, e)
|
||||||
|
}
|
||||||
if err := json.Unmarshal(data, &e.Refable); err != nil {
|
if err := json.Unmarshal(data, &e.Refable); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -61,6 +67,23 @@ func (e *Example) UnmarshalJSON(data []byte) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (e *Example) UnmarshalNextJSON(opts jsonv2.UnmarshalOptions, dec *jsonv2.Decoder) error {
|
||||||
|
var x struct {
|
||||||
|
spec.Extensions
|
||||||
|
ExampleProps
|
||||||
|
}
|
||||||
|
if err := opts.UnmarshalNext(dec, &x); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := internal.JSONRefFromMap(&e.Ref.Ref, x.Extensions); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
e.Extensions = internal.SanitizeExtensions(x.Extensions)
|
||||||
|
e.ExampleProps = x.ExampleProps
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
type ExampleProps struct {
|
type ExampleProps struct {
|
||||||
// Summary holds a short description of the example
|
// Summary holds a short description of the example
|
||||||
Summary string `json:"summary,omitempty"`
|
Summary string `json:"summary,omitempty"`
|
||||||
|
19
vendor/k8s.io/kube-openapi/pkg/spec3/external_documentation.go
generated
vendored
19
vendor/k8s.io/kube-openapi/pkg/spec3/external_documentation.go
generated
vendored
@ -18,7 +18,10 @@ package spec3
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
|
||||||
"github.com/go-openapi/swag"
|
"github.com/go-openapi/swag"
|
||||||
|
"k8s.io/kube-openapi/pkg/internal"
|
||||||
|
jsonv2 "k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json"
|
||||||
"k8s.io/kube-openapi/pkg/validation/spec"
|
"k8s.io/kube-openapi/pkg/validation/spec"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -48,6 +51,9 @@ func (e *ExternalDocumentation) MarshalJSON() ([]byte, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (e *ExternalDocumentation) UnmarshalJSON(data []byte) error {
|
func (e *ExternalDocumentation) UnmarshalJSON(data []byte) error {
|
||||||
|
if internal.UseOptimizedJSONUnmarshalingV3 {
|
||||||
|
return jsonv2.Unmarshal(data, e)
|
||||||
|
}
|
||||||
if err := json.Unmarshal(data, &e.ExternalDocumentationProps); err != nil {
|
if err := json.Unmarshal(data, &e.ExternalDocumentationProps); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -56,3 +62,16 @@ func (e *ExternalDocumentation) UnmarshalJSON(data []byte) error {
|
|||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (e *ExternalDocumentation) UnmarshalNextJSON(opts jsonv2.UnmarshalOptions, dec *jsonv2.Decoder) error {
|
||||||
|
var x struct {
|
||||||
|
spec.Extensions
|
||||||
|
ExternalDocumentationProps
|
||||||
|
}
|
||||||
|
if err := opts.UnmarshalNext(dec, &x); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
e.Extensions = internal.SanitizeExtensions(x.Extensions)
|
||||||
|
e.ExternalDocumentationProps = x.ExternalDocumentationProps
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
254
vendor/k8s.io/kube-openapi/pkg/spec3/fuzz.go
generated
vendored
Normal file
254
vendor/k8s.io/kube-openapi/pkg/spec3/fuzz.go
generated
vendored
Normal file
@ -0,0 +1,254 @@
|
|||||||
|
package spec3
|
||||||
|
|
||||||
|
import (
|
||||||
|
"math/rand"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
fuzz "github.com/google/gofuzz"
|
||||||
|
|
||||||
|
"k8s.io/kube-openapi/pkg/validation/spec"
|
||||||
|
)
|
||||||
|
|
||||||
|
// refChance is the chance that a particular component will use a $ref
|
||||||
|
// instead of fuzzed. Expressed as a fraction 1/n, currently there is
|
||||||
|
// a 1/3 chance that a ref will be used.
|
||||||
|
const refChance = 3
|
||||||
|
|
||||||
|
const alphaNumChars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
|
||||||
|
|
||||||
|
func randAlphanumString() string {
|
||||||
|
arr := make([]string, rand.Intn(10)+5)
|
||||||
|
for i := 0; i < len(arr); i++ {
|
||||||
|
arr[i] = string(alphaNumChars[rand.Intn(len(alphaNumChars))])
|
||||||
|
}
|
||||||
|
return strings.Join(arr, "")
|
||||||
|
}
|
||||||
|
|
||||||
|
var OpenAPIV3FuzzFuncs []interface{} = []interface{}{
|
||||||
|
func(s *string, c fuzz.Continue) {
|
||||||
|
// All OpenAPI V3 map keys must follow the corresponding
|
||||||
|
// regex. Note that this restricts the range for all other
|
||||||
|
// string values as well.
|
||||||
|
str := randAlphanumString()
|
||||||
|
*s = str
|
||||||
|
},
|
||||||
|
func(o *OpenAPI, c fuzz.Continue) {
|
||||||
|
c.FuzzNoCustom(o)
|
||||||
|
o.Version = "3.0.0"
|
||||||
|
},
|
||||||
|
func(r *interface{}, c fuzz.Continue) {
|
||||||
|
switch c.Intn(3) {
|
||||||
|
case 0:
|
||||||
|
*r = nil
|
||||||
|
case 1:
|
||||||
|
n := c.RandString() + "x"
|
||||||
|
*r = n
|
||||||
|
case 2:
|
||||||
|
n := c.Float64()
|
||||||
|
*r = n
|
||||||
|
}
|
||||||
|
},
|
||||||
|
func(v **spec.Info, c fuzz.Continue) {
|
||||||
|
// Info is never nil
|
||||||
|
*v = &spec.Info{}
|
||||||
|
c.FuzzNoCustom(*v)
|
||||||
|
(*v).Title = c.RandString() + "x"
|
||||||
|
},
|
||||||
|
func(v *Paths, c fuzz.Continue) {
|
||||||
|
c.Fuzz(&v.VendorExtensible)
|
||||||
|
num := c.Intn(5)
|
||||||
|
if num > 0 {
|
||||||
|
v.Paths = make(map[string]*Path)
|
||||||
|
}
|
||||||
|
for i := 0; i < num; i++ {
|
||||||
|
val := Path{}
|
||||||
|
c.Fuzz(&val)
|
||||||
|
v.Paths["/"+c.RandString()] = &val
|
||||||
|
}
|
||||||
|
},
|
||||||
|
func(v *SecurityScheme, c fuzz.Continue) {
|
||||||
|
if c.Intn(refChance) == 0 {
|
||||||
|
c.Fuzz(&v.Refable)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
switch c.Intn(4) {
|
||||||
|
case 0:
|
||||||
|
v.Type = "apiKey"
|
||||||
|
v.Name = c.RandString() + "x"
|
||||||
|
switch c.Intn(3) {
|
||||||
|
case 0:
|
||||||
|
v.In = "query"
|
||||||
|
case 1:
|
||||||
|
v.In = "header"
|
||||||
|
case 2:
|
||||||
|
v.In = "cookie"
|
||||||
|
}
|
||||||
|
case 1:
|
||||||
|
v.Type = "http"
|
||||||
|
case 2:
|
||||||
|
v.Type = "oauth2"
|
||||||
|
v.Flows = make(map[string]*OAuthFlow)
|
||||||
|
flow := OAuthFlow{}
|
||||||
|
flow.AuthorizationUrl = c.RandString() + "x"
|
||||||
|
v.Flows["implicit"] = &flow
|
||||||
|
flow.Scopes = make(map[string]string)
|
||||||
|
flow.Scopes["foo"] = "bar"
|
||||||
|
case 3:
|
||||||
|
v.Type = "openIdConnect"
|
||||||
|
v.OpenIdConnectUrl = "https://" + c.RandString()
|
||||||
|
}
|
||||||
|
v.Scheme = "basic"
|
||||||
|
},
|
||||||
|
func(v *spec.Ref, c fuzz.Continue) {
|
||||||
|
switch c.Intn(7) {
|
||||||
|
case 0:
|
||||||
|
*v = spec.MustCreateRef("#/components/schemas/" + randAlphanumString())
|
||||||
|
case 1:
|
||||||
|
*v = spec.MustCreateRef("#/components/responses/" + randAlphanumString())
|
||||||
|
case 2:
|
||||||
|
*v = spec.MustCreateRef("#/components/headers/" + randAlphanumString())
|
||||||
|
case 3:
|
||||||
|
*v = spec.MustCreateRef("#/components/securitySchemes/" + randAlphanumString())
|
||||||
|
case 5:
|
||||||
|
*v = spec.MustCreateRef("#/components/parameters/" + randAlphanumString())
|
||||||
|
case 6:
|
||||||
|
*v = spec.MustCreateRef("#/components/requestBodies/" + randAlphanumString())
|
||||||
|
}
|
||||||
|
},
|
||||||
|
func(v *Parameter, c fuzz.Continue) {
|
||||||
|
if c.Intn(refChance) == 0 {
|
||||||
|
c.Fuzz(&v.Refable)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
c.Fuzz(&v.ParameterProps)
|
||||||
|
c.Fuzz(&v.VendorExtensible)
|
||||||
|
|
||||||
|
switch c.Intn(3) {
|
||||||
|
case 0:
|
||||||
|
// Header param
|
||||||
|
v.In = "query"
|
||||||
|
case 1:
|
||||||
|
v.In = "header"
|
||||||
|
case 2:
|
||||||
|
v.In = "cookie"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
func(v *RequestBody, c fuzz.Continue) {
|
||||||
|
if c.Intn(refChance) == 0 {
|
||||||
|
c.Fuzz(&v.Refable)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
c.Fuzz(&v.RequestBodyProps)
|
||||||
|
c.Fuzz(&v.VendorExtensible)
|
||||||
|
},
|
||||||
|
func(v *Header, c fuzz.Continue) {
|
||||||
|
if c.Intn(refChance) == 0 {
|
||||||
|
c.Fuzz(&v.Refable)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
c.Fuzz(&v.HeaderProps)
|
||||||
|
c.Fuzz(&v.VendorExtensible)
|
||||||
|
},
|
||||||
|
func(v *ResponsesProps, c fuzz.Continue) {
|
||||||
|
c.Fuzz(&v.Default)
|
||||||
|
n := c.Intn(5)
|
||||||
|
for i := 0; i < n; i++ {
|
||||||
|
r2 := Response{}
|
||||||
|
c.Fuzz(&r2)
|
||||||
|
// HTTP Status code in 100-599 Range
|
||||||
|
code := c.Intn(500) + 100
|
||||||
|
v.StatusCodeResponses = make(map[int]*Response)
|
||||||
|
v.StatusCodeResponses[code] = &r2
|
||||||
|
}
|
||||||
|
},
|
||||||
|
func(v *Response, c fuzz.Continue) {
|
||||||
|
if c.Intn(refChance) == 0 {
|
||||||
|
c.Fuzz(&v.Refable)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
c.Fuzz(&v.ResponseProps)
|
||||||
|
c.Fuzz(&v.VendorExtensible)
|
||||||
|
},
|
||||||
|
func(v *spec.Extensions, c fuzz.Continue) {
|
||||||
|
numChildren := c.Intn(5)
|
||||||
|
for i := 0; i < numChildren; i++ {
|
||||||
|
if *v == nil {
|
||||||
|
*v = spec.Extensions{}
|
||||||
|
}
|
||||||
|
(*v)["x-"+c.RandString()] = c.RandString()
|
||||||
|
}
|
||||||
|
},
|
||||||
|
func(v *spec.ExternalDocumentation, c fuzz.Continue) {
|
||||||
|
c.Fuzz(&v.Description)
|
||||||
|
v.URL = "https://" + randAlphanumString()
|
||||||
|
},
|
||||||
|
func(v *spec.SchemaURL, c fuzz.Continue) {
|
||||||
|
*v = spec.SchemaURL("https://" + randAlphanumString())
|
||||||
|
},
|
||||||
|
func(v *spec.SchemaOrBool, c fuzz.Continue) {
|
||||||
|
*v = spec.SchemaOrBool{}
|
||||||
|
|
||||||
|
if c.RandBool() {
|
||||||
|
v.Allows = c.RandBool()
|
||||||
|
} else {
|
||||||
|
v.Schema = &spec.Schema{}
|
||||||
|
v.Allows = true
|
||||||
|
c.Fuzz(&v.Schema)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
func(v *spec.SchemaOrArray, c fuzz.Continue) {
|
||||||
|
*v = spec.SchemaOrArray{}
|
||||||
|
if c.RandBool() {
|
||||||
|
schema := spec.Schema{}
|
||||||
|
c.Fuzz(&schema)
|
||||||
|
v.Schema = &schema
|
||||||
|
} else {
|
||||||
|
v.Schemas = []spec.Schema{}
|
||||||
|
numChildren := c.Intn(5)
|
||||||
|
for i := 0; i < numChildren; i++ {
|
||||||
|
schema := spec.Schema{}
|
||||||
|
c.Fuzz(&schema)
|
||||||
|
v.Schemas = append(v.Schemas, schema)
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
},
|
||||||
|
func(v *spec.SchemaOrStringArray, c fuzz.Continue) {
|
||||||
|
if c.RandBool() {
|
||||||
|
*v = spec.SchemaOrStringArray{}
|
||||||
|
if c.RandBool() {
|
||||||
|
c.Fuzz(&v.Property)
|
||||||
|
} else {
|
||||||
|
c.Fuzz(&v.Schema)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
func(v *spec.Schema, c fuzz.Continue) {
|
||||||
|
if c.Intn(refChance) == 0 {
|
||||||
|
c.Fuzz(&v.Ref)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if c.RandBool() {
|
||||||
|
// file schema
|
||||||
|
c.Fuzz(&v.Default)
|
||||||
|
c.Fuzz(&v.Description)
|
||||||
|
c.Fuzz(&v.Example)
|
||||||
|
c.Fuzz(&v.ExternalDocs)
|
||||||
|
|
||||||
|
c.Fuzz(&v.Format)
|
||||||
|
c.Fuzz(&v.ReadOnly)
|
||||||
|
c.Fuzz(&v.Required)
|
||||||
|
c.Fuzz(&v.Title)
|
||||||
|
v.Type = spec.StringOrArray{"file"}
|
||||||
|
|
||||||
|
} else {
|
||||||
|
// normal schema
|
||||||
|
c.Fuzz(&v.SchemaProps)
|
||||||
|
c.Fuzz(&v.SwaggerSchemaProps)
|
||||||
|
c.Fuzz(&v.VendorExtensible)
|
||||||
|
c.Fuzz(&v.ExtraProps)
|
||||||
|
}
|
||||||
|
|
||||||
|
},
|
||||||
|
}
|
21
vendor/k8s.io/kube-openapi/pkg/spec3/header.go
generated
vendored
21
vendor/k8s.io/kube-openapi/pkg/spec3/header.go
generated
vendored
@ -20,6 +20,8 @@ import (
|
|||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
|
||||||
"github.com/go-openapi/swag"
|
"github.com/go-openapi/swag"
|
||||||
|
"k8s.io/kube-openapi/pkg/internal"
|
||||||
|
jsonv2 "k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json"
|
||||||
"k8s.io/kube-openapi/pkg/validation/spec"
|
"k8s.io/kube-openapi/pkg/validation/spec"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -50,6 +52,9 @@ func (h *Header) MarshalJSON() ([]byte, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (h *Header) UnmarshalJSON(data []byte) error {
|
func (h *Header) UnmarshalJSON(data []byte) error {
|
||||||
|
if internal.UseOptimizedJSONUnmarshalingV3 {
|
||||||
|
return jsonv2.Unmarshal(data, h)
|
||||||
|
}
|
||||||
if err := json.Unmarshal(data, &h.Refable); err != nil {
|
if err := json.Unmarshal(data, &h.Refable); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -63,6 +68,22 @@ func (h *Header) UnmarshalJSON(data []byte) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (h *Header) UnmarshalNextJSON(opts jsonv2.UnmarshalOptions, dec *jsonv2.Decoder) error {
|
||||||
|
var x struct {
|
||||||
|
spec.Extensions
|
||||||
|
HeaderProps
|
||||||
|
}
|
||||||
|
if err := opts.UnmarshalNext(dec, &x); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := internal.JSONRefFromMap(&h.Ref.Ref, x.Extensions); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
h.Extensions = internal.SanitizeExtensions(x.Extensions)
|
||||||
|
h.HeaderProps = x.HeaderProps
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
// HeaderProps a struct that describes a header object
|
// HeaderProps a struct that describes a header object
|
||||||
type HeaderProps struct {
|
type HeaderProps struct {
|
||||||
// Description holds a brief description of the parameter
|
// Description holds a brief description of the parameter
|
||||||
|
20
vendor/k8s.io/kube-openapi/pkg/spec3/media_type.go
generated
vendored
20
vendor/k8s.io/kube-openapi/pkg/spec3/media_type.go
generated
vendored
@ -18,7 +18,10 @@ package spec3
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
|
||||||
"github.com/go-openapi/swag"
|
"github.com/go-openapi/swag"
|
||||||
|
"k8s.io/kube-openapi/pkg/internal"
|
||||||
|
jsonv2 "k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json"
|
||||||
"k8s.io/kube-openapi/pkg/validation/spec"
|
"k8s.io/kube-openapi/pkg/validation/spec"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -44,6 +47,9 @@ func (m *MediaType) MarshalJSON() ([]byte, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (m *MediaType) UnmarshalJSON(data []byte) error {
|
func (m *MediaType) UnmarshalJSON(data []byte) error {
|
||||||
|
if internal.UseOptimizedJSONUnmarshalingV3 {
|
||||||
|
return jsonv2.Unmarshal(data, m)
|
||||||
|
}
|
||||||
if err := json.Unmarshal(data, &m.MediaTypeProps); err != nil {
|
if err := json.Unmarshal(data, &m.MediaTypeProps); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -53,6 +59,20 @@ func (m *MediaType) UnmarshalJSON(data []byte) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (m *MediaType) UnmarshalNextJSON(opts jsonv2.UnmarshalOptions, dec *jsonv2.Decoder) error {
|
||||||
|
var x struct {
|
||||||
|
spec.Extensions
|
||||||
|
MediaTypeProps
|
||||||
|
}
|
||||||
|
if err := opts.UnmarshalNext(dec, &x); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
m.Extensions = internal.SanitizeExtensions(x.Extensions)
|
||||||
|
m.MediaTypeProps = x.MediaTypeProps
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
// MediaTypeProps a struct that allows you to specify content format, more at https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#mediaTypeObject
|
// MediaTypeProps a struct that allows you to specify content format, more at https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#mediaTypeObject
|
||||||
type MediaTypeProps struct {
|
type MediaTypeProps struct {
|
||||||
// Schema holds the schema defining the type used for the media type
|
// Schema holds the schema defining the type used for the media type
|
||||||
|
18
vendor/k8s.io/kube-openapi/pkg/spec3/operation.go
generated
vendored
18
vendor/k8s.io/kube-openapi/pkg/spec3/operation.go
generated
vendored
@ -20,6 +20,8 @@ import (
|
|||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
|
||||||
"github.com/go-openapi/swag"
|
"github.com/go-openapi/swag"
|
||||||
|
"k8s.io/kube-openapi/pkg/internal"
|
||||||
|
jsonv2 "k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json"
|
||||||
"k8s.io/kube-openapi/pkg/validation/spec"
|
"k8s.io/kube-openapi/pkg/validation/spec"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -46,12 +48,28 @@ func (o *Operation) MarshalJSON() ([]byte, error) {
|
|||||||
|
|
||||||
// UnmarshalJSON hydrates this items instance with the data from JSON
|
// UnmarshalJSON hydrates this items instance with the data from JSON
|
||||||
func (o *Operation) UnmarshalJSON(data []byte) error {
|
func (o *Operation) UnmarshalJSON(data []byte) error {
|
||||||
|
if internal.UseOptimizedJSONUnmarshalingV3 {
|
||||||
|
return jsonv2.Unmarshal(data, o)
|
||||||
|
}
|
||||||
if err := json.Unmarshal(data, &o.OperationProps); err != nil {
|
if err := json.Unmarshal(data, &o.OperationProps); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
return json.Unmarshal(data, &o.VendorExtensible)
|
return json.Unmarshal(data, &o.VendorExtensible)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (o *Operation) UnmarshalNextJSON(opts jsonv2.UnmarshalOptions, dec *jsonv2.Decoder) error {
|
||||||
|
var x struct {
|
||||||
|
spec.Extensions
|
||||||
|
OperationProps
|
||||||
|
}
|
||||||
|
if err := opts.UnmarshalNext(dec, &x); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
o.Extensions = internal.SanitizeExtensions(x.Extensions)
|
||||||
|
o.OperationProps = x.OperationProps
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
// OperationProps describes a single API operation on a path, more at https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#operationObject
|
// OperationProps describes a single API operation on a path, more at https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#operationObject
|
||||||
type OperationProps struct {
|
type OperationProps struct {
|
||||||
// Tags holds a list of tags for API documentation control
|
// Tags holds a list of tags for API documentation control
|
||||||
|
22
vendor/k8s.io/kube-openapi/pkg/spec3/parameter.go
generated
vendored
22
vendor/k8s.io/kube-openapi/pkg/spec3/parameter.go
generated
vendored
@ -20,6 +20,8 @@ import (
|
|||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
|
||||||
"github.com/go-openapi/swag"
|
"github.com/go-openapi/swag"
|
||||||
|
"k8s.io/kube-openapi/pkg/internal"
|
||||||
|
jsonv2 "k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json"
|
||||||
"k8s.io/kube-openapi/pkg/validation/spec"
|
"k8s.io/kube-openapi/pkg/validation/spec"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -50,6 +52,10 @@ func (p *Parameter) MarshalJSON() ([]byte, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (p *Parameter) UnmarshalJSON(data []byte) error {
|
func (p *Parameter) UnmarshalJSON(data []byte) error {
|
||||||
|
if internal.UseOptimizedJSONUnmarshalingV3 {
|
||||||
|
return jsonv2.Unmarshal(data, p)
|
||||||
|
}
|
||||||
|
|
||||||
if err := json.Unmarshal(data, &p.Refable); err != nil {
|
if err := json.Unmarshal(data, &p.Refable); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -63,6 +69,22 @@ func (p *Parameter) UnmarshalJSON(data []byte) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (p *Parameter) UnmarshalNextJSON(opts jsonv2.UnmarshalOptions, dec *jsonv2.Decoder) error {
|
||||||
|
var x struct {
|
||||||
|
spec.Extensions
|
||||||
|
ParameterProps
|
||||||
|
}
|
||||||
|
if err := opts.UnmarshalNext(dec, &x); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := internal.JSONRefFromMap(&p.Ref.Ref, x.Extensions); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
p.Extensions = internal.SanitizeExtensions(x.Extensions)
|
||||||
|
p.ParameterProps = x.ParameterProps
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
// ParameterProps a struct that describes a single operation parameter, more at https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#parameterObject
|
// ParameterProps a struct that describes a single operation parameter, more at https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#parameterObject
|
||||||
type ParameterProps struct {
|
type ParameterProps struct {
|
||||||
// Name holds the name of the parameter
|
// Name holds the name of the parameter
|
||||||
|
80
vendor/k8s.io/kube-openapi/pkg/spec3/path.go
generated
vendored
80
vendor/k8s.io/kube-openapi/pkg/spec3/path.go
generated
vendored
@ -18,9 +18,12 @@ package spec3
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/go-openapi/swag"
|
"github.com/go-openapi/swag"
|
||||||
|
"k8s.io/kube-openapi/pkg/internal"
|
||||||
|
jsonv2 "k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json"
|
||||||
"k8s.io/kube-openapi/pkg/validation/spec"
|
"k8s.io/kube-openapi/pkg/validation/spec"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -45,6 +48,9 @@ func (p *Paths) MarshalJSON() ([]byte, error) {
|
|||||||
|
|
||||||
// UnmarshalJSON hydrates this items instance with the data from JSON
|
// UnmarshalJSON hydrates this items instance with the data from JSON
|
||||||
func (p *Paths) UnmarshalJSON(data []byte) error {
|
func (p *Paths) UnmarshalJSON(data []byte) error {
|
||||||
|
if internal.UseOptimizedJSONUnmarshalingV3 {
|
||||||
|
return jsonv2.Unmarshal(data, p)
|
||||||
|
}
|
||||||
var res map[string]json.RawMessage
|
var res map[string]json.RawMessage
|
||||||
if err := json.Unmarshal(data, &res); err != nil {
|
if err := json.Unmarshal(data, &res); err != nil {
|
||||||
return err
|
return err
|
||||||
@ -74,6 +80,59 @@ func (p *Paths) UnmarshalJSON(data []byte) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (p *Paths) UnmarshalNextJSON(opts jsonv2.UnmarshalOptions, dec *jsonv2.Decoder) error {
|
||||||
|
tok, err := dec.ReadToken()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
switch k := tok.Kind(); k {
|
||||||
|
case 'n':
|
||||||
|
*p = Paths{}
|
||||||
|
return nil
|
||||||
|
case '{':
|
||||||
|
for {
|
||||||
|
tok, err := dec.ReadToken()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if tok.Kind() == '}' {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
switch k := tok.String(); {
|
||||||
|
case internal.IsExtensionKey(k):
|
||||||
|
var ext any
|
||||||
|
if err := opts.UnmarshalNext(dec, &ext); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if p.Extensions == nil {
|
||||||
|
p.Extensions = make(map[string]any)
|
||||||
|
}
|
||||||
|
p.Extensions[k] = ext
|
||||||
|
case len(k) > 0 && k[0] == '/':
|
||||||
|
pi := Path{}
|
||||||
|
if err := opts.UnmarshalNext(dec, &pi); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if p.Paths == nil {
|
||||||
|
p.Paths = make(map[string]*Path)
|
||||||
|
}
|
||||||
|
p.Paths[k] = &pi
|
||||||
|
default:
|
||||||
|
_, err := dec.ReadValue() // skip value
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
return fmt.Errorf("unknown JSON kind: %v", k)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Path describes the operations available on a single path, more at https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#pathItemObject
|
// Path describes the operations available on a single path, more at https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#pathItemObject
|
||||||
//
|
//
|
||||||
// Note that this struct is actually a thin wrapper around PathProps to make it referable and extensible
|
// Note that this struct is actually a thin wrapper around PathProps to make it referable and extensible
|
||||||
@ -101,6 +160,9 @@ func (p *Path) MarshalJSON() ([]byte, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (p *Path) UnmarshalJSON(data []byte) error {
|
func (p *Path) UnmarshalJSON(data []byte) error {
|
||||||
|
if internal.UseOptimizedJSONUnmarshalingV3 {
|
||||||
|
return jsonv2.Unmarshal(data, p)
|
||||||
|
}
|
||||||
if err := json.Unmarshal(data, &p.Refable); err != nil {
|
if err := json.Unmarshal(data, &p.Refable); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -113,6 +175,24 @@ func (p *Path) UnmarshalJSON(data []byte) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (p *Path) UnmarshalNextJSON(opts jsonv2.UnmarshalOptions, dec *jsonv2.Decoder) error {
|
||||||
|
var x struct {
|
||||||
|
spec.Extensions
|
||||||
|
PathProps
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := opts.UnmarshalNext(dec, &x); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := internal.JSONRefFromMap(&p.Ref.Ref, x.Extensions); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
p.Extensions = internal.SanitizeExtensions(x.Extensions)
|
||||||
|
p.PathProps = x.PathProps
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
// PathProps describes the operations available on a single path, more at https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#pathItemObject
|
// PathProps describes the operations available on a single path, more at https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#pathItemObject
|
||||||
type PathProps struct {
|
type PathProps struct {
|
||||||
// Summary holds a summary for all operations in this path
|
// Summary holds a summary for all operations in this path
|
||||||
|
21
vendor/k8s.io/kube-openapi/pkg/spec3/request_body.go
generated
vendored
21
vendor/k8s.io/kube-openapi/pkg/spec3/request_body.go
generated
vendored
@ -20,6 +20,8 @@ import (
|
|||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
|
||||||
"github.com/go-openapi/swag"
|
"github.com/go-openapi/swag"
|
||||||
|
"k8s.io/kube-openapi/pkg/internal"
|
||||||
|
jsonv2 "k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json"
|
||||||
"k8s.io/kube-openapi/pkg/validation/spec"
|
"k8s.io/kube-openapi/pkg/validation/spec"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -50,6 +52,9 @@ func (r *RequestBody) MarshalJSON() ([]byte, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (r *RequestBody) UnmarshalJSON(data []byte) error {
|
func (r *RequestBody) UnmarshalJSON(data []byte) error {
|
||||||
|
if internal.UseOptimizedJSONUnmarshalingV3 {
|
||||||
|
return jsonv2.Unmarshal(data, r)
|
||||||
|
}
|
||||||
if err := json.Unmarshal(data, &r.Refable); err != nil {
|
if err := json.Unmarshal(data, &r.Refable); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -71,3 +76,19 @@ type RequestBodyProps struct {
|
|||||||
// Required determines if the request body is required in the request
|
// Required determines if the request body is required in the request
|
||||||
Required bool `json:"required,omitempty"`
|
Required bool `json:"required,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (r *RequestBody) UnmarshalNextJSON(opts jsonv2.UnmarshalOptions, dec *jsonv2.Decoder) error {
|
||||||
|
var x struct {
|
||||||
|
spec.Extensions
|
||||||
|
RequestBodyProps
|
||||||
|
}
|
||||||
|
if err := opts.UnmarshalNext(dec, &x); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := internal.JSONRefFromMap(&r.Ref.Ref, x.Extensions); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
r.Extensions = internal.SanitizeExtensions(x.Extensions)
|
||||||
|
r.RequestBodyProps = x.RequestBodyProps
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
118
vendor/k8s.io/kube-openapi/pkg/spec3/response.go
generated
vendored
118
vendor/k8s.io/kube-openapi/pkg/spec3/response.go
generated
vendored
@ -18,9 +18,12 @@ package spec3
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
|
||||||
"github.com/go-openapi/swag"
|
"github.com/go-openapi/swag"
|
||||||
|
"k8s.io/kube-openapi/pkg/internal"
|
||||||
|
jsonv2 "k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json"
|
||||||
"k8s.io/kube-openapi/pkg/validation/spec"
|
"k8s.io/kube-openapi/pkg/validation/spec"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -46,13 +49,15 @@ func (r *Responses) MarshalJSON() ([]byte, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (r *Responses) UnmarshalJSON(data []byte) error {
|
func (r *Responses) UnmarshalJSON(data []byte) error {
|
||||||
|
if internal.UseOptimizedJSONUnmarshalingV3 {
|
||||||
|
return jsonv2.Unmarshal(data, r)
|
||||||
|
}
|
||||||
if err := json.Unmarshal(data, &r.ResponsesProps); err != nil {
|
if err := json.Unmarshal(data, &r.ResponsesProps); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if err := json.Unmarshal(data, &r.VendorExtensible); err != nil {
|
if err := json.Unmarshal(data, &r.VendorExtensible); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -78,25 +83,91 @@ func (r ResponsesProps) MarshalJSON() ([]byte, error) {
|
|||||||
|
|
||||||
// UnmarshalJSON unmarshals responses from JSON
|
// UnmarshalJSON unmarshals responses from JSON
|
||||||
func (r *ResponsesProps) UnmarshalJSON(data []byte) error {
|
func (r *ResponsesProps) UnmarshalJSON(data []byte) error {
|
||||||
var res map[string]*Response
|
if internal.UseOptimizedJSONUnmarshalingV3 {
|
||||||
|
return jsonv2.Unmarshal(data, r)
|
||||||
|
}
|
||||||
|
var res map[string]json.RawMessage
|
||||||
if err := json.Unmarshal(data, &res); err != nil {
|
if err := json.Unmarshal(data, &res); err != nil {
|
||||||
return nil
|
return err
|
||||||
}
|
}
|
||||||
if v, ok := res["default"]; ok {
|
if v, ok := res["default"]; ok {
|
||||||
r.Default = v
|
value := Response{}
|
||||||
|
if err := json.Unmarshal(v, &value); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
r.Default = &value
|
||||||
delete(res, "default")
|
delete(res, "default")
|
||||||
}
|
}
|
||||||
for k, v := range res {
|
for k, v := range res {
|
||||||
|
// Take all integral keys
|
||||||
if nk, err := strconv.Atoi(k); err == nil {
|
if nk, err := strconv.Atoi(k); err == nil {
|
||||||
if r.StatusCodeResponses == nil {
|
if r.StatusCodeResponses == nil {
|
||||||
r.StatusCodeResponses = map[int]*Response{}
|
r.StatusCodeResponses = map[int]*Response{}
|
||||||
}
|
}
|
||||||
r.StatusCodeResponses[nk] = v
|
value := Response{}
|
||||||
|
if err := json.Unmarshal(v, &value); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
r.StatusCodeResponses[nk] = &value
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (r *Responses) UnmarshalNextJSON(opts jsonv2.UnmarshalOptions, dec *jsonv2.Decoder) (err error) {
|
||||||
|
tok, err := dec.ReadToken()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
switch k := tok.Kind(); k {
|
||||||
|
case 'n':
|
||||||
|
*r = Responses{}
|
||||||
|
return nil
|
||||||
|
case '{':
|
||||||
|
for {
|
||||||
|
tok, err := dec.ReadToken()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if tok.Kind() == '}' {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
switch k := tok.String(); {
|
||||||
|
case internal.IsExtensionKey(k):
|
||||||
|
var ext any
|
||||||
|
if err := opts.UnmarshalNext(dec, &ext); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if r.Extensions == nil {
|
||||||
|
r.Extensions = make(map[string]any)
|
||||||
|
}
|
||||||
|
r.Extensions[k] = ext
|
||||||
|
case k == "default":
|
||||||
|
resp := Response{}
|
||||||
|
if err := opts.UnmarshalNext(dec, &resp); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
r.ResponsesProps.Default = &resp
|
||||||
|
default:
|
||||||
|
if nk, err := strconv.Atoi(k); err == nil {
|
||||||
|
resp := Response{}
|
||||||
|
if err := opts.UnmarshalNext(dec, &resp); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if r.StatusCodeResponses == nil {
|
||||||
|
r.StatusCodeResponses = map[int]*Response{}
|
||||||
|
}
|
||||||
|
r.StatusCodeResponses[nk] = &resp
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
return fmt.Errorf("unknown JSON kind: %v", k)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Response describes a single response from an API Operation, more at https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#responseObject
|
// Response describes a single response from an API Operation, more at https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#responseObject
|
||||||
//
|
//
|
||||||
// Note that this struct is actually a thin wrapper around ResponseProps to make it referable and extensible
|
// Note that this struct is actually a thin wrapper around ResponseProps to make it referable and extensible
|
||||||
@ -124,6 +195,9 @@ func (r *Response) MarshalJSON() ([]byte, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (r *Response) UnmarshalJSON(data []byte) error {
|
func (r *Response) UnmarshalJSON(data []byte) error {
|
||||||
|
if internal.UseOptimizedJSONUnmarshalingV3 {
|
||||||
|
return jsonv2.Unmarshal(data, r)
|
||||||
|
}
|
||||||
if err := json.Unmarshal(data, &r.Refable); err != nil {
|
if err := json.Unmarshal(data, &r.Refable); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -133,7 +207,22 @@ func (r *Response) UnmarshalJSON(data []byte) error {
|
|||||||
if err := json.Unmarshal(data, &r.VendorExtensible); err != nil {
|
if err := json.Unmarshal(data, &r.VendorExtensible); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *Response) UnmarshalNextJSON(opts jsonv2.UnmarshalOptions, dec *jsonv2.Decoder) error {
|
||||||
|
var x struct {
|
||||||
|
spec.Extensions
|
||||||
|
ResponseProps
|
||||||
|
}
|
||||||
|
if err := opts.UnmarshalNext(dec, &x); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := internal.JSONRefFromMap(&r.Ref.Ref, x.Extensions); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
r.Extensions = internal.SanitizeExtensions(x.Extensions)
|
||||||
|
r.ResponseProps = x.ResponseProps
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -174,6 +263,9 @@ func (r *Link) MarshalJSON() ([]byte, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (r *Link) UnmarshalJSON(data []byte) error {
|
func (r *Link) UnmarshalJSON(data []byte) error {
|
||||||
|
if internal.UseOptimizedJSONUnmarshalingV3 {
|
||||||
|
return jsonv2.Unmarshal(data, r)
|
||||||
|
}
|
||||||
if err := json.Unmarshal(data, &r.Refable); err != nil {
|
if err := json.Unmarshal(data, &r.Refable); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -187,6 +279,22 @@ func (r *Link) UnmarshalJSON(data []byte) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (l *Link) UnmarshalNextJSON(opts jsonv2.UnmarshalOptions, dec *jsonv2.Decoder) error {
|
||||||
|
var x struct {
|
||||||
|
spec.Extensions
|
||||||
|
LinkProps
|
||||||
|
}
|
||||||
|
if err := opts.UnmarshalNext(dec, &x); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := internal.JSONRefFromMap(&l.Ref.Ref, x.Extensions); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
l.Extensions = internal.SanitizeExtensions(x.Extensions)
|
||||||
|
l.LinkProps = x.LinkProps
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
// LinkProps describes a single response from an API Operation, more at https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#responseObject
|
// LinkProps describes a single response from an API Operation, more at https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#responseObject
|
||||||
type LinkProps struct {
|
type LinkProps struct {
|
||||||
// OperationId is the name of an existing, resolvable OAS operation
|
// OperationId is the name of an existing, resolvable OAS operation
|
||||||
|
38
vendor/k8s.io/kube-openapi/pkg/spec3/server.go
generated
vendored
38
vendor/k8s.io/kube-openapi/pkg/spec3/server.go
generated
vendored
@ -18,7 +18,10 @@ package spec3
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
|
||||||
"github.com/go-openapi/swag"
|
"github.com/go-openapi/swag"
|
||||||
|
"k8s.io/kube-openapi/pkg/internal"
|
||||||
|
jsonv2 "k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json"
|
||||||
"k8s.io/kube-openapi/pkg/validation/spec"
|
"k8s.io/kube-openapi/pkg/validation/spec"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -50,6 +53,10 @@ func (s *Server) MarshalJSON() ([]byte, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s *Server) UnmarshalJSON(data []byte) error {
|
func (s *Server) UnmarshalJSON(data []byte) error {
|
||||||
|
if internal.UseOptimizedJSONUnmarshalingV3 {
|
||||||
|
return jsonv2.Unmarshal(data, s)
|
||||||
|
}
|
||||||
|
|
||||||
if err := json.Unmarshal(data, &s.ServerProps); err != nil {
|
if err := json.Unmarshal(data, &s.ServerProps); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -59,6 +66,20 @@ func (s *Server) UnmarshalJSON(data []byte) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *Server) UnmarshalNextJSON(opts jsonv2.UnmarshalOptions, dec *jsonv2.Decoder) error {
|
||||||
|
var x struct {
|
||||||
|
spec.Extensions
|
||||||
|
ServerProps
|
||||||
|
}
|
||||||
|
if err := opts.UnmarshalNext(dec, &x); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
s.Extensions = internal.SanitizeExtensions(x.Extensions)
|
||||||
|
s.ServerProps = x.ServerProps
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
type ServerVariable struct {
|
type ServerVariable struct {
|
||||||
ServerVariableProps
|
ServerVariableProps
|
||||||
spec.VendorExtensible
|
spec.VendorExtensible
|
||||||
@ -87,6 +108,9 @@ func (s *ServerVariable) MarshalJSON() ([]byte, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s *ServerVariable) UnmarshalJSON(data []byte) error {
|
func (s *ServerVariable) UnmarshalJSON(data []byte) error {
|
||||||
|
if internal.UseOptimizedJSONUnmarshalingV3 {
|
||||||
|
return jsonv2.Unmarshal(data, s)
|
||||||
|
}
|
||||||
if err := json.Unmarshal(data, &s.ServerVariableProps); err != nil {
|
if err := json.Unmarshal(data, &s.ServerVariableProps); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -95,3 +119,17 @@ func (s *ServerVariable) UnmarshalJSON(data []byte) error {
|
|||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *ServerVariable) UnmarshalNextJSON(opts jsonv2.UnmarshalOptions, dec *jsonv2.Decoder) error {
|
||||||
|
var x struct {
|
||||||
|
spec.Extensions
|
||||||
|
ServerVariableProps
|
||||||
|
}
|
||||||
|
if err := opts.UnmarshalNext(dec, &x); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
s.Extensions = internal.SanitizeExtensions(x.Extensions)
|
||||||
|
s.ServerVariableProps = x.ServerVariableProps
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
13
vendor/k8s.io/kube-openapi/pkg/spec3/spec.go
generated
vendored
13
vendor/k8s.io/kube-openapi/pkg/spec3/spec.go
generated
vendored
@ -17,6 +17,10 @@ limitations under the License.
|
|||||||
package spec3
|
package spec3
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
|
||||||
|
"k8s.io/kube-openapi/pkg/internal"
|
||||||
|
jsonv2 "k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json"
|
||||||
"k8s.io/kube-openapi/pkg/validation/spec"
|
"k8s.io/kube-openapi/pkg/validation/spec"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -35,3 +39,12 @@ type OpenAPI struct {
|
|||||||
// ExternalDocs holds additional external documentation
|
// ExternalDocs holds additional external documentation
|
||||||
ExternalDocs *ExternalDocumentation `json:"externalDocs,omitempty"`
|
ExternalDocs *ExternalDocumentation `json:"externalDocs,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (o *OpenAPI) UnmarshalJSON(data []byte) error {
|
||||||
|
type OpenAPIWithNoFunctions OpenAPI
|
||||||
|
p := (*OpenAPIWithNoFunctions)(o)
|
||||||
|
if internal.UseOptimizedJSONUnmarshalingV3 {
|
||||||
|
return jsonv2.Unmarshal(data, &p)
|
||||||
|
}
|
||||||
|
return json.Unmarshal(data, &p)
|
||||||
|
}
|
||||||
|
23
vendor/k8s.io/kube-openapi/pkg/validation/spec/header.go
generated
vendored
23
vendor/k8s.io/kube-openapi/pkg/validation/spec/header.go
generated
vendored
@ -43,6 +43,9 @@ type Header struct {
|
|||||||
|
|
||||||
// MarshalJSON marshal this to JSON
|
// MarshalJSON marshal this to JSON
|
||||||
func (h Header) MarshalJSON() ([]byte, error) {
|
func (h Header) MarshalJSON() ([]byte, error) {
|
||||||
|
if internal.UseOptimizedJSONMarshaling {
|
||||||
|
return internal.DeterministicMarshal(h)
|
||||||
|
}
|
||||||
b1, err := json.Marshal(h.CommonValidations)
|
b1, err := json.Marshal(h.CommonValidations)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@ -62,6 +65,20 @@ func (h Header) MarshalJSON() ([]byte, error) {
|
|||||||
return swag.ConcatJSON(b1, b2, b3, b4), nil
|
return swag.ConcatJSON(b1, b2, b3, b4), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (h Header) MarshalNextJSON(opts jsonv2.MarshalOptions, enc *jsonv2.Encoder) error {
|
||||||
|
var x struct {
|
||||||
|
CommonValidations commonValidationsOmitZero `json:",inline"`
|
||||||
|
SimpleSchema simpleSchemaOmitZero `json:",inline"`
|
||||||
|
Extensions
|
||||||
|
HeaderProps
|
||||||
|
}
|
||||||
|
x.CommonValidations = commonValidationsOmitZero(h.CommonValidations)
|
||||||
|
x.SimpleSchema = simpleSchemaOmitZero(h.SimpleSchema)
|
||||||
|
x.Extensions = internal.SanitizeExtensions(h.Extensions)
|
||||||
|
x.HeaderProps = h.HeaderProps
|
||||||
|
return opts.MarshalNext(enc, x)
|
||||||
|
}
|
||||||
|
|
||||||
// UnmarshalJSON unmarshals this header from JSON
|
// UnmarshalJSON unmarshals this header from JSON
|
||||||
func (h *Header) UnmarshalJSON(data []byte) error {
|
func (h *Header) UnmarshalJSON(data []byte) error {
|
||||||
if internal.UseOptimizedJSONUnmarshaling {
|
if internal.UseOptimizedJSONUnmarshaling {
|
||||||
@ -94,12 +111,8 @@ func (h *Header) UnmarshalNextJSON(opts jsonv2.UnmarshalOptions, dec *jsonv2.Dec
|
|||||||
|
|
||||||
h.CommonValidations = x.CommonValidations
|
h.CommonValidations = x.CommonValidations
|
||||||
h.SimpleSchema = x.SimpleSchema
|
h.SimpleSchema = x.SimpleSchema
|
||||||
h.Extensions = x.Extensions
|
h.Extensions = internal.SanitizeExtensions(x.Extensions)
|
||||||
h.HeaderProps = x.HeaderProps
|
h.HeaderProps = x.HeaderProps
|
||||||
|
|
||||||
h.Extensions.sanitize()
|
|
||||||
if len(h.Extensions) == 0 {
|
|
||||||
h.Extensions = nil
|
|
||||||
}
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
33
vendor/k8s.io/kube-openapi/pkg/validation/spec/info.go
generated
vendored
33
vendor/k8s.io/kube-openapi/pkg/validation/spec/info.go
generated
vendored
@ -89,17 +89,9 @@ func (e Extensions) GetObject(key string, out interface{}) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (e Extensions) sanitize() {
|
|
||||||
for k := range e {
|
|
||||||
if !isExtensionKey(k) {
|
|
||||||
delete(e, k)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (e Extensions) sanitizeWithExtra() (extra map[string]any) {
|
func (e Extensions) sanitizeWithExtra() (extra map[string]any) {
|
||||||
for k, v := range e {
|
for k, v := range e {
|
||||||
if !isExtensionKey(k) {
|
if !internal.IsExtensionKey(k) {
|
||||||
if extra == nil {
|
if extra == nil {
|
||||||
extra = make(map[string]any)
|
extra = make(map[string]any)
|
||||||
}
|
}
|
||||||
@ -110,10 +102,6 @@ func (e Extensions) sanitizeWithExtra() (extra map[string]any) {
|
|||||||
return extra
|
return extra
|
||||||
}
|
}
|
||||||
|
|
||||||
func isExtensionKey(k string) bool {
|
|
||||||
return len(k) > 1 && (k[0] == 'x' || k[0] == 'X') && k[1] == '-'
|
|
||||||
}
|
|
||||||
|
|
||||||
// VendorExtensible composition block.
|
// VendorExtensible composition block.
|
||||||
type VendorExtensible struct {
|
type VendorExtensible struct {
|
||||||
Extensions Extensions
|
Extensions Extensions
|
||||||
@ -181,6 +169,9 @@ type Info struct {
|
|||||||
|
|
||||||
// MarshalJSON marshal this to JSON
|
// MarshalJSON marshal this to JSON
|
||||||
func (i Info) MarshalJSON() ([]byte, error) {
|
func (i Info) MarshalJSON() ([]byte, error) {
|
||||||
|
if internal.UseOptimizedJSONMarshaling {
|
||||||
|
return internal.DeterministicMarshal(i)
|
||||||
|
}
|
||||||
b1, err := json.Marshal(i.InfoProps)
|
b1, err := json.Marshal(i.InfoProps)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@ -192,6 +183,16 @@ func (i Info) MarshalJSON() ([]byte, error) {
|
|||||||
return swag.ConcatJSON(b1, b2), nil
|
return swag.ConcatJSON(b1, b2), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (i Info) MarshalNextJSON(opts jsonv2.MarshalOptions, enc *jsonv2.Encoder) error {
|
||||||
|
var x struct {
|
||||||
|
Extensions
|
||||||
|
InfoProps
|
||||||
|
}
|
||||||
|
x.Extensions = i.Extensions
|
||||||
|
x.InfoProps = i.InfoProps
|
||||||
|
return opts.MarshalNext(enc, x)
|
||||||
|
}
|
||||||
|
|
||||||
// UnmarshalJSON marshal this from JSON
|
// UnmarshalJSON marshal this from JSON
|
||||||
func (i *Info) UnmarshalJSON(data []byte) error {
|
func (i *Info) UnmarshalJSON(data []byte) error {
|
||||||
if internal.UseOptimizedJSONUnmarshaling {
|
if internal.UseOptimizedJSONUnmarshaling {
|
||||||
@ -212,11 +213,7 @@ func (i *Info) UnmarshalNextJSON(opts jsonv2.UnmarshalOptions, dec *jsonv2.Decod
|
|||||||
if err := opts.UnmarshalNext(dec, &x); err != nil {
|
if err := opts.UnmarshalNext(dec, &x); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
x.Extensions.sanitize()
|
i.Extensions = internal.SanitizeExtensions(x.Extensions)
|
||||||
if len(x.Extensions) == 0 {
|
|
||||||
x.Extensions = nil
|
|
||||||
}
|
|
||||||
i.VendorExtensible.Extensions = x.Extensions
|
|
||||||
i.InfoProps = x.InfoProps
|
i.InfoProps = x.InfoProps
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
53
vendor/k8s.io/kube-openapi/pkg/validation/spec/items.go
generated
vendored
53
vendor/k8s.io/kube-openapi/pkg/validation/spec/items.go
generated
vendored
@ -37,6 +37,18 @@ type SimpleSchema struct {
|
|||||||
Example interface{} `json:"example,omitempty"`
|
Example interface{} `json:"example,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Marshaling structure only, always edit along with corresponding
|
||||||
|
// struct (or compilation will fail).
|
||||||
|
type simpleSchemaOmitZero struct {
|
||||||
|
Type string `json:"type,omitempty"`
|
||||||
|
Nullable bool `json:"nullable,omitzero"`
|
||||||
|
Format string `json:"format,omitempty"`
|
||||||
|
Items *Items `json:"items,omitzero"`
|
||||||
|
CollectionFormat string `json:"collectionFormat,omitempty"`
|
||||||
|
Default interface{} `json:"default,omitempty"`
|
||||||
|
Example interface{} `json:"example,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
// CommonValidations describe common JSON-schema validations
|
// CommonValidations describe common JSON-schema validations
|
||||||
type CommonValidations struct {
|
type CommonValidations struct {
|
||||||
Maximum *float64 `json:"maximum,omitempty"`
|
Maximum *float64 `json:"maximum,omitempty"`
|
||||||
@ -53,6 +65,23 @@ type CommonValidations struct {
|
|||||||
Enum []interface{} `json:"enum,omitempty"`
|
Enum []interface{} `json:"enum,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Marshaling structure only, always edit along with corresponding
|
||||||
|
// struct (or compilation will fail).
|
||||||
|
type commonValidationsOmitZero struct {
|
||||||
|
Maximum *float64 `json:"maximum,omitempty"`
|
||||||
|
ExclusiveMaximum bool `json:"exclusiveMaximum,omitzero"`
|
||||||
|
Minimum *float64 `json:"minimum,omitempty"`
|
||||||
|
ExclusiveMinimum bool `json:"exclusiveMinimum,omitzero"`
|
||||||
|
MaxLength *int64 `json:"maxLength,omitempty"`
|
||||||
|
MinLength *int64 `json:"minLength,omitempty"`
|
||||||
|
Pattern string `json:"pattern,omitempty"`
|
||||||
|
MaxItems *int64 `json:"maxItems,omitempty"`
|
||||||
|
MinItems *int64 `json:"minItems,omitempty"`
|
||||||
|
UniqueItems bool `json:"uniqueItems,omitzero"`
|
||||||
|
MultipleOf *float64 `json:"multipleOf,omitempty"`
|
||||||
|
Enum []interface{} `json:"enum,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
// Items a limited subset of JSON-Schema's items object.
|
// Items a limited subset of JSON-Schema's items object.
|
||||||
// It is used by parameter definitions that are not located in "body".
|
// It is used by parameter definitions that are not located in "body".
|
||||||
//
|
//
|
||||||
@ -105,18 +134,18 @@ func (i *Items) UnmarshalNextJSON(opts jsonv2.UnmarshalOptions, dec *jsonv2.Deco
|
|||||||
if err := i.Refable.Ref.fromMap(x.Extensions); err != nil {
|
if err := i.Refable.Ref.fromMap(x.Extensions); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
x.Extensions.sanitize()
|
|
||||||
if len(x.Extensions) == 0 {
|
|
||||||
x.Extensions = nil
|
|
||||||
}
|
|
||||||
i.CommonValidations = x.CommonValidations
|
i.CommonValidations = x.CommonValidations
|
||||||
i.SimpleSchema = x.SimpleSchema
|
i.SimpleSchema = x.SimpleSchema
|
||||||
i.VendorExtensible.Extensions = x.Extensions
|
i.Extensions = internal.SanitizeExtensions(x.Extensions)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// MarshalJSON converts this items object to JSON
|
// MarshalJSON converts this items object to JSON
|
||||||
func (i Items) MarshalJSON() ([]byte, error) {
|
func (i Items) MarshalJSON() ([]byte, error) {
|
||||||
|
if internal.UseOptimizedJSONMarshaling {
|
||||||
|
return internal.DeterministicMarshal(i)
|
||||||
|
}
|
||||||
b1, err := json.Marshal(i.CommonValidations)
|
b1, err := json.Marshal(i.CommonValidations)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@ -135,3 +164,17 @@ func (i Items) MarshalJSON() ([]byte, error) {
|
|||||||
}
|
}
|
||||||
return swag.ConcatJSON(b4, b3, b1, b2), nil
|
return swag.ConcatJSON(b4, b3, b1, b2), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (i Items) MarshalNextJSON(opts jsonv2.MarshalOptions, enc *jsonv2.Encoder) error {
|
||||||
|
var x struct {
|
||||||
|
CommonValidations commonValidationsOmitZero `json:",inline"`
|
||||||
|
SimpleSchema simpleSchemaOmitZero `json:",inline"`
|
||||||
|
Ref string `json:"$ref,omitempty"`
|
||||||
|
Extensions
|
||||||
|
}
|
||||||
|
x.CommonValidations = commonValidationsOmitZero(i.CommonValidations)
|
||||||
|
x.SimpleSchema = simpleSchemaOmitZero(i.SimpleSchema)
|
||||||
|
x.Ref = i.Refable.Ref.String()
|
||||||
|
x.Extensions = internal.SanitizeExtensions(i.Extensions)
|
||||||
|
return opts.MarshalNext(enc, x)
|
||||||
|
}
|
||||||
|
36
vendor/k8s.io/kube-openapi/pkg/validation/spec/operation.go
generated
vendored
36
vendor/k8s.io/kube-openapi/pkg/validation/spec/operation.go
generated
vendored
@ -42,6 +42,23 @@ type OperationProps struct {
|
|||||||
Responses *Responses `json:"responses,omitempty"`
|
Responses *Responses `json:"responses,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Marshaling structure only, always edit along with corresponding
|
||||||
|
// struct (or compilation will fail).
|
||||||
|
type operationPropsOmitZero struct {
|
||||||
|
Description string `json:"description,omitempty"`
|
||||||
|
Consumes []string `json:"consumes,omitempty"`
|
||||||
|
Produces []string `json:"produces,omitempty"`
|
||||||
|
Schemes []string `json:"schemes,omitempty"`
|
||||||
|
Tags []string `json:"tags,omitempty"`
|
||||||
|
Summary string `json:"summary,omitempty"`
|
||||||
|
ExternalDocs *ExternalDocumentation `json:"externalDocs,omitzero"`
|
||||||
|
ID string `json:"operationId,omitempty"`
|
||||||
|
Deprecated bool `json:"deprecated,omitempty,omitzero"`
|
||||||
|
Security []map[string][]string `json:"security,omitempty"`
|
||||||
|
Parameters []Parameter `json:"parameters,omitempty"`
|
||||||
|
Responses *Responses `json:"responses,omitzero"`
|
||||||
|
}
|
||||||
|
|
||||||
// MarshalJSON takes care of serializing operation properties to JSON
|
// MarshalJSON takes care of serializing operation properties to JSON
|
||||||
//
|
//
|
||||||
// We use a custom marhaller here to handle a special cases related to
|
// We use a custom marhaller here to handle a special cases related to
|
||||||
@ -96,17 +113,16 @@ func (o *Operation) UnmarshalNextJSON(opts jsonv2.UnmarshalOptions, dec *jsonv2.
|
|||||||
if err := opts.UnmarshalNext(dec, &x); err != nil {
|
if err := opts.UnmarshalNext(dec, &x); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
x.Extensions.sanitize()
|
o.Extensions = internal.SanitizeExtensions(x.Extensions)
|
||||||
if len(x.Extensions) == 0 {
|
|
||||||
x.Extensions = nil
|
|
||||||
}
|
|
||||||
o.VendorExtensible.Extensions = x.Extensions
|
|
||||||
o.OperationProps = OperationProps(x.OperationPropsNoMethods)
|
o.OperationProps = OperationProps(x.OperationPropsNoMethods)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// MarshalJSON converts this items object to JSON
|
// MarshalJSON converts this items object to JSON
|
||||||
func (o Operation) MarshalJSON() ([]byte, error) {
|
func (o Operation) MarshalJSON() ([]byte, error) {
|
||||||
|
if internal.UseOptimizedJSONMarshaling {
|
||||||
|
return internal.DeterministicMarshal(o)
|
||||||
|
}
|
||||||
b1, err := json.Marshal(o.OperationProps)
|
b1, err := json.Marshal(o.OperationProps)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@ -118,3 +134,13 @@ func (o Operation) MarshalJSON() ([]byte, error) {
|
|||||||
concated := swag.ConcatJSON(b1, b2)
|
concated := swag.ConcatJSON(b1, b2)
|
||||||
return concated, nil
|
return concated, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (o Operation) MarshalNextJSON(opts jsonv2.MarshalOptions, enc *jsonv2.Encoder) error {
|
||||||
|
var x struct {
|
||||||
|
Extensions
|
||||||
|
OperationProps operationPropsOmitZero `json:",inline"`
|
||||||
|
}
|
||||||
|
x.Extensions = internal.SanitizeExtensions(o.Extensions)
|
||||||
|
x.OperationProps = operationPropsOmitZero(o.OperationProps)
|
||||||
|
return opts.MarshalNext(enc, x)
|
||||||
|
}
|
||||||
|
36
vendor/k8s.io/kube-openapi/pkg/validation/spec/parameter.go
generated
vendored
36
vendor/k8s.io/kube-openapi/pkg/validation/spec/parameter.go
generated
vendored
@ -36,6 +36,17 @@ type ParamProps struct {
|
|||||||
AllowEmptyValue bool `json:"allowEmptyValue,omitempty"`
|
AllowEmptyValue bool `json:"allowEmptyValue,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Marshaling structure only, always edit along with corresponding
|
||||||
|
// struct (or compilation will fail).
|
||||||
|
type paramPropsOmitZero struct {
|
||||||
|
Description string `json:"description,omitempty"`
|
||||||
|
Name string `json:"name,omitempty"`
|
||||||
|
In string `json:"in,omitempty"`
|
||||||
|
Required bool `json:"required,omitzero"`
|
||||||
|
Schema *Schema `json:"schema,omitzero"`
|
||||||
|
AllowEmptyValue bool `json:"allowEmptyValue,omitzero"`
|
||||||
|
}
|
||||||
|
|
||||||
// Parameter a unique parameter is defined by a combination of a [name](#parameterName) and [location](#parameterIn).
|
// Parameter a unique parameter is defined by a combination of a [name](#parameterName) and [location](#parameterIn).
|
||||||
//
|
//
|
||||||
// There are five possible parameter types.
|
// There are five possible parameter types.
|
||||||
@ -109,19 +120,18 @@ func (p *Parameter) UnmarshalNextJSON(opts jsonv2.UnmarshalOptions, dec *jsonv2.
|
|||||||
if err := p.Refable.Ref.fromMap(x.Extensions); err != nil {
|
if err := p.Refable.Ref.fromMap(x.Extensions); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
x.Extensions.sanitize()
|
|
||||||
if len(x.Extensions) == 0 {
|
|
||||||
x.Extensions = nil
|
|
||||||
}
|
|
||||||
p.CommonValidations = x.CommonValidations
|
p.CommonValidations = x.CommonValidations
|
||||||
p.SimpleSchema = x.SimpleSchema
|
p.SimpleSchema = x.SimpleSchema
|
||||||
p.VendorExtensible.Extensions = x.Extensions
|
p.Extensions = internal.SanitizeExtensions(x.Extensions)
|
||||||
p.ParamProps = x.ParamProps
|
p.ParamProps = x.ParamProps
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// MarshalJSON converts this items object to JSON
|
// MarshalJSON converts this items object to JSON
|
||||||
func (p Parameter) MarshalJSON() ([]byte, error) {
|
func (p Parameter) MarshalJSON() ([]byte, error) {
|
||||||
|
if internal.UseOptimizedJSONMarshaling {
|
||||||
|
return internal.DeterministicMarshal(p)
|
||||||
|
}
|
||||||
b1, err := json.Marshal(p.CommonValidations)
|
b1, err := json.Marshal(p.CommonValidations)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@ -144,3 +154,19 @@ func (p Parameter) MarshalJSON() ([]byte, error) {
|
|||||||
}
|
}
|
||||||
return swag.ConcatJSON(b3, b1, b2, b4, b5), nil
|
return swag.ConcatJSON(b3, b1, b2, b4, b5), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (p Parameter) MarshalNextJSON(opts jsonv2.MarshalOptions, enc *jsonv2.Encoder) error {
|
||||||
|
var x struct {
|
||||||
|
CommonValidations commonValidationsOmitZero `json:",inline"`
|
||||||
|
SimpleSchema simpleSchemaOmitZero `json:",inline"`
|
||||||
|
ParamProps paramPropsOmitZero `json:",inline"`
|
||||||
|
Ref string `json:"$ref,omitempty"`
|
||||||
|
Extensions
|
||||||
|
}
|
||||||
|
x.CommonValidations = commonValidationsOmitZero(p.CommonValidations)
|
||||||
|
x.SimpleSchema = simpleSchemaOmitZero(p.SimpleSchema)
|
||||||
|
x.Extensions = internal.SanitizeExtensions(p.Extensions)
|
||||||
|
x.ParamProps = paramPropsOmitZero(p.ParamProps)
|
||||||
|
x.Ref = p.Refable.Ref.String()
|
||||||
|
return opts.MarshalNext(enc, x)
|
||||||
|
}
|
||||||
|
28
vendor/k8s.io/kube-openapi/pkg/validation/spec/path_item.go
generated
vendored
28
vendor/k8s.io/kube-openapi/pkg/validation/spec/path_item.go
generated
vendored
@ -70,24 +70,20 @@ func (p *PathItem) UnmarshalNextJSON(opts jsonv2.UnmarshalOptions, dec *jsonv2.D
|
|||||||
if err := opts.UnmarshalNext(dec, &x); err != nil {
|
if err := opts.UnmarshalNext(dec, &x); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
if err := p.Refable.Ref.fromMap(x.Extensions); err != nil {
|
||||||
p.Extensions = x.Extensions
|
|
||||||
p.PathItemProps = x.PathItemProps
|
|
||||||
|
|
||||||
if err := p.Refable.Ref.fromMap(p.Extensions); err != nil {
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
p.Extensions = internal.SanitizeExtensions(x.Extensions)
|
||||||
p.Extensions.sanitize()
|
p.PathItemProps = x.PathItemProps
|
||||||
if len(p.Extensions) == 0 {
|
|
||||||
p.Extensions = nil
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// MarshalJSON converts this items object to JSON
|
// MarshalJSON converts this items object to JSON
|
||||||
func (p PathItem) MarshalJSON() ([]byte, error) {
|
func (p PathItem) MarshalJSON() ([]byte, error) {
|
||||||
|
if internal.UseOptimizedJSONMarshaling {
|
||||||
|
return internal.DeterministicMarshal(p)
|
||||||
|
}
|
||||||
b3, err := json.Marshal(p.Refable)
|
b3, err := json.Marshal(p.Refable)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@ -103,3 +99,15 @@ func (p PathItem) MarshalJSON() ([]byte, error) {
|
|||||||
concated := swag.ConcatJSON(b3, b4, b5)
|
concated := swag.ConcatJSON(b3, b4, b5)
|
||||||
return concated, nil
|
return concated, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (p PathItem) MarshalNextJSON(opts jsonv2.MarshalOptions, enc *jsonv2.Encoder) error {
|
||||||
|
var x struct {
|
||||||
|
Ref string `json:"$ref,omitempty"`
|
||||||
|
Extensions
|
||||||
|
PathItemProps
|
||||||
|
}
|
||||||
|
x.Ref = p.Refable.Ref.String()
|
||||||
|
x.Extensions = internal.SanitizeExtensions(p.Extensions)
|
||||||
|
x.PathItemProps = p.PathItemProps
|
||||||
|
return opts.MarshalNext(enc, x)
|
||||||
|
}
|
||||||
|
20
vendor/k8s.io/kube-openapi/pkg/validation/spec/paths.go
generated
vendored
20
vendor/k8s.io/kube-openapi/pkg/validation/spec/paths.go
generated
vendored
@ -92,7 +92,7 @@ func (p *Paths) UnmarshalNextJSON(opts jsonv2.UnmarshalOptions, dec *jsonv2.Deco
|
|||||||
}
|
}
|
||||||
|
|
||||||
switch k := tok.String(); {
|
switch k := tok.String(); {
|
||||||
case isExtensionKey(k):
|
case internal.IsExtensionKey(k):
|
||||||
ext = nil
|
ext = nil
|
||||||
if err := opts.UnmarshalNext(dec, &ext); err != nil {
|
if err := opts.UnmarshalNext(dec, &ext); err != nil {
|
||||||
return err
|
return err
|
||||||
@ -126,6 +126,9 @@ func (p *Paths) UnmarshalNextJSON(opts jsonv2.UnmarshalOptions, dec *jsonv2.Deco
|
|||||||
|
|
||||||
// MarshalJSON converts this items object to JSON
|
// MarshalJSON converts this items object to JSON
|
||||||
func (p Paths) MarshalJSON() ([]byte, error) {
|
func (p Paths) MarshalJSON() ([]byte, error) {
|
||||||
|
if internal.UseOptimizedJSONMarshaling {
|
||||||
|
return internal.DeterministicMarshal(p)
|
||||||
|
}
|
||||||
b1, err := json.Marshal(p.VendorExtensible)
|
b1, err := json.Marshal(p.VendorExtensible)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@ -144,3 +147,18 @@ func (p Paths) MarshalJSON() ([]byte, error) {
|
|||||||
concated := swag.ConcatJSON(b1, b2)
|
concated := swag.ConcatJSON(b1, b2)
|
||||||
return concated, nil
|
return concated, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (p Paths) MarshalNextJSON(opts jsonv2.MarshalOptions, enc *jsonv2.Encoder) error {
|
||||||
|
m := make(map[string]any, len(p.Extensions)+len(p.Paths))
|
||||||
|
for k, v := range p.Extensions {
|
||||||
|
if internal.IsExtensionKey(k) {
|
||||||
|
m[k] = v
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for k, v := range p.Paths {
|
||||||
|
if strings.HasPrefix(k, "/") {
|
||||||
|
m[k] = v
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return opts.MarshalNext(enc, m)
|
||||||
|
}
|
||||||
|
18
vendor/k8s.io/kube-openapi/pkg/validation/spec/ref.go
generated
vendored
18
vendor/k8s.io/kube-openapi/pkg/validation/spec/ref.go
generated
vendored
@ -21,6 +21,8 @@ import (
|
|||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
|
||||||
"github.com/go-openapi/jsonreference"
|
"github.com/go-openapi/jsonreference"
|
||||||
|
|
||||||
|
"k8s.io/kube-openapi/pkg/internal"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Refable is a struct for things that accept a $ref property
|
// Refable is a struct for things that accept a $ref property
|
||||||
@ -149,19 +151,5 @@ func (r *Ref) UnmarshalJSON(d []byte) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (r *Ref) fromMap(v map[string]interface{}) error {
|
func (r *Ref) fromMap(v map[string]interface{}) error {
|
||||||
if v == nil {
|
return internal.JSONRefFromMap(&r.Ref, v)
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
if vv, ok := v["$ref"]; ok {
|
|
||||||
if str, ok := vv.(string); ok {
|
|
||||||
ref, err := jsonreference.New(str)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
*r = Ref{Ref: ref}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
|
36
vendor/k8s.io/kube-openapi/pkg/validation/spec/response.go
generated
vendored
36
vendor/k8s.io/kube-openapi/pkg/validation/spec/response.go
generated
vendored
@ -30,6 +30,15 @@ type ResponseProps struct {
|
|||||||
Examples map[string]interface{} `json:"examples,omitempty"`
|
Examples map[string]interface{} `json:"examples,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Marshaling structure only, always edit along with corresponding
|
||||||
|
// struct (or compilation will fail).
|
||||||
|
type responsePropsOmitZero struct {
|
||||||
|
Description string `json:"description,omitempty"`
|
||||||
|
Schema *Schema `json:"schema,omitzero"`
|
||||||
|
Headers map[string]Header `json:"headers,omitempty"`
|
||||||
|
Examples map[string]interface{} `json:"examples,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
// Response describes a single response from an API Operation.
|
// Response describes a single response from an API Operation.
|
||||||
//
|
//
|
||||||
// For more information: http://goo.gl/8us55a#responseObject
|
// For more information: http://goo.gl/8us55a#responseObject
|
||||||
@ -68,23 +77,20 @@ func (r *Response) UnmarshalNextJSON(opts jsonv2.UnmarshalOptions, dec *jsonv2.D
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
r.Extensions = x.Extensions
|
if err := r.Refable.Ref.fromMap(x.Extensions); err != nil {
|
||||||
r.ResponseProps = x.ResponseProps
|
|
||||||
|
|
||||||
if err := r.Refable.Ref.fromMap(r.Extensions); err != nil {
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
r.Extensions = internal.SanitizeExtensions(x.Extensions)
|
||||||
r.Extensions.sanitize()
|
r.ResponseProps = x.ResponseProps
|
||||||
if len(r.Extensions) == 0 {
|
|
||||||
r.Extensions = nil
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// MarshalJSON converts this items object to JSON
|
// MarshalJSON converts this items object to JSON
|
||||||
func (r Response) MarshalJSON() ([]byte, error) {
|
func (r Response) MarshalJSON() ([]byte, error) {
|
||||||
|
if internal.UseOptimizedJSONMarshaling {
|
||||||
|
return internal.DeterministicMarshal(r)
|
||||||
|
}
|
||||||
b1, err := json.Marshal(r.ResponseProps)
|
b1, err := json.Marshal(r.ResponseProps)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@ -100,6 +106,18 @@ func (r Response) MarshalJSON() ([]byte, error) {
|
|||||||
return swag.ConcatJSON(b1, b2, b3), nil
|
return swag.ConcatJSON(b1, b2, b3), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (r Response) MarshalNextJSON(opts jsonv2.MarshalOptions, enc *jsonv2.Encoder) error {
|
||||||
|
var x struct {
|
||||||
|
Ref string `json:"$ref,omitempty"`
|
||||||
|
Extensions
|
||||||
|
ResponseProps responsePropsOmitZero `json:",inline"`
|
||||||
|
}
|
||||||
|
x.Ref = r.Refable.Ref.String()
|
||||||
|
x.Extensions = internal.SanitizeExtensions(r.Extensions)
|
||||||
|
x.ResponseProps = responsePropsOmitZero(r.ResponseProps)
|
||||||
|
return opts.MarshalNext(enc, x)
|
||||||
|
}
|
||||||
|
|
||||||
// NewResponse creates a new response instance
|
// NewResponse creates a new response instance
|
||||||
func NewResponse() *Response {
|
func NewResponse() *Response {
|
||||||
return new(Response)
|
return new(Response)
|
||||||
|
24
vendor/k8s.io/kube-openapi/pkg/validation/spec/responses.go
generated
vendored
24
vendor/k8s.io/kube-openapi/pkg/validation/spec/responses.go
generated
vendored
@ -63,6 +63,9 @@ func (r *Responses) UnmarshalJSON(data []byte) error {
|
|||||||
|
|
||||||
// MarshalJSON converts this items object to JSON
|
// MarshalJSON converts this items object to JSON
|
||||||
func (r Responses) MarshalJSON() ([]byte, error) {
|
func (r Responses) MarshalJSON() ([]byte, error) {
|
||||||
|
if internal.UseOptimizedJSONMarshaling {
|
||||||
|
return internal.DeterministicMarshal(r)
|
||||||
|
}
|
||||||
b1, err := json.Marshal(r.ResponsesProps)
|
b1, err := json.Marshal(r.ResponsesProps)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@ -75,6 +78,25 @@ func (r Responses) MarshalJSON() ([]byte, error) {
|
|||||||
return concated, nil
|
return concated, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (r Responses) MarshalNextJSON(opts jsonv2.MarshalOptions, enc *jsonv2.Encoder) error {
|
||||||
|
type ArbitraryKeys map[string]interface{}
|
||||||
|
var x struct {
|
||||||
|
ArbitraryKeys
|
||||||
|
Default *Response `json:"default,omitempty"`
|
||||||
|
}
|
||||||
|
x.ArbitraryKeys = make(map[string]any, len(r.Extensions)+len(r.StatusCodeResponses))
|
||||||
|
for k, v := range r.Extensions {
|
||||||
|
if internal.IsExtensionKey(k) {
|
||||||
|
x.ArbitraryKeys[k] = v
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for k, v := range r.StatusCodeResponses {
|
||||||
|
x.ArbitraryKeys[strconv.Itoa(k)] = v
|
||||||
|
}
|
||||||
|
x.Default = r.Default
|
||||||
|
return opts.MarshalNext(enc, x)
|
||||||
|
}
|
||||||
|
|
||||||
// ResponsesProps describes all responses for an operation.
|
// ResponsesProps describes all responses for an operation.
|
||||||
// It tells what is the default response and maps all responses with a
|
// It tells what is the default response and maps all responses with a
|
||||||
// HTTP status code.
|
// HTTP status code.
|
||||||
@ -148,7 +170,7 @@ func (r *Responses) UnmarshalNextJSON(opts jsonv2.UnmarshalOptions, dec *jsonv2.
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
switch k := tok.String(); {
|
switch k := tok.String(); {
|
||||||
case isExtensionKey(k):
|
case internal.IsExtensionKey(k):
|
||||||
ext = nil
|
ext = nil
|
||||||
if err := opts.UnmarshalNext(dec, &ext); err != nil {
|
if err := opts.UnmarshalNext(dec, &ext); err != nil {
|
||||||
return err
|
return err
|
||||||
|
79
vendor/k8s.io/kube-openapi/pkg/validation/spec/schema.go
generated
vendored
79
vendor/k8s.io/kube-openapi/pkg/validation/spec/schema.go
generated
vendored
@ -196,6 +196,46 @@ type SchemaProps struct {
|
|||||||
Definitions Definitions `json:"definitions,omitempty"`
|
Definitions Definitions `json:"definitions,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Marshaling structure only, always edit along with corresponding
|
||||||
|
// struct (or compilation will fail).
|
||||||
|
type schemaPropsOmitZero struct {
|
||||||
|
ID string `json:"id,omitempty"`
|
||||||
|
Ref Ref `json:"-"`
|
||||||
|
Schema SchemaURL `json:"-"`
|
||||||
|
Description string `json:"description,omitempty"`
|
||||||
|
Type StringOrArray `json:"type,omitzero"`
|
||||||
|
Nullable bool `json:"nullable,omitzero"`
|
||||||
|
Format string `json:"format,omitempty"`
|
||||||
|
Title string `json:"title,omitempty"`
|
||||||
|
Default interface{} `json:"default,omitzero"`
|
||||||
|
Maximum *float64 `json:"maximum,omitempty"`
|
||||||
|
ExclusiveMaximum bool `json:"exclusiveMaximum,omitzero"`
|
||||||
|
Minimum *float64 `json:"minimum,omitempty"`
|
||||||
|
ExclusiveMinimum bool `json:"exclusiveMinimum,omitzero"`
|
||||||
|
MaxLength *int64 `json:"maxLength,omitempty"`
|
||||||
|
MinLength *int64 `json:"minLength,omitempty"`
|
||||||
|
Pattern string `json:"pattern,omitempty"`
|
||||||
|
MaxItems *int64 `json:"maxItems,omitempty"`
|
||||||
|
MinItems *int64 `json:"minItems,omitempty"`
|
||||||
|
UniqueItems bool `json:"uniqueItems,omitzero"`
|
||||||
|
MultipleOf *float64 `json:"multipleOf,omitempty"`
|
||||||
|
Enum []interface{} `json:"enum,omitempty"`
|
||||||
|
MaxProperties *int64 `json:"maxProperties,omitempty"`
|
||||||
|
MinProperties *int64 `json:"minProperties,omitempty"`
|
||||||
|
Required []string `json:"required,omitempty"`
|
||||||
|
Items *SchemaOrArray `json:"items,omitzero"`
|
||||||
|
AllOf []Schema `json:"allOf,omitempty"`
|
||||||
|
OneOf []Schema `json:"oneOf,omitempty"`
|
||||||
|
AnyOf []Schema `json:"anyOf,omitempty"`
|
||||||
|
Not *Schema `json:"not,omitzero"`
|
||||||
|
Properties map[string]Schema `json:"properties,omitempty"`
|
||||||
|
AdditionalProperties *SchemaOrBool `json:"additionalProperties,omitzero"`
|
||||||
|
PatternProperties map[string]Schema `json:"patternProperties,omitempty"`
|
||||||
|
Dependencies Dependencies `json:"dependencies,omitempty"`
|
||||||
|
AdditionalItems *SchemaOrBool `json:"additionalItems,omitzero"`
|
||||||
|
Definitions Definitions `json:"definitions,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
// SwaggerSchemaProps are additional properties supported by swagger schemas, but not JSON-schema (draft 4)
|
// SwaggerSchemaProps are additional properties supported by swagger schemas, but not JSON-schema (draft 4)
|
||||||
type SwaggerSchemaProps struct {
|
type SwaggerSchemaProps struct {
|
||||||
Discriminator string `json:"discriminator,omitempty"`
|
Discriminator string `json:"discriminator,omitempty"`
|
||||||
@ -204,6 +244,15 @@ type SwaggerSchemaProps struct {
|
|||||||
Example interface{} `json:"example,omitempty"`
|
Example interface{} `json:"example,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Marshaling structure only, always edit along with corresponding
|
||||||
|
// struct (or compilation will fail).
|
||||||
|
type swaggerSchemaPropsOmitZero struct {
|
||||||
|
Discriminator string `json:"discriminator,omitempty"`
|
||||||
|
ReadOnly bool `json:"readOnly,omitzero"`
|
||||||
|
ExternalDocs *ExternalDocumentation `json:"externalDocs,omitzero"`
|
||||||
|
Example interface{} `json:"example,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
// Schema the schema object allows the definition of input and output data types.
|
// Schema the schema object allows the definition of input and output data types.
|
||||||
// These types can be objects, but also primitives and arrays.
|
// These types can be objects, but also primitives and arrays.
|
||||||
// This object is based on the [JSON Schema Specification Draft 4](http://json-schema.org/)
|
// This object is based on the [JSON Schema Specification Draft 4](http://json-schema.org/)
|
||||||
@ -434,6 +483,9 @@ func (s *Schema) WithExternalDocs(description, url string) *Schema {
|
|||||||
|
|
||||||
// MarshalJSON marshal this to JSON
|
// MarshalJSON marshal this to JSON
|
||||||
func (s Schema) MarshalJSON() ([]byte, error) {
|
func (s Schema) MarshalJSON() ([]byte, error) {
|
||||||
|
if internal.UseOptimizedJSONMarshaling {
|
||||||
|
return internal.DeterministicMarshal(s)
|
||||||
|
}
|
||||||
b1, err := json.Marshal(s.SchemaProps)
|
b1, err := json.Marshal(s.SchemaProps)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("schema props %v", err)
|
return nil, fmt.Errorf("schema props %v", err)
|
||||||
@ -465,6 +517,31 @@ func (s Schema) MarshalJSON() ([]byte, error) {
|
|||||||
return swag.ConcatJSON(b1, b2, b3, b4, b5, b6), nil
|
return swag.ConcatJSON(b1, b2, b3, b4, b5, b6), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s Schema) MarshalNextJSON(opts jsonv2.MarshalOptions, enc *jsonv2.Encoder) error {
|
||||||
|
type ArbitraryKeys map[string]interface{}
|
||||||
|
var x struct {
|
||||||
|
ArbitraryKeys
|
||||||
|
SchemaProps schemaPropsOmitZero `json:",inline"`
|
||||||
|
SwaggerSchemaProps swaggerSchemaPropsOmitZero `json:",inline"`
|
||||||
|
Schema string `json:"$schema,omitempty"`
|
||||||
|
Ref string `json:"$ref,omitempty"`
|
||||||
|
}
|
||||||
|
x.ArbitraryKeys = make(map[string]any, len(s.Extensions)+len(s.ExtraProps))
|
||||||
|
for k, v := range s.Extensions {
|
||||||
|
if internal.IsExtensionKey(k) {
|
||||||
|
x.ArbitraryKeys[k] = v
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for k, v := range s.ExtraProps {
|
||||||
|
x.ArbitraryKeys[k] = v
|
||||||
|
}
|
||||||
|
x.SchemaProps = schemaPropsOmitZero(s.SchemaProps)
|
||||||
|
x.SwaggerSchemaProps = swaggerSchemaPropsOmitZero(s.SwaggerSchemaProps)
|
||||||
|
x.Ref = s.Ref.String()
|
||||||
|
x.Schema = string(s.Schema)
|
||||||
|
return opts.MarshalNext(enc, x)
|
||||||
|
}
|
||||||
|
|
||||||
// UnmarshalJSON marshal this from JSON
|
// UnmarshalJSON marshal this from JSON
|
||||||
func (s *Schema) UnmarshalJSON(data []byte) error {
|
func (s *Schema) UnmarshalJSON(data []byte) error {
|
||||||
if internal.UseOptimizedJSONUnmarshaling {
|
if internal.UseOptimizedJSONUnmarshaling {
|
||||||
@ -547,7 +624,7 @@ func (s *Schema) UnmarshalNextJSON(opts jsonv2.UnmarshalOptions, dec *jsonv2.Dec
|
|||||||
}
|
}
|
||||||
|
|
||||||
s.ExtraProps = x.Extensions.sanitizeWithExtra()
|
s.ExtraProps = x.Extensions.sanitizeWithExtra()
|
||||||
s.VendorExtensible.Extensions = x.Extensions
|
s.Extensions = internal.SanitizeExtensions(x.Extensions)
|
||||||
s.SchemaProps = x.SchemaProps
|
s.SchemaProps = x.SchemaProps
|
||||||
s.SwaggerSchemaProps = x.SwaggerSchemaProps
|
s.SwaggerSchemaProps = x.SwaggerSchemaProps
|
||||||
return nil
|
return nil
|
||||||
|
20
vendor/k8s.io/kube-openapi/pkg/validation/spec/security_scheme.go
generated
vendored
20
vendor/k8s.io/kube-openapi/pkg/validation/spec/security_scheme.go
generated
vendored
@ -18,6 +18,7 @@ import (
|
|||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
|
||||||
"github.com/go-openapi/swag"
|
"github.com/go-openapi/swag"
|
||||||
|
"k8s.io/kube-openapi/pkg/internal"
|
||||||
jsonv2 "k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json"
|
jsonv2 "k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -45,6 +46,9 @@ type SecurityScheme struct {
|
|||||||
|
|
||||||
// MarshalJSON marshal this to JSON
|
// MarshalJSON marshal this to JSON
|
||||||
func (s SecurityScheme) MarshalJSON() ([]byte, error) {
|
func (s SecurityScheme) MarshalJSON() ([]byte, error) {
|
||||||
|
if internal.UseOptimizedJSONMarshaling {
|
||||||
|
return internal.DeterministicMarshal(s)
|
||||||
|
}
|
||||||
b1, err := json.Marshal(s.SecuritySchemeProps)
|
b1, err := json.Marshal(s.SecuritySchemeProps)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@ -56,6 +60,16 @@ func (s SecurityScheme) MarshalJSON() ([]byte, error) {
|
|||||||
return swag.ConcatJSON(b1, b2), nil
|
return swag.ConcatJSON(b1, b2), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s SecurityScheme) MarshalNextJSON(opts jsonv2.MarshalOptions, enc *jsonv2.Encoder) error {
|
||||||
|
var x struct {
|
||||||
|
Extensions
|
||||||
|
SecuritySchemeProps
|
||||||
|
}
|
||||||
|
x.Extensions = internal.SanitizeExtensions(s.Extensions)
|
||||||
|
x.SecuritySchemeProps = s.SecuritySchemeProps
|
||||||
|
return opts.MarshalNext(enc, x)
|
||||||
|
}
|
||||||
|
|
||||||
// UnmarshalJSON marshal this from JSON
|
// UnmarshalJSON marshal this from JSON
|
||||||
func (s *SecurityScheme) UnmarshalJSON(data []byte) error {
|
func (s *SecurityScheme) UnmarshalJSON(data []byte) error {
|
||||||
if err := json.Unmarshal(data, &s.SecuritySchemeProps); err != nil {
|
if err := json.Unmarshal(data, &s.SecuritySchemeProps); err != nil {
|
||||||
@ -72,11 +86,7 @@ func (s *SecurityScheme) UnmarshalNextJSON(opts jsonv2.UnmarshalOptions, dec *js
|
|||||||
if err := opts.UnmarshalNext(dec, &x); err != nil {
|
if err := opts.UnmarshalNext(dec, &x); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
x.Extensions.sanitize()
|
s.Extensions = internal.SanitizeExtensions(x.Extensions)
|
||||||
if len(x.Extensions) == 0 {
|
|
||||||
x.Extensions = nil
|
|
||||||
}
|
|
||||||
s.VendorExtensible.Extensions = x.Extensions
|
|
||||||
s.SecuritySchemeProps = x.SecuritySchemeProps
|
s.SecuritySchemeProps = x.SecuritySchemeProps
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
74
vendor/k8s.io/kube-openapi/pkg/validation/spec/swagger.go
generated
vendored
74
vendor/k8s.io/kube-openapi/pkg/validation/spec/swagger.go
generated
vendored
@ -35,6 +35,9 @@ type Swagger struct {
|
|||||||
|
|
||||||
// MarshalJSON marshals this swagger structure to json
|
// MarshalJSON marshals this swagger structure to json
|
||||||
func (s Swagger) MarshalJSON() ([]byte, error) {
|
func (s Swagger) MarshalJSON() ([]byte, error) {
|
||||||
|
if internal.UseOptimizedJSONMarshaling {
|
||||||
|
return internal.DeterministicMarshal(s)
|
||||||
|
}
|
||||||
b1, err := json.Marshal(s.SwaggerProps)
|
b1, err := json.Marshal(s.SwaggerProps)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@ -46,12 +49,22 @@ func (s Swagger) MarshalJSON() ([]byte, error) {
|
|||||||
return swag.ConcatJSON(b1, b2), nil
|
return swag.ConcatJSON(b1, b2), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// MarshalJSON marshals this swagger structure to json
|
||||||
|
func (s Swagger) MarshalNextJSON(opts jsonv2.MarshalOptions, enc *jsonv2.Encoder) error {
|
||||||
|
var x struct {
|
||||||
|
Extensions
|
||||||
|
SwaggerProps
|
||||||
|
}
|
||||||
|
x.Extensions = internal.SanitizeExtensions(s.Extensions)
|
||||||
|
x.SwaggerProps = s.SwaggerProps
|
||||||
|
return opts.MarshalNext(enc, x)
|
||||||
|
}
|
||||||
|
|
||||||
// UnmarshalJSON unmarshals a swagger spec from json
|
// UnmarshalJSON unmarshals a swagger spec from json
|
||||||
func (s *Swagger) UnmarshalJSON(data []byte) error {
|
func (s *Swagger) UnmarshalJSON(data []byte) error {
|
||||||
if internal.UseOptimizedJSONUnmarshaling {
|
if internal.UseOptimizedJSONUnmarshaling {
|
||||||
return jsonv2.Unmarshal(data, s)
|
return jsonv2.Unmarshal(data, s)
|
||||||
}
|
}
|
||||||
|
|
||||||
var sw Swagger
|
var sw Swagger
|
||||||
if err := json.Unmarshal(data, &sw.SwaggerProps); err != nil {
|
if err := json.Unmarshal(data, &sw.SwaggerProps); err != nil {
|
||||||
return err
|
return err
|
||||||
@ -75,15 +88,8 @@ func (s *Swagger) UnmarshalNextJSON(opts jsonv2.UnmarshalOptions, dec *jsonv2.De
|
|||||||
if err := opts.UnmarshalNext(dec, &x); err != nil {
|
if err := opts.UnmarshalNext(dec, &x); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
s.Extensions = internal.SanitizeExtensions(x.Extensions)
|
||||||
s.Extensions = x.Extensions
|
|
||||||
s.SwaggerProps = x.SwaggerProps
|
s.SwaggerProps = x.SwaggerProps
|
||||||
|
|
||||||
s.Extensions.sanitize()
|
|
||||||
if len(s.Extensions) == 0 {
|
|
||||||
s.Extensions = nil
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -126,6 +132,9 @@ var jsFalse = []byte("false")
|
|||||||
|
|
||||||
// MarshalJSON convert this object to JSON
|
// MarshalJSON convert this object to JSON
|
||||||
func (s SchemaOrBool) MarshalJSON() ([]byte, error) {
|
func (s SchemaOrBool) MarshalJSON() ([]byte, error) {
|
||||||
|
if internal.UseOptimizedJSONMarshaling {
|
||||||
|
return internal.DeterministicMarshal(s)
|
||||||
|
}
|
||||||
if s.Schema != nil {
|
if s.Schema != nil {
|
||||||
return json.Marshal(s.Schema)
|
return json.Marshal(s.Schema)
|
||||||
}
|
}
|
||||||
@ -136,6 +145,18 @@ func (s SchemaOrBool) MarshalJSON() ([]byte, error) {
|
|||||||
return jsTrue, nil
|
return jsTrue, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// MarshalJSON convert this object to JSON
|
||||||
|
func (s SchemaOrBool) MarshalNextJSON(opts jsonv2.MarshalOptions, enc *jsonv2.Encoder) error {
|
||||||
|
if s.Schema != nil {
|
||||||
|
return opts.MarshalNext(enc, s.Schema)
|
||||||
|
}
|
||||||
|
|
||||||
|
if s.Schema == nil && !s.Allows {
|
||||||
|
return enc.WriteToken(jsonv2.False)
|
||||||
|
}
|
||||||
|
return enc.WriteToken(jsonv2.True)
|
||||||
|
}
|
||||||
|
|
||||||
// UnmarshalJSON converts this bool or schema object from a JSON structure
|
// UnmarshalJSON converts this bool or schema object from a JSON structure
|
||||||
func (s *SchemaOrBool) UnmarshalJSON(data []byte) error {
|
func (s *SchemaOrBool) UnmarshalJSON(data []byte) error {
|
||||||
if internal.UseOptimizedJSONUnmarshaling {
|
if internal.UseOptimizedJSONUnmarshaling {
|
||||||
@ -143,15 +164,15 @@ func (s *SchemaOrBool) UnmarshalJSON(data []byte) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var nw SchemaOrBool
|
var nw SchemaOrBool
|
||||||
if len(data) >= 4 {
|
if len(data) > 0 && data[0] == '{' {
|
||||||
if data[0] == '{' {
|
|
||||||
var sch Schema
|
var sch Schema
|
||||||
if err := json.Unmarshal(data, &sch); err != nil {
|
if err := json.Unmarshal(data, &sch); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
nw.Schema = &sch
|
nw.Schema = &sch
|
||||||
}
|
nw.Allows = true
|
||||||
nw.Allows = !(data[0] == 'f' && data[1] == 'a' && data[2] == 'l' && data[3] == 's' && data[4] == 'e')
|
} else {
|
||||||
|
json.Unmarshal(data, &nw.Allows)
|
||||||
}
|
}
|
||||||
*s = nw
|
*s = nw
|
||||||
return nil
|
return nil
|
||||||
@ -185,6 +206,9 @@ type SchemaOrStringArray struct {
|
|||||||
|
|
||||||
// MarshalJSON converts this schema object or array into JSON structure
|
// MarshalJSON converts this schema object or array into JSON structure
|
||||||
func (s SchemaOrStringArray) MarshalJSON() ([]byte, error) {
|
func (s SchemaOrStringArray) MarshalJSON() ([]byte, error) {
|
||||||
|
if internal.UseOptimizedJSONMarshaling {
|
||||||
|
return internal.DeterministicMarshal(s)
|
||||||
|
}
|
||||||
if len(s.Property) > 0 {
|
if len(s.Property) > 0 {
|
||||||
return json.Marshal(s.Property)
|
return json.Marshal(s.Property)
|
||||||
}
|
}
|
||||||
@ -194,6 +218,17 @@ func (s SchemaOrStringArray) MarshalJSON() ([]byte, error) {
|
|||||||
return []byte("null"), nil
|
return []byte("null"), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// MarshalJSON converts this schema object or array into JSON structure
|
||||||
|
func (s SchemaOrStringArray) MarshalNextJSON(opts jsonv2.MarshalOptions, enc *jsonv2.Encoder) error {
|
||||||
|
if len(s.Property) > 0 {
|
||||||
|
return opts.MarshalNext(enc, s.Property)
|
||||||
|
}
|
||||||
|
if s.Schema != nil {
|
||||||
|
return opts.MarshalNext(enc, s.Schema)
|
||||||
|
}
|
||||||
|
return enc.WriteToken(jsonv2.Null)
|
||||||
|
}
|
||||||
|
|
||||||
// UnmarshalJSON converts this schema object or array from a JSON structure
|
// UnmarshalJSON converts this schema object or array from a JSON structure
|
||||||
func (s *SchemaOrStringArray) UnmarshalJSON(data []byte) error {
|
func (s *SchemaOrStringArray) UnmarshalJSON(data []byte) error {
|
||||||
if internal.UseOptimizedJSONUnmarshaling {
|
if internal.UseOptimizedJSONUnmarshaling {
|
||||||
@ -347,12 +382,23 @@ func (s *SchemaOrArray) ContainsType(name string) bool {
|
|||||||
|
|
||||||
// MarshalJSON converts this schema object or array into JSON structure
|
// MarshalJSON converts this schema object or array into JSON structure
|
||||||
func (s SchemaOrArray) MarshalJSON() ([]byte, error) {
|
func (s SchemaOrArray) MarshalJSON() ([]byte, error) {
|
||||||
if len(s.Schemas) > 0 {
|
if internal.UseOptimizedJSONMarshaling {
|
||||||
|
return internal.DeterministicMarshal(s)
|
||||||
|
}
|
||||||
|
if s.Schemas != nil {
|
||||||
return json.Marshal(s.Schemas)
|
return json.Marshal(s.Schemas)
|
||||||
}
|
}
|
||||||
return json.Marshal(s.Schema)
|
return json.Marshal(s.Schema)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// MarshalJSON converts this schema object or array into JSON structure
|
||||||
|
func (s SchemaOrArray) MarshalNextJSON(opts jsonv2.MarshalOptions, enc *jsonv2.Encoder) error {
|
||||||
|
if s.Schemas != nil {
|
||||||
|
return opts.MarshalNext(enc, s.Schemas)
|
||||||
|
}
|
||||||
|
return opts.MarshalNext(enc, s.Schema)
|
||||||
|
}
|
||||||
|
|
||||||
// UnmarshalJSON converts this schema object or array from a JSON structure
|
// UnmarshalJSON converts this schema object or array from a JSON structure
|
||||||
func (s *SchemaOrArray) UnmarshalJSON(data []byte) error {
|
func (s *SchemaOrArray) UnmarshalJSON(data []byte) error {
|
||||||
if internal.UseOptimizedJSONUnmarshaling {
|
if internal.UseOptimizedJSONUnmarshaling {
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user