CAPI controller modification: network and reconciliation loop (#15)

* add debug mode for manager client

* modified vm uuid string type

* refactor wait for tasks

* modify subnet spec to list for NutanixMachine

* Modify nutanix machine controller to use subnet list

* added kube-vip and subnet list to cluster-template

api/v1alpha4/nutanixmachine_types.go

@@ -66,7 +66,8 @@ type NutanixMachineSpec struct {
 	// The cluster identifier (uuid or name) can be obtained from the Prism Central console
 	// or using the prism_central API.
 	// +kubebuilder:validation:Required
-	Subnet NutanixResourceIdentifier `json:"subnet"`
+	// +kubebuilder:validation:MinItems=1
+	Subnets []NutanixResourceIdentifier `json:"subnet"`
 
 	// systemDiskSize is size (in Quantity format) of the system disk of the VM
 	// The minimum systemDiskSize is 20Gi bytes
@@ -94,7 +95,7 @@ type NutanixMachineStatus struct {
 
 	// The Nutanix VM's UUID
 	// +optional
-	VmUUID *string `json:"vmUUID,omitempty"`
+	VmUUID string `json:"vmUUID,omitempty"`
 
 	// NodeRef is a reference to the corresponding workload cluster Node if it exists.
 	// +optional

api/v1beta1/nutanixmachine_types.go

@@ -66,7 +66,8 @@ type NutanixMachineSpec struct {
 	// The cluster identifier (uuid or name) can be obtained from the Prism Central console
 	// or using the prism_central API.
 	// +kubebuilder:validation:Required
-	Subnet NutanixResourceIdentifier `json:"subnet"`
+	// +kubebuilder:validation:MinItems=1
+	Subnets []NutanixResourceIdentifier `json:"subnet"`
 
 	// systemDiskSize is size (in Quantity format) of the system disk of the VM
 	// The minimum systemDiskSize is 20Gi bytes
@@ -94,7 +95,7 @@ type NutanixMachineStatus struct {
 
 	// The Nutanix VM's UUID
 	// +optional
-	VmUUID *string `json:"vmUUID,omitempty"`
+	VmUUID string `json:"vmUUID,omitempty"`
 
 	// NodeRef is a reference to the corresponding workload cluster Node if it exists.
 	// +optional

cluster-template.yaml

@@ -6,7 +6,7 @@ metadata:
 spec:
   controlPlaneEndpoint:
     host: "${CONTROL_PLANE_ENDPOINT_IP}"
-    port: ${CONTROLPLANE_ENDPOINT_PORT=6443}
+    port: ${CONTROL_PLANE_ENDPOINT_PORT=6443}
 
 ---
 apiVersion: cluster.x-k8s.io/v1beta1
@@ -53,8 +53,8 @@ spec:
         type: name
         name: "${NUTANIX_PRISM_ELEMENT_CLUSTER_NAME}"
       subnet:
-        type: name
-        name: "${NUTANIX_SUBNET_NAME}"
+        - type: name
+          name: "${NUTANIX_SUBNET_NAME}"
 
 ---
 apiVersion: controlplane.cluster.x-k8s.io/v1beta1
@@ -80,6 +80,66 @@ spec:
       controllerManager:
         extraArgs:
           enable-hostpath-provisioner: "true"
+    files:
+      - content: |
+          apiVersion: v1
+          kind: Pod
+          metadata:
+            name: kube-vip
+            namespace: kube-system
+          spec:
+            containers:
+              - name: kube-vip
+                image: ghcr.io/kube-vip/kube-vip:v0.4.2
+                imagePullPolicy: IfNotPresent
+                args:
+                  - manager
+                env:
+                  - name: vip_arp
+                    value: "true"
+                  - name: address
+                    value: "${CONTROL_PLANE_ENDPOINT_IP}"
+                  - name: port
+                    value: "${CONTROL_PLANE_ENDPOINT_PORT=6443}"
+                  - name: vip_cidr
+                    value: "32"
+                  - name: cp_enable
+                    value: "true"
+                  - name: cp_namespace
+                    value: kube-system
+                  - name: vip_ddns
+                    value: "false"
+                  - name: vip_leaderelection
+                    value: "true"
+                  - name: vip_leaseduration
+                    value: "15"
+                  - name: vip_renewdeadline
+                    value: "10"
+                  - name: vip_retryperiod
+                    value: "2"
+                securityContext:
+                  capabilities:
+                    add:
+                      - NET_ADMIN
+                      - SYS_TIME
+                      - NET_RAW
+                volumeMounts:
+                  - mountPath: /etc/kubernetes/admin.conf
+                    name: kubeconfig
+                resources: {}
+            hostNetwork: true
+            hostAliases:
+              - hostnames:
+                  - kubernetes
+                ip: 127.0.0.1
+            volumes:
+              - name: kubeconfig
+                hostPath:
+                  type: FileOrCreate
+                  path: /etc/kubernetes/admin.conf
+          status: {}
+        owner: root:root
+        path: /etc/kubernetes/manifests/kube-vip.yaml
     initConfiguration:
       nodeRegistration:
         kubeletExtraArgs:
@@ -98,6 +158,7 @@ spec:
     postKubeadmCommands:
       - echo export KUBECONFIG=/etc/kubernetes/admin.conf >> /root/.bashrc
       - echo "after kubeadm call" > /var/log/postkubeadm.log
+    useExperimentalRetryJoin: true
     verbosity: 10
 
 ---

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

@@ -150,22 +150,27 @@ spec:
                   use for the Machine's VM The cluster identifier (uuid or name) can
                   be obtained from the Prism Central console or using the prism_central
                   API.
-                properties:
-                  name:
-                    description: name is the resource name in the PC
-                    type: string
-                  type:
-                    description: Type is the identifier type to use for this resource.
-                    enum:
-                    - uuid
-                    - name
-                    type: string
-                  uuid:
-                    description: uuid is the UUID of the resource in the PC.
-                    type: string
-                required:
-                - type
-                type: object
+                items:
+                  description: NutanixResourceIdentifier holds the identity of a Nutanix
+                    PC resource (cluster, image, subnet, etc.)
+                  properties:
+                    name:
+                      description: name is the resource name in the PC
+                      type: string
+                    type:
+                      description: Type is the identifier type to use for this resource.
+                      enum:
+                      - uuid
+                      - name
+                      type: string
+                    uuid:
+                      description: uuid is the UUID of the resource in the PC.
+                      type: string
+                  required:
+                  - type
+                  type: object
+                minItems: 1
+                type: array
               systemDiskSize:
                 anyOf:
                 - type: integer
@@ -441,22 +446,27 @@ spec:
                   use for the Machine's VM The cluster identifier (uuid or name) can
                   be obtained from the Prism Central console or using the prism_central
                   API.
-                properties:
-                  name:
-                    description: name is the resource name in the PC
-                    type: string
-                  type:
-                    description: Type is the identifier type to use for this resource.
-                    enum:
-                    - uuid
-                    - name
-                    type: string
-                  uuid:
-                    description: uuid is the UUID of the resource in the PC.
-                    type: string
-                required:
-                - type
-                type: object
+                items:
+                  description: NutanixResourceIdentifier holds the identity of a Nutanix
+                    PC resource (cluster, image, subnet, etc.)
+                  properties:
+                    name:
+                      description: name is the resource name in the PC
+                      type: string
+                    type:
+                      description: Type is the identifier type to use for this resource.
+                      enum:
+                      - uuid
+                      - name
+                      type: string
+                    uuid:
+                      description: uuid is the UUID of the resource in the PC.
+                      type: string
+                  required:
+                  - type
+                  type: object
+                minItems: 1
+                type: array
               systemDiskSize:
                 anyOf:
                 - type: integer