From 96406b915d3ceb3731553988ddb0b7a272353a0d Mon Sep 17 00:00:00 2001 From: Mengjiao Liu Date: Wed, 7 Jul 2021 15:39:59 +0800 Subject: [PATCH] Clean up the remaining master names in test/integration --- test/integration/controlplane/kube_apiserver_test.go | 2 +- test/integration/etcd/server.go | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/integration/controlplane/kube_apiserver_test.go b/test/integration/controlplane/kube_apiserver_test.go index 3c6d07e081b..d3e7d00bdab 100644 --- a/test/integration/controlplane/kube_apiserver_test.go +++ b/test/integration/controlplane/kube_apiserver_test.go @@ -551,7 +551,7 @@ func TestMultiAPIServerNodePortAllocation(t *testing.T) { // create 2 api servers and 2 clients for i := 0; i < 2; i++ { - // start master count api server + // start count api server t.Logf("starting api server: %d", i) server := kubeapiservertesting.StartTestServerOrDie(t, instanceOptions, []string{ "--advertise-address", fmt.Sprintf("10.0.1.%v", i+1), diff --git a/test/integration/etcd/server.go b/test/integration/etcd/server.go index 8e74cfe08ce..6760c4d6702 100644 --- a/test/integration/etcd/server.go +++ b/test/integration/etcd/server.go @@ -62,7 +62,7 @@ AwEHoUQDQgAEH6cuzP8XuD5wal6wf9M6xDljTOPLX2i8uIp/C/ASqiIGUeeKQtX0 -----END EC PRIVATE KEY-----` // StartRealAPIServerOrDie starts an API server that is appropriate for use in tests that require one of every resource -func StartRealAPIServerOrDie(t *testing.T, configFuncs ...func(*options.ServerRunOptions)) *Master { +func StartRealAPIServerOrDie(t *testing.T, configFuncs ...func(*options.ServerRunOptions)) *APIServer { certDir, err := ioutil.TempDir("", t.Name()) if err != nil { t.Fatal(err) @@ -125,7 +125,7 @@ func StartRealAPIServerOrDie(t *testing.T, configFuncs ...func(*options.ServerRu } // then build and use an etcd lock - // this prevents more than one of these masters from running at the same time + // this prevents more than one of these api servers from running at the same time lock := concurrency.NewLocker(session, "kube_integration_etcd_raw") lock.Lock() @@ -217,7 +217,7 @@ func StartRealAPIServerOrDie(t *testing.T, configFuncs ...func(*options.ServerRu } } - return &Master{ + return &APIServer{ Client: kubeClient, Dynamic: dynamic.NewForConfigOrDie(kubeClientConfig), Config: kubeClientConfig, @@ -228,9 +228,9 @@ func StartRealAPIServerOrDie(t *testing.T, configFuncs ...func(*options.ServerRu } } -// Master represents a running API server that is ready for use +// APIServer represents a running API server that is ready for use // The Cleanup func must be deferred to prevent resource leaks -type Master struct { +type APIServer struct { Client clientset.Interface Dynamic dynamic.Interface Config *restclient.Config