Merge pull request #104877 from pohly/json-kobj

component-base: test and fix JSON output for KObj

Kubernetes-commit: a5cd438b9fbf49e013453f4d6c9b2e935a78071c
This commit is contained in:
Kubernetes Publisher 2021-10-22 13:24:42 -07:00
parent 816febed68
commit 56656ba0e0
2 changed files with 8 additions and 5 deletions

9
go.mod
View File

@ -30,8 +30,8 @@ require (
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
google.golang.org/protobuf v1.26.0
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/api v0.0.0-20211022203536-7d47955f01bd
k8s.io/apimachinery v0.0.0-20211022203306-153f11a7f300
k8s.io/klog/v2 v2.30.0
k8s.io/kube-openapi v0.0.0-20210817084001-7fbd8d59e5b8
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b
@ -40,7 +40,6 @@ require (
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/api => k8s.io/api v0.0.0-20211022203536-7d47955f01bd
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211022203306-153f11a7f300
)

4
go.sum
View File

@ -598,6 +598,10 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20211022203536-7d47955f01bd h1:t2LT7M8JRuofDih9ziRvu/Vyla8Ej3yjSrxJ9FgB3Pc=
k8s.io/api v0.0.0-20211022203536-7d47955f01bd/go.mod h1:eJg/6b+/Rz9bOKmx0Edyb0/GSov2ZHPYDXoxbqMJgKg=
k8s.io/apimachinery v0.0.0-20211022203306-153f11a7f300 h1:SaXMD0Olvi/V70/K8OKFF4e/+b21wKuSolzf5Uk2Lak=
k8s.io/apimachinery v0.0.0-20211022203306-153f11a7f300/go.mod h1:Us141aTxAE+ha/FV0yDwUGmNqwDlF6EpCGN/6w1eLZk=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.30.0 h1:bUO6drIvCIsvZ/XFgfxoGFQU/a4Qkh0iAlvUR7vlHJw=