github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #74433 from tallclair/runtimeclass-internal

Browse Source 
Migrate RuntimeClass from a CRD to an internal API
This commit is contained in:
Kubernetes Prow Robot
2019-03-07 21:19:30 -08:00
committed by GitHub
parent ad27abde62 428e9fa329
commit 183e6cc190
151 changed files with 7749 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/integration/apiserver/BUILD
View File

@@ -34,6 +34,7 @@ go_test(
"//staging/src/k8s.io/api/batch/v2alpha1:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library",
"//staging/src/k8s.io/api/extensions/v1beta1:go_default_library",
"//staging/src/k8s.io/api/node/v1alpha1:go_default_library",
"//staging/src/k8s.io/api/rbac/v1alpha1:go_default_library",
"//staging/src/k8s.io/api/scheduling/v1beta1:go_default_library",
"//staging/src/k8s.io/api/settings/v1alpha1:go_default_library",

2
test/integration/apiserver/print_test.go
View File

@@ -31,6 +31,7 @@ import (
auditregv1alpha1 "k8s.io/api/auditregistration/v1alpha1"
batchv2alpha1 "k8s.io/api/batch/v2alpha1"
extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
nodev1alpha1 "k8s.io/api/node/v1alpha1"
rbacv1alpha1 "k8s.io/api/rbac/v1alpha1"
schedulerapi "k8s.io/api/scheduling/v1beta1"
settingsv1alpha1 "k8s.io/api/settings/v1alpha1"
@@ -150,6 +151,7 @@ func TestServerSidePrint(t *testing.T) {
appsv1beta1.SchemeGroupVersion,
appsv1beta2.SchemeGroupVersion,
extensionsv1beta1.SchemeGroupVersion,
nodev1alpha1.SchemeGroupVersion,
},
[]schema.GroupVersionResource{
extensionsv1beta1.SchemeGroupVersion.WithResource("daemonsets"),

15
test/integration/etcd/data.go
View File

@@ -485,6 +485,21 @@ func GetEtcdStorageData() map[schema.GroupVersionResource]StorageData {
ExpectedEtcdPath: "/registry/auditsinks/sink1",
},
// --
// k8s.io/kubernetes/pkg/apis/node/v1alpha1
gvr("node.k8s.io", "v1alpha1", "runtimeclasses"): {
Stub: `{"metadata": {"name": "rc1"}, "spec": {"runtimeHandler": "h1"}}`,
ExpectedEtcdPath: "/registry/runtimeclasses/rc1",
ExpectedGVK: gvkP("node.k8s.io", "v1beta1", "RuntimeClass"),
},
// --
// k8s.io/kubernetes/pkg/apis/node/v1beta1
gvr("node.k8s.io", "v1beta1", "runtimeclasses"): {
Stub: `{"metadata": {"name": "rc2"}, "handler": "h2"}`,
ExpectedEtcdPath: "/registry/runtimeclasses/rc2",
},
// --
}
// k8s.io/kubernetes/pkg/apis/storage/v1beta1

1
test/integration/framework/BUILD
View File

@@ -37,6 +37,7 @@ go_library(
"//staging/src/k8s.io/api/certificates/v1beta1:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library",
"//staging/src/k8s.io/api/extensions/v1beta1:go_default_library",
"//staging/src/k8s.io/api/node/v1alpha1:go_default_library",
"//staging/src/k8s.io/api/rbac/v1alpha1:go_default_library",
"//staging/src/k8s.io/api/storage/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library",

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

@@ -33,6 +33,7 @@ import (
certificates "k8s.io/api/certificates/v1beta1"
"k8s.io/api/core/v1"
extensions "k8s.io/api/extensions/v1beta1"
nodev1alpha1 "k8s.io/api/node/v1alpha1"
rbac "k8s.io/api/rbac/v1alpha1"
storage "k8s.io/api/storage/v1"
"k8s.io/apimachinery/pkg/runtime"
@@ -311,6 +312,10 @@ func NewMasterConfig() *master.Config {
schema.GroupResource{Group: auditreg.GroupName, Resource: serverstorage.AllResources},
"",
ns)
storageFactory.SetSerializer(
schema.GroupResource{Group: nodev1alpha1.GroupName, Resource: serverstorage.AllResources},
"",
ns)
genericConfig := genericapiserver.NewConfig(legacyscheme.Codecs)
kubeVersion := version.Get()