From 0dc0659e07e743c605d4fd2e2a66d2bf3342b57b Mon Sep 17 00:00:00 2001 From: yuexiao-wang Date: Mon, 3 Dec 2018 18:22:53 +0800 Subject: [PATCH] move test utilites out of /test Signed-off-by: yuexiao-wang --- cmd/kubeadm/app/cmd/alpha/BUILD | 2 +- cmd/kubeadm/app/cmd/alpha/certs_test.go | 2 +- cmd/kubeadm/app/cmd/phases/BUILD | 2 +- cmd/kubeadm/app/cmd/phases/certs_test.go | 2 +- cmd/kubeadm/app/phases/certs/BUILD | 2 +- cmd/kubeadm/app/phases/certs/certs_test.go | 2 +- cmd/kubeadm/app/phases/certs/renewal/BUILD | 2 +- cmd/kubeadm/app/phases/certs/renewal/renewal_test.go | 2 +- cmd/kubeadm/app/phases/kubeconfig/BUILD | 2 +- cmd/kubeadm/app/phases/kubeconfig/kubeconfig_test.go | 2 +- cmd/kubeadm/app/phases/upgrade/BUILD | 2 +- cmd/kubeadm/app/phases/upgrade/staticpods_test.go | 2 +- cmd/kubeadm/app/util/BUILD | 1 + cmd/kubeadm/{test => app/util}/certs/BUILD | 2 +- cmd/kubeadm/{test => app/util}/certs/util.go | 0 cmd/kubeadm/test/BUILD | 3 +-- cmd/kubeadm/test/kubeconfig/BUILD | 2 +- cmd/kubeadm/test/kubeconfig/util.go | 2 +- cmd/kubeadm/test/util.go | 2 +- 19 files changed, 18 insertions(+), 18 deletions(-) rename cmd/kubeadm/{test => app/util}/certs/BUILD (89%) rename cmd/kubeadm/{test => app/util}/certs/util.go (100%) diff --git a/cmd/kubeadm/app/cmd/alpha/BUILD b/cmd/kubeadm/app/cmd/alpha/BUILD index 1e2b35048c..2046387f56 100644 --- a/cmd/kubeadm/app/cmd/alpha/BUILD +++ b/cmd/kubeadm/app/cmd/alpha/BUILD @@ -63,9 +63,9 @@ go_test( deps = [ "//cmd/kubeadm/app/constants:go_default_library", "//cmd/kubeadm/app/phases/certs:go_default_library", + "//cmd/kubeadm/app/util/certs:go_default_library", "//cmd/kubeadm/app/util/pkiutil:go_default_library", "//cmd/kubeadm/test:go_default_library", - "//cmd/kubeadm/test/certs:go_default_library", "//cmd/kubeadm/test/cmd:go_default_library", "//cmd/kubeadm/test/kubeconfig:go_default_library", "//staging/src/k8s.io/client-go/tools/clientcmd:go_default_library", diff --git a/cmd/kubeadm/app/cmd/alpha/certs_test.go b/cmd/kubeadm/app/cmd/alpha/certs_test.go index 47798fd76c..9e184a3509 100644 --- a/cmd/kubeadm/app/cmd/alpha/certs_test.go +++ b/cmd/kubeadm/app/cmd/alpha/certs_test.go @@ -31,9 +31,9 @@ import ( "github.com/spf13/cobra" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" "k8s.io/kubernetes/cmd/kubeadm/app/phases/certs" + certstestutil "k8s.io/kubernetes/cmd/kubeadm/app/util/certs" "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" testutil "k8s.io/kubernetes/cmd/kubeadm/test" - certstestutil "k8s.io/kubernetes/cmd/kubeadm/test/certs" cmdtestutil "k8s.io/kubernetes/cmd/kubeadm/test/cmd" ) diff --git a/cmd/kubeadm/app/cmd/phases/BUILD b/cmd/kubeadm/app/cmd/phases/BUILD index 08d6431656..302ac06721 100644 --- a/cmd/kubeadm/app/cmd/phases/BUILD +++ b/cmd/kubeadm/app/cmd/phases/BUILD @@ -71,9 +71,9 @@ go_test( "//cmd/kubeadm/app/apis/kubeadm/v1beta1:go_default_library", "//cmd/kubeadm/app/cmd/phases/workflow:go_default_library", "//cmd/kubeadm/app/phases/certs:go_default_library", + "//cmd/kubeadm/app/util/certs:go_default_library", "//cmd/kubeadm/app/util/pkiutil:go_default_library", "//cmd/kubeadm/test:go_default_library", - "//cmd/kubeadm/test/certs:go_default_library", "//pkg/version:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", ], diff --git a/cmd/kubeadm/app/cmd/phases/certs_test.go b/cmd/kubeadm/app/cmd/phases/certs_test.go index 3e9c49d8d6..f72208c5f3 100644 --- a/cmd/kubeadm/app/cmd/phases/certs_test.go +++ b/cmd/kubeadm/app/cmd/phases/certs_test.go @@ -24,9 +24,9 @@ import ( kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/workflow" "k8s.io/kubernetes/cmd/kubeadm/app/phases/certs" + certstestutil "k8s.io/kubernetes/cmd/kubeadm/app/util/certs" "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" testutil "k8s.io/kubernetes/cmd/kubeadm/test" - certstestutil "k8s.io/kubernetes/cmd/kubeadm/test/certs" ) type testCertsData struct { diff --git a/cmd/kubeadm/app/phases/certs/BUILD b/cmd/kubeadm/app/phases/certs/BUILD index a138ced2e8..c8a637aa15 100644 --- a/cmd/kubeadm/app/phases/certs/BUILD +++ b/cmd/kubeadm/app/phases/certs/BUILD @@ -16,9 +16,9 @@ go_test( deps = [ "//cmd/kubeadm/app/apis/kubeadm:go_default_library", "//cmd/kubeadm/app/constants:go_default_library", + "//cmd/kubeadm/app/util/certs:go_default_library", "//cmd/kubeadm/app/util/pkiutil:go_default_library", "//cmd/kubeadm/test:go_default_library", - "//cmd/kubeadm/test/certs:go_default_library", "//staging/src/k8s.io/client-go/util/cert:go_default_library", "//vendor/github.com/pkg/errors:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library", diff --git a/cmd/kubeadm/app/phases/certs/certs_test.go b/cmd/kubeadm/app/phases/certs/certs_test.go index d13416f317..f83437de1f 100644 --- a/cmd/kubeadm/app/phases/certs/certs_test.go +++ b/cmd/kubeadm/app/phases/certs/certs_test.go @@ -32,9 +32,9 @@ import ( certutil "k8s.io/client-go/util/cert" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" + certstestutil "k8s.io/kubernetes/cmd/kubeadm/app/util/certs" "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" testutil "k8s.io/kubernetes/cmd/kubeadm/test" - certstestutil "k8s.io/kubernetes/cmd/kubeadm/test/certs" ) func createTestCSR(t *testing.T) (*x509.CertificateRequest, *rsa.PrivateKey) { diff --git a/cmd/kubeadm/app/phases/certs/renewal/BUILD b/cmd/kubeadm/app/phases/certs/renewal/BUILD index 6172ca4837..98da00fd17 100644 --- a/cmd/kubeadm/app/phases/certs/renewal/BUILD +++ b/cmd/kubeadm/app/phases/certs/renewal/BUILD @@ -31,9 +31,9 @@ go_test( embed = [":go_default_library"], deps = [ "//cmd/kubeadm/app/phases/certs:go_default_library", + "//cmd/kubeadm/app/util/certs:go_default_library", "//cmd/kubeadm/app/util/pkiutil:go_default_library", "//cmd/kubeadm/test:go_default_library", - "//cmd/kubeadm/test/certs:go_default_library", "//staging/src/k8s.io/api/certificates/v1beta1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", diff --git a/cmd/kubeadm/app/phases/certs/renewal/renewal_test.go b/cmd/kubeadm/app/phases/certs/renewal/renewal_test.go index 6b24c6f060..199127862c 100644 --- a/cmd/kubeadm/app/phases/certs/renewal/renewal_test.go +++ b/cmd/kubeadm/app/phases/certs/renewal/renewal_test.go @@ -33,9 +33,9 @@ import ( k8stesting "k8s.io/client-go/testing" certutil "k8s.io/client-go/util/cert" "k8s.io/kubernetes/cmd/kubeadm/app/phases/certs" + certtestutil "k8s.io/kubernetes/cmd/kubeadm/app/util/certs" "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" testutil "k8s.io/kubernetes/cmd/kubeadm/test" - certtestutil "k8s.io/kubernetes/cmd/kubeadm/test/certs" ) func TestRenewImplementations(t *testing.T) { diff --git a/cmd/kubeadm/app/phases/kubeconfig/BUILD b/cmd/kubeadm/app/phases/kubeconfig/BUILD index c23e735b97..8df7d1038e 100644 --- a/cmd/kubeadm/app/phases/kubeconfig/BUILD +++ b/cmd/kubeadm/app/phases/kubeconfig/BUILD @@ -48,9 +48,9 @@ go_test( "//cmd/kubeadm/app/apis/kubeadm:go_default_library", "//cmd/kubeadm/app/constants:go_default_library", "//cmd/kubeadm/app/util:go_default_library", + "//cmd/kubeadm/app/util/certs:go_default_library", "//cmd/kubeadm/app/util/pkiutil:go_default_library", "//cmd/kubeadm/test:go_default_library", - "//cmd/kubeadm/test/certs:go_default_library", "//cmd/kubeadm/test/kubeconfig:go_default_library", "//staging/src/k8s.io/client-go/tools/clientcmd:go_default_library", "//staging/src/k8s.io/client-go/tools/clientcmd/api:go_default_library", diff --git a/cmd/kubeadm/app/phases/kubeconfig/kubeconfig_test.go b/cmd/kubeadm/app/phases/kubeconfig/kubeconfig_test.go index 8416c672fc..2d278d990f 100644 --- a/cmd/kubeadm/app/phases/kubeconfig/kubeconfig_test.go +++ b/cmd/kubeadm/app/phases/kubeconfig/kubeconfig_test.go @@ -34,9 +34,9 @@ import ( kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" + certstestutil "k8s.io/kubernetes/cmd/kubeadm/app/util/certs" pkiutil "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" testutil "k8s.io/kubernetes/cmd/kubeadm/test" - certstestutil "k8s.io/kubernetes/cmd/kubeadm/test/certs" kubeconfigtestutil "k8s.io/kubernetes/cmd/kubeadm/test/kubeconfig" ) diff --git a/cmd/kubeadm/app/phases/upgrade/BUILD b/cmd/kubeadm/app/phases/upgrade/BUILD index d804a9e2e7..ffaae1e84c 100644 --- a/cmd/kubeadm/app/phases/upgrade/BUILD +++ b/cmd/kubeadm/app/phases/upgrade/BUILD @@ -82,11 +82,11 @@ go_test( "//cmd/kubeadm/app/phases/controlplane:go_default_library", "//cmd/kubeadm/app/phases/etcd:go_default_library", "//cmd/kubeadm/app/util/apiclient:go_default_library", + "//cmd/kubeadm/app/util/certs:go_default_library", "//cmd/kubeadm/app/util/config:go_default_library", "//cmd/kubeadm/app/util/etcd:go_default_library", "//cmd/kubeadm/app/util/pkiutil:go_default_library", "//cmd/kubeadm/test:go_default_library", - "//cmd/kubeadm/test/certs:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/cmd/kubeadm/app/phases/upgrade/staticpods_test.go b/cmd/kubeadm/app/phases/upgrade/staticpods_test.go index 9f58c369da..270a6f6964 100644 --- a/cmd/kubeadm/app/phases/upgrade/staticpods_test.go +++ b/cmd/kubeadm/app/phases/upgrade/staticpods_test.go @@ -38,11 +38,11 @@ import ( controlplanephase "k8s.io/kubernetes/cmd/kubeadm/app/phases/controlplane" etcdphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/etcd" "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" + certstestutil "k8s.io/kubernetes/cmd/kubeadm/app/util/certs" configutil "k8s.io/kubernetes/cmd/kubeadm/app/util/config" etcdutil "k8s.io/kubernetes/cmd/kubeadm/app/util/etcd" "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" testutil "k8s.io/kubernetes/cmd/kubeadm/test" - certstestutil "k8s.io/kubernetes/cmd/kubeadm/test/certs" ) const ( diff --git a/cmd/kubeadm/app/util/BUILD b/cmd/kubeadm/app/util/BUILD index becafa093b..7356f887c0 100644 --- a/cmd/kubeadm/app/util/BUILD +++ b/cmd/kubeadm/app/util/BUILD @@ -80,6 +80,7 @@ filegroup( ":package-srcs", "//cmd/kubeadm/app/util/apiclient:all-srcs", "//cmd/kubeadm/app/util/audit:all-srcs", + "//cmd/kubeadm/app/util/certs:all-srcs", "//cmd/kubeadm/app/util/config:all-srcs", "//cmd/kubeadm/app/util/dryrun:all-srcs", "//cmd/kubeadm/app/util/etcd:all-srcs", diff --git a/cmd/kubeadm/test/certs/BUILD b/cmd/kubeadm/app/util/certs/BUILD similarity index 89% rename from cmd/kubeadm/test/certs/BUILD rename to cmd/kubeadm/app/util/certs/BUILD index 2bd48fc0e1..d3007e29a7 100644 --- a/cmd/kubeadm/test/certs/BUILD +++ b/cmd/kubeadm/app/util/certs/BUILD @@ -8,7 +8,7 @@ load( go_library( name = "go_default_library", srcs = ["util.go"], - importpath = "k8s.io/kubernetes/cmd/kubeadm/test/certs", + importpath = "k8s.io/kubernetes/cmd/kubeadm/app/util/certs", deps = [ "//cmd/kubeadm/app/util/pkiutil:go_default_library", "//staging/src/k8s.io/client-go/util/cert:go_default_library", diff --git a/cmd/kubeadm/test/certs/util.go b/cmd/kubeadm/app/util/certs/util.go similarity index 100% rename from cmd/kubeadm/test/certs/util.go rename to cmd/kubeadm/app/util/certs/util.go diff --git a/cmd/kubeadm/test/BUILD b/cmd/kubeadm/test/BUILD index 2c6fc05940..53a4ff8911 100644 --- a/cmd/kubeadm/test/BUILD +++ b/cmd/kubeadm/test/BUILD @@ -13,9 +13,9 @@ go_library( "//cmd/kubeadm/app/apis/kubeadm:go_default_library", "//cmd/kubeadm/app/apis/kubeadm/v1beta1:go_default_library", "//cmd/kubeadm/app/constants:go_default_library", + "//cmd/kubeadm/app/util/certs:go_default_library", "//cmd/kubeadm/app/util/config:go_default_library", "//cmd/kubeadm/app/util/pkiutil:go_default_library", - "//cmd/kubeadm/test/certs:go_default_library", "//vendor/github.com/renstrom/dedent:go_default_library", ], ) @@ -31,7 +31,6 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//cmd/kubeadm/test/certs:all-srcs", "//cmd/kubeadm/test/cmd:all-srcs", "//cmd/kubeadm/test/kubeconfig:all-srcs", ], diff --git a/cmd/kubeadm/test/kubeconfig/BUILD b/cmd/kubeadm/test/kubeconfig/BUILD index 7b6e9eeba1..792e593e13 100644 --- a/cmd/kubeadm/test/kubeconfig/BUILD +++ b/cmd/kubeadm/test/kubeconfig/BUILD @@ -10,7 +10,7 @@ go_library( srcs = ["util.go"], importpath = "k8s.io/kubernetes/cmd/kubeadm/test/kubeconfig", deps = [ - "//cmd/kubeadm/test/certs:go_default_library", + "//cmd/kubeadm/app/util/certs:go_default_library", "//staging/src/k8s.io/client-go/tools/clientcmd/api:go_default_library", ], ) diff --git a/cmd/kubeadm/test/kubeconfig/util.go b/cmd/kubeadm/test/kubeconfig/util.go index daad689228..51092a79d7 100644 --- a/cmd/kubeadm/test/kubeconfig/util.go +++ b/cmd/kubeadm/test/kubeconfig/util.go @@ -22,7 +22,7 @@ import ( "testing" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" - certstestutil "k8s.io/kubernetes/cmd/kubeadm/test/certs" + certstestutil "k8s.io/kubernetes/cmd/kubeadm/app/util/certs" ) // AssertKubeConfigCurrentCluster is a utility function for kubeadm testing that asserts if the CurrentCluster in diff --git a/cmd/kubeadm/test/util.go b/cmd/kubeadm/test/util.go index 471aa7633e..e54dde5857 100644 --- a/cmd/kubeadm/test/util.go +++ b/cmd/kubeadm/test/util.go @@ -28,9 +28,9 @@ import ( kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmapiv1beta1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta1" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" + certtestutil "k8s.io/kubernetes/cmd/kubeadm/app/util/certs" configutil "k8s.io/kubernetes/cmd/kubeadm/app/util/config" "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" - certtestutil "k8s.io/kubernetes/cmd/kubeadm/test/certs" ) // SetupTempDir is a utility function for kubeadm testing, that creates a temporary directory