github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

kubeadm: updated pkg node tests to correct type

Browse Source 
updated ""k8s.io/kubernetes/pkg/api" to apiv1 "k8s.io/kubernetes/pkg/api/v1" to fix broken types in tests.
This commit is contained in:
Derek McQuay 2016-12-01 10:20:58 -08:00
parent 644a0ceec9
commit b3a56abed0
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/kubeadm/app/master/BUILD
View File

@ -60,7 +60,6 @@ go_test(
tags = ["automanaged"], tags = ["automanaged"],
deps = [ deps = [
"//cmd/kubeadm/app/apis/kubeadm:go_default_library", "//cmd/kubeadm/app/apis/kubeadm:go_default_library",
"//pkg/api:go_default_library",
"//pkg/api/v1:go_default_library", "//pkg/api/v1:go_default_library",
"//pkg/util/cert:go_default_library", "//pkg/util/cert:go_default_library",
"//pkg/util/intstr:go_default_library", "//pkg/util/intstr:go_default_library",

8
cmd/kubeadm/app/master/apiclient_test.go
View File

@ -22,7 +22,7 @@ import (
"k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
"k8s.io/kubernetes/pkg/api" apiv1 "k8s.io/kubernetes/pkg/api/v1"
) )
func TestCreateClientAndWaitForAPI(t *testing.T) { func TestCreateClientAndWaitForAPI(t *testing.T) {
@ -90,7 +90,7 @@ func TestNewDaemonSet(t *testing.T) {
} }
for _, rt := range tests { for _, rt := range tests {
p := api.PodSpec{} p := apiv1.PodSpec{}
actual := NewDaemonSet(rt.dn, p) actual := NewDaemonSet(rt.dn, p)
if actual.Spec.Selector.MatchLabels["k8s-app"] != rt.expected { if actual.Spec.Selector.MatchLabels["k8s-app"] != rt.expected {
t.Errorf( t.Errorf(
@ -132,7 +132,7 @@ func TestNewService(t *testing.T) {
} }
for _, rt := range tests { for _, rt := range tests {
p := api.ServiceSpec{} p := apiv1.ServiceSpec{}
actual := NewService(rt.dn, p) actual := NewService(rt.dn, p)
if actual.ObjectMeta.Labels["k8s-app"] != rt.expected { if actual.ObjectMeta.Labels["k8s-app"] != rt.expected {
t.Errorf( t.Errorf(
@ -174,7 +174,7 @@ func TestNewDeployment(t *testing.T) {
} }
for _, rt := range tests { for _, rt := range tests {
p := api.PodSpec{} p := apiv1.PodSpec{}
actual := NewDeployment(rt.dn, 1, p) actual := NewDeployment(rt.dn, 1, p)
if actual.Spec.Selector.MatchLabels["k8s-app"] != rt.expected { if actual.Spec.Selector.MatchLabels["k8s-app"] != rt.expected {
t.Errorf( t.Errorf(