scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-12-07 00:25:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #26044 from smarterclayton/multiversion_encode

Browse Source 
Automatic merge from submit-queue

Guarantee that Encode handles nested objects again
This commit is contained in:
Kubernetes Submit Queue
2016-08-18 21:10:55 -07:00
committed by GitHub
parent c5e3b79f32 12d7032c39
commit c19e9cc89d
44 changed files with 790 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/config/file_test.go
View File

@@ -129,7 +129,7 @@ func TestReadPodsFromFile(t *testing.T) {
for _, testCase := range testCases {
func() {
var versionedPod runtime.Object
err := testapi.Default.Converter().Convert(&testCase.pod, &versionedPod)
err := testapi.Default.Converter().Convert(&testCase.pod, &versionedPod, nil)
if err != nil {
t.Fatalf("%s: error in versioning the pod: %v", testCase.desc, err)
}

2
pkg/kubelet/config/http_test.go
View File

@@ -276,7 +276,7 @@ func TestExtractPodsFromHTTP(t *testing.T) {
for _, testCase := range testCases {
var versionedPods runtime.Object
err := testapi.Default.Converter().Convert(&testCase.pods, &versionedPods)
err := testapi.Default.Converter().Convert(&testCase.pods, &versionedPods, nil)
if err != nil {
t.Fatalf("%s: error in versioning the pods: %s", testCase.desc, err)
}