github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove use of testapi codecs, selflink, resourcepath functions

Browse Source
This commit is contained in:
Jordan Liggitt
2019-12-13 11:28:11 -05:00
parent bb90f0ff94
commit 5d5b444c4d
31 changed files with 146 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/kubelet/config/BUILD
View File

@@ -72,7 +72,6 @@ go_test(
embed = [":go_default_library"],
deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/api/testapi:go_default_library",
"//pkg/apis/core:go_default_library",
"//pkg/apis/core/v1:go_default_library",
"//pkg/apis/core/validation:go_default_library",

6
pkg/kubelet/config/common_test.go
View File

@@ -26,8 +26,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
clientscheme "k8s.io/client-go/kubernetes/scheme"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/api/testapi"
"k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/apis/core/validation"
"k8s.io/kubernetes/pkg/securitycontext"
@@ -72,7 +72,7 @@ func TestDecodeSinglePod(t *testing.T) {
},
},
}
json, err := runtime.Encode(testapi.Default.Codec(), pod)
json, err := runtime.Encode(clientscheme.Codecs.LegacyCodec(v1.SchemeGroupVersion), pod)
if err != nil {
t.Errorf("unexpected error: %v", err)
}
@@ -148,7 +148,7 @@ func TestDecodePodList(t *testing.T) {
podList := &v1.PodList{
Items: []v1.Pod{*pod},
}
json, err := runtime.Encode(testapi.Default.Codec(), podList)
json, err := runtime.Encode(clientscheme.Codecs.LegacyCodec(v1.SchemeGroupVersion), podList)
if err != nil {
t.Errorf("unexpected error: %v", err)
}

4
pkg/kubelet/config/file_linux_test.go
View File

@@ -33,7 +33,7 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/kubernetes/pkg/api/testapi"
clientscheme "k8s.io/client-go/kubernetes/scheme"
api "k8s.io/kubernetes/pkg/apis/core"
k8s_api_v1 "k8s.io/kubernetes/pkg/apis/core/v1"
"k8s.io/kubernetes/pkg/apis/core/validation"
@@ -199,7 +199,7 @@ func getTestCases(hostname types.NodeName) []*testCase {
}
func (tc *testCase) writeToFile(dir, name string, t *testing.T) string {
fileContents, err := runtime.Encode(testapi.Default.Codec(), tc.pod)
fileContents, err := runtime.Encode(clientscheme.Codecs.LegacyCodec(v1.SchemeGroupVersion), tc.pod)
if err != nil {
t.Fatalf("%s: error in encoding the pod: %v", tc.desc, err)
}

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

@@ -28,8 +28,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
clientscheme "k8s.io/client-go/kubernetes/scheme"
utiltesting "k8s.io/client-go/util/testing"
"k8s.io/kubernetes/pkg/api/testapi"
api "k8s.io/kubernetes/pkg/apis/core"
k8s_api_v1 "k8s.io/kubernetes/pkg/apis/core/v1"
"k8s.io/kubernetes/pkg/apis/core/validation"
@@ -292,7 +292,7 @@ func TestExtractPodsFromHTTP(t *testing.T) {
}
for _, testCase := range testCases {
data, err := runtime.Encode(testapi.Default.Codec(), testCase.pods)
data, err := runtime.Encode(clientscheme.Codecs.LegacyCodec(v1.SchemeGroupVersion), testCase.pods)
if err != nil {
t.Fatalf("%s: error in encoding the pod: %v", testCase.desc, err)
}