github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14360 from mikedanese/ds-describe

Browse Source 
move daemonset describe to experimental
This commit is contained in:
Eric Tune
2015-09-22 10:32:55 -07:00
parent ab07e320ec 2313c9ada0
commit e560a4b600
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/completions/bash/kubectl
View File

@@ -329,7 +329,6 @@ _kubectl_describe()
must_have_one_flag=() must_have_one_flag=()
must_have_one_noun=() must_have_one_noun=()
must_have_one_noun+=("daemonset")
must_have_one_noun+=("limitrange") must_have_one_noun+=("limitrange")
must_have_one_noun+=("minion") must_have_one_noun+=("minion")
must_have_one_noun+=("namespace") must_have_one_noun+=("namespace")

4
pkg/kubectl/describe.go
View File

@@ -69,7 +69,6 @@ func describerMap(c *client.Client) map[string]Describer {
m := map[string]Describer{ m := map[string]Describer{
"Pod": &PodDescriber{c}, "Pod": &PodDescriber{c},
"ReplicationController": &ReplicationControllerDescriber{c}, "ReplicationController": &ReplicationControllerDescriber{c},
"DaemonSet": &DaemonSetDescriber{c},
"Secret": &SecretDescriber{c}, "Secret": &SecretDescriber{c},
"Service": &ServiceDescriber{c}, "Service": &ServiceDescriber{c},
"ServiceAccount": &ServiceAccountDescriber{c}, "ServiceAccount": &ServiceAccountDescriber{c},
@@ -87,7 +86,8 @@ func describerMap(c *client.Client) map[string]Describer {
func expDescriberMap(c *client.Client) map[string]Describer { func expDescriberMap(c *client.Client) map[string]Describer {
return map[string]Describer{ return map[string]Describer{
"HorizontalPodAutoscaler": &HorizontalPodAutoscalerDescriber{c}, "HorizontalPodAutoscaler": &HorizontalPodAutoscalerDescriber{c},
"Job": &JobDescriber{c}, "DaemonSet": &DaemonSetDescriber{c},
"Job": &JobDescriber{c},
} }
} }