github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 22:46:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #49399 from timothysc/CRD_version_gate

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 49326, 49394, 49346, 49379, 49399)

Update to version gate CRDs to 1.7 and greater

**What this PR does / why we need it**:
Allows e2e's to be tested on earlier version do to version check.  

xref: #49313

**Release note**:
```
NONE
```

/cc @kubernetes/sig-api-machinery-bugs @kubernetes/sig-testing-bugs
This commit is contained in:
Kubernetes Submit Queue 2017-07-21 23:23:39 -07:00 committed by GitHub
commit 32952d9c29
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/e2e/apimachinery/BUILD
View File

@ -24,6 +24,7 @@ go_library(
"//pkg/client/retry:go_default_library", "//pkg/client/retry:go_default_library",
"//pkg/controller:go_default_library", "//pkg/controller:go_default_library",
"//pkg/printers:go_default_library", "//pkg/printers:go_default_library",
"//pkg/util/version:go_default_library",
"//test/e2e/framework:go_default_library", "//test/e2e/framework:go_default_library",
"//test/e2e/metrics:go_default_library", "//test/e2e/metrics:go_default_library",
"//test/e2e/workload:go_default_library", "//test/e2e/workload:go_default_library",

6
test/e2e/apimachinery/custom_resource_definition.go
View File

@ -20,17 +20,23 @@ import (
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
"k8s.io/apiextensions-apiserver/test/integration/testserver" "k8s.io/apiextensions-apiserver/test/integration/testserver"
utilversion "k8s.io/kubernetes/pkg/util/version"
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
) )
var crdVersion = utilversion.MustParseSemantic("v1.7.0")
var _ = SIGDescribe("CustomResourceDefinition resources", func() { var _ = SIGDescribe("CustomResourceDefinition resources", func() {
f := framework.NewDefaultFramework("custom-resource-definition") f := framework.NewDefaultFramework("custom-resource-definition")
Context("Simple CustomResourceDefinition", func() { Context("Simple CustomResourceDefinition", func() {
It("creating/deleting custom resource definition objects works [Conformance]", func() { It("creating/deleting custom resource definition objects works [Conformance]", func() {
framework.SkipUnlessServerVersionGTE(crdVersion, f.ClientSet.Discovery())
config, err := framework.LoadConfig() config, err := framework.LoadConfig()
if err != nil { if err != nil {
framework.Failf("failed to load config: %v", err) framework.Failf("failed to load config: %v", err)