Skip to content
This repository was archived by the owner on Jan 19, 2022. It is now read-only.

Commit 1ef8457

Browse files
committed
Update k8s.io/apiextensions to v1
CRDs are GA in Kubernetes 1.16
1 parent 5c0793a commit 1ef8457

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

pkg/crd/crd.go

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@ import (
44
"reflect"
55
"time"
66

7-
"code.cloudfoundry.org/quarks-utils/pkg/pointers"
87
"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"
1111
apierrors "k8s.io/apimachinery/pkg/api/errors"
1212
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1313
"k8s.io/apimachinery/pkg/runtime/schema"
1414
"k8s.io/apimachinery/pkg/util/wait"
1515
)
1616

1717
// 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 {
1919
crd := &extv1.CustomResourceDefinition{
2020
ObjectMeta: metav1.ObjectMeta{
2121
Name: crdName,
@@ -27,13 +27,12 @@ func ApplyCRD(client extv1client.ApiextensionsV1beta1Interface, crdName, kind, p
2727
Name: groupVersion.Version,
2828
Served: true,
2929
Storage: true,
30+
Schema: validation,
31+
Subresources: &extv1.CustomResourceSubresources{
32+
Status: &extv1.CustomResourceSubresourceStatus{},
33+
},
3034
},
3135
},
32-
Validation: validation,
33-
PreserveUnknownFields: pointers.Bool(false),
34-
Subresources: &extv1.CustomResourceSubresources{
35-
Status: &extv1.CustomResourceSubresourceStatus{},
36-
},
3736
Scope: extv1.NamespaceScoped,
3837
Names: extv1.CustomResourceDefinitionNames{
3938
Kind: kind,
@@ -67,7 +66,7 @@ func ApplyCRD(client extv1client.ApiextensionsV1beta1Interface, crdName, kind, p
6766
}
6867

6968
// 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 {
7170
err := wait.ExponentialBackoff(
7271
wait.Backoff{
7372
Duration: time.Second,

0 commit comments

Comments
 (0)