Skip to content

Commit b64075d

Browse files
liggittliggitt
committed
explicitly enable apps/v1beta1, apps/v1beta2, extensions/v1beta1 for print,etcd,storage tests
1 parent 4fc63fd commit b64075d

File tree

8 files changed

+61
-16
lines changed

8 files changed

+61
-16
lines changed

‎hack/update-openapi-spec.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ kube::log::status "Starting kube-apiserver"
6666
--etcd-servers="http://${ETCD_HOST}:${ETCD_PORT}" \
6767
--advertise-address="10.10.10.10" \
6868
--cert-dir="${TMP_DIR}/certs" \
69-
--runtime-config="api/all=true" \
69+
--runtime-config="api/all=true,extensions/v1beta1/daemonsets=true,extensions/v1beta1/deployments=true,extensions/v1beta1/replicasets=true,extensions/v1beta1/networkpolicies=true,extensions/v1beta1/podsecuritypolicies=true,extensions/v1beta1/replicationcontrollers=true" \
7070
--token-auth-file="${TMP_DIR}/tokenauth.csv" \
7171
--logtostderr \
7272
--v=2 \

‎test/integration/apiserver/BUILD‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,12 @@ go_test(
2525
"//pkg/printers:go_default_library",
2626
"//pkg/printers/internalversion:go_default_library",
2727
"//staging/src/k8s.io/api/apps/v1:go_default_library",
28+
"//staging/src/k8s.io/api/apps/v1beta1:go_default_library",
29+
"//staging/src/k8s.io/api/apps/v1beta2:go_default_library",
2830
"//staging/src/k8s.io/api/auditregistration/v1alpha1:go_default_library",
2931
"//staging/src/k8s.io/api/batch/v2alpha1:go_default_library",
3032
"//staging/src/k8s.io/api/core/v1:go_default_library",
33+
"//staging/src/k8s.io/api/extensions/v1beta1:go_default_library",
3134
"//staging/src/k8s.io/api/rbac/v1alpha1:go_default_library",
3235
"//staging/src/k8s.io/api/scheduling/v1beta1:go_default_library",
3336
"//staging/src/k8s.io/api/settings/v1alpha1:go_default_library",

‎test/integration/apiserver/apiserver_test.go‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,15 @@ import (
4545
)
4646

4747
func setup(t *testing.T, groupVersions ...schema.GroupVersion) (*httptest.Server, clientset.Interface, framework.CloseFunc) {
48+
return setupWithResources(t, groupVersions, nil)
49+
}
50+
51+
func setupWithResources(t *testing.T, groupVersions []schema.GroupVersion, resources []schema.GroupVersionResource) (*httptest.Server, clientset.Interface, framework.CloseFunc) {
4852
masterConfig := framework.NewIntegrationTestMasterConfig()
49-
if len(groupVersions) > 0 {
53+
if len(groupVersions) > 0 || len(resources) > 0 {
5054
resourceConfig := master.DefaultAPIResourceConfigSource()
5155
resourceConfig.EnableVersions(groupVersions...)
56+
resourceConfig.EnableResources(resources...)
5257
masterConfig.ExtraConfig.APIResourceConfigSource = resourceConfig
5358
}
5459
_, s, closeFn := framework.RunAMaster(masterConfig)

‎test/integration/apiserver/print_test.go‎

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,19 @@ import (
2626
"testing"
2727
"time"
2828

29+
appsv1beta1 "k8s.io/api/apps/v1beta1"
30+
appsv1beta2 "k8s.io/api/apps/v1beta2"
2931
auditregv1alpha1 "k8s.io/api/auditregistration/v1alpha1"
3032
batchv2alpha1 "k8s.io/api/batch/v2alpha1"
33+
extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
3134
rbacv1alpha1 "k8s.io/api/rbac/v1alpha1"
3235
schedulerapi "k8s.io/api/scheduling/v1beta1"
3336
settingsv1alpha1 "k8s.io/api/settings/v1alpha1"
3437
storagev1alpha1 "k8s.io/api/storage/v1alpha1"
3538
"k8s.io/apimachinery/pkg/api/meta"
3639
metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1"
3740
"k8s.io/apimachinery/pkg/runtime"
41+
"k8s.io/apimachinery/pkg/runtime/schema"
3842
"k8s.io/cli-runtime/pkg/genericclioptions"
3943
"k8s.io/client-go/discovery"
4044
"k8s.io/client-go/tools/clientcmd"
@@ -131,14 +135,27 @@ var missingHanlders = sets.NewString(
131135
)
132136

133137
func TestServerSidePrint(t *testing.T) {
134-
s, _, closeFn := setup(t,
138+
s, _, closeFn := setupWithResources(t,
135139
// additional groupversions needed for the test to run
136-
auditregv1alpha1.SchemeGroupVersion,
137-
batchv2alpha1.SchemeGroupVersion,
138-
rbacv1alpha1.SchemeGroupVersion,
139-
settingsv1alpha1.SchemeGroupVersion,
140-
schedulerapi.SchemeGroupVersion,
141-
storagev1alpha1.SchemeGroupVersion)
140+
[]schema.GroupVersion{
141+
auditregv1alpha1.SchemeGroupVersion,
142+
batchv2alpha1.SchemeGroupVersion,
143+
rbacv1alpha1.SchemeGroupVersion,
144+
settingsv1alpha1.SchemeGroupVersion,
145+
schedulerapi.SchemeGroupVersion,
146+
storagev1alpha1.SchemeGroupVersion,
147+
appsv1beta1.SchemeGroupVersion,
148+
appsv1beta2.SchemeGroupVersion,
149+
extensionsv1beta1.SchemeGroupVersion,
150+
},
151+
[]schema.GroupVersionResource{
152+
extensionsv1beta1.SchemeGroupVersion.WithResource("daemonsets"),
153+
extensionsv1beta1.SchemeGroupVersion.WithResource("deployments"),
154+
extensionsv1beta1.SchemeGroupVersion.WithResource("networkpolicies"),
155+
extensionsv1beta1.SchemeGroupVersion.WithResource("podsecuritypolicies"),
156+
extensionsv1beta1.SchemeGroupVersion.WithResource("replicasets"),
157+
},
158+
)
142159
defer closeFn()
143160

144161
ns := framework.CreateTestingNamespace("server-print", s, t)

‎test/integration/etcd/BUILD‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ go_test(
1515
"integration",
1616
],
1717
deps = [
18+
"//cmd/kube-apiserver/app/options:go_default_library",
1819
"//staging/src/k8s.io/api/core/v1:go_default_library",
1920
"//staging/src/k8s.io/apimachinery/pkg/api/equality:go_default_library",
2021
"//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library",

‎test/integration/etcd/etcd_storage_path_test.go‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import (
3535
"k8s.io/apimachinery/pkg/util/diff"
3636
"k8s.io/apimachinery/pkg/util/sets"
3737
"k8s.io/client-go/dynamic"
38+
"k8s.io/kubernetes/cmd/kube-apiserver/app/options"
3839
)
3940

4041
// Only add kinds to this list when this a virtual resource with get and create verbs that doesn't actually
@@ -49,7 +50,15 @@ const testNamespace = "etcdstoragepathtestnamespace"
4950
// It will also fail when a type gets moved to a different location. Be very careful in this situation because
5051
// it essentially means that you will be break old clusters unless you create some migration path for the old data.
5152
func TestEtcdStoragePath(t *testing.T) {
52-
master := StartRealMasterOrDie(t)
53+
master := StartRealMasterOrDie(t, func(opts *options.ServerRunOptions) {
54+
// force enable all resources so we can check storage.
55+
// TODO: drop these once we stop allowing them to be served.
56+
opts.APIEnablement.RuntimeConfig["extensions/v1beta1/deployments"] = "true"
57+
opts.APIEnablement.RuntimeConfig["extensions/v1beta1/daemonsets"] = "true"
58+
opts.APIEnablement.RuntimeConfig["extensions/v1beta1/replicasets"] = "true"
59+
opts.APIEnablement.RuntimeConfig["extensions/v1beta1/podsecuritypolicies"] = "true"
60+
opts.APIEnablement.RuntimeConfig["extensions/v1beta1/networkpolicies"] = "true"
61+
})
5362
defer master.Cleanup()
5463
defer dumpEtcdKVOnFailure(t, master.KV)
5564

‎test/integration/etcd/server.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ import (
5454
)
5555

5656
// StartRealMasterOrDie starts an API master that is appropriate for use in tests that require one of every resource
57-
func StartRealMasterOrDie(t *testing.T) *Master {
57+
func StartRealMasterOrDie(t *testing.T, configFuncs ...func(*options.ServerRunOptions)) *Master {
5858
certDir, err := ioutil.TempDir("", t.Name())
5959
if err != nil {
6060
t.Fatal(err)
@@ -79,13 +79,14 @@ func StartRealMasterOrDie(t *testing.T) *Master {
7979
kubeAPIServerOptions.ServiceClusterIPRange = *defaultServiceClusterIPRange
8080
kubeAPIServerOptions.Authorization.Modes = []string{"RBAC"}
8181
kubeAPIServerOptions.Admission.GenericAdmission.DisablePlugins = []string{"ServiceAccount"}
82+
kubeAPIServerOptions.APIEnablement.RuntimeConfig["api/all"] = "true"
83+
for _, f := range configFuncs {
84+
f(kubeAPIServerOptions)
85+
}
8286
completedOptions, err := app.Complete(kubeAPIServerOptions)
8387
if err != nil {
8488
t.Fatal(err)
8589
}
86-
if err := completedOptions.APIEnablement.RuntimeConfig.Set("api/all=true"); err != nil {
87-
t.Fatal(err)
88-
}
8990

9091
// get etcd client before starting API server
9192
rawClient, kvClient, err := integration.GetEtcdClients(completedOptions.Etcd.StorageConfig.Transport)

‎test/integration/scale/scale_test.go‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,11 @@ func TestMain(m *testing.M) {
5252
}
5353

5454
func TestScaleSubresources(t *testing.T) {
55-
clientSet, tearDown := setup(t)
55+
clientSet, tearDown := setupWithOptions(t, nil, []string{
56+
"--runtime-config",
57+
// TODO(liggitt): remove these once apps/v1beta1, apps/v1beta2, and extensions/v1beta1 can no longer be served
58+
"api/all=true,extensions/v1beta1/deployments=true,extensions/v1beta1/replicationcontrollers=true,extensions/v1beta1/replicasets=true",
59+
})
5660
defer tearDown()
5761

5862
resourceLists, err := clientSet.Discovery().ServerResources()
@@ -63,6 +67,7 @@ func TestScaleSubresources(t *testing.T) {
6367
expectedScaleSubresources := map[schema.GroupVersionResource]schema.GroupVersionKind{
6468
makeGVR("", "v1", "replicationcontrollers/scale"): makeGVK("autoscaling", "v1", "Scale"),
6569

70+
// TODO(liggitt): remove these once apps/v1beta1, apps/v1beta2, and extensions/v1beta1 can no longer be served
6671
makeGVR("extensions", "v1beta1", "deployments/scale"): makeGVK("extensions", "v1beta1", "Scale"),
6772
makeGVR("extensions", "v1beta1", "replicationcontrollers/scale"): makeGVK("extensions", "v1beta1", "Scale"),
6873
makeGVR("extensions", "v1beta1", "replicasets/scale"): makeGVK("extensions", "v1beta1", "Scale"),
@@ -215,7 +220,11 @@ var (
215220
)
216221

217222
func setup(t *testing.T) (client kubernetes.Interface, tearDown func()) {
218-
result := apitesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd())
223+
return setupWithOptions(t, nil, nil)
224+
}
225+
226+
func setupWithOptions(t *testing.T, instanceOptions *apitesting.TestServerInstanceOptions, flags []string) (client kubernetes.Interface, tearDown func()) {
227+
result := apitesting.StartTestServerOrDie(t, instanceOptions, flags, framework.SharedEtcd())
219228

220229
// TODO: Disable logging here until we resolve teardown issues which result in
221230
// massive log spam. Another path forward would be to refactor

0 commit comments

Comments
 (0)