diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 148eaac9d..e8db62198 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -568,7 +568,7 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "d155b85a4fda" + "Rev": "0cf4f255cdfe" }, { "ImportPath": "k8s.io/apimachinery", @@ -580,7 +580,7 @@ }, { "ImportPath": "k8s.io/client-go", - "Rev": "dd730ded405f" + "Rev": "bcb30edc8b38" }, { "ImportPath": "k8s.io/code-generator", @@ -604,7 +604,7 @@ }, { "ImportPath": "k8s.io/metrics", - "Rev": "647dd8d4af75" + "Rev": "9a31b1dece01" }, { "ImportPath": "k8s.io/utils", diff --git a/go.mod b/go.mod index 2a61e94cb..0d3bd2cf4 100644 --- a/go.mod +++ b/go.mod @@ -36,14 +36,14 @@ require ( golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7 gopkg.in/yaml.v2 v2.2.8 gotest.tools v2.2.0+incompatible // indirect - k8s.io/api v0.0.0-20200226122402-d155b85a4fda + k8s.io/api v0.0.0-20200229073839-0cf4f255cdfe k8s.io/apimachinery v0.0.0-20200214081019-2373d029717c k8s.io/cli-runtime v0.0.0-20200221172330-03707b9714f9 - k8s.io/client-go v0.0.0-20200227162456-dd730ded405f + k8s.io/client-go v0.0.0-20200229082506-bcb30edc8b38 k8s.io/component-base v0.0.0-20200227163006-6f93f319a354 k8s.io/klog v1.0.0 k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c - k8s.io/metrics v0.0.0-20200221172033-647dd8d4af75 + k8s.io/metrics v0.0.0-20200229084100-9a31b1dece01 k8s.io/utils v0.0.0-20200117235808-5f6fbceb4c31 sigs.k8s.io/kustomize v2.0.3+incompatible sigs.k8s.io/yaml v1.2.0 @@ -53,11 +53,11 @@ require ( replace ( golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13 golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13 - k8s.io/api => k8s.io/api v0.0.0-20200226122402-d155b85a4fda + k8s.io/api => k8s.io/api v0.0.0-20200229073839-0cf4f255cdfe k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200214081019-2373d029717c k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200221172330-03707b9714f9 - k8s.io/client-go => k8s.io/client-go v0.0.0-20200227162456-dd730ded405f + k8s.io/client-go => k8s.io/client-go v0.0.0-20200229082506-bcb30edc8b38 k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200214080538-dc8f3adce97c k8s.io/component-base => k8s.io/component-base v0.0.0-20200227163006-6f93f319a354 - k8s.io/metrics => k8s.io/metrics v0.0.0-20200221172033-647dd8d4af75 + k8s.io/metrics => k8s.io/metrics v0.0.0-20200229084100-9a31b1dece01 ) diff --git a/go.sum b/go.sum index a34463630..b591cd06b 100644 --- a/go.sum +++ b/go.sum @@ -306,10 +306,10 @@ gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -k8s.io/api v0.0.0-20200226122402-d155b85a4fda/go.mod h1:brPp6rLV9ZWi2IgXmvCsY7TKw2l27eF4rfCHlyW88ys= +k8s.io/api v0.0.0-20200229073839-0cf4f255cdfe/go.mod h1:brPp6rLV9ZWi2IgXmvCsY7TKw2l27eF4rfCHlyW88ys= k8s.io/apimachinery v0.0.0-20200214081019-2373d029717c/go.mod h1:5X8oEhnd931nEg6/Nkumo00nT6ZsCLp2h7Xwd7Ym6P4= k8s.io/cli-runtime v0.0.0-20200221172330-03707b9714f9/go.mod h1:jFVnu9CV5hIeRRksJ7Tt7Uo+k7nXrLmHlLDSZT+lSsw= -k8s.io/client-go v0.0.0-20200227162456-dd730ded405f/go.mod h1:gO+mdvDoeJffZ4HcZD+zu/NtuHo7sKuRq517y1fVxhg= +k8s.io/client-go v0.0.0-20200229082506-bcb30edc8b38/go.mod h1:AffEArDYoUR2YjYt8gY7dNfq5cDXWIv3uhfKwsa+2jo= k8s.io/code-generator v0.0.0-20200214080538-dc8f3adce97c/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc= k8s.io/component-base v0.0.0-20200227163006-6f93f319a354/go.mod h1:HDvqB92UBNY8EfzZuIRA2S7PmDF5CfiRwS88LNkTRnE= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= @@ -320,7 +320,7 @@ k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c h1:/KUFqjjqAcY4Us6luF5RDNZ16KJtb49HfR3ZHB9qYXM= k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E= -k8s.io/metrics v0.0.0-20200221172033-647dd8d4af75/go.mod h1:xxUDeXPl3CRHlecM966oGWaqDvKZCFgY8zk/htYkzmw= +k8s.io/metrics v0.0.0-20200229084100-9a31b1dece01/go.mod h1:RS8UdNg4EDy1Uh5sXvZsP2vX0EgOpqLkaI6Q39oZk1o= k8s.io/utils v0.0.0-20200117235808-5f6fbceb4c31 h1:KCcLuc/HD1RogJgEbZi9ObRuLv1bgiRCfAbidLKrUpg= k8s.io/utils v0.0.0-20200117235808-5f6fbceb4c31/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0= diff --git a/pkg/describe/versioned/describe.go b/pkg/describe/versioned/describe.go index 586420df0..d39ddfbc6 100644 --- a/pkg/describe/versioned/describe.go +++ b/pkg/describe/versioned/describe.go @@ -3239,6 +3239,9 @@ func describeCertificateSigningRequest(csr *certificatesv1beta1.CertificateSigni w.Write(LEVEL_0, "Annotations:\t%s\n", labels.FormatLabels(csr.Annotations)) w.Write(LEVEL_0, "CreationTimestamp:\t%s\n", csr.CreationTimestamp.Time.Format(time.RFC1123Z)) w.Write(LEVEL_0, "Requesting User:\t%s\n", csr.Spec.Username) + if csr.Spec.SignerName != nil { + w.Write(LEVEL_0, "Signer:\t%s\n", *csr.Spec.SignerName) + } w.Write(LEVEL_0, "Status:\t%s\n", status) w.Write(LEVEL_0, "Subject:\n")