scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-02 03:08:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move pkg/kubectl/apply.go to staging

Browse Source
This commit is contained in:
Sean Sullivan
2019-07-24 20:40:25 -07:00
parent 9aefaa163f
commit 309de42878
21 changed files with 39 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubectl/cmd/diff/diff.go
View File

@@ -37,8 +37,8 @@ import (
"k8s.io/client-go/dynamic"
"k8s.io/klog"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubectl/pkg/util"
"k8s.io/kubectl/pkg/util/templates"
"k8s.io/kubernetes/pkg/kubectl"
"k8s.io/kubernetes/pkg/kubectl/cmd/apply"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi"
@@ -308,7 +308,7 @@ func (obj InfoObject) Merged() (runtime.Object, error) {
resourceVersion = &str
}
modified, err := kubectl.GetModifiedConfiguration(obj.LocalObj, false, unstructured.UnstructuredJSONScheme)
modified, err := util.GetModifiedConfiguration(obj.LocalObj, false, unstructured.UnstructuredJSONScheme)
if err != nil {
return nil, err
}