diff --git a/hack/generate-lib-resources.py b/hack/generate-lib-resources.py index b6a3d7c2c..951ca000c 100755 --- a/hack/generate-lib-resources.py +++ b/hack/generate-lib-resources.py @@ -265,12 +265,7 @@ def scheme_group_versions(types): 'k8s.io/api/core/v1': {'ConfigMap', 'Namespace', 'Service', 'ServiceAccount'}, 'k8s.io/api/rbac/v1': {'ClusterRole', 'ClusterRoleBinding', 'Role', 'RoleBinding'}, 'k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1': {'CustomResourceDefinition'}, - 'k8s.io/kube-aggregator/pkg/apis/apiregistration/v1': {'APIService'}, } - - types['k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1'] = types['k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1'] - types['k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1'] = types['k8s.io/kube-aggregator/pkg/apis/apiregistration/v1'] - clients = { 'github.com/openshift/api/security/v1': {'package': 'github.com/openshift/client-go/security/clientset/versioned/typed/security/v1', 'type': 'SecurityV1Client'}, 'github.com/openshift/api/config/v1': {'package': 'github.com/openshift/client-go/config/clientset/versioned/typed/config/v1', 'type': 'ConfigV1Client'}, @@ -280,9 +275,7 @@ def scheme_group_versions(types): 'k8s.io/api/core/v1': {'package': 'k8s.io/client-go/kubernetes/typed/core/v1', 'type': 'CoreV1Client'}, 'k8s.io/api/rbac/v1': {'package': 'k8s.io/client-go/kubernetes/typed/rbac/v1', 'type': 'RbacV1Client'}, 'k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1': {'package': 'k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1', 'type': 'ApiextensionsV1Client'}, - 'k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1': {'package': 'k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1', 'type': 'ApiextensionsV1beta1Client'}, 'k8s.io/kube-aggregator/pkg/apis/apiregistration/v1': {'package': 'k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1', 'type': 'ApiregistrationV1Client'}, - 'k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1': {'package': 'k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1beta1', 'type': 'ApiregistrationV1beta1Client'}, } modifiers = { diff --git a/lib/resourceapply/apiext.go b/lib/resourceapply/apiext.go index bce881f42..1649c488e 100644 --- a/lib/resourceapply/apiext.go +++ b/lib/resourceapply/apiext.go @@ -5,9 +5,7 @@ import ( "github.com/openshift/cluster-version-operator/lib/resourcemerge" apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" - apiextv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" apiextclientv1 "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1" - apiextclientv1beta1 "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/diff" @@ -15,33 +13,6 @@ import ( "k8s.io/utils/pointer" ) -func ApplyCustomResourceDefinitionv1beta1(ctx context.Context, client apiextclientv1beta1.CustomResourceDefinitionsGetter, required *apiextv1beta1.CustomResourceDefinition) (*apiextv1beta1.CustomResourceDefinition, bool, error) { - existing, err := client.CustomResourceDefinitions().Get(ctx, required.Name, metav1.GetOptions{}) - if apierrors.IsNotFound(err) { - klog.V(2).Infof("CRD %s not found, creating", required.Name) - actual, err := client.CustomResourceDefinitions().Create(ctx, required, metav1.CreateOptions{}) - return actual, true, err - } - if err != nil { - return nil, false, err - } - // if we only create this resource, we have no need to continue further - if IsCreateOnly(required) { - return nil, false, nil - } - - modified := pointer.BoolPtr(false) - resourcemerge.EnsureCustomResourceDefinitionV1beta1(modified, existing, *required) - if !*modified { - return existing, false, nil - } - - klog.V(2).Infof("Updating CRD %s due to diff: %v", required.Name, diff.ObjectDiff(existing, required)) - - actual, err := client.CustomResourceDefinitions().Update(ctx, existing, metav1.UpdateOptions{}) - return actual, true, err -} - func ApplyCustomResourceDefinitionv1(ctx context.Context, client apiextclientv1.CustomResourceDefinitionsGetter, required *apiextv1.CustomResourceDefinition) (*apiextv1.CustomResourceDefinition, bool, error) { existing, err := client.CustomResourceDefinitions().Get(ctx, required.Name, metav1.GetOptions{}) if apierrors.IsNotFound(err) { diff --git a/lib/resourceapply/apireg.go b/lib/resourceapply/apireg.go deleted file mode 100644 index 440d0f822..000000000 --- a/lib/resourceapply/apireg.go +++ /dev/null @@ -1,40 +0,0 @@ -package resourceapply - -import ( - "context" - - "github.com/openshift/cluster-version-operator/lib/resourcemerge" - apierrors "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/util/diff" - "k8s.io/klog/v2" - apiregv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1" - apiregclientv1 "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1" - "k8s.io/utils/pointer" -) - -func ApplyAPIServicev1(ctx context.Context, client apiregclientv1.APIServicesGetter, required *apiregv1.APIService) (*apiregv1.APIService, bool, error) { - existing, err := client.APIServices().Get(ctx, required.Name, metav1.GetOptions{}) - if apierrors.IsNotFound(err) { - klog.V(2).Infof("APIService %s not found, creating", required.Name) - actual, err := client.APIServices().Create(ctx, required, metav1.CreateOptions{}) - return actual, true, err - } - if err != nil { - return nil, false, err - } - // if we only create this resource, we have no need to continue further - if IsCreateOnly(required) { - return nil, false, nil - } - - modified := pointer.BoolPtr(false) - resourcemerge.EnsureAPIService(modified, existing, *required) - if !*modified { - return existing, false, nil - } - klog.V(2).Infof("Updating APIService %s due to diff: %v", required.Name, diff.ObjectDiff(existing, required)) - - actual, err := client.APIServices().Update(ctx, existing, metav1.UpdateOptions{}) - return actual, true, err -} diff --git a/lib/resourceapply/apiregv1beta1.go b/lib/resourceapply/apiregv1beta1.go deleted file mode 100644 index d758e2e33..000000000 --- a/lib/resourceapply/apiregv1beta1.go +++ /dev/null @@ -1,36 +0,0 @@ -package resourceapply - -import ( - "context" - - "github.com/openshift/cluster-version-operator/lib/resourcemerge" - apierrors "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - apiregv1beta1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1" - apiregclientv1beta1 "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1beta1" - "k8s.io/utils/pointer" -) - -func ApplyAPIServicev1beta1(ctx context.Context, client apiregclientv1beta1.APIServicesGetter, required *apiregv1beta1.APIService) (*apiregv1beta1.APIService, bool, error) { - existing, err := client.APIServices().Get(ctx, required.Name, metav1.GetOptions{}) - if apierrors.IsNotFound(err) { - actual, err := client.APIServices().Create(ctx, required, metav1.CreateOptions{}) - return actual, true, err - } - if err != nil { - return nil, false, err - } - // if we only create this resource, we have no need to continue further - if IsCreateOnly(required) { - return nil, false, nil - } - - modified := pointer.BoolPtr(false) - resourcemerge.EnsureAPIServicev1beta1(modified, existing, *required) - if !*modified { - return existing, false, nil - } - - actual, err := client.APIServices().Update(ctx, existing, metav1.UpdateOptions{}) - return actual, true, err -} diff --git a/lib/resourcebuilder/resourcebuilder.go b/lib/resourcebuilder/resourcebuilder.go index a86a78084..bc5a4e5d2 100644 --- a/lib/resourcebuilder/resourcebuilder.go +++ b/lib/resourcebuilder/resourcebuilder.go @@ -20,18 +20,13 @@ import ( corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" - apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" apiextensionsclientv1 "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1" - apiextensionsclientv1beta1 "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1" appsclientv1 "k8s.io/client-go/kubernetes/typed/apps/v1" batchclientv1 "k8s.io/client-go/kubernetes/typed/batch/v1" coreclientv1 "k8s.io/client-go/kubernetes/typed/core/v1" rbacclientv1 "k8s.io/client-go/kubernetes/typed/rbac/v1" "k8s.io/client-go/rest" - apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1" - apiregistrationv1beta1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1" apiregistrationclientv1 "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1" - apiregistrationclientv1beta1 "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1beta1" ) // builder manages single-manifest cluster reconciliation and monitoring. @@ -40,34 +35,30 @@ type builder struct { mode Mode modifier MetaV1ObjectModifierFunc - apiextensionsClientv1 *apiextensionsclientv1.ApiextensionsV1Client - apiextensionsClientv1beta1 *apiextensionsclientv1beta1.ApiextensionsV1beta1Client - apiregistrationClientv1 *apiregistrationclientv1.ApiregistrationV1Client - apiregistrationClientv1beta1 *apiregistrationclientv1beta1.ApiregistrationV1beta1Client - appsClientv1 *appsclientv1.AppsV1Client - batchClientv1 *batchclientv1.BatchV1Client - configClientv1 *configclientv1.ConfigV1Client - coreClientv1 *coreclientv1.CoreV1Client - imageClientv1 *imageclientv1.ImageV1Client - rbacClientv1 *rbacclientv1.RbacV1Client - securityClientv1 *securityclientv1.SecurityV1Client + apiextensionsClientv1 *apiextensionsclientv1.ApiextensionsV1Client + apiregistrationClientv1 *apiregistrationclientv1.ApiregistrationV1Client + appsClientv1 *appsclientv1.AppsV1Client + batchClientv1 *batchclientv1.BatchV1Client + configClientv1 *configclientv1.ConfigV1Client + coreClientv1 *coreclientv1.CoreV1Client + imageClientv1 *imageclientv1.ImageV1Client + rbacClientv1 *rbacclientv1.RbacV1Client + securityClientv1 *securityclientv1.SecurityV1Client } func newBuilder(config *rest.Config, m manifest.Manifest) Interface { return &builder{ raw: m.Raw, - apiextensionsClientv1: apiextensionsclientv1.NewForConfigOrDie(withProtobuf(config)), - apiextensionsClientv1beta1: apiextensionsclientv1beta1.NewForConfigOrDie(withProtobuf(config)), - apiregistrationClientv1: apiregistrationclientv1.NewForConfigOrDie(config), - apiregistrationClientv1beta1: apiregistrationclientv1beta1.NewForConfigOrDie(config), - appsClientv1: appsclientv1.NewForConfigOrDie(withProtobuf(config)), - batchClientv1: batchclientv1.NewForConfigOrDie(withProtobuf(config)), - configClientv1: configclientv1.NewForConfigOrDie(config), - coreClientv1: coreclientv1.NewForConfigOrDie(withProtobuf(config)), - imageClientv1: imageclientv1.NewForConfigOrDie(config), - rbacClientv1: rbacclientv1.NewForConfigOrDie(withProtobuf(config)), - securityClientv1: securityclientv1.NewForConfigOrDie(config), + apiextensionsClientv1: apiextensionsclientv1.NewForConfigOrDie(withProtobuf(config)), + apiregistrationClientv1: apiregistrationclientv1.NewForConfigOrDie(config), + appsClientv1: appsclientv1.NewForConfigOrDie(withProtobuf(config)), + batchClientv1: batchclientv1.NewForConfigOrDie(withProtobuf(config)), + configClientv1: configclientv1.NewForConfigOrDie(config), + coreClientv1: coreclientv1.NewForConfigOrDie(withProtobuf(config)), + imageClientv1: imageclientv1.NewForConfigOrDie(config), + rbacClientv1: rbacclientv1.NewForConfigOrDie(withProtobuf(config)), + securityClientv1: securityclientv1.NewForConfigOrDie(config), } } @@ -192,27 +183,6 @@ func (b *builder) Do(ctx context.Context) error { if _, _, err := resourceapply.ApplyCustomResourceDefinitionv1(ctx, b.apiextensionsClientv1, typedObject); err != nil { return err } - case *apiextensionsv1beta1.CustomResourceDefinition: - if b.modifier != nil { - b.modifier(typedObject) - } - if _, _, err := resourceapply.ApplyCustomResourceDefinitionv1beta1(ctx, b.apiextensionsClientv1beta1, typedObject); err != nil { - return err - } - case *apiregistrationv1.APIService: - if b.modifier != nil { - b.modifier(typedObject) - } - if _, _, err := resourceapply.ApplyAPIServicev1(ctx, b.apiregistrationClientv1, typedObject); err != nil { - return err - } - case *apiregistrationv1beta1.APIService: - if b.modifier != nil { - b.modifier(typedObject) - } - if _, _, err := resourceapply.ApplyAPIServicev1beta1(ctx, b.apiregistrationClientv1beta1, typedObject); err != nil { - return err - } default: return fmt.Errorf("unrecognized manifest type: %T", obj) } @@ -223,9 +193,6 @@ func (b *builder) Do(ctx context.Context) error { func init() { rm := NewResourceMapper() rm.RegisterGVK(apiextensionsv1.SchemeGroupVersion.WithKind("CustomResourceDefinition"), newBuilder) - rm.RegisterGVK(apiextensionsv1beta1.SchemeGroupVersion.WithKind("CustomResourceDefinition"), newBuilder) - rm.RegisterGVK(apiregistrationv1.SchemeGroupVersion.WithKind("APIService"), newBuilder) - rm.RegisterGVK(apiregistrationv1beta1.SchemeGroupVersion.WithKind("APIService"), newBuilder) rm.RegisterGVK(appsv1.SchemeGroupVersion.WithKind("DaemonSet"), newBuilder) rm.RegisterGVK(appsv1.SchemeGroupVersion.WithKind("Deployment"), newBuilder) rm.RegisterGVK(batchv1.SchemeGroupVersion.WithKind("Job"), newBuilder) diff --git a/lib/resourcemerge/apiext.go b/lib/resourcemerge/apiext.go index 2fbac35c6..f2d745958 100644 --- a/lib/resourcemerge/apiext.go +++ b/lib/resourcemerge/apiext.go @@ -4,47 +4,10 @@ import ( "strings" apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" - apiextv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" - "k8s.io/utils/pointer" "k8s.io/apimachinery/pkg/api/equality" ) -// EnsureCustomResourceDefinitionV1beta1 ensures that the existing matches the required. -// modified is set to true when existing had to be updated with required. -func EnsureCustomResourceDefinitionV1beta1(modified *bool, existing *apiextv1beta1.CustomResourceDefinition, required apiextv1beta1.CustomResourceDefinition) { - EnsureObjectMeta(modified, &existing.ObjectMeta, required.ObjectMeta) - - // apply defaults to blue print - if len(required.Spec.Versions) > 0 && len(required.Spec.Version) == 0 { - required.Spec.Version = required.Spec.Versions[0].Name - } - if len(required.Spec.Versions) == 0 && len(required.Spec.Version) > 0 { - required.Spec.Versions = []apiextv1beta1.CustomResourceDefinitionVersion{ - { - Name: required.Spec.Version, - Served: true, - Storage: true, - }, - } - } - if required.Spec.PreserveUnknownFields == nil { - required.Spec.PreserveUnknownFields = pointer.BoolPtr(true) - } - if len(required.Spec.Names.Singular) == 0 { - required.Spec.Names.Singular = strings.ToLower(required.Spec.Names.Kind) - } - if len(required.Spec.Names.ListKind) == 0 { - required.Spec.Names.ListKind = required.Spec.Names.Kind + "List" - } - - // we stomp everything - if !equality.Semantic.DeepEqual(existing.Spec, required.Spec) { - *modified = true - existing.Spec = required.Spec - } -} - // EnsureCustomResourceDefinitionV1 ensures that the existing matches the required. // modified is set to true when existing had to be updated with required. func EnsureCustomResourceDefinitionV1(modified *bool, existing *apiextv1.CustomResourceDefinition, required apiextv1.CustomResourceDefinition) { diff --git a/lib/resourcemerge/apireg.go b/lib/resourcemerge/apireg.go deleted file mode 100644 index d1c58e8b5..000000000 --- a/lib/resourcemerge/apireg.go +++ /dev/null @@ -1,18 +0,0 @@ -package resourcemerge - -import ( - "k8s.io/apimachinery/pkg/api/equality" - apiregv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1" -) - -// EnsureAPIService ensures that the existing matches the required. -// modified is set to true when existing had to be updated with required. -func EnsureAPIService(modified *bool, existing *apiregv1.APIService, required apiregv1.APIService) { - EnsureObjectMeta(modified, &existing.ObjectMeta, required.ObjectMeta) - - // we stomp everything - if !equality.Semantic.DeepEqual(existing.Spec, required.Spec) { - *modified = true - existing.Spec = required.Spec - } -} diff --git a/lib/resourcemerge/apiregv1beta1.go b/lib/resourcemerge/apiregv1beta1.go deleted file mode 100644 index 5d4f6e5be..000000000 --- a/lib/resourcemerge/apiregv1beta1.go +++ /dev/null @@ -1,18 +0,0 @@ -package resourcemerge - -import ( - "k8s.io/apimachinery/pkg/api/equality" - apiregv1beta1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1" -) - -// EnsureAPIServicev1beta1 ensures that the existing matches the required. -// modified is set to true when existing had to be updated with required. -func EnsureAPIServicev1beta1(modified *bool, existing *apiregv1beta1.APIService, required apiregv1beta1.APIService) { - EnsureObjectMeta(modified, &existing.ObjectMeta, required.ObjectMeta) - - // we stomp everything - if !equality.Semantic.DeepEqual(existing.Spec, required.Spec) { - *modified = true - existing.Spec = required.Spec - } -} diff --git a/lib/resourceread/resourceread.go b/lib/resourceread/resourceread.go index af4d0cff4..ab8250369 100644 --- a/lib/resourceread/resourceread.go +++ b/lib/resourceread/resourceread.go @@ -11,11 +11,9 @@ import ( corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" - apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/serializer" apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1" - apiregistrationv1beta1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1" ) var ( @@ -28,15 +26,9 @@ func init() { if err := apiextensionsv1.AddToScheme(scheme); err != nil { panic(err) } - if err := apiextensionsv1beta1.AddToScheme(scheme); err != nil { - panic(err) - } if err := apiregistrationv1.AddToScheme(scheme); err != nil { panic(err) } - if err := apiregistrationv1beta1.AddToScheme(scheme); err != nil { - panic(err) - } if err := appsv1.AddToScheme(scheme); err != nil { panic(err) } @@ -57,9 +49,7 @@ func init() { } decoder = codecs.UniversalDecoder( apiextensionsv1.SchemeGroupVersion, - apiextensionsv1beta1.SchemeGroupVersion, apiregistrationv1.SchemeGroupVersion, - apiregistrationv1beta1.SchemeGroupVersion, appsv1.SchemeGroupVersion, batchv1.SchemeGroupVersion, corev1.SchemeGroupVersion, diff --git a/pkg/cvo/cvo_test.go b/pkg/cvo/cvo_test.go index 7e8e31b96..f89fe64ab 100644 --- a/pkg/cvo/cvo_test.go +++ b/pkg/cvo/cvo_test.go @@ -17,8 +17,8 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/google/uuid" corev1 "k8s.io/api/core/v1" - apiextv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" - apiextclientv1 "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1" + apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" + apiextclientv1 "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -191,10 +191,10 @@ func (l *cmConfigLister) Get(name string) (*corev1.ConfigMap, error) { type crdLister struct { Err error - Items []*apiextv1beta1.CustomResourceDefinition + Items []*apiextv1.CustomResourceDefinition } -func (r *crdLister) Get(name string) (*apiextv1beta1.CustomResourceDefinition, error) { +func (r *crdLister) Get(name string) (*apiextv1.CustomResourceDefinition, error) { for _, s := range r.Items { if s.Name == name { return s, nil @@ -203,7 +203,7 @@ func (r *crdLister) Get(name string) (*apiextv1beta1.CustomResourceDefinition, e return nil, errors.NewNotFound(schema.GroupResource{Resource: "customresourcedefinitions"}, name) } -func (r *crdLister) List(selector labels.Selector) (ret []*apiextv1beta1.CustomResourceDefinition, err error) { +func (r *crdLister) List(selector labels.Selector) (ret []*apiextv1.CustomResourceDefinition, err error) { return r.Items, r.Err } @@ -213,11 +213,7 @@ func (c *fakeApiExtClient) Discovery() discovery.DiscoveryInterface { panic("not implemented") } -func (c *fakeApiExtClient) ApiextensionsV1beta1() apiextclientv1.ApiextensionsV1beta1Interface { - return c -} - -func (c *fakeApiExtClient) Apiextensions() apiextclientv1.ApiextensionsV1beta1Interface { +func (c *fakeApiExtClient) Apiextensions() apiextclientv1.ApiextensionsV1Interface { return c } @@ -226,13 +222,13 @@ func (c *fakeApiExtClient) RESTClient() rest.Interface { panic("not implemented" func (c *fakeApiExtClient) CustomResourceDefinitions() apiextclientv1.CustomResourceDefinitionInterface { return c } -func (c *fakeApiExtClient) Create(ctx context.Context, crd *apiextv1beta1.CustomResourceDefinition, createOptions metav1.CreateOptions) (*apiextv1beta1.CustomResourceDefinition, error) { +func (c *fakeApiExtClient) Create(ctx context.Context, crd *apiextv1.CustomResourceDefinition, createOptions metav1.CreateOptions) (*apiextv1.CustomResourceDefinition, error) { return crd, nil } -func (c *fakeApiExtClient) Update(ctx context.Context, crd *apiextv1beta1.CustomResourceDefinition, updateOptions metav1.UpdateOptions) (*apiextv1beta1.CustomResourceDefinition, error) { +func (c *fakeApiExtClient) Update(ctx context.Context, crd *apiextv1.CustomResourceDefinition, updateOptions metav1.UpdateOptions) (*apiextv1.CustomResourceDefinition, error) { panic("not implemented") } -func (c *fakeApiExtClient) UpdateStatus(ctx context.Context, crd *apiextv1beta1.CustomResourceDefinition, updateOptions metav1.UpdateOptions) (*apiextv1beta1.CustomResourceDefinition, error) { +func (c *fakeApiExtClient) UpdateStatus(ctx context.Context, crd *apiextv1.CustomResourceDefinition, updateOptions metav1.UpdateOptions) (*apiextv1.CustomResourceDefinition, error) { panic("not implemented") } func (c *fakeApiExtClient) Delete(ctx context.Context, name string, options metav1.DeleteOptions) error { @@ -241,16 +237,16 @@ func (c *fakeApiExtClient) Delete(ctx context.Context, name string, options meta func (c *fakeApiExtClient) DeleteCollection(ctx context.Context, options metav1.DeleteOptions, listOptions metav1.ListOptions) error { panic("not implemented") } -func (c *fakeApiExtClient) Get(ctx context.Context, name string, options metav1.GetOptions) (*apiextv1beta1.CustomResourceDefinition, error) { +func (c *fakeApiExtClient) Get(ctx context.Context, name string, options metav1.GetOptions) (*apiextv1.CustomResourceDefinition, error) { panic("not implemented") } -func (c *fakeApiExtClient) List(ctx context.Context, opts metav1.ListOptions) (*apiextv1beta1.CustomResourceDefinitionList, error) { +func (c *fakeApiExtClient) List(ctx context.Context, opts metav1.ListOptions) (*apiextv1.CustomResourceDefinitionList, error) { panic("not implemented") } func (c *fakeApiExtClient) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { panic("not implemented") } -func (c *fakeApiExtClient) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, patchOptions metav1.PatchOptions, subresources ...string) (result *apiextv1beta1.CustomResourceDefinition, err error) { +func (c *fakeApiExtClient) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, patchOptions metav1.PatchOptions, subresources ...string) (result *apiextv1.CustomResourceDefinition, err error) { panic("not implemented") }