From bd4705c414a31ed34eb9afa5d965f2494639ff3f Mon Sep 17 00:00:00 2001 From: markturansky Date: Tue, 15 Sep 2015 13:26:49 -0400 Subject: [PATCH] rebased and changed io helpers to use new API groups --- pkg/util/io/io.go | 5 +++-- pkg/util/io/io_test.go | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkg/util/io/io.go b/pkg/util/io/io.go index 8324a83b928..70bc605f5e3 100644 --- a/pkg/util/io/io.go +++ b/pkg/util/io/io.go @@ -38,7 +38,8 @@ func LoadPodFromFile(filePath string) (*api.Pod, error) { return nil, fmt.Errorf("file was empty: %s", filePath) } pod := &api.Pod{} - if err := latest.Codec.DecodeInto(podDef, pod); err != nil { + + if err := latest.GroupOrDie("").Codec.DecodeInto(podDef, pod); err != nil { return nil, fmt.Errorf("failed decoding file: %v", err) } return pod, nil @@ -49,7 +50,7 @@ func SavePodToFile(pod *api.Pod, filePath string, perm os.FileMode) error { if filePath == "" { return fmt.Errorf("file path not specified") } - data, err := latest.Codec.Encode(pod) + data, err := latest.GroupOrDie("").Codec.Encode(pod) if err != nil { return fmt.Errorf("failed encoding pod: %v", err) } diff --git a/pkg/util/io/io_test.go b/pkg/util/io/io_test.go index 105bb5c5ee9..5b691e27f7f 100644 --- a/pkg/util/io/io_test.go +++ b/pkg/util/io/io_test.go @@ -30,8 +30,8 @@ func TestSavePodToFile(t *testing.T) { pod := volume.NewPersistentVolumeRecyclerPodTemplate() // sets all default values on a pod for equality comparison after decoding from file - encoded, err := latest.Codec.Encode(pod) - latest.Codec.DecodeInto(encoded, pod) + encoded, err := latest.GroupOrDie("").Codec.Encode(pod) + latest.GroupOrDie("").Codec.DecodeInto(encoded, pod) path := fmt.Sprintf("/tmp/kube-io-test-%s", uuid.New()) defer os.Remove(path)