github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #69119 from seans3/diff-small-fix 

Replace internal reference of last-applied-config with external refer…
pull/58/head
k8s-ci-robot 2018-09-27 09:51:29 -07:00 committed by GitHub
parent 53fe9e2a30 7863e7c4ba
commit 63930183e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,6 +26,7 @@ import (
"github.com/ghodss/yaml"
"github.com/spf13/cobra"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@ -33,7 +34,6 @@ import (
"k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/cli-runtime/pkg/genericclioptions/resource"
"k8s.io/client-go/dynamic"
api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/kubectl/apply/parse"
"k8s.io/kubernetes/pkg/kubectl/apply/strategy"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
@ -291,7 +291,7 @@ func (obj InfoObject) Last() (map[string]interface{}, error) {
return nil, nil // Not an error, just empty.
}
return obj.toMap([]byte(annots[api.LastAppliedConfigAnnotation]))
return obj.toMap([]byte(annots[corev1.LastAppliedConfigAnnotation]))
}
func (obj InfoObject) Name() string {