use serverRef insted of server&credentialsRef

Author: sp-yduck

api/v1beta1/proxmoxcluster_types.go

@@ -35,13 +35,9 @@ type ProxmoxClusterSpec struct {
 	// +optional
 	ControlPlaneEndpoint clusterv1.APIEndpoint `json:"controlPlaneEndpoint"`
 
-	// Server is the address of the Proxmox-VE REST API endpoint.
+	// ServerRef is used for configuring Proxmox client
 	// to do : client options like insecure tls verify, token login, etc.
-	Server string `json:"server"`
-
-	// CredentialsRef is a reference for secret which contains proxmox login secrets
-	// and ssh configs for proxmox nodes
-	CredentialsRef *ObjectReference `json:"credentialsRef"`
+	ServerRef ServerRef `json:"serverRef"`
 
 	// storage is for proxmox storage used by vm instances
 	Storage Storage `json:"storage"`

api/v1beta1/type.go

@@ -7,6 +7,21 @@ import (
 	"github.com/sp-yduck/proxmox/pkg/service/node/vm"
 )
 
+// ServerRef is used for configuring Proxmox client
+type ServerRef struct {
+	// endpoint is the address of the Proxmox-VE REST API endpoint.
+	Endpoint string `json:"endpoint"`
+
+	// to do : login type should be an option
+	// user&pass or token
+
+	// to do : insecure tls verify
+
+	// CredentialsRef is a reference for secret which contains proxmox login secrets
+	// and ssh configs for proxmox nodes
+	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

@@ -31,7 +31,6 @@ type ClusterGetter interface {
 	Client
 	Name() string
 	Namespace() string
-	Server() string
 	// NetworkName() string
 	// Network() *infrav1.Network
 	// AdditionalLabels() infrav1.Labels

cloud/interfaces.go

@@ -32,8 +32,8 @@ type ProxmoxServices struct {
 	Remote  *SSHClient
 }
 
-func newComputeService(ctx context.Context, pCluster *infrav1.ProxmoxCluster, crClient client.Client) (*service.Service, error) {
-	credentialsRef := pCluster.Spec.CredentialsRef
+func newComputeService(ctx context.Context, serverRef infrav1.ServerRef, crClient client.Client) (*service.Service, error) {
+	credentialsRef := serverRef.CredentialsRef
 	if credentialsRef == nil {
 		return nil, errors.New("failed to get proxmox client form nil credentialsRef")
 	}
@@ -53,7 +53,7 @@ func newComputeService(ctx context.Context, pCluster *infrav1.ProxmoxCluster, cr
 		return nil, errors.Errorf("failed to fetch PROXMOX_PASSWORD from Secret : %v", key)
 	}
 
-	return service.NewServiceWithLogin(pCluster.Spec.Server, string(proxmoxUser), string(proxmoxPassword))
+	return service.NewServiceWithLogin(serverRef.Endpoint, string(proxmoxUser), string(proxmoxPassword))
 }
 
 func newRemoteClient(ctx context.Context, credentialsRef *infrav1.ObjectReference, crClient client.Client) (*SSHClient, error) {

cloud/scope/clients.go

@@ -44,15 +44,15 @@ func NewClusterScope(ctx context.Context, params ClusterScopeParams) (*ClusterSc
 	}
 
 	if params.ProxmoxServices.Compute == nil {
-		computeSvc, err := newComputeService(ctx, params.ProxmoxCluster, params.Client)
+		computeSvc, err := newComputeService(ctx, params.ProxmoxCluster.Spec.ServerRef, params.Client)
 		if err != nil {
 			return nil, errors.Errorf("failed to create proxmox compute client: %v", err)
 		}
 		params.ProxmoxServices.Compute = computeSvc
 	}
 
 	if params.ProxmoxServices.Remote == nil {
-		remote, err := newRemoteClient(ctx, params.ProxmoxCluster.Spec.CredentialsRef, params.Client)
+		remote, err := newRemoteClient(ctx, params.ProxmoxCluster.Spec.ServerRef.CredentialsRef, params.Client)
 		if err != nil {
 			return nil, errors.Errorf("failed to create remote client: %v", err)
 		}
@@ -89,10 +89,6 @@ func (s *ClusterScope) Namespace() string {
 	return s.Cluster.Namespace
 }
 
-func (s *ClusterScope) Server() string {
-	return s.ProxmoxCluster.Spec.Server
-}
-
 func (s *ClusterScope) ControlPlaneEndpoint() clusterv1.APIEndpoint {
 	return s.ProxmoxCluster.Spec.ControlPlaneEndpoint
 }

cloud/scope/cluster.go

@@ -57,24 +57,32 @@ spec:
                 - host
                 - port
                 type: object
-              credentialsRef:
-                description: CredentialsRef is a reference for secret which contains
-                  proxmox login secrets and ssh configs for proxmox nodes
+              serverRef:
+                description: 'ServerRef is used for configuring Proxmox client to
+                  do : client options like insecure tls verify, token login, etc.'
                 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/'
+                  credentialsRef:
+                    description: CredentialsRef is a reference for secret which contains
+                      proxmox login secrets and ssh configs for proxmox nodes
+                    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
+                  endpoint:
+                    description: endpoint is the address of the Proxmox-VE REST API
+                      endpoint.
                     type: string
                 required:
-                - name
-                - namespace
+                - credentialsRef
+                - endpoint
                 type: object
-              server:
-                description: 'Server is the address of the Proxmox-VE REST API endpoint.
-                  to do : client options like insecure tls verify, token login, etc.'
-                type: string
               storage:
                 description: storage is for proxmox storage used by vm instances
                 properties:
@@ -84,8 +92,7 @@ spec:
                     type: string
                 type: object
             required:
-            - credentialsRef
-            - server
+            - serverRef
             - storage
             type: object
           status: