kubernetes
/
kubectl
mirror of https://github.com/kubernetes/kubectl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor cleanup of jsonFallbackEncoder 

Kubernetes-commit: cd24a0e5fa7af1bd921386cf80c90cd535954e6c
This commit is contained in:
wojtekt 2019-09-22 13:50:05 +02:00 committed by Kubernetes Publisher
parent 0e9f77c7d7
commit 52d3bfc415
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/cmd/apply/apply_test.go
View File

@ -199,7 +199,7 @@ func annotateRuntimeObject(t *testing.T, originalObj, currentObj runtime.Object,
originalLabels := originalAccessor.GetLabels() originalLabels := originalAccessor.GetLabels()
originalLabels["DELETE_ME"] = "DELETE_ME" originalLabels["DELETE_ME"] = "DELETE_ME"
originalAccessor.SetLabels(originalLabels) originalAccessor.SetLabels(originalLabels)
original, err := runtime.Encode(unstructured.JSONFallbackEncoder{Encoder: codec}, originalObj) original, err := runtime.Encode(unstructured.NewJSONFallbackEncoder(codec), originalObj)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -215,7 +215,7 @@ func annotateRuntimeObject(t *testing.T, originalObj, currentObj runtime.Object,
} }
currentAnnotations[corev1.LastAppliedConfigAnnotation] = string(original) currentAnnotations[corev1.LastAppliedConfigAnnotation] = string(original)
currentAccessor.SetAnnotations(currentAnnotations) currentAccessor.SetAnnotations(currentAnnotations)
current, err := runtime.Encode(unstructured.JSONFallbackEncoder{Encoder: codec}, currentObj) current, err := runtime.Encode(unstructured.NewJSONFallbackEncoder(codec), currentObj)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -1030,7 +1030,7 @@ func TestUnstructuredIdempotentApply(t *testing.T) {
cmdtesting.InitTestErrorHandler(t) cmdtesting.InitTestErrorHandler(t)
serversideObject := readUnstructuredFromFile(t, filenameWidgetServerside) serversideObject := readUnstructuredFromFile(t, filenameWidgetServerside)
serversideData, err := runtime.Encode(unstructured.JSONFallbackEncoder{Encoder: codec}, serversideObject) serversideData, err := runtime.Encode(unstructured.NewJSONFallbackEncoder(codec), serversideObject)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

2
pkg/scheme/scheme.go
View File

@ -35,5 +35,5 @@ var ParameterCodec = runtime.NewParameterCodec(Scheme)
// DefaultJSONEncoder returns a default encoder for our scheme // DefaultJSONEncoder returns a default encoder for our scheme
func DefaultJSONEncoder() runtime.Encoder { func DefaultJSONEncoder() runtime.Encoder {
return unstructured.JSONFallbackEncoder{Encoder: Codecs.LegacyCodec(Scheme.PrioritizedVersionsAllGroups()...)} return unstructured.NewJSONFallbackEncoder(Codecs.LegacyCodec(Scheme.PrioritizedVersionsAllGroups()...))
} }