github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 15:58:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #84942 from oomichi/fix-nodev1beta1

Browse Source 
Fix the import aliase nodev1beta1
This commit is contained in:
Kubernetes Prow Robot 2019-11-07 23:52:58 -08:00 committed by GitHub
commit 55962eaaaa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,7 @@ import (
"fmt" "fmt"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
"k8s.io/api/node/v1beta1" nodev1beta1 "k8s.io/api/node/v1beta1"
apierrs "k8s.io/apimachinery/pkg/api/errors" apierrs "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtimeclasstest "k8s.io/kubernetes/pkg/kubelet/runtimeclass/testing" runtimeclasstest "k8s.io/kubernetes/pkg/kubelet/runtimeclass/testing"
@ -38,7 +38,7 @@ var _ = ginkgo.Describe("[sig-node] RuntimeClass", func() {
f := framework.NewDefaultFramework("runtimeclass") f := framework.NewDefaultFramework("runtimeclass")
ginkgo.It("should reject a Pod requesting a RuntimeClass with conflicting node selector", func() { ginkgo.It("should reject a Pod requesting a RuntimeClass with conflicting node selector", func() {
scheduling := &v1beta1.Scheduling{ scheduling := &nodev1beta1.Scheduling{
NodeSelector: map[string]string{ NodeSelector: map[string]string{
"foo": "conflict", "foo": "conflict",
}, },
@ -72,7 +72,7 @@ var _ = ginkgo.Describe("[sig-node] RuntimeClass", func() {
Effect: v1.TaintEffectNoSchedule, Effect: v1.TaintEffectNoSchedule,
}, },
} }
scheduling := &v1beta1.Scheduling{ scheduling := &nodev1beta1.Scheduling{
NodeSelector: nodeSelector, NodeSelector: nodeSelector,
Tolerations: tolerations, Tolerations: tolerations,
} }
@ -118,7 +118,7 @@ var _ = ginkgo.Describe("[sig-node] RuntimeClass", func() {
}) })
// newRuntimeClass returns a test runtime class. // newRuntimeClass returns a test runtime class.
func newRuntimeClass(namespace, name string) *v1beta1.RuntimeClass { func newRuntimeClass(namespace, name string) *nodev1beta1.RuntimeClass {
uniqueName := fmt.Sprintf("%s-%s", namespace, name) uniqueName := fmt.Sprintf("%s-%s", namespace, name)
return runtimeclasstest.NewRuntimeClass(uniqueName, framework.PreconfiguredRuntimeClassHandler()) return runtimeclasstest.NewRuntimeClass(uniqueName, framework.PreconfiguredRuntimeClassHandler())
} }