Make intergration test helper public.

This was done in the master branch in https://github.com/kubernetes/kubernetes/pull/69902. The pull includes many other changes, so we made this targeted patch.

Make intergration test helper public.
18162da0 · Chao Xu · 9dfdb6a2 · 18162da0 · 18162da0 · 18162da0
Commit 18162da0 authored Feb 15, 2019 by Chao Xu
4 changed files
--- a/test/integration/examples/BUILD
+++ b/test/integration/examples/BUILD
@@ -11,7 +11,6 @@ go_test(
    srcs = [
        "apiserver_test.go",
        "main_test.go",
-        "setup_test.go",
        "webhook_test.go",
    ],
    tags = ["integration"],
@@ -43,7 +42,6 @@ go_test(
        "//staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1beta1:go_default_library",
        "//staging/src/k8s.io/sample-apiserver/pkg/cmd/server:go_default_library",
        "//test/integration/framework:go_default_library",
-        "//vendor/github.com/pborman/uuid:go_default_library",
        "//vendor/github.com/stretchr/testify/assert:go_default_library",
    ],
 )

--- a/test/integration/examples/webhook_test.go
+++ b/test/integration/examples/webhook_test.go
@@ -30,6 +30,7 @@ import (
 	"k8s.io/kubernetes/cmd/kube-apiserver/app/options"
 	"k8s.io/kubernetes/pkg/master"
 	"k8s.io/kubernetes/pkg/master/reconcilers"
+	"k8s.io/kubernetes/test/integration/framework"
 )

 func TestWebhookLoopback(t *testing.T) {
@@ -40,7 +41,7 @@ func TestWebhookLoopback(t *testing.T) {

 	called := int32(0)

-	client, _ := startTestServer(t, stopCh, TestServerSetup{
+	client, _ := framework.StartTestServer(t, stopCh, framework.TestServerSetup{
 		ModifyServerRunOptions: func(opts *options.ServerRunOptions) {
 		},
 		ModifyServerConfig: func(config *master.Config) {

--- a/test/integration/framework/BUILD
+++ b/test/integration/framework/BUILD
@@ -12,6 +12,7 @@ go_library(
        "master_utils.go",
        "perf_utils.go",
        "serializer.go",
+        "test_server.go",
        "util.go",
    ],
    data = [
@@ -19,6 +20,8 @@ go_library(
    ],
    importpath = "k8s.io/kubernetes/test/integration/framework",
    deps = [
+        "//cmd/kube-apiserver/app:go_default_library",
+        "//cmd/kube-apiserver/app/options:go_default_library",
        "//pkg/api/legacyscheme:go_default_library",
        "//pkg/api/testapi:go_default_library",
        "//pkg/apis/batch:go_default_library",
@@ -57,6 +60,7 @@ go_library(
        "//staging/src/k8s.io/client-go/informers:go_default_library",
        "//staging/src/k8s.io/client-go/kubernetes:go_default_library",
        "//staging/src/k8s.io/client-go/rest:go_default_library",
+        "//staging/src/k8s.io/client-go/util/cert:go_default_library",
        "//test/e2e/framework:go_default_library",
        "//test/utils:go_default_library",
        "//vendor/github.com/go-openapi/spec:go_default_library",

--- a/test/integration/examples/setup_test.go
+++ b/test/integration/examples/setup_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-package apiserver
+package framework

 import (
 	"io/ioutil"
@@ -36,7 +36,6 @@ import (
 	"k8s.io/kubernetes/cmd/kube-apiserver/app"
 	"k8s.io/kubernetes/cmd/kube-apiserver/app/options"
 	"k8s.io/kubernetes/pkg/master"
-	"k8s.io/kubernetes/test/integration/framework"
 )

 type TestServerSetup struct {
@@ -45,7 +44,7 @@ type TestServerSetup struct {
 }

 // startTestServer runs a kube-apiserver, optionally calling out to the setup.ModifyServerRunOptions and setup.ModifyServerConfig functions
-func startTestServer(t *testing.T, stopCh <-chan struct{}, setup TestServerSetup) (client.Interface, *rest.Config) {
+func StartTestServer(t *testing.T, stopCh <-chan struct{}, setup TestServerSetup) (client.Interface, *rest.Config) {
 	certDir, _ := ioutil.TempDir("", "test-integration-"+t.Name())
 	go func() {
 		<-stopCh
@@ -89,7 +88,7 @@ func startTestServer(t *testing.T, stopCh <-chan struct{}, setup TestServerSetup
 	kubeAPIServerOptions.SecureServing.ServerCert.CertDirectory = certDir
 	kubeAPIServerOptions.InsecureServing.BindPort = 0
 	kubeAPIServerOptions.Etcd.StorageConfig.Prefix = path.Join("/", uuid.New(), "registry")
-	kubeAPIServerOptions.Etcd.StorageConfig.ServerList = []string{framework.GetEtcdURL()}
+	kubeAPIServerOptions.Etcd.StorageConfig.ServerList = []string{GetEtcdURL()}
 	kubeAPIServerOptions.ServiceClusterIPRange = *defaultServiceClusterIPRange
 	kubeAPIServerOptions.Authentication.RequestHeader.UsernameHeaders = []string{"X-Remote-User"}
 	kubeAPIServerOptions.Authentication.RequestHeader.GroupHeaders = []string{"X-Remote-Group"}