From d87d3ff9caa89d4e4f7b6a0a49d536368bc5d9bf Mon Sep 17 00:00:00 2001 From: Derek McQuay Date: Thu, 1 Dec 2016 09:56:39 -0800 Subject: [PATCH] kubeadm: updated pkg node tests to correct types updated pkg "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" to "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" because the type that bootstrap.go:126 checkAPIEndpoint requires changed as well as *internalversion.CertificatesClient in csr_test.go:69 --- cmd/kubeadm/app/node/BUILD | 4 ++-- cmd/kubeadm/app/node/bootstrap_test.go | 2 +- cmd/kubeadm/app/node/csr_test.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/kubeadm/app/node/BUILD b/cmd/kubeadm/app/node/BUILD index b0acdc30986..3b8d4cf0698 100644 --- a/cmd/kubeadm/app/node/BUILD +++ b/cmd/kubeadm/app/node/BUILD @@ -46,8 +46,8 @@ go_test( deps = [ "//cmd/kubeadm/app/apis/kubeadm:go_default_library", "//pkg/api/unversioned:go_default_library", - "//pkg/client/clientset_generated/internalclientset:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion:go_default_library", + "//pkg/client/clientset_generated/release_1_5:go_default_library", + "//pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/typed/discovery:go_default_library", "//pkg/version:go_default_library", diff --git a/cmd/kubeadm/app/node/bootstrap_test.go b/cmd/kubeadm/app/node/bootstrap_test.go index 2f3922e9813..b410b3a8125 100644 --- a/cmd/kubeadm/app/node/bootstrap_test.go +++ b/cmd/kubeadm/app/node/bootstrap_test.go @@ -24,7 +24,7 @@ import ( kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" "k8s.io/kubernetes/pkg/api/unversioned" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/typed/discovery" "k8s.io/kubernetes/pkg/version" diff --git a/cmd/kubeadm/app/node/csr_test.go b/cmd/kubeadm/app/node/csr_test.go index 34c014a48b7..f9c26ead288 100644 --- a/cmd/kubeadm/app/node/csr_test.go +++ b/cmd/kubeadm/app/node/csr_test.go @@ -22,7 +22,7 @@ import ( "net/http/httptest" "testing" - certclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion" + certclient "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1" restclient "k8s.io/kubernetes/pkg/client/restclient" )