github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-18 08:09:58 +00:00
Code Issues Projects Releases Wiki Activity

remove internal version api from apply

Browse Source 
Signed-off-by: dungeonmaster18 <umesh4257@gmail.com>
This commit is contained in:
dungeonmaster18 2017-12-09 20:59:25 +05:30
parent bb72237375
commit 7927127c7d
No known key found for this signature in database
GPG Key ID: 6ECBFB47CEDFAF1E
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/kubectl/apply.go
View File

@ -17,9 +17,9 @@ limitations under the License.
package kubectl package kubectl
import ( import (
"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/kubectl/resource" "k8s.io/kubernetes/pkg/kubectl/resource"
) )
@ -35,7 +35,7 @@ func GetOriginalConfiguration(mapping *meta.RESTMapping, obj runtime.Object) ([]
return nil, nil return nil, nil
} }
original, ok := annots[api.LastAppliedConfigAnnotation] original, ok := annots[v1.LastAppliedConfigAnnotation]
if !ok { if !ok {
return nil, nil return nil, nil
} }
@ -60,7 +60,7 @@ func SetOriginalConfiguration(info *resource.Info, original []byte) error {
annots = map[string]string{} annots = map[string]string{}
} }
annots[api.LastAppliedConfigAnnotation] = string(original) annots[v1.LastAppliedConfigAnnotation] = string(original)
return info.Mapping.MetadataAccessor.SetAnnotations(info.Object, annots) return info.Mapping.MetadataAccessor.SetAnnotations(info.Object, annots)
} }
@ -85,8 +85,8 @@ func GetModifiedConfiguration(info *resource.Info, annotate bool, codec runtime.
annots = map[string]string{} annots = map[string]string{}
} }
original := annots[api.LastAppliedConfigAnnotation] original := annots[v1.LastAppliedConfigAnnotation]
delete(annots, api.LastAppliedConfigAnnotation) delete(annots, v1.LastAppliedConfigAnnotation)
if err := accessor.SetAnnotations(info.Object, annots); err != nil { if err := accessor.SetAnnotations(info.Object, annots); err != nil {
return nil, err return nil, err
} }
@ -97,7 +97,7 @@ func GetModifiedConfiguration(info *resource.Info, annotate bool, codec runtime.
} }
if annotate { if annotate {
annots[api.LastAppliedConfigAnnotation] = string(modified) annots[v1.LastAppliedConfigAnnotation] = string(modified)
if err := info.Mapping.MetadataAccessor.SetAnnotations(info.Object, annots); err != nil { if err := info.Mapping.MetadataAccessor.SetAnnotations(info.Object, annots); err != nil {
return nil, err return nil, err
} }
@ -109,7 +109,7 @@ func GetModifiedConfiguration(info *resource.Info, annotate bool, codec runtime.
} }
// Restore the object to its original condition. // Restore the object to its original condition.
annots[api.LastAppliedConfigAnnotation] = original annots[v1.LastAppliedConfigAnnotation] = original
if err := info.Mapping.MetadataAccessor.SetAnnotations(info.Object, annots); err != nil { if err := info.Mapping.MetadataAccessor.SetAnnotations(info.Object, annots); err != nil {
return nil, err return nil, err
} }