fix #24

Author: sp-yduck

api/v1beta1/type.go

@@ -17,23 +17,22 @@ type ServerRef struct {
 
 	// to do : client options like insecure tls verify
 
-	// CredentialsRef is a reference for secret which contains proxmox login secrets
+	// SecretRef is a reference for secret which contains proxmox login secrets
 	// and ssh configs for proxmox nodes
-	CredentialsRef *ObjectReference `json:"credentialsRef"`
+	SecretRef *ObjectReference `json:"secretRef"`
 }
 
 // NodeRef
 type NodeRef struct {
-	Name           string           `json:"name"`
-	CredentialsRef *ObjectReference `json:"credentialsRef"`
+	Name      string           `json:"name"`
+	SecretRef *ObjectReference `json:"secretRef"`
 }
 
 // ObjectReference is a reference to another Kubernetes object instance.
 type ObjectReference struct {
 	// Namespace of the referent.
 	// More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
-	// +kubebuilder:validation:Required
-	Namespace string `json:"namespace"`
+	Namespace string `json:"namespace,omitempty"`
 	// Name of the referent.
 	// More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
 	// +kubebuilder:validation:Required

api/v1beta1/zz_generated.deepcopy.go

@@ -33,13 +33,13 @@ type ProxmoxServices struct {
 }
 
 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")
+	secretRef := serverRef.SecretRef
+	if secretRef == nil {
+		return nil, errors.New("failed to get proxmox client form nil secretRef")
 	}
 
 	var secret corev1.Secret
-	key := client.ObjectKey{Namespace: credentialsRef.Namespace, Name: credentialsRef.Name}
+	key := client.ObjectKey{Namespace: secretRef.Namespace, Name: secretRef.Name}
 	if err := crClient.Get(ctx, key, &secret); err != nil {
 		return nil, err
 	}
@@ -56,13 +56,13 @@ func newComputeService(ctx context.Context, serverRef infrav1.ServerRef, crClien
 	return service.NewServiceWithLogin(serverRef.Endpoint, string(proxmoxUser), string(proxmoxPassword))
 }
 
-func newRemoteClient(ctx context.Context, credentialsRef *infrav1.ObjectReference, crClient client.Client) (*SSHClient, error) {
-	if credentialsRef == nil {
-		return nil, errors.New("failed to get proxmox client form nil credentialsRef")
+func newRemoteClient(ctx context.Context, secretRef *infrav1.ObjectReference, crClient client.Client) (*SSHClient, error) {
+	if secretRef == nil {
+		return nil, errors.New("failed to get proxmox client form nil secretRef")
 	}
 
 	var secret corev1.Secret
-	key := client.ObjectKey{Namespace: credentialsRef.Namespace, Name: credentialsRef.Name}
+	key := client.ObjectKey{Namespace: secretRef.Namespace, Name: secretRef.Name}
 	if err := crClient.Get(ctx, key, &secret); err != nil {
 		return nil, err
 	}

cloud/scope/clients.go

@@ -42,6 +42,7 @@ func NewClusterScope(ctx context.Context, params ClusterScopeParams) (*ClusterSc
 	if params.ProxmoxCluster == nil {
 		return nil, errors.New("failed to generate new scope from nil ProxmoxCluster")
 	}
+	populateNamespace(params.ProxmoxCluster)
 
 	if params.ProxmoxServices.Compute == nil {
 		computeSvc, err := newComputeService(ctx, params.ProxmoxCluster.Spec.ServerRef, params.Client)
@@ -53,7 +54,7 @@ func NewClusterScope(ctx context.Context, params ClusterScopeParams) (*ClusterSc
 
 	if params.ProxmoxServices.Remote == nil {
 		// current CAPP is compatible with only single node proxmox cluster
-		remote, err := newRemoteClient(ctx, params.ProxmoxCluster.Spec.NodeRefs[0].CredentialsRef, params.Client)
+		remote, err := newRemoteClient(ctx, params.ProxmoxCluster.Spec.NodeRefs[0].SecretRef, params.Client)
 		if err != nil {
 			return nil, errors.Errorf("failed to create remote client: %v", err)
 		}
@@ -74,6 +75,17 @@ func NewClusterScope(ctx context.Context, params ClusterScopeParams) (*ClusterSc
 	}, err
 }
 
+func populateNamespace(proxmoxCluster *infrav1.ProxmoxCluster) {
+	if proxmoxCluster.Spec.ServerRef.SecretRef.Namespace == "" {
+		proxmoxCluster.Spec.ServerRef.SecretRef.Namespace = proxmoxCluster.Namespace
+	}
+	for i, nodeRef := range proxmoxCluster.Spec.NodeRefs {
+		if nodeRef.SecretRef.Namespace == "" {
+			proxmoxCluster.Spec.NodeRefs[i].SecretRef.Namespace = proxmoxCluster.Namespace
+		}
+	}
+}
+
 type ClusterScope struct {
 	ProxmoxServices
 	client         client.Client

cloud/scope/cluster.go

@@ -72,7 +72,9 @@ spec:
                 items:
                   description: NodeRef
                   properties:
-                    credentialsRef:
+                    name:
+                      type: string
+                    secretRef:
                       description: ObjectReference is a reference to another Kubernetes
                         object instance.
                       properties:
@@ -84,20 +86,21 @@ spec:
                           type: string
                       required:
                       - name
-                      - namespace
                       type: object
-                    name:
-                      type: string
                   required:
-                  - credentialsRef
                   - name
+                  - secretRef
                   type: object
                 type: array
               serverRef:
                 description: ServerRef is used for configuring Proxmox client
                 properties:
-                  credentialsRef:
-                    description: CredentialsRef is a reference for secret which contains
+                  endpoint:
+                    description: endpoint is the address of the Proxmox-VE REST API
+                      endpoint.
+                    type: string
+                  secretRef:
+                    description: SecretRef is a reference for secret which contains
                       proxmox login secrets and ssh configs for proxmox nodes
                     properties:
                       name:
@@ -108,15 +111,10 @@ spec:
                         type: string
                     required:
                     - name
-                    - namespace
                     type: object
-                  endpoint:
-                    description: endpoint is the address of the Proxmox-VE REST API
-                      endpoint.
-                    type: string
                 required:
-                - credentialsRef
                 - endpoint
+                - secretRef
                 type: object
               storage:
                 description: storage is for proxmox storage used by vm instances

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

@@ -14,14 +14,12 @@ spec:
     port: 6443
   serverRef: 
     endpoint: 192.168.1.157:8006  # your proxmox api endpoint
-    credentialsRef:
+    secretRef:
       name: proxmoxcluster-sample
-      namespace: default
   nodeRefs:
     - name: mynode
-      credentialsRef:
+      secretRef:
         name: proxmoxcluster-sample
-        namespace: default
   storage:
     name: proxmoxcluster-sample
     path: ""