move proxmox endpoint from secret to proxmoxcluster.spec

Author: sp-yduck

api/v1beta1/proxmoxcluster_types.go

@@ -35,6 +35,12 @@ type ProxmoxClusterSpec struct {
 	// +optional
 	ControlPlaneEndpoint clusterv1.APIEndpoint `json:"controlPlaneEndpoint"`
 
+	// Server is the address of the Proxmox-VE REST API endpoint.
+	// 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"`
 
 	// storage is for proxmox storage used by vm instances

cloud/interfaces.go

@@ -29,9 +29,9 @@ type Cluster interface {
 // ClusterGetter is an interface which can get cluster information.
 type ClusterGetter interface {
 	Client
-	// Region() string
 	Name() string
 	Namespace() string
+	Server() string
 	// NetworkName() string
 	// Network() *infrav1.Network
 	// AdditionalLabels() infrav1.Labels

cloud/scope/clients.go

@@ -25,15 +25,15 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	infrav1 "github.com/sp-yduck/cluster-api-provider-proxmox/api/v1beta1"
-	// "github.com/sp-yduck/cluster-api-provider-proxmox/cloud/services/compute/vm"
 )
 
 type ProxmoxServices struct {
 	Compute *service.Service
 	Remote  *SSHClient
 }
 
-func newComputeService(ctx context.Context, credentialsRef *infrav1.ObjectReference, crClient client.Client) (*service.Service, error) {
+func newComputeService(ctx context.Context, pCluster *infrav1.ProxmoxCluster, crClient client.Client) (*service.Service, error) {
+	credentialsRef := pCluster.Spec.CredentialsRef
 	if credentialsRef == nil {
 		return nil, errors.New("failed to get proxmox client form nil credentialsRef")
 	}
@@ -44,10 +44,6 @@ func newComputeService(ctx context.Context, credentialsRef *infrav1.ObjectRefere
 		return nil, err
 	}
 
-	proxmoxUrl, ok := secret.Data["PROXMOX_URL"]
-	if !ok {
-		return nil, errors.Errorf("failed to fetch PROXMOX_URL from Secret : %v", key)
-	}
 	proxmoxUser, ok := secret.Data["PROXMOX_USER"]
 	if !ok {
 		return nil, errors.Errorf("failed to fetch PROXMOX_USER from Secret : %v", key)
@@ -57,7 +53,7 @@ func newComputeService(ctx context.Context, credentialsRef *infrav1.ObjectRefere
 		return nil, errors.Errorf("failed to fetch PROXMOX_PASSWORD from Secret : %v", key)
 	}
 
-	return service.NewServiceWithLogin(string(proxmoxUrl), string(proxmoxUser), string(proxmoxPassword))
+	return service.NewServiceWithLogin(pCluster.Spec.Server, string(proxmoxUser), string(proxmoxPassword))
 }
 
 func newRemoteClient(ctx context.Context, credentialsRef *infrav1.ObjectReference, crClient client.Client) (*SSHClient, error) {

cloud/scope/cluster.go

@@ -44,7 +44,7 @@ func NewClusterScope(ctx context.Context, params ClusterScopeParams) (*ClusterSc
 	}
 
 	if params.ProxmoxServices.Compute == nil {
-		computeSvc, err := newComputeService(ctx, params.ProxmoxCluster.Spec.CredentialsRef, params.Client)
+		computeSvc, err := newComputeService(ctx, params.ProxmoxCluster, params.Client)
 		if err != nil {
 			return nil, errors.Errorf("failed to create proxmox compute client: %v", err)
 		}
@@ -89,6 +89,10 @@ 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
 }

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

@@ -58,8 +58,8 @@ spec:
                 - port
                 type: object
               credentialsRef:
-                description: ObjectReference is a reference to another Kubernetes
-                  object instance.
+                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'
@@ -71,6 +71,10 @@ spec:
                 - name
                 - namespace
                 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:
@@ -81,6 +85,7 @@ spec:
                 type: object
             required:
             - credentialsRef
+            - server
             - storage
             type: object
           status: