Created
December 19, 2019 16:04
-
-
Save ncdc/a0d8bf79a3f62c5211526fca40ad2b84 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/pkg/envtest/crd.go b/pkg/envtest/crd.go | |
index 39b24452..2fd1e4e3 100644 | |
--- a/pkg/envtest/crd.go | |
+++ b/pkg/envtest/crd.go | |
@@ -25,7 +25,7 @@ import ( | |
"path/filepath" | |
"time" | |
- apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" | |
+ apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" | |
"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" | |
apierrors "k8s.io/apimachinery/pkg/api/errors" | |
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | |
@@ -114,9 +114,6 @@ func WaitForCRDs(config *rest.Config, crds []*apiextensionsv1beta1.CustomResourc | |
waitingFor := map[schema.GroupVersion]*sets.String{} | |
for _, crd := range crds { | |
gvs := []schema.GroupVersion{} | |
- if crd.Spec.Version != "" { | |
- gvs = append(gvs, schema.GroupVersion{Group: crd.Spec.Group, Version: crd.Spec.Version}) | |
- } | |
for _, ver := range crd.Spec.Versions { | |
if ver.Served { | |
gvs = append(gvs, schema.GroupVersion{Group: crd.Spec.Group, Version: ver.Name}) | |
@@ -221,7 +218,7 @@ func CreateCRDs(config *rest.Config, crds []*apiextensionsv1beta1.CustomResource | |
// Create each CRD | |
for _, crd := range crds { | |
log.V(1).Info("installing CRD", "crd", crd.Name) | |
- if _, err := cs.ApiextensionsV1beta1().CustomResourceDefinitions().Create(crd); err != nil { | |
+ if _, err := cs.ApiextensionsV1().CustomResourceDefinitions().Create(crd); err != nil { | |
return err | |
} | |
} | |
diff --git a/pkg/envtest/helper.go b/pkg/envtest/helper.go | |
index 6e9b3e4b..3ede8edf 100644 | |
--- a/pkg/envtest/helper.go | |
+++ b/pkg/envtest/helper.go | |
@@ -3,7 +3,7 @@ package envtest | |
import ( | |
"reflect" | |
- apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" | |
+ apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" | |
) | |
// mergePaths merges two string slices containing paths. | |
diff --git a/pkg/envtest/server.go b/pkg/envtest/server.go | |
index c57fa6ac..249df6c5 100644 | |
--- a/pkg/envtest/server.go | |
+++ b/pkg/envtest/server.go | |
@@ -23,7 +23,7 @@ import ( | |
"strings" | |
"time" | |
- apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" | |
+ apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" | |
"k8s.io/client-go/rest" | |
"sigs.k8s.io/controller-runtime/pkg/client/config" | |
"sigs.k8s.io/testing_frameworks/integration" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment