github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-06 07:57:35 +00:00
Code Issues Projects Releases Wiki Activity

pkg/api/legacyscheme: fixup imports

Browse Source
This commit is contained in:
Dr. Stefan Schimanski
2017-10-16 13:41:50 +02:00
parent a31075b1b3
commit 7773a30f67
308 changed files with 1298 additions and 1162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/apis/apps/v1/conversion_test.go
View File

@@ -21,7 +21,7 @@ import (
appsv1 "k8s.io/api/apps/v1"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/apis/extensions"
apiequality "k8s.io/apimachinery/pkg/api/equality"
@@ -42,7 +42,7 @@ func TestV1RollingUpdateDaemonSetConversion(t *testing.T) {
for k, tc := range testcases {
// extensions -> v1
internal1 := &appsv1.RollingUpdateDaemonSet{}
if err := api.Scheme.Convert(tc.rollingUpdateDs1, internal1, nil); err != nil {
if err := legacyscheme.Scheme.Convert(tc.rollingUpdateDs1, internal1, nil); err != nil {
t.Errorf("%q - %q: unexpected error: %v", k, "from extensions to v1", err)
}
if !apiequality.Semantic.DeepEqual(internal1, tc.rollingUpdateDs2) {
@@ -51,7 +51,7 @@ func TestV1RollingUpdateDaemonSetConversion(t *testing.T) {
// v1 -> extensions
internal2 := &extensions.RollingUpdateDaemonSet{}
if err := api.Scheme.Convert(tc.rollingUpdateDs2, internal2, nil); err != nil {
if err := legacyscheme.Scheme.Convert(tc.rollingUpdateDs2, internal2, nil); err != nil {
t.Errorf("%q - %q: unexpected error: %v", k, "from v1 to extensions", err)
}
if !apiequality.Semantic.DeepEqual(internal2, tc.rollingUpdateDs1) {