github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 02:09:56 +00:00
Code Issues Projects Releases Wiki Activity

filter lastAppliedConfig annotation for describe secret

Browse Source
This commit is contained in:
ymqytw 2017-02-03 14:58:30 -08:00
parent ab794c6128
commit aadcd9b5e2
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/kubectl/describe.go
View File

@ -42,6 +42,8 @@ import (
"k8s.io/kubernetes/federation/apis/federation" "k8s.io/kubernetes/federation/apis/federation"
fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset" fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/annotations"
"k8s.io/kubernetes/pkg/api/events" "k8s.io/kubernetes/pkg/api/events"
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/apis/apps" "k8s.io/kubernetes/pkg/apis/apps"
@ -1545,7 +1547,8 @@ func describeSecret(secret *api.Secret) (string, error) {
w.Write(LEVEL_0, "Name:\t%s\n", secret.Name) w.Write(LEVEL_0, "Name:\t%s\n", secret.Name)
w.Write(LEVEL_0, "Namespace:\t%s\n", secret.Namespace) w.Write(LEVEL_0, "Namespace:\t%s\n", secret.Namespace)
printLabelsMultiline(w, "Labels", secret.Labels) printLabelsMultiline(w, "Labels", secret.Labels)
printLabelsMultiline(w, "Annotations", secret.Annotations) skipAnnotations := sets.NewString(annotations.LastAppliedConfigAnnotation)
printLabelsMultilineWithFilter(w, "Annotations", secret.Annotations, skipAnnotations)
w.Write(LEVEL_0, "\nType:\t%s\n", secret.Type) w.Write(LEVEL_0, "\nType:\t%s\n", secret.Type)
@ -2776,13 +2779,18 @@ func (fn typeFunc) Describe(exact interface{}, extra ...interface{}) (string, er
return s, err return s, err
} }
// printLabelsMultilineWithFilter prints filtered multiple labels with a proper alignment.
func printLabelsMultilineWithFilter(w *PrefixWriter, title string, labels map[string]string, skip sets.String) {
printLabelsMultilineWithIndent(w, "", title, "\t", labels, skip)
}
// printLabelsMultiline prints multiple labels with a proper alignment. // printLabelsMultiline prints multiple labels with a proper alignment.
func printLabelsMultiline(w *PrefixWriter, title string, labels map[string]string) { func printLabelsMultiline(w *PrefixWriter, title string, labels map[string]string) {
printLabelsMultilineWithIndent(w, "", title, "\t", labels) printLabelsMultilineWithIndent(w, "", title, "\t", labels, sets.NewString())
} }
// printLabelsMultiline prints multiple labels with a user-defined alignment. // printLabelsMultiline prints multiple labels with a user-defined alignment.
func printLabelsMultilineWithIndent(w *PrefixWriter, initialIndent, title, innerIndent string, labels map[string]string) { func printLabelsMultilineWithIndent(w *PrefixWriter, initialIndent, title, innerIndent string, labels map[string]string, skip sets.String) {
w.Write(LEVEL_0, "%s%s:%s", initialIndent, title, innerIndent) w.Write(LEVEL_0, "%s%s:%s", initialIndent, title, innerIndent)
@ -2794,8 +2802,15 @@ func printLabelsMultilineWithIndent(w *PrefixWriter, initialIndent, title, inner
// to print labels in the sorted order // to print labels in the sorted order
keys := make([]string, 0, len(labels)) keys := make([]string, 0, len(labels))
for key := range labels { for key := range labels {
if skip.Has(key) {
continue
}
keys = append(keys, key) keys = append(keys, key)
} }
if len(keys) == 0 {
w.WriteLine("<none>")
return
}
sort.Strings(keys) sort.Strings(keys)
for i, key := range keys { for i, key := range keys {