Skip to content

Commit 0535520

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#88758 from soltysh/hide_last_applied
Hide kubectl.kubernetes.io/last-applied-configuration in describe
2 parents cd23e78 + 02cd65d commit 0535520

File tree

14 files changed

+203
-246
lines changed

14 files changed

+203
-246
lines changed

‎hack/.golint_failures

+1-1
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ staging/src/k8s.io/kubectl/pkg/cmd/testing
488488
staging/src/k8s.io/kubectl/pkg/cmd/top
489489
staging/src/k8s.io/kubectl/pkg/cmd/util
490490
staging/src/k8s.io/kubectl/pkg/cmd/wait
491-
staging/src/k8s.io/kubectl/pkg/describe/versioned
491+
staging/src/k8s.io/kubectl/pkg/describe
492492
staging/src/k8s.io/kubectl/pkg/generate
493493
staging/src/k8s.io/kubectl/pkg/generate/versioned
494494
staging/src/k8s.io/kubectl/pkg/metricsutil

‎pkg/kubectl/cmd/auth/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ go_library(
3434
"//staging/src/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library",
3535
"//staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1:go_default_library",
3636
"//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library",
37-
"//staging/src/k8s.io/kubectl/pkg/describe/versioned:go_default_library",
37+
"//staging/src/k8s.io/kubectl/pkg/describe:go_default_library",
3838
"//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library",
3939
"//staging/src/k8s.io/kubectl/pkg/util/rbac:go_default_library",
4040
"//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library",

‎pkg/kubectl/cmd/auth/cani.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import (
3939
discovery "k8s.io/client-go/discovery"
4040
authorizationv1client "k8s.io/client-go/kubernetes/typed/authorization/v1"
4141
cmdutil "k8s.io/kubectl/pkg/cmd/util"
42-
describeutil "k8s.io/kubectl/pkg/describe/versioned"
42+
"k8s.io/kubectl/pkg/describe"
4343
rbacutil "k8s.io/kubectl/pkg/util/rbac"
4444
"k8s.io/kubectl/pkg/util/templates"
4545
)
@@ -367,7 +367,7 @@ func printAccessHeaders(out io.Writer) error {
367367

368368
func printAccess(out io.Writer, rules []rbacv1.PolicyRule) error {
369369
for _, r := range rules {
370-
if _, err := fmt.Fprintf(out, "%s\t%v\t%v\t%v\n", describeutil.CombineResourceGroup(r.Resources, r.APIGroups), r.NonResourceURLs, r.ResourceNames, r.Verbs); err != nil {
370+
if _, err := fmt.Fprintf(out, "%s\t%v\t%v\t%v\n", describe.CombineResourceGroup(r.Resources, r.APIGroups), r.NonResourceURLs, r.ResourceNames, r.Verbs); err != nil {
371371
return err
372372
}
373373
}

‎staging/src/k8s.io/kubectl/pkg/cmd/describe/BUILD

-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ go_library(
1515
"//staging/src/k8s.io/cli-runtime/pkg/resource:go_default_library",
1616
"//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library",
1717
"//staging/src/k8s.io/kubectl/pkg/describe:go_default_library",
18-
"//staging/src/k8s.io/kubectl/pkg/describe/versioned:go_default_library",
1918
"//staging/src/k8s.io/kubectl/pkg/util/i18n:go_default_library",
2019
"//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library",
2120
"//vendor/github.com/spf13/cobra:go_default_library",
@@ -34,7 +33,6 @@ go_test(
3433
"//staging/src/k8s.io/client-go/rest/fake:go_default_library",
3534
"//staging/src/k8s.io/kubectl/pkg/cmd/testing:go_default_library",
3635
"//staging/src/k8s.io/kubectl/pkg/describe:go_default_library",
37-
"//staging/src/k8s.io/kubectl/pkg/describe/versioned:go_default_library",
3836
"//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library",
3937
],
4038
)

‎staging/src/k8s.io/kubectl/pkg/cmd/describe/describe.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import (
3030
"k8s.io/cli-runtime/pkg/resource"
3131
cmdutil "k8s.io/kubectl/pkg/cmd/util"
3232
"k8s.io/kubectl/pkg/describe"
33-
describeversioned "k8s.io/kubectl/pkg/describe/versioned"
3433
"k8s.io/kubectl/pkg/util/i18n"
3534
"k8s.io/kubectl/pkg/util/templates"
3635
)
@@ -74,7 +73,7 @@ type DescribeOptions struct {
7473
Selector string
7574
Namespace string
7675

77-
Describer func(*meta.RESTMapping) (describe.Describer, error)
76+
Describer func(*meta.RESTMapping) (describe.ResourceDescriber, error)
7877
NewBuilder func() *resource.Builder
7978

8079
BuilderArgs []string
@@ -136,8 +135,8 @@ func (o *DescribeOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args [
136135

137136
o.BuilderArgs = args
138137

139-
o.Describer = func(mapping *meta.RESTMapping) (describe.Describer, error) {
140-
return describeversioned.DescriberFn(f, mapping)
138+
o.Describer = func(mapping *meta.RESTMapping) (describe.ResourceDescriber, error) {
139+
return describe.DescriberFn(f, mapping)
141140
}
142141

143142
o.NewBuilder = f.NewBuilder

‎staging/src/k8s.io/kubectl/pkg/cmd/describe/describe_test.go

+19-20
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,17 @@ import (
2828
"k8s.io/client-go/rest/fake"
2929
cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
3030
"k8s.io/kubectl/pkg/describe"
31-
versioneddescribe "k8s.io/kubectl/pkg/describe/versioned"
3231
"k8s.io/kubectl/pkg/scheme"
3332
)
3433

3534
// Verifies that schemas that are not in the master tree of Kubernetes can be retrieved via Get.
3635
func TestDescribeUnknownSchemaObject(t *testing.T) {
3736
d := &testDescriber{Output: "test output"}
38-
oldFn := versioneddescribe.DescriberFn
37+
oldFn := describe.DescriberFn
3938
defer func() {
40-
versioneddescribe.DescriberFn = oldFn
39+
describe.DescriberFn = oldFn
4140
}()
42-
versioneddescribe.DescriberFn = d.describerFor
41+
describe.DescriberFn = d.describerFor
4342

4443
tf := cmdtesting.NewTestFactory().WithNamespace("non-default")
4544
defer tf.Cleanup()
@@ -67,11 +66,11 @@ func TestDescribeUnknownSchemaObject(t *testing.T) {
6766
// Verifies that schemas that are not in the master tree of Kubernetes can be retrieved via Get.
6867
func TestDescribeUnknownNamespacedSchemaObject(t *testing.T) {
6968
d := &testDescriber{Output: "test output"}
70-
oldFn := versioneddescribe.DescriberFn
69+
oldFn := describe.DescriberFn
7170
defer func() {
72-
versioneddescribe.DescriberFn = oldFn
71+
describe.DescriberFn = oldFn
7372
}()
74-
versioneddescribe.DescriberFn = d.describerFor
73+
describe.DescriberFn = d.describerFor
7574

7675
tf := cmdtesting.NewTestFactory()
7776
defer tf.Cleanup()
@@ -99,11 +98,11 @@ func TestDescribeUnknownNamespacedSchemaObject(t *testing.T) {
9998

10099
func TestDescribeObject(t *testing.T) {
101100
d := &testDescriber{Output: "test output"}
102-
oldFn := versioneddescribe.DescriberFn
101+
oldFn := describe.DescriberFn
103102
defer func() {
104-
versioneddescribe.DescriberFn = oldFn
103+
describe.DescriberFn = oldFn
105104
}()
106-
versioneddescribe.DescriberFn = d.describerFor
105+
describe.DescriberFn = d.describerFor
107106

108107
_, _, rc := cmdtesting.TestData()
109108
tf := cmdtesting.NewTestFactory().WithNamespace("test")
@@ -140,11 +139,11 @@ func TestDescribeObject(t *testing.T) {
140139

141140
func TestDescribeListObjects(t *testing.T) {
142141
d := &testDescriber{Output: "test output"}
143-
oldFn := versioneddescribe.DescriberFn
142+
oldFn := describe.DescriberFn
144143
defer func() {
145-
versioneddescribe.DescriberFn = oldFn
144+
describe.DescriberFn = oldFn
146145
}()
147-
versioneddescribe.DescriberFn = d.describerFor
146+
describe.DescriberFn = d.describerFor
148147

149148
pods, _, _ := cmdtesting.TestData()
150149
tf := cmdtesting.NewTestFactory().WithNamespace("test")
@@ -167,11 +166,11 @@ func TestDescribeListObjects(t *testing.T) {
167166

168167
func TestDescribeObjectShowEvents(t *testing.T) {
169168
d := &testDescriber{Output: "test output"}
170-
oldFn := versioneddescribe.DescriberFn
169+
oldFn := describe.DescriberFn
171170
defer func() {
172-
versioneddescribe.DescriberFn = oldFn
171+
describe.DescriberFn = oldFn
173172
}()
174-
versioneddescribe.DescriberFn = d.describerFor
173+
describe.DescriberFn = d.describerFor
175174

176175
pods, _, _ := cmdtesting.TestData()
177176
tf := cmdtesting.NewTestFactory().WithNamespace("test")
@@ -193,11 +192,11 @@ func TestDescribeObjectShowEvents(t *testing.T) {
193192

194193
func TestDescribeObjectSkipEvents(t *testing.T) {
195194
d := &testDescriber{Output: "test output"}
196-
oldFn := versioneddescribe.DescriberFn
195+
oldFn := describe.DescriberFn
197196
defer func() {
198-
versioneddescribe.DescriberFn = oldFn
197+
describe.DescriberFn = oldFn
199198
}()
200-
versioneddescribe.DescriberFn = d.describerFor
199+
describe.DescriberFn = d.describerFor
201200

202201
pods, _, _ := cmdtesting.TestData()
203202
tf := cmdtesting.NewTestFactory().WithNamespace("test")
@@ -310,6 +309,6 @@ func (t *testDescriber) Describe(namespace, name string, describerSettings descr
310309
t.Settings = describerSettings
311310
return t.Output, t.Err
312311
}
313-
func (t *testDescriber) describerFor(restClientGetter genericclioptions.RESTClientGetter, mapping *meta.RESTMapping) (describe.Describer, error) {
312+
func (t *testDescriber) describerFor(restClientGetter genericclioptions.RESTClientGetter, mapping *meta.RESTMapping) (describe.ResourceDescriber, error) {
314313
return t, nil
315314
}

‎staging/src/k8s.io/kubectl/pkg/describe/BUILD

+75-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,60 @@
1-
load("@io_bazel_rules_go//go:def.bzl", "go_library")
1+
load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
22

33
go_library(
44
name = "go_default_library",
5-
srcs = ["interface.go"],
5+
srcs = [
6+
"describe.go",
7+
"interface.go",
8+
],
69
importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/describe",
710
importpath = "k8s.io/kubectl/pkg/describe",
811
visibility = ["//visibility:public"],
912
deps = [
13+
"//staging/src/k8s.io/api/apps/v1:go_default_library",
14+
"//staging/src/k8s.io/api/autoscaling/v1:go_default_library",
15+
"//staging/src/k8s.io/api/autoscaling/v2beta2:go_default_library",
16+
"//staging/src/k8s.io/api/batch/v1:go_default_library",
17+
"//staging/src/k8s.io/api/batch/v1beta1:go_default_library",
18+
"//staging/src/k8s.io/api/certificates/v1beta1:go_default_library",
19+
"//staging/src/k8s.io/api/coordination/v1:go_default_library",
20+
"//staging/src/k8s.io/api/core/v1:go_default_library",
21+
"//staging/src/k8s.io/api/discovery/v1beta1:go_default_library",
22+
"//staging/src/k8s.io/api/extensions/v1beta1:go_default_library",
23+
"//staging/src/k8s.io/api/networking/v1:go_default_library",
24+
"//staging/src/k8s.io/api/networking/v1beta1:go_default_library",
25+
"//staging/src/k8s.io/api/policy/v1beta1:go_default_library",
26+
"//staging/src/k8s.io/api/rbac/v1:go_default_library",
27+
"//staging/src/k8s.io/api/scheduling/v1:go_default_library",
28+
"//staging/src/k8s.io/api/storage/v1:go_default_library",
29+
"//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",
1030
"//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library",
31+
"//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library",
32+
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
33+
"//staging/src/k8s.io/apimachinery/pkg/fields:go_default_library",
34+
"//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library",
35+
"//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
36+
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
37+
"//staging/src/k8s.io/apimachinery/pkg/util/duration:go_default_library",
38+
"//staging/src/k8s.io/apimachinery/pkg/util/intstr:go_default_library",
39+
"//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
1140
"//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library",
41+
"//staging/src/k8s.io/client-go/dynamic:go_default_library",
42+
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
43+
"//staging/src/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library",
44+
"//staging/src/k8s.io/client-go/rest:go_default_library",
45+
"//staging/src/k8s.io/client-go/tools/reference:go_default_library",
46+
"//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library",
47+
"//staging/src/k8s.io/kubectl/pkg/util/certificate:go_default_library",
48+
"//staging/src/k8s.io/kubectl/pkg/util/deployment:go_default_library",
49+
"//staging/src/k8s.io/kubectl/pkg/util/event:go_default_library",
50+
"//staging/src/k8s.io/kubectl/pkg/util/fieldpath:go_default_library",
51+
"//staging/src/k8s.io/kubectl/pkg/util/qos:go_default_library",
52+
"//staging/src/k8s.io/kubectl/pkg/util/rbac:go_default_library",
53+
"//staging/src/k8s.io/kubectl/pkg/util/resource:go_default_library",
54+
"//staging/src/k8s.io/kubectl/pkg/util/slice:go_default_library",
55+
"//staging/src/k8s.io/kubectl/pkg/util/storage:go_default_library",
56+
"//vendor/github.com/fatih/camelcase:go_default_library",
57+
"//vendor/k8s.io/klog:go_default_library",
1258
],
1359
)
1460

@@ -21,10 +67,33 @@ filegroup(
2167

2268
filegroup(
2369
name = "all-srcs",
24-
srcs = [
25-
":package-srcs",
26-
"//staging/src/k8s.io/kubectl/pkg/describe/versioned:all-srcs",
27-
],
70+
srcs = [":package-srcs"],
2871
tags = ["automanaged"],
2972
visibility = ["//visibility:public"],
3073
)
74+
75+
go_test(
76+
name = "go_default_test",
77+
srcs = ["describe_test.go"],
78+
embed = [":go_default_library"],
79+
deps = [
80+
"//staging/src/k8s.io/api/apps/v1:go_default_library",
81+
"//staging/src/k8s.io/api/autoscaling/v1:go_default_library",
82+
"//staging/src/k8s.io/api/autoscaling/v2beta2:go_default_library",
83+
"//staging/src/k8s.io/api/coordination/v1:go_default_library",
84+
"//staging/src/k8s.io/api/core/v1:go_default_library",
85+
"//staging/src/k8s.io/api/discovery/v1beta1:go_default_library",
86+
"//staging/src/k8s.io/api/networking/v1:go_default_library",
87+
"//staging/src/k8s.io/api/networking/v1beta1:go_default_library",
88+
"//staging/src/k8s.io/api/policy/v1beta1:go_default_library",
89+
"//staging/src/k8s.io/api/storage/v1:go_default_library",
90+
"//staging/src/k8s.io/apimachinery/pkg/api/equality:go_default_library",
91+
"//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library",
92+
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
93+
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library",
94+
"//staging/src/k8s.io/apimachinery/pkg/util/intstr:go_default_library",
95+
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
96+
"//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library",
97+
"//vendor/k8s.io/utils/pointer:go_default_library",
98+
],
99+
)

0 commit comments

Comments
 (0)