@@ -4,18 +4,18 @@ import (
4
4
"reflect"
5
5
"time"
6
6
7
- "code.cloudfoundry.org/quarks-utils/pkg/pointers"
8
7
"github.com/pkg/errors"
9
- extv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
10
- extv1client "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1"
8
+
9
+ extv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
10
+ extv1client "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1"
11
11
apierrors "k8s.io/apimachinery/pkg/api/errors"
12
12
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
13
13
"k8s.io/apimachinery/pkg/runtime/schema"
14
14
"k8s.io/apimachinery/pkg/util/wait"
15
15
)
16
16
17
17
// ApplyCRD creates or updates the CRD
18
- func ApplyCRD (client extv1client.ApiextensionsV1beta1Interface , crdName , kind , plural string , shortNames []string , groupVersion schema.GroupVersion , validation * extv1.CustomResourceValidation ) error {
18
+ func ApplyCRD (client extv1client.ApiextensionsV1Interface , crdName , kind , plural string , shortNames []string , groupVersion schema.GroupVersion , validation * extv1.CustomResourceValidation ) error {
19
19
crd := & extv1.CustomResourceDefinition {
20
20
ObjectMeta : metav1.ObjectMeta {
21
21
Name : crdName ,
@@ -27,13 +27,12 @@ func ApplyCRD(client extv1client.ApiextensionsV1beta1Interface, crdName, kind, p
27
27
Name : groupVersion .Version ,
28
28
Served : true ,
29
29
Storage : true ,
30
+ Schema : validation ,
31
+ Subresources : & extv1.CustomResourceSubresources {
32
+ Status : & extv1.CustomResourceSubresourceStatus {},
33
+ },
30
34
},
31
35
},
32
- Validation : validation ,
33
- PreserveUnknownFields : pointers .Bool (false ),
34
- Subresources : & extv1.CustomResourceSubresources {
35
- Status : & extv1.CustomResourceSubresourceStatus {},
36
- },
37
36
Scope : extv1 .NamespaceScoped ,
38
37
Names : extv1.CustomResourceDefinitionNames {
39
38
Kind : kind ,
@@ -67,7 +66,7 @@ func ApplyCRD(client extv1client.ApiextensionsV1beta1Interface, crdName, kind, p
67
66
}
68
67
69
68
// WaitForCRDReady blocks until the CRD is ready.
70
- func WaitForCRDReady (client extv1client.ApiextensionsV1beta1Interface , crdName string ) error {
69
+ func WaitForCRDReady (client extv1client.ApiextensionsV1Interface , crdName string ) error {
71
70
err := wait .ExponentialBackoff (
72
71
wait.Backoff {
73
72
Duration : time .Second ,
0 commit comments