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

test/integration: Rename masterConfig to instanceConfig

Browse Source
This commit is contained in:
Mengjiao Liu 2021-06-08 17:21:47 +08:00
parent ac5535c949
commit 257b494478
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/integration/apiserver/apiserver_test.go
View File

@ -226,10 +226,10 @@ func Test4xxStatusCodeInvalidPatch(t *testing.T) {
func TestCacheControl(t *testing.T) { func TestCacheControl(t *testing.T) {
controlPlaneConfig := framework.NewIntegrationTestControlPlaneConfigWithOptions(&framework.ControlPlaneConfigOptions{}) controlPlaneConfig := framework.NewIntegrationTestControlPlaneConfigWithOptions(&framework.ControlPlaneConfigOptions{})
controlPlaneConfig.GenericConfig.OpenAPIConfig = framework.DefaultOpenAPIConfig() controlPlaneConfig.GenericConfig.OpenAPIConfig = framework.DefaultOpenAPIConfig()
master, _, closeFn := framework.RunAnAPIServer(controlPlaneConfig) instanceConfig, _, closeFn := framework.RunAnAPIServer(controlPlaneConfig)
defer closeFn() defer closeFn()
rt, err := restclient.TransportFor(master.GenericAPIServer.LoopbackClientConfig) rt, err := restclient.TransportFor(instanceConfig.GenericAPIServer.LoopbackClientConfig)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -253,7 +253,7 @@ func TestCacheControl(t *testing.T) {
} }
for _, path := range paths { for _, path := range paths {
t.Run(path, func(t *testing.T) { t.Run(path, func(t *testing.T) {
req, err := http.NewRequest("GET", master.GenericAPIServer.LoopbackClientConfig.Host+path, nil) req, err := http.NewRequest("GET", instanceConfig.GenericAPIServer.LoopbackClientConfig.Host+path, nil)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

8
test/integration/apiserver/apply/apply_test.go
View File

@ -2825,8 +2825,8 @@ func TestStopTrackingManagedFieldsOnFeatureDisabled(t *testing.T) {
controlPlaneConfig.GenericConfig.OpenAPIConfig = framework.DefaultOpenAPIConfig() controlPlaneConfig.GenericConfig.OpenAPIConfig = framework.DefaultOpenAPIConfig()
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)()
_, master, closeFn := framework.RunAnAPIServer(controlPlaneConfig) _, instanceConfig, closeFn := framework.RunAnAPIServer(controlPlaneConfig)
client, err := clientset.NewForConfig(&restclient.Config{Host: master.URL, QPS: -1}) client, err := clientset.NewForConfig(&restclient.Config{Host: instanceConfig.URL, QPS: -1})
if err != nil { if err != nil {
t.Fatalf("Error in create clientset: %v", err) t.Fatalf("Error in create clientset: %v", err)
} }
@ -2878,8 +2878,8 @@ spec:
// Restart server with server-side apply disabled // Restart server with server-side apply disabled
closeFn() closeFn()
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, false)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, false)()
_, master, closeFn = framework.RunAnAPIServer(controlPlaneConfig) _, instanceConfig, closeFn = framework.RunAnAPIServer(controlPlaneConfig)
client, err = clientset.NewForConfig(&restclient.Config{Host: master.URL, QPS: -1}) client, err = clientset.NewForConfig(&restclient.Config{Host: instanceConfig.URL, QPS: -1})
if err != nil { if err != nil {
t.Fatalf("Error in create clientset: %v", err) t.Fatalf("Error in create clientset: %v", err)
} }

6
test/integration/auth/svcaccttoken_test.go
View File

@ -119,16 +119,16 @@ func TestServiceAccountTokenCreate(t *testing.T) {
controlPlaneConfig.ExtraConfig.ServiceAccountJWKSURI = "" controlPlaneConfig.ExtraConfig.ServiceAccountJWKSURI = ""
controlPlaneConfig.ExtraConfig.ServiceAccountPublicKeys = []interface{}{&pk} controlPlaneConfig.ExtraConfig.ServiceAccountPublicKeys = []interface{}{&pk}
master, _, closeFn := framework.RunAnAPIServer(controlPlaneConfig) instanceConfig, _, closeFn := framework.RunAnAPIServer(controlPlaneConfig)
defer closeFn() defer closeFn()
cs, err := clientset.NewForConfig(master.GenericAPIServer.LoopbackClientConfig) cs, err := clientset.NewForConfig(instanceConfig.GenericAPIServer.LoopbackClientConfig)
if err != nil { if err != nil {
t.Fatalf("err: %v", err) t.Fatalf("err: %v", err)
} }
*gcs = *cs *gcs = *cs
rc, err := rest.UnversionedRESTClientFor(master.GenericAPIServer.LoopbackClientConfig) rc, err := rest.UnversionedRESTClientFor(instanceConfig.GenericAPIServer.LoopbackClientConfig)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

4
test/integration/framework/master_utils.go
View File

@ -59,10 +59,10 @@ import (
kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" kubeletclient "k8s.io/kubernetes/pkg/kubelet/client"
) )
// Config is a struct of configuration directives for NewMasterComponents. // Config is a struct of configuration directives for NewControlPlaneComponents.
type Config struct { type Config struct {
// If nil, a default is used, partially filled configs will not get populated. // If nil, a default is used, partially filled configs will not get populated.
MasterConfig *controlplane.Config InstanceConfig *controlplane.Config
StartReplicationManager bool StartReplicationManager bool
// Client throttling qps // Client throttling qps
QPS float32 QPS float32