refactor: move to operator

Following the upstream project, we moved all initialization to the operator module.

Signed-off-by: Serge Logvinov <[email protected]>

Author: sergelogvinov

cmd/controller/main.go

@@ -18,13 +18,9 @@ limitations under the License.
 package main
 
 import (
-	"os"
-
 	proxmox "github.com/sergelogvinov/karpenter-provider-proxmox/pkg/cloudprovider"
 	"github.com/sergelogvinov/karpenter-provider-proxmox/pkg/controllers"
 	"github.com/sergelogvinov/karpenter-provider-proxmox/pkg/operator"
-	"github.com/sergelogvinov/karpenter-provider-proxmox/pkg/providers/cloudcapacity"
-	"github.com/sergelogvinov/karpenter-provider-proxmox/pkg/providers/instance"
 
 	"sigs.k8s.io/karpenter/pkg/cloudprovider/metrics"
 	corecontrollers "sigs.k8s.io/karpenter/pkg/controllers"
@@ -38,30 +34,8 @@ func main() {
 
 	log.Info("Karpenter Proxmox Provider version", "version", coreoperator.Version)
 
-	cloudcapacityProvider, err := cloudcapacity.NewProvider(ctx)
-	if err != nil {
-		log.Error(err, "failed creating instance provider")
-
-		os.Exit(1)
-	}
-
-	cloudcapacityProvider.Sync(ctx)
-
-	instanceTypes, err := proxmox.ConstructInstanceTypes(ctx, cloudcapacityProvider)
-	if err != nil {
-		log.Error(err, "failed constructing instance types")
-
-		os.Exit(1)
-	}
-
-	instanceProvider, err := instance.NewProvider(ctx, cloudcapacityProvider)
-	if err != nil {
-		log.Error(err, "failed creating instance provider")
-
-		os.Exit(1)
-	}
+	proxmoxCloudProvider := proxmox.NewCloudProvider(ctx, op.GetClient(), op.InstanceTypes, op.InstanceProvider, op.CapacityProvider)
 
-	proxmoxCloudProvider := proxmox.NewCloudProvider(ctx, op.GetClient(), instanceTypes, instanceProvider, cloudcapacityProvider)
 	cloudProvider := metrics.Decorate(proxmoxCloudProvider)
 	clusterState := state.NewCluster(op.Clock, op.GetClient(), cloudProvider)
 

go.mod

@@ -11,6 +11,7 @@ require (
 	github.com/samber/lo v1.51.0
 	github.com/sergelogvinov/proxmox-cloud-controller-manager v0.10.0
 	github.com/stretchr/testify v1.10.0
+	go.uber.org/multierr v1.11.0
 	gopkg.in/yaml.v3 v3.0.1
 	k8s.io/api v0.33.3
 	k8s.io/apimachinery v0.33.3
@@ -56,7 +57,6 @@ require (
 	github.com/spf13/cobra v1.9.1 // indirect
 	github.com/spf13/pflag v1.0.7 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
-	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
 	go.yaml.in/yaml/v2 v2.4.2 // indirect
 	golang.org/x/crypto v0.40.0 // indirect

pkg/operator/operator.go

@@ -18,10 +18,15 @@ package operator
 
 import (
 	"context"
+	"os"
 
+	proxmox "github.com/sergelogvinov/karpenter-provider-proxmox/pkg/cloudprovider"
 	"github.com/sergelogvinov/karpenter-provider-proxmox/pkg/operator/options"
+	"github.com/sergelogvinov/karpenter-provider-proxmox/pkg/providers/cloudcapacity"
+	"github.com/sergelogvinov/karpenter-provider-proxmox/pkg/providers/instance"
 
 	"sigs.k8s.io/controller-runtime/pkg/log"
+	"sigs.k8s.io/karpenter/pkg/cloudprovider"
 	"sigs.k8s.io/karpenter/pkg/operator"
 )
 
@@ -30,12 +35,43 @@ func init() {
 
 type Operator struct {
 	*operator.Operator
+
+	CapacityProvider *cloudcapacity.Provider
+	// InstanceTypeProvider *[]cloudprovider.InstanceType
+	InstanceProvider *instance.Provider
+	InstanceTypes    []*cloudprovider.InstanceType
 }
 
 func NewOperator(ctx context.Context, operator *operator.Operator) (context.Context, *Operator) {
 	log.FromContext(ctx).Info("Initializing Karpenter Proxmox Provider Operator", "cloud-config", options.FromContext(ctx).CloudConfigPath)
 
+	cloudcapacityProvider, err := cloudcapacity.NewProvider(ctx)
+	if err != nil {
+		log.FromContext(ctx).Error(err, "failed creating cloud capacity provider")
+
+		os.Exit(1)
+	}
+
+	cloudcapacityProvider.Sync(ctx)
+
+	instanceTypes, err := proxmox.ConstructInstanceTypes(ctx, cloudcapacityProvider)
+	if err != nil {
+		log.FromContext(ctx).Error(err, "failed constructing instance types")
+
+		os.Exit(1)
+	}
+
+	instanceProvider, err := instance.NewProvider(ctx, cloudcapacityProvider)
+	if err != nil {
+		log.FromContext(ctx).Error(err, "failed creating instance provider")
+
+		os.Exit(1)
+	}
+
 	return ctx, &Operator{
-		Operator: operator,
+		Operator:         operator,
+		CapacityProvider: cloudcapacityProvider,
+		InstanceTypes:    instanceTypes,
+		InstanceProvider: instanceProvider,
 	}
 }

pkg/providers/instance/instance.go

@@ -251,6 +251,12 @@ func (p *Provider) Get(ctx context.Context, providerID string) (*corev1.Node, er
 
 	vmInfo, err := cl.GetVmInfo(ctx, vmr)
 	if err != nil {
+		if strings.Contains(err.Error(), "not found") {
+			log.FromContext(ctx).Error(err, "vm is not found")
+
+			return nil, cloudprovider.NewNodeClaimNotFoundError(fmt.Errorf("instance not found: %w", err))
+		}
+
 		return nil, fmt.Errorf("failed to get vm: %v", err)
 	}
 
@@ -292,7 +298,9 @@ func (p *Provider) Delete(ctx context.Context, nodeClaim *karpv1.NodeClaim) erro
 
 	if _, err := cl.GetVmInfo(ctx, vmr); err != nil {
 		if strings.Contains(err.Error(), "not found") {
-			return nil
+			log.FromContext(ctx).Error(err, "vm is not found")
+
+			return cloudprovider.NewNodeClaimNotFoundError(fmt.Errorf("instance not found: %w", err))
 		}
 
 		return fmt.Errorf("failed to get vm %d: %v", vmr.VmId(), err)