From 98ebfb1bcdd373a6008b5e3445329bd4752f7940 Mon Sep 17 00:00:00 2001 From: Sebastian Cole Date: Fri, 15 Sep 2023 10:43:13 +1000 Subject: [PATCH] handling v1beta1.NodeClass -> EC2NodeClass --- pkg/controllers/nodeclass/controller.go | 4 ++-- pkg/providers/hostresourcegroup/hostresourcegroup.go | 2 +- pkg/providers/license/license.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/controllers/nodeclass/controller.go b/pkg/controllers/nodeclass/controller.go index e29bfd08cd35..aeb214810d4b 100644 --- a/pkg/controllers/nodeclass/controller.go +++ b/pkg/controllers/nodeclass/controller.go @@ -160,7 +160,7 @@ func (c *Controller) resolveAMIs(ctx context.Context, nodeClass *v1beta1.EC2Node return nil } -func (c *Controller) resolveLicenses(ctx context.Context, nodeClass *v1beta1.NodeClass) error { +func (c *Controller) resolveLicenses(ctx context.Context, nodeClass *v1beta1.EC2NodeClass) error { licenses, err := c.licenseProvider.List(ctx, nodeClass) if err != nil { return err @@ -171,7 +171,7 @@ func (c *Controller) resolveLicenses(ctx context.Context, nodeClass *v1beta1.Nod } -func (c *Controller) resolveHostResourceGroups(ctx context.Context, nodeClass *v1beta1.NodeClass) error { +func (c *Controller) resolveHostResourceGroups(ctx context.Context, nodeClass *v1beta1.EC2NodeClass) error { result , err := c.hostResourceGroupProvider.Get(ctx, nodeClass) if err != nil { return err diff --git a/pkg/providers/hostresourcegroup/hostresourcegroup.go b/pkg/providers/hostresourcegroup/hostresourcegroup.go index ae5275bc4840..39f2239220dd 100644 --- a/pkg/providers/hostresourcegroup/hostresourcegroup.go +++ b/pkg/providers/hostresourcegroup/hostresourcegroup.go @@ -30,7 +30,7 @@ func NewProvider(rgapi resourcegroupsiface.ResourceGroupsAPI, cache *cache.Cache } } -func (p *Provider) Get(ctx context.Context, nodeClass *v1beta1.NodeClass) (*v1beta1.HostResourceGroup, error) { +func (p *Provider) Get(ctx context.Context, nodeClass *v1beta1.EC2NodeClass) (*v1beta1.HostResourceGroup, error) { p.Lock() defer p.Unlock() var nextToken *string = nil diff --git a/pkg/providers/license/license.go b/pkg/providers/license/license.go index b1c8f2fbda57..d1feb09e1ef6 100644 --- a/pkg/providers/license/license.go +++ b/pkg/providers/license/license.go @@ -48,7 +48,7 @@ func NewProvider(lmapi licensemanageriface.LicenseManagerAPI, cache *cache.Cache } } -func (p *Provider) List(ctx context.Context, nodeClass *v1beta1.NodeClass) ([]string, error) { +func (p *Provider) List(ctx context.Context, nodeClass *v1beta1.EC2NodeClass) ([]string, error) { p.Lock() defer p.Unlock()