Commit baafbf40 authored by xiangpengzhao's avatar xiangpengzhao

Add support for PodPreset in kubectl get command

parent 3153cd68
...@@ -223,6 +223,7 @@ __custom_func() { ...@@ -223,6 +223,7 @@ __custom_func() {
* persistentvolumeclaims (aka 'pvc') * persistentvolumeclaims (aka 'pvc')
* persistentvolumes (aka 'pv') * persistentvolumes (aka 'pv')
* poddisruptionbudgets (aka 'pdb') * poddisruptionbudgets (aka 'pdb')
* podpreset
* pods (aka 'po') * pods (aka 'po')
* podsecuritypolicies (aka 'psp') * podsecuritypolicies (aka 'psp')
* podtemplates * podtemplates
......
...@@ -73,6 +73,7 @@ go_library( ...@@ -73,6 +73,7 @@ go_library(
"//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library",
"//pkg/apis/policy:go_default_library", "//pkg/apis/policy:go_default_library",
"//pkg/apis/rbac:go_default_library", "//pkg/apis/rbac:go_default_library",
"//pkg/apis/settings:go_default_library",
"//pkg/apis/storage:go_default_library", "//pkg/apis/storage:go_default_library",
"//pkg/apis/storage/util:go_default_library", "//pkg/apis/storage/util:go_default_library",
"//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library",
......
...@@ -40,6 +40,7 @@ import ( ...@@ -40,6 +40,7 @@ import (
"k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions"
"k8s.io/kubernetes/pkg/apis/policy" "k8s.io/kubernetes/pkg/apis/policy"
"k8s.io/kubernetes/pkg/apis/rbac" "k8s.io/kubernetes/pkg/apis/rbac"
"k8s.io/kubernetes/pkg/apis/settings"
"k8s.io/kubernetes/pkg/apis/storage" "k8s.io/kubernetes/pkg/apis/storage"
storageutil "k8s.io/kubernetes/pkg/apis/storage/util" storageutil "k8s.io/kubernetes/pkg/apis/storage/util"
"k8s.io/kubernetes/pkg/printers" "k8s.io/kubernetes/pkg/printers"
...@@ -100,6 +101,7 @@ var ( ...@@ -100,6 +101,7 @@ var (
clusterColumns = []string{"NAME", "STATUS", "AGE"} clusterColumns = []string{"NAME", "STATUS", "AGE"}
networkPolicyColumns = []string{"NAME", "POD-SELECTOR", "AGE"} networkPolicyColumns = []string{"NAME", "POD-SELECTOR", "AGE"}
certificateSigningRequestColumns = []string{"NAME", "AGE", "REQUESTOR", "CONDITION"} certificateSigningRequestColumns = []string{"NAME", "AGE", "REQUESTOR", "CONDITION"}
podPresetColumns = []string{"NAME", "AGE"}
) )
func printPod(pod *api.Pod, w io.Writer, options printers.PrintOptions) error { func printPod(pod *api.Pod, w io.Writer, options printers.PrintOptions) error {
...@@ -193,6 +195,8 @@ func AddHandlers(h *printers.HumanReadablePrinter) { ...@@ -193,6 +195,8 @@ func AddHandlers(h *printers.HumanReadablePrinter) {
h.Handler(certificateSigningRequestColumns, nil, printCertificateSigningRequestList) h.Handler(certificateSigningRequestColumns, nil, printCertificateSigningRequestList)
h.Handler(storageClassColumns, nil, printStorageClass) h.Handler(storageClassColumns, nil, printStorageClass)
h.Handler(storageClassColumns, nil, printStorageClassList) h.Handler(storageClassColumns, nil, printStorageClassList)
h.Handler(podPresetColumns, nil, printPodPreset)
h.Handler(podPresetColumns, nil, printPodPresetList)
h.Handler(statusColumns, nil, printStatus) h.Handler(statusColumns, nil, printStatus)
} }
...@@ -1906,6 +1910,19 @@ func printStorageClassList(scList *storage.StorageClassList, w io.Writer, option ...@@ -1906,6 +1910,19 @@ func printStorageClassList(scList *storage.StorageClassList, w io.Writer, option
return nil return nil
} }
func printPodPreset(podPreset *settings.PodPreset, w io.Writer, options printers.PrintOptions) error {
return printObjectMeta(podPreset.ObjectMeta, w, options, false)
}
func printPodPresetList(list *settings.PodPresetList, w io.Writer, options printers.PrintOptions) error {
for i := range list.Items {
if err := printPodPreset(&list.Items[i], w, options); err != nil {
return err
}
}
return nil
}
func printStatus(status *metav1.Status, w io.Writer, options printers.PrintOptions) error { func printStatus(status *metav1.Status, w io.Writer, options printers.PrintOptions) error {
if _, err := fmt.Fprintf(w, "%s\t%s\t%s\n", status.Status, status.Reason, status.Message); err != nil { if _, err := fmt.Fprintf(w, "%s\t%s\t%s\n", status.Status, status.Reason, status.Message); err != nil {
return err return err
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment