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

Clean shutdown of openapi integration tests

Browse Source
This commit is contained in:
Wojciech Tyczyński 2022-06-15 14:23:24 +02:00
parent b1e2af45e4
commit 57242e3cbb
2 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/integration/apiserver/openapi/openapi_test.go
View File

@ -28,6 +28,7 @@ import (
featuregatetesting "k8s.io/component-base/featuregate/testing" featuregatetesting "k8s.io/component-base/featuregate/testing"
"k8s.io/kube-openapi/pkg/common" "k8s.io/kube-openapi/pkg/common"
"k8s.io/kube-openapi/pkg/validation/spec" "k8s.io/kube-openapi/pkg/validation/spec"
"k8s.io/kubernetes/pkg/controlplane"
generated "k8s.io/kubernetes/pkg/generated/openapi" generated "k8s.io/kubernetes/pkg/generated/openapi"
"k8s.io/kubernetes/test/integration/framework" "k8s.io/kubernetes/test/integration/framework"
) )
@ -55,9 +56,7 @@ func TestEnablingOpenAPIEnumTypes(t *testing.T) {
t.Run(tc.name, func(t *testing.T) { t.Run(tc.name, func(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.OpenAPIEnums, tc.featureEnabled)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.OpenAPIEnums, tc.featureEnabled)()
controlPlaneConfig := framework.NewIntegrationTestControlPlaneConfigWithOptions(&framework.ControlPlaneConfigOptions{}) getDefinitionsFn := openapi.GetOpenAPIDefinitionsWithoutDisabledFeatures(func(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition {
controlPlaneConfig.GenericConfig.OpenAPIConfig = framework.DefaultOpenAPIConfig()
controlPlaneConfig.GenericConfig.OpenAPIConfig.GetDefinitions = openapi.GetOpenAPIDefinitionsWithoutDisabledFeatures(func(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition {
defs := generated.GetOpenAPIDefinitions(ref) defs := generated.GetOpenAPIDefinitions(ref)
def := defs[typeToAddEnum] def := defs[typeToAddEnum]
// replace protocol to add the would-be enum field. // replace protocol to add the would-be enum field.
@ -74,15 +73,20 @@ func TestEnablingOpenAPIEnumTypes(t *testing.T) {
return defs return defs
}) })
instanceConfig, _, closeFn := framework.RunAnAPIServer(controlPlaneConfig) _, kubeConfig, tearDownFn := framework.StartTestServer(t, framework.TestServerSetup{
defer closeFn() ModifyServerConfig: func(config *controlplane.Config) {
config.GenericConfig.OpenAPIConfig = framework.DefaultOpenAPIConfig()
config.GenericConfig.OpenAPIConfig.GetDefinitions = getDefinitionsFn
},
})
defer tearDownFn()
rt, err := restclient.TransportFor(instanceConfig.GenericAPIServer.LoopbackClientConfig) rt, err := restclient.TransportFor(kubeConfig)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
req, err := http.NewRequest("GET", instanceConfig.GenericAPIServer.LoopbackClientConfig.Host+"/openapi/v2", nil) req, err := http.NewRequest("GET", kubeConfig.Host+"/openapi/v2", nil)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

28
test/integration/apiserver/openapi/openapiv3_test.go
View File

@ -46,11 +46,10 @@ import (
func TestOpenAPIV3SpecRoundTrip(t *testing.T) { func TestOpenAPIV3SpecRoundTrip(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.OpenAPIV3, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.OpenAPIV3, true)()
controlPlaneConfig := framework.NewIntegrationTestControlPlaneConfigWithOptions(&framework.ControlPlaneConfigOptions{})
controlPlaneConfig.GenericConfig.OpenAPIConfig = framework.DefaultOpenAPIConfig() _, kubeConfig, tearDownFn := framework.StartTestServer(t, framework.TestServerSetup{})
controlPlaneConfig.GenericConfig.OpenAPIV3Config = framework.DefaultOpenAPIV3Config() defer tearDownFn()
instanceConfig, _, closeFn := framework.RunAnAPIServer(controlPlaneConfig)
defer closeFn()
paths := []string{ paths := []string{
"/apis/apps/v1", "/apis/apps/v1",
"/apis/authentication.k8s.io/v1", "/apis/authentication.k8s.io/v1",
@ -60,12 +59,12 @@ func TestOpenAPIV3SpecRoundTrip(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) {
rt, err := restclient.TransportFor(instanceConfig.GenericAPIServer.LoopbackClientConfig) rt, err := restclient.TransportFor(kubeConfig)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
// attempt to fetch and unmarshal // attempt to fetch and unmarshal
url := instanceConfig.GenericAPIServer.LoopbackClientConfig.Host + "/openapi/v3" + path url := kubeConfig.Host + "/openapi/v3" + path
req, err := http.NewRequest("GET", url, nil) req, err := http.NewRequest("GET", url, nil)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -191,17 +190,16 @@ func TestOpenAPIV3ProtoRoundtrip(t *testing.T) {
// See https://github.com/kubernetes/kubernetes/issues/106387 for more details // See https://github.com/kubernetes/kubernetes/issues/106387 for more details
t.Skip("Skipping OpenAPI V3 Proto roundtrip test") t.Skip("Skipping OpenAPI V3 Proto roundtrip test")
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.OpenAPIV3, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.OpenAPIV3, true)()
controlPlaneConfig := framework.NewIntegrationTestControlPlaneConfigWithOptions(&framework.ControlPlaneConfigOptions{})
controlPlaneConfig.GenericConfig.OpenAPIConfig = framework.DefaultOpenAPIConfig() _, kubeConfig, tearDownFn := framework.StartTestServer(t, framework.TestServerSetup{})
controlPlaneConfig.GenericConfig.OpenAPIV3Config = framework.DefaultOpenAPIV3Config() defer tearDownFn()
instanceConfig, _, closeFn := framework.RunAnAPIServer(controlPlaneConfig)
defer closeFn() rt, err := restclient.TransportFor(kubeConfig)
rt, err := restclient.TransportFor(instanceConfig.GenericAPIServer.LoopbackClientConfig)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
// attempt to fetch and unmarshal // attempt to fetch and unmarshal
req, err := http.NewRequest("GET", instanceConfig.GenericAPIServer.LoopbackClientConfig.Host+"/openapi/v3/apis/apps/v1", nil) req, err := http.NewRequest("GET", kubeConfig.Host+"/openapi/v3/apis/apps/v1", nil)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -220,7 +218,7 @@ func TestOpenAPIV3ProtoRoundtrip(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
protoReq, err := http.NewRequest("GET", instanceConfig.GenericAPIServer.LoopbackClientConfig.Host+"/openapi/v3/apis/apps/v1", nil) protoReq, err := http.NewRequest("GET", kubeConfig.Host+"/openapi/v3/apis/apps/v1", nil)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }