fix storage reconciler

Author: sp-yduck

cloud/interfaces.go

@@ -38,10 +38,12 @@ type ClusterGetter interface {
 	// FailureDomains() clusterv1.FailureDomains
 	ControlPlaneEndpoint() clusterv1.APIEndpoint
 	Storage() infrav1.Storage
+	LoadBalancer() infrav1.LoadBalancer
 }
 
 type ClusterSettter interface {
 	SetControlPlaneEndpoint(endpoint clusterv1.APIEndpoint)
+	SetStorage(storage infrav1.Storage)
 }
 
 // MachineGetter is an interface which can get machine information.

cloud/scope/cluster.go

@@ -97,6 +97,10 @@ func (s *ClusterScope) Storage() infrav1.Storage {
 	return s.ProxmoxCluster.Spec.Storage
 }
 
+func (s *ClusterScope) LoadBalancer() infrav1.LoadBalancer {
+	return s.ProxmoxCluster.Spec.LoadBalancer
+}
+
 func (s *ClusterScope) CloudClient() *service.Service {
 	return s.ProxmoxServices.Compute
 }
@@ -117,6 +121,10 @@ func (s *ClusterScope) SetControlPlaneEndpoint(endpoint clusterv1.APIEndpoint) {
 	s.ProxmoxCluster.Spec.ControlPlaneEndpoint = endpoint
 }
 
+func (s *ClusterScope) SetStorage(storage infrav1.Storage) {
+	s.ProxmoxCluster.Spec.Storage = storage
+}
+
 // PatchObject persists the cluster configuration and status.
 func (s *ClusterScope) PatchObject() error {
 	return s.patchHelper.Patch(context.TODO(), s.ProxmoxCluster)

cloud/services/compute/storage/reconcile.go

@@ -31,50 +31,49 @@ func (s *Service) Delete(ctx context.Context) error {
 func (s *Service) createOrGetStorage(ctx context.Context) error {
 	log := log.FromContext(ctx)
 	log.Info("Reconciling vm storage")
-	if err := s.getStorage(); err != nil {
+
+	opts := generateVMStorageOptions(s.scope)
+	if err := s.getStorage(opts.Storage); err != nil {
 		if api.IsNotFound(err) {
-			if err := s.createStorage(); err != nil {
+			if err := s.createStorage(opts); err != nil {
 				return err
 			}
 		}
 		return err
 	}
+
+	s.scope.SetStorage(infrav1.Storage{Name: opts.Storage, Path: opts.Path})
 	return nil
 }
 
-func (s *Service) getStorage() error {
-	storageSpec := s.scope.Storage()
-	if _, err := s.client.Storage(storageSpec.Name); err != nil {
+func (s *Service) getStorage(name string) error {
+	if _, err := s.client.Storage(name); err != nil {
 		return err
 	}
 	return nil
 }
 
-func (s *Service) createStorage() error {
-	storageSpec := s.scope.Storage()
-	opts := storage.StorageCreateOptions{
-		Content: "images,snippets",
-		Mkdir:   true,
-		Path:    generateStoragePath(storageSpec),
-	}
-	if _, err := s.client.CreateStorage(storageSpec.Name, "dif", opts); err != nil {
+func (s *Service) createStorage(options storage.StorageCreateOptions) error {
+	if _, err := s.client.CreateStorage(options.Storage, options.StorageType, options); err != nil {
 		return err
 	}
 	return nil
 }
 
-func generateStoragePath(storage infrav1.Storage) string {
-	if storage.Path == "" {
-		return fmt.Sprintf("%s/%s", defaultBasePath, storage.Name)
-	}
-	return storage.Path
-}
-
-func defaultVMStorageOptions(name string) storage.StorageCreateOptions {
+func generateVMStorageOptions(scope Scope) storage.StorageCreateOptions {
+	storageSpec := scope.Storage()
 	options := storage.StorageCreateOptions{
-		Content: "images,snippets",
-		Mkdir:   true,
-		Path:    defaultBasePath + "/" + name,
+		Storage:     storageSpec.Name,
+		StorageType: "dir",
+		Content:     "images,snippets",
+		Mkdir:       true,
+		Path:        storageSpec.Path,
+	}
+	if options.Storage == "" {
+		options.Storage = fmt.Sprintf("local-dir-%s", scope.Name())
+	}
+	if options.Path == "" {
+		options.Path = fmt.Sprintf("%s/%s", defaultBasePath, options.Storage)
 	}
 	return options
 }