diff --git a/apiextensions/kubernetes.go b/apiextensions/kubernetes.go index 63052359d..75e509a8a 100644 --- a/apiextensions/kubernetes.go +++ b/apiextensions/kubernetes.go @@ -34,6 +34,10 @@ import ( ) func RegisterCRDs(client crd_cs.Interface, crds []*CustomResourceDefinition) error { + return RegisterWithOpts(client, crds, false) +} + +func RegisterWithOpts(client crd_cs.Interface, crds []*CustomResourceDefinition, preserveConversion bool) error { for _, crd := range crds { // Use crd v1 for k8s >= 1.16, if available // ref: https://github.com/kubernetes/kubernetes/issues/91395 @@ -49,13 +53,34 @@ func RegisterCRDs(client crd_cs.Interface, crds []*CustomResourceDefinition) err context.TODO(), client, crd.V1.Name, - func(in *crdv1.CustomResourceDefinition) *crdv1.CustomResourceDefinition { - in.Labels = meta_util.OverwriteKeys(in.Labels, crd.V1.Labels) - in.Annotations = meta_util.OverwriteKeys(in.Annotations, crd.V1.Annotations) + transform(crd, preserveConversion), + metav1.UpdateOptions{}, + ) + if err != nil && !kerr.IsAlreadyExists(err) { + return err + } + } + return WaitForCRDReady(client, crds) +} + +func UpdateWithOpts(client crd_cs.Interface, crds []*CustomResourceDefinition, preserveConversion bool) error { + for _, crd := range crds { + // Use crd v1 for k8s >= 1.16, if available + // ref: https://github.com/kubernetes/kubernetes/issues/91395 + if crd.V1 == nil { + gvr := schema.GroupVersionResource{ + Group: crd.V1beta1.Spec.Group, + Version: crd.V1beta1.Spec.Versions[0].Name, + Resource: crd.V1beta1.Spec.Names.Plural, + } + return fmt.Errorf("missing V1 definition for %s", gvr) + } - in.Spec = crd.V1.Spec - return in - }, + _, _, err := v1.UpdateCustomResourceDefinitionIfPresent( + context.TODO(), + client, + crd.V1.Name, + transform(crd, preserveConversion), metav1.UpdateOptions{}, ) if err != nil && !kerr.IsAlreadyExists(err) { @@ -65,6 +90,21 @@ func RegisterCRDs(client crd_cs.Interface, crds []*CustomResourceDefinition) err return WaitForCRDReady(client, crds) } +func transform(crd *CustomResourceDefinition, preserveConversion bool) func(in *crdv1.CustomResourceDefinition) *crdv1.CustomResourceDefinition { + return func(in *crdv1.CustomResourceDefinition) *crdv1.CustomResourceDefinition { + in.Labels = meta_util.OverwriteKeys(in.Labels, crd.V1.Labels) + in.Annotations = meta_util.OverwriteKeys(in.Annotations, crd.V1.Annotations) + + conversion := in.Spec.Conversion + in.Spec = crd.V1.Spec + // preserve conversion + if preserveConversion && in.Spec.Conversion == nil && conversion != nil { + in.Spec.Conversion = conversion + } + return in + } +} + func WaitForCRDReady(client crd_cs.Interface, crds []*CustomResourceDefinition) error { err := wait.PollUntilContextTimeout(context.Background(), 3*time.Second, 5*time.Minute, false, func(ctx context.Context) (bool, error) { for _, crd := range crds { diff --git a/apiextensions/v1/crd.go b/apiextensions/v1/crd.go index 28156ee2a..c6aa7bfc2 100644 --- a/apiextensions/v1/crd.go +++ b/apiextensions/v1/crd.go @@ -67,6 +67,34 @@ func CreateOrUpdateCustomResourceDefinition( return cur, kutil.VerbUpdated, nil } +func UpdateCustomResourceDefinitionIfPresent( + ctx context.Context, + c cs.Interface, + name string, + transform func(in *api.CustomResourceDefinition) *api.CustomResourceDefinition, + opts metav1.UpdateOptions, +) (*api.CustomResourceDefinition, kutil.VerbType, error) { + _, err := c.ApiextensionsV1().CustomResourceDefinitions().Get(ctx, name, metav1.GetOptions{}) + if kerr.IsNotFound(err) { + return transform(&api.CustomResourceDefinition{ + TypeMeta: metav1.TypeMeta{ + APIVersion: api.SchemeGroupVersion.String(), + Kind: "CustomResourceDefinition", + }, + ObjectMeta: metav1.ObjectMeta{ + Name: name, + }, + }), kutil.VerbUnchanged, nil + } else if err != nil { + return nil, kutil.VerbUnchanged, err + } + cur, err := TryUpdateCustomResourceDefinition(ctx, c, name, transform, opts) + if err != nil { + return nil, kutil.VerbUnchanged, err + } + return cur, kutil.VerbUpdated, nil +} + func TryUpdateCustomResourceDefinition( ctx context.Context, c cs.Interface,