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

run root-rewrite-v1-..., compile

Browse Source
This commit is contained in:
Chao Xu
2017-06-22 10:25:57 -07:00
parent 9f5f4ba729
commit f4989a45a5
1049 changed files with 1522 additions and 1418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/kubectl/history.go
View File

@@ -22,6 +22,7 @@ import (
"io"
"text/tabwriter"
"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
@@ -29,7 +30,7 @@ import (
"k8s.io/apimachinery/pkg/util/json"
"k8s.io/apimachinery/pkg/util/strategicpatch"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1"
k8s_api_v1 "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/apis/apps"
appsv1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1"
"k8s.io/kubernetes/pkg/apis/extensions"
@@ -137,7 +138,7 @@ func (h *DeploymentHistoryViewer) ViewHistory(namespace, name string, revision i
func printTemplate(template *v1.PodTemplateSpec) (string, error) {
buf := bytes.NewBuffer([]byte{})
internalTemplate := &api.PodTemplateSpec{}
if err := v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(template, internalTemplate, nil); err != nil {
if err := k8s_api_v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(template, internalTemplate, nil); err != nil {
return "", fmt.Errorf("failed to convert podtemplate, %v", err)
}
w := printersinternal.NewPrefixWriter(buf)