Skip to content

Commit e1fc73d

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#130325 from pohly/test-integration-apiserver-defaults
test/integration: use default API groups in test apiserver
2 parents 81f03c2 + 56bd8d8 commit e1fc73d

22 files changed

+102
-65
lines changed

‎cmd/kube-apiserver/app/testing/testserver.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,6 @@ func StartTestServer(t ktesting.TB, instanceOptions *TestServerInstanceOptions,
339339

340340
s.ServiceClusterIPRanges = "10.0.0.0/16"
341341
s.Etcd.StorageConfig = *storageConfig
342-
s.APIEnablement.RuntimeConfig.Set("api/all=true")
343342

344343
if err := fs.Parse(customFlags); err != nil {
345344
return result, err

‎test/integration/apiserver/apiserver_test.go‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import (
3434
"time"
3535

3636
admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
37+
admissionregistrationv1beta1 "k8s.io/api/admissionregistration/v1beta1"
3738
apps "k8s.io/api/apps/v1"
3839
v1 "k8s.io/api/core/v1"
3940
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
@@ -1683,12 +1684,14 @@ func TestGetScaleSubresourceAsTableForAllBuiltins(t *testing.T) {
16831684
// KUBE_APISERVER_SERVE_REMOVED_APIS_FOR_ONE_RELEASE allows for APIs pending removal to not block tests
16841685
t.Setenv("KUBE_APISERVER_SERVE_REMOVED_APIS_FOR_ONE_RELEASE", "true")
16851686

1686-
// Enable all features for testing
1687+
// Enable all features and apis for testing
1688+
flags := framework.DefaultTestServerFlags()
1689+
flags = append(flags, "--runtime-config=api/all=true")
16871690
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, "AllAlpha", true)
16881691
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, "AllBeta", true)
16891692

16901693
testNamespace := "test-scale"
1691-
server := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd())
1694+
server := kubeapiservertesting.StartTestServerOrDie(t, nil, flags, framework.SharedEtcd())
16921695
defer server.TearDownFn()
16931696

16941697
clientset := clientset.NewForConfigOrDie(server.ClientConfig)
@@ -3199,7 +3202,7 @@ func TestEmulatedStorageVersion(t *testing.T) {
31993202
for emulatedVersion, cases := range groupedCases {
32003203
t.Run(emulatedVersion, func(t *testing.T) {
32013204
server := kubeapiservertesting.StartTestServerOrDie(
3202-
t, nil, []string{"--emulated-version=kube=" + emulatedVersion, `--storage-media-type=application/json`}, framework.SharedEtcd())
3205+
t, nil, []string{"--emulated-version=kube=" + emulatedVersion, `--storage-media-type=application/json`, fmt.Sprintf("--runtime-config=%s=true", admissionregistrationv1beta1.SchemeGroupVersion)}, framework.SharedEtcd())
32033206
defer server.TearDownFn()
32043207

32053208
client := clientset.NewForConfigOrDie(server.ClientConfig)
@@ -3340,7 +3343,7 @@ func TestEnableEmulationVersion(t *testing.T) {
33403343
featuregatetesting.SetFeatureGateEmulationVersionDuringTest(t, utilfeature.DefaultFeatureGate, version.MustParse("1.32"))
33413344
server := kubeapiservertesting.StartTestServerOrDie(t,
33423345
&kubeapiservertesting.TestServerInstanceOptions{BinaryVersion: "1.32"},
3343-
[]string{"--emulated-version=kube=1.31"}, framework.SharedEtcd())
3346+
[]string{"--emulated-version=kube=1.31", "--runtime-config=api/beta=true"}, framework.SharedEtcd())
33443347
defer server.TearDownFn()
33453348

33463349
rt, err := restclient.TransportFor(server.ClientConfig)

‎test/integration/apiserver/cel/authorizerselector/helper.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func RunAuthzSelectorsLibraryTests(t *testing.T, featureEnabled bool) {
4949
// Start the server with the desired feature enablement
5050
server, err := apiservertesting.StartTestServer(t, nil, []string{
5151
fmt.Sprintf("--feature-gates=AuthorizeNodeWithSelectors=%v,AuthorizeWithSelectors=%v", featureEnabled, featureEnabled),
52-
"--runtime-config=resource.k8s.io/v1alpha3=true",
52+
fmt.Sprintf("--runtime-config=%s=true", resourceapi.SchemeGroupVersion),
5353
}, framework.SharedEtcd())
5454
if err != nil {
5555
t.Fatal(err)

‎test/integration/apiserver/cel/mutatingadmissionpolicy_test.go‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ import (
2020
"context"
2121
"errors"
2222
"fmt"
23-
"github.com/google/go-cmp/cmp/cmpopts"
2423
"reflect"
2524
"strings"
2625
"testing"
2726
"time"
2827

2928
"github.com/google/go-cmp/cmp"
29+
"github.com/google/go-cmp/cmp/cmpopts"
3030
"github.com/stretchr/testify/require"
3131

3232
admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
@@ -493,7 +493,8 @@ func TestMutatingAdmissionPolicy(t *testing.T) {
493493

494494
// Run all tests in a shared apiserver
495495
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.MutatingAdmissionPolicy, true)
496-
server, err := apiservertesting.StartTestServer(t, nil, nil, framework.SharedEtcd())
496+
flags := []string{fmt.Sprintf("--runtime-config=%s=true", v1alpha1.SchemeGroupVersion)}
497+
server, err := apiservertesting.StartTestServer(t, nil, flags, framework.SharedEtcd())
497498
require.NoError(t, err)
498499
defer server.TearDownFn()
499500

@@ -1006,7 +1007,8 @@ func TestMutatingAdmissionPolicy_Slow(t *testing.T) {
10061007
for _, tc := range cases {
10071008
t.Run(tc.name, func(t *testing.T) {
10081009
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.MutatingAdmissionPolicy, true)
1009-
server, err := apiservertesting.StartTestServer(t, nil, nil, framework.SharedEtcd())
1010+
flags := []string{fmt.Sprintf("--runtime-config=%s=true", v1alpha1.SchemeGroupVersion)}
1011+
server, err := apiservertesting.StartTestServer(t, nil, flags, framework.SharedEtcd())
10101012
require.NoError(t, err)
10111013
defer server.TearDownFn()
10121014

@@ -1091,7 +1093,8 @@ func TestMutatingAdmissionPolicy_Slow(t *testing.T) {
10911093
// tested.
10921094
func Test_MutatingAdmissionPolicy_CustomResources(t *testing.T) {
10931095
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.MutatingAdmissionPolicy, true)
1094-
server, err := apiservertesting.StartTestServer(t, nil, nil, framework.SharedEtcd())
1096+
flags := []string{fmt.Sprintf("--runtime-config=%s=true", v1alpha1.SchemeGroupVersion)}
1097+
server, err := apiservertesting.StartTestServer(t, nil, flags, framework.SharedEtcd())
10951098
etcd.CreateTestCRDs(t, apiextensions.NewForConfigOrDie(server.ClientConfig), false, versionedCustomResourceDefinition())
10961099
if err != nil {
10971100
t.Fatal(err)

‎test/integration/apiserver/coordinated_leader_election_test.go‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ import (
4444
func TestSingleLeaseCandidate(t *testing.T) {
4545
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.CoordinatedLeaderElection, true)
4646

47-
server, err := apiservertesting.StartTestServer(t, apiservertesting.NewDefaultTestServerOptions(), nil, framework.SharedEtcd())
47+
flags := []string{fmt.Sprintf("--runtime-config=%s=true", v1alpha2.SchemeGroupVersion)}
48+
server, err := apiservertesting.StartTestServer(t, apiservertesting.NewDefaultTestServerOptions(), flags, framework.SharedEtcd())
4849
if err != nil {
4950
t.Fatal(err)
5051
}
@@ -62,7 +63,8 @@ func TestSingleLeaseCandidate(t *testing.T) {
6263
func TestMultipleLeaseCandidate(t *testing.T) {
6364
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.CoordinatedLeaderElection, true)
6465

65-
server, err := apiservertesting.StartTestServer(t, apiservertesting.NewDefaultTestServerOptions(), nil, framework.SharedEtcd())
66+
flags := []string{fmt.Sprintf("--runtime-config=%s=true", v1alpha2.SchemeGroupVersion)}
67+
server, err := apiservertesting.StartTestServer(t, apiservertesting.NewDefaultTestServerOptions(), flags, framework.SharedEtcd())
6668
if err != nil {
6769
t.Fatal(err)
6870
}
@@ -84,7 +86,8 @@ func TestMultipleLeaseCandidate(t *testing.T) {
8486
func TestLeaseSwapIfBetterAvailable(t *testing.T) {
8587
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.CoordinatedLeaderElection, true)
8688

87-
server, err := apiservertesting.StartTestServer(t, apiservertesting.NewDefaultTestServerOptions(), nil, framework.SharedEtcd())
89+
flags := []string{fmt.Sprintf("--runtime-config=%s=true", v1alpha2.SchemeGroupVersion)}
90+
server, err := apiservertesting.StartTestServer(t, apiservertesting.NewDefaultTestServerOptions(), flags, framework.SharedEtcd())
8891
if err != nil {
8992
t.Fatal(err)
9093
}
@@ -105,7 +108,8 @@ func TestLeaseSwapIfBetterAvailable(t *testing.T) {
105108
func TestUpgradeSkew(t *testing.T) {
106109
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.CoordinatedLeaderElection, true)
107110

108-
server, err := apiservertesting.StartTestServer(t, apiservertesting.NewDefaultTestServerOptions(), nil, framework.SharedEtcd())
111+
flags := []string{fmt.Sprintf("--runtime-config=%s=true", v1alpha2.SchemeGroupVersion)}
112+
server, err := apiservertesting.StartTestServer(t, apiservertesting.NewDefaultTestServerOptions(), flags, framework.SharedEtcd())
109113
if err != nil {
110114
t.Fatal(err)
111115
}
@@ -134,7 +138,8 @@ func TestLeaseCandidateCleanup(t *testing.T) {
134138
apiserver.LeaseCandidateGCPeriod = 30 * time.Minute
135139
}()
136140

137-
server, err := apiservertesting.StartTestServer(t, apiservertesting.NewDefaultTestServerOptions(), nil, framework.SharedEtcd())
141+
flags := []string{fmt.Sprintf("--runtime-config=%s=true", v1alpha2.SchemeGroupVersion)}
142+
server, err := apiservertesting.StartTestServer(t, apiservertesting.NewDefaultTestServerOptions(), flags, framework.SharedEtcd())
138143
if err != nil {
139144
t.Fatal(err)
140145
}

‎test/integration/apiserver/peerproxy/peer_proxy_test.go‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package peerproxy
1818

1919
import (
2020
"context"
21-
"fmt"
2221
"testing"
2322
"time"
2423

@@ -77,7 +76,7 @@ func TestPeerProxiedRequest(t *testing.T) {
7776
serverA := kastesting.StartTestServerOrDie(t, &kastesting.TestServerInstanceOptions{
7877
EnableCertAuth: true,
7978
ProxyCA: &proxyCA},
80-
[]string{}, etcd)
79+
[]string{"--runtime-config=api/all=true"}, etcd)
8180
t.Cleanup(serverA.TearDownFn)
8281

8382
// start another test server with some api disabled
@@ -86,7 +85,7 @@ func TestPeerProxiedRequest(t *testing.T) {
8685
serverB := kastesting.StartTestServerOrDie(t, &kastesting.TestServerInstanceOptions{
8786
EnableCertAuth: true,
8887
ProxyCA: &proxyCA},
89-
[]string{fmt.Sprintf("--runtime-config=%s", "batch/v1=false")}, etcd)
88+
[]string{"--runtime-config=api/all=true,batch/v1=false"}, etcd)
9089
t.Cleanup(serverB.TearDownFn)
9190

9291
kubeClientSetA, err := kubernetes.NewForConfig(serverA.ClientConfig)
@@ -144,7 +143,7 @@ func TestPeerProxiedRequestToThirdServerAfterFirstDies(t *testing.T) {
144143
// override hostname to ensure unique ips
145144
server.SetHostnameFuncForTests("test-server-a")
146145
t.Log("starting apiserver for ServerA")
147-
serverA := kastesting.StartTestServerOrDie(t, &kastesting.TestServerInstanceOptions{EnableCertAuth: true, ProxyCA: &proxyCA}, []string{}, etcd)
146+
serverA := kastesting.StartTestServerOrDie(t, &kastesting.TestServerInstanceOptions{EnableCertAuth: true, ProxyCA: &proxyCA}, []string{"--runtime-config=api/all=true"}, etcd)
148147
kubeClientSetA, err := kubernetes.NewForConfig(serverA.ClientConfig)
149148
require.NoError(t, err)
150149
// ensure storageversion garbage collector ctlr is set up
@@ -160,7 +159,7 @@ func TestPeerProxiedRequestToThirdServerAfterFirstDies(t *testing.T) {
160159
server.SetHostnameFuncForTests("test-server-b")
161160
t.Log("starting apiserver for ServerB")
162161
serverB := kastesting.StartTestServerOrDie(t, &kastesting.TestServerInstanceOptions{EnableCertAuth: true, ProxyCA: &proxyCA}, []string{
163-
fmt.Sprintf("--runtime-config=%v", "batch/v1=false")}, etcd)
162+
"--runtime-config=api/all=true,batch/v1=false"}, etcd)
164163
t.Cleanup(serverB.TearDownFn)
165164
kubeClientSetB, err := kubernetes.NewForConfig(serverB.ClientConfig)
166165
require.NoError(t, err)
@@ -172,7 +171,7 @@ func TestPeerProxiedRequestToThirdServerAfterFirstDies(t *testing.T) {
172171
// override hostname to ensure unique ips
173172
server.SetHostnameFuncForTests("test-server-c")
174173
t.Log("starting apiserver for ServerC")
175-
serverC := kastesting.StartTestServerOrDie(t, &kastesting.TestServerInstanceOptions{EnableCertAuth: true, ProxyCA: &proxyCA}, []string{}, etcd)
174+
serverC := kastesting.StartTestServerOrDie(t, &kastesting.TestServerInstanceOptions{EnableCertAuth: true, ProxyCA: &proxyCA}, []string{"--runtime-config=api/all=true"}, etcd)
176175
t.Cleanup(serverC.TearDownFn)
177176

178177
// create jobs resource using serverA

‎test/integration/client/metrics/metrics_test.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@ func TestAPIServerTransportMetrics(t *testing.T) {
5050
// reset default registry metrics
5151
legacyregistry.Reset()
5252

53-
result := kubeapiservertesting.StartTestServerOrDie(t, nil, framework.DefaultTestServerFlags(), framework.SharedEtcd())
53+
flags := framework.DefaultTestServerFlags()
54+
flags = append(flags, "--runtime-config=api/all=true,api/beta=true")
55+
result := kubeapiservertesting.StartTestServerOrDie(t, nil, flags, framework.SharedEtcd())
5456
defer result.TearDownFn()
5557

5658
client := clientset.NewForConfigOrDie(result.ClientConfig)

‎test/integration/clustertrustbundles/admission_establishtrust_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"context"
2121
"crypto/x509"
2222
"crypto/x509/pkix"
23+
"fmt"
2324
"math/big"
2425
"testing"
2526

@@ -77,7 +78,7 @@ func TestCTBAttestPlugin(t *testing.T) {
7778
t.Run(tc.description, func(t *testing.T) {
7879
ctx := context.Background()
7980

80-
server := kubeapiservertesting.StartTestServerOrDie(t, nil, []string{"--authorization-mode=RBAC", "--feature-gates=ClusterTrustBundle=true"}, framework.SharedEtcd())
81+
server := kubeapiservertesting.StartTestServerOrDie(t, nil, []string{"--authorization-mode=RBAC", "--feature-gates=ClusterTrustBundle=true", fmt.Sprintf("--runtime-config=%s=true", certsv1alpha1.SchemeGroupVersion)}, framework.SharedEtcd())
8182
defer server.TearDownFn()
8283

8384
client := kubernetes.NewForConfigOrDie(server.ClientConfig)

‎test/integration/clustertrustbundles/apiserversigner_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ func TestClusterTrustBundlesPublisherController(t *testing.T) {
7373
"--disable-admission-plugins", "ServiceAccount",
7474
"--authorization-mode=RBAC",
7575
"--feature-gates", "ClusterTrustBundle=true",
76+
fmt.Sprintf("--runtime-config=%s=true", v1alpha1.SchemeGroupVersion),
7677
}
7778
storageConfig := framework.SharedEtcd()
7879
server := kubeapiservertesting.StartTestServerOrDie(t, nil, apiServerFlags, storageConfig)

‎test/integration/clustertrustbundles/field_selector_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"context"
2121
"crypto/x509"
2222
"crypto/x509/pkix"
23+
"fmt"
2324
"math/big"
2425
"testing"
2526

@@ -37,7 +38,7 @@ func TestCTBSignerNameFieldSelector(t *testing.T) {
3738

3839
ctx := context.Background()
3940

40-
server := kubeapiservertesting.StartTestServerOrDie(t, nil, []string{"--feature-gates=ClusterTrustBundle=true"}, framework.SharedEtcd())
41+
server := kubeapiservertesting.StartTestServerOrDie(t, nil, []string{"--feature-gates=ClusterTrustBundle=true", fmt.Sprintf("--runtime-config=%s=true", certsv1alpha1.SchemeGroupVersion)}, framework.SharedEtcd())
4142
defer server.TearDownFn()
4243

4344
client := kubernetes.NewForConfigOrDie(server.ClientConfig)

0 commit comments

Comments
 (0)