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/e2e/framework/BUILD
View File

@@ -127,7 +127,6 @@ go_library(
"//staging/src/k8s.io/client-go/util/retry:go_default_library",
"//staging/src/k8s.io/component-base/cli/flag:go_default_library",
"//staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset:go_default_library",
"//staging/src/k8s.io/node-api/pkg/client/clientset/versioned:go_default_library",
"//test/e2e/framework/ginkgowrapper:go_default_library",
"//test/e2e/framework/metrics:go_default_library",
"//test/e2e/framework/testfiles:go_default_library",

3
test/e2e/framework/framework.go
View File

@@ -51,7 +51,6 @@ import (
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
"k8s.io/kubernetes/test/e2e/framework/metrics"
testutils "k8s.io/kubernetes/test/utils"
nodeapiclient "k8s.io/node-api/pkg/client/clientset/versioned"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
@@ -77,7 +76,6 @@ type Framework struct {
ClientSet clientset.Interface
KubemarkExternalClusterClientSet clientset.Interface
APIExtensionsClientSet apiextensionsclient.Interface
NodeAPIClientSet nodeapiclient.Interface
InternalClientset *internalclientset.Clientset
AggregatorClient *aggregatorclient.Clientset
@@ -195,7 +193,6 @@ func (f *Framework) BeforeEach() {
// node.k8s.io is based on CRD, which is served only as JSON
jsonConfig := config
jsonConfig.ContentType = "application/json"
f.NodeAPIClientSet, err = nodeapiclient.NewForConfig(jsonConfig)
ExpectNoError(err)
// create scales getter, set GroupVersion and NegotiatedSerializer to default values

1
test/e2e/node/BUILD
View File

@@ -34,7 +34,6 @@ go_library(
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/fields:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",

63
test/e2e/node/runtimeclass.go
View File

@@ -24,7 +24,6 @@ import (
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/fields"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/kubernetes/pkg/kubelet/events"
runtimeclasstest "k8s.io/kubernetes/pkg/kubelet/runtimeclass/testing"
@@ -35,16 +34,6 @@ import (
. "github.com/onsi/ginkgo"
)
const runtimeClassCRDName = "runtimeclasses.node.k8s.io"
var (
runtimeClassGVR = schema.GroupVersionResource{
Group: "node.k8s.io",
Version: "v1alpha1",
Resource: "runtimeclasses",
}
)
var _ = SIGDescribe("RuntimeClass [Feature:RuntimeClass]", func() {
f := framework.NewDefaultFramework("runtimeclass")
@@ -69,7 +58,7 @@ var _ = SIGDescribe("RuntimeClass [Feature:RuntimeClass]", func() {
It("should reject a Pod requesting a deleted RuntimeClass", func() {
rcName := createRuntimeClass(f, "delete-me", "")
rcClient := f.NodeAPIClientSet.NodeV1alpha1().RuntimeClasses()
rcClient := f.ClientSet.NodeV1beta1().RuntimeClasses()
By("Deleting RuntimeClass "+rcName, func() {
err := rcClient.Delete(rcName, nil)
@@ -92,54 +81,6 @@ var _ = SIGDescribe("RuntimeClass [Feature:RuntimeClass]", func() {
expectSandboxFailureEvent(f, pod, fmt.Sprintf("\"%s\" not found", rcName))
})
It("should recover when the RuntimeClass CRD is deleted [Slow]", func() {
By("Deleting the RuntimeClass CRD", func() {
crds := f.APIExtensionsClientSet.ApiextensionsV1beta1().CustomResourceDefinitions()
runtimeClassCRD, err := crds.Get(runtimeClassCRDName, metav1.GetOptions{})
framework.ExpectNoError(err, "failed to get RuntimeClass CRD %s", runtimeClassCRDName)
runtimeClassCRDUID := runtimeClassCRD.GetUID()
err = crds.Delete(runtimeClassCRDName, nil)
framework.ExpectNoError(err, "failed to delete RuntimeClass CRD %s", runtimeClassCRDName)
By("Waiting for the CRD to disappear")
framework.ExpectNoError(wait.PollImmediate(framework.Poll, time.Minute, func() (bool, error) {
crd, err := crds.Get(runtimeClassCRDName, metav1.GetOptions{})
if errors.IsNotFound(err) {
return true, nil // done
}
if err != nil {
return true, err // stop wait with error
}
// If the UID changed, that means the addon manager has already recreated it.
return crd.GetUID() != runtimeClassCRDUID, nil
}))
By("Waiting for the CRD to be recreated")
framework.ExpectNoError(wait.PollImmediate(framework.Poll, 5*time.Minute, func() (bool, error) {
crd, err := crds.Get(runtimeClassCRDName, metav1.GetOptions{})
if errors.IsNotFound(err) {
return false, nil // still not recreated
}
if err != nil {
return true, err // stop wait with error
}
if crd.GetUID() == runtimeClassCRDUID {
return true, fmt.Errorf("RuntimeClass CRD never deleted") // this shouldn't happen
}
return true, nil
}))
})
rcName := createRuntimeClass(f, "valid", "")
pod := createRuntimeClassPod(f, rcName)
// Before the pod can be run, the RuntimeClass informer must time out, by which time the Kubelet
// will probably be in a backoff state, so the pod can take a long time to start.
framework.ExpectNoError(framework.WaitForPodSuccessInNamespaceSlow(
f.ClientSet, pod.Name, f.Namespace.Name))
})
// TODO(tallclair): Test an actual configured non-default runtimeHandler.
})
@@ -148,7 +89,7 @@ var _ = SIGDescribe("RuntimeClass [Feature:RuntimeClass]", func() {
func createRuntimeClass(f *framework.Framework, name, handler string) string {
uniqueName := fmt.Sprintf("%s-%s", f.Namespace.Name, name)
rc := runtimeclasstest.NewRuntimeClass(uniqueName, handler)
rc, err := f.NodeAPIClientSet.NodeV1alpha1().RuntimeClasses().Create(rc)
rc, err := f.ClientSet.NodeV1beta1().RuntimeClasses().Create(rc)
framework.ExpectNoError(err, "failed to create RuntimeClass resource")
return rc.GetName()
}

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()