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 de7eb39b07
commit 1974865198
2 changed files with 22 additions and 11 deletions

21
go.mod
View File

@ -5,18 +5,17 @@ module k8s.io/kube-controller-manager
go 1.16
require (
k8s.io/apimachinery v0.0.0
k8s.io/cloud-provider v0.0.0
k8s.io/controller-manager v0.0.0
k8s.io/apimachinery v0.0.0-20211022203306-153f11a7f300
k8s.io/cloud-provider v0.0.0-20211022210821-011470155cbb
k8s.io/controller-manager v0.0.0-20211022210710-da677ae7f065
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/apiserver => ../apiserver
k8s.io/client-go => ../client-go
k8s.io/cloud-provider => ../cloud-provider
k8s.io/component-base => ../component-base
k8s.io/controller-manager => ../controller-manager
k8s.io/kube-controller-manager => ../kube-controller-manager
k8s.io/api => k8s.io/api v0.0.0-20211022203536-7d47955f01bd
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211022203306-153f11a7f300
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20211022204855-c6a896594815
k8s.io/client-go => k8s.io/client-go v0.0.0-20211022203833-56656ba0e04f
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20211022210821-011470155cbb
k8s.io/component-base => k8s.io/component-base v0.0.0-20211022204341-77b90367040a
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20211022210710-da677ae7f065
)

12
go.sum
View File

@ -846,6 +846,18 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-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/apiserver v0.0.0-20211022204855-c6a896594815/go.mod h1:uY1uhPF7UL4lte9c/ukX8Y7ULxxvtfy8Exl2XeVA7Hg=
k8s.io/client-go v0.0.0-20211022203833-56656ba0e04f/go.mod h1:J/CKd1tfft/vlmtgr40pGEK4bXNV0EZOQtV3cXS09IA=
k8s.io/cloud-provider v0.0.0-20211022210821-011470155cbb h1:R2zOfi2aI3m7ewVCieQypS1RbfQZrUACM52eYelXyqI=
k8s.io/cloud-provider v0.0.0-20211022210821-011470155cbb/go.mod h1:uPfith5oKowuASWTY11MIpaqzBFedhWV8gW33Eckw8s=
k8s.io/component-base v0.0.0-20211022204341-77b90367040a h1:2jEZKdDEhjwIacbANPC057Q/f0Q4Phwwv7TPpMBMRYc=
k8s.io/component-base v0.0.0-20211022204341-77b90367040a/go.mod h1:Ntx6wQVfe1+jiwlrNaGcEVGKsnUmrEJoF4nCG4xUjfg=
k8s.io/controller-manager v0.0.0-20211022210710-da677ae7f065 h1:kJFN6CXchOEiyMj+nFhNpWtVaa3Lchvc5BNLeqVkk+M=
k8s.io/controller-manager v0.0.0-20211022210710-da677ae7f065/go.mod h1:AmZFMrdj39uHIRr11+KV/hsJbhpqqaSaYaSDzKgHif8=
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=