Merge pull request #20452 from caesarxuchao/replace-client-kubelet

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-02 23:46:58 -08:00
97 changed files with 1072 additions and 689 deletions

View File

@@ -2152,6 +2152,8 @@ type SecretList struct {
Items []Secret `json:"items"`
}
// +genclient=true
// ConfigMap holds configuration data for components or applications to consume.
type ConfigMap struct {
unversioned.TypeMeta `json:",inline"`