proxmox node name in machine spec

Author: sp-yduck

api/v1beta1/proxmoxcluster_types.go

@@ -35,10 +35,12 @@ type ProxmoxClusterSpec struct {
 	// +optional
 	ControlPlaneEndpoint clusterv1.APIEndpoint `json:"controlPlaneEndpoint"`
 
-	// ServerRef is used for configuring Proxmox client (and node ssh client)
-	// to do : client options like insecure tls verify, token login, etc.
+	// ServerRef is used for configuring Proxmox client
 	ServerRef ServerRef `json:"serverRef"`
 
+	// NodesRef contains reference of nodes used for ProxmoxCluster
+	NodeRefs []NodeRef `json:"nodeRefs,omitempty"`
+
 	// storage is for proxmox storage used by vm instances
 	Storage Storage `json:"storage"`
 }

api/v1beta1/proxmoxmachine_types.go

@@ -38,6 +38,10 @@ type ProxmoxMachineSpec struct {
 	// ProviderID
 	ProviderID *string `json:"providerID,omitempty"`
 
+	// Node is proxmox node hosting vm instance which used for ProxmoxMachine
+	// +optional
+	Node string `json:"node,omitempty"`
+
 	// Image is the image to be provisioned
 	Image Image `json:"image"`
 

api/v1beta1/type.go

@@ -15,13 +15,19 @@ type ServerRef struct {
 	// to do : login type should be an option
 	// user&pass or token
 
-	// to do : insecure tls verify
+	// to do : client options like insecure tls verify
 
 	// CredentialsRef is a reference for secret which contains proxmox login secrets
 	// and ssh configs for proxmox nodes
 	CredentialsRef *ObjectReference `json:"credentialsRef"`
 }
 
+// NodeRef
+type NodeRef struct {
+	Name           string           `json:"name"`
+	CredentialsRef *ObjectReference `json:"credentialsRef"`
+}
+
 // ObjectReference is a reference to another Kubernetes object instance.
 type ObjectReference struct {
 	// Namespace of the referent.

api/v1beta1/zz_generated.deepcopy.go

@@ -53,6 +53,7 @@ type MachineGetter interface {
 	// Role() string
 	// IsControlPlane() bool
 	// ControlPlaneGroupName() string
+	NodeName() string
 	GetInstanceID() *string
 	GetProviderID() string
 	GetBootstrapData() (string, error)

cloud/interfaces.go

@@ -52,7 +52,8 @@ func NewClusterScope(ctx context.Context, params ClusterScopeParams) (*ClusterSc
 	}
 
 	if params.ProxmoxServices.Remote == nil {
-		remote, err := newRemoteClient(ctx, params.ProxmoxCluster.Spec.ServerRef.CredentialsRef, params.Client)
+		// current CAPP is compatible with only single node proxmox cluster
+		remote, err := newRemoteClient(ctx, params.ProxmoxCluster.Spec.NodeRefs[0].CredentialsRef, params.Client)
 		if err != nil {
 			return nil, errors.Errorf("failed to create remote client: %v", err)
 		}

cloud/scope/cluster.go

@@ -99,6 +99,10 @@ func (m *MachineScope) Namespace() string {
 	return m.ProxmoxMachine.Namespace
 }
 
+func (m *MachineScope) NodeName() string {
+	return m.ProxmoxMachine.Spec.Node
+}
+
 // func (m *MachineScope) Client() Compute {
 // 	return m.ClusterGetter.Client()
 // }

cloud/scope/machine.go

@@ -100,13 +100,27 @@ func (s *Service) getInstanceFromInstanceID(instanceID string) (*vm.VirtualMachi
 func (s *Service) CreateInstance(ctx context.Context, bootstrap string) (*vm.VirtualMachine, error) {
 	log := log.FromContext(ctx)
 
-	// temp solution
-	node, err := s.GetRandomNode()
-	if err != nil {
-		log.Error(err, "failed to get random node")
-		return nil, err
+	var node *node.Node
+	var err error
+	nodeName := s.scope.NodeName()
+	if nodeName != "" {
+		node, err = s.GetNode(nodeName)
+		if err != nil {
+			log.Error(err, fmt.Sprintf("failed to get node %s", nodeName))
+			return nil, err
+		}
+	} else {
+		// temp solution
+		node, err = s.GetRandomNode()
+		if err != nil {
+			log.Error(err, "failed to get random node")
+			return nil, err
+		}
 	}
 
+	// (for multiple node proxmox cluster support)
+	// to do : set ssh client for specific node
+
 	vmid, err := s.GetNextID()
 	if err != nil {
 		log.Error(err, "failed to get available vmid")
@@ -155,6 +169,10 @@ func (s *Service) GetNodes() ([]*node.Node, error) {
 	return s.client.Nodes()
 }
 
+func (s *Service) GetNode(name string) (*node.Node, error) {
+	return s.client.Node(name)
+}
+
 // GetRandomNode returns a node chosen randomly
 func (s *Service) GetRandomNode() (*node.Node, error) {
 	nodes, err := s.GetNodes()

cloud/services/compute/instance/reconcile.go

@@ -57,9 +57,34 @@ spec:
                 - host
                 - port
                 type: object
+              nodeRefs:
+                description: NodesRef contains reference of nodes used for ProxmoxCluster
+                items:
+                  description: NodeRef
+                  properties:
+                    credentialsRef:
+                      description: ObjectReference is a reference to another Kubernetes
+                        object instance.
+                      properties:
+                        name:
+                          description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                          type: string
+                        namespace:
+                          description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
+                          type: string
+                      required:
+                      - name
+                      - namespace
+                      type: object
+                    name:
+                      type: string
+                  required:
+                  - credentialsRef
+                  - name
+                  type: object
+                type: array
               serverRef:
-                description: 'ServerRef is used for configuring Proxmox client to
-                  do : client options like insecure tls verify, token login, etc.'
+                description: ServerRef is used for configuring Proxmox client
                 properties:
                   credentialsRef:
                     description: CredentialsRef is a reference for secret which contains

config/crd/bases/infrastructure.cluster.x-k8s.io_proxmoxclusters.yaml

@@ -118,6 +118,10 @@ spec:
                     description: search domain
                     type: string
                 type: object
+              node:
+                description: Node is proxmox node hosting vm instance which used for
+                  ProxmoxMachine
+                type: string
               providerID:
                 description: ProviderID
                 type: string