[hypervisor] add internal ip address field to status

Author: notandy

api/v1/hypervisor_types.go

@@ -181,6 +181,9 @@ type HypervisorStatus struct {
 	// Aggregates are the applied aggregates of the hypervisor.
 	Aggregates []string `json:"aggregates,omitempty"`
 
+	// InternalIP is the internal IP address of the hypervisor.
+	InternalIP string `json:"internalIp,omitempty"`
+
 	// Represents the Hypervisor node conditions.
 	Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"`
 
@@ -199,6 +202,7 @@ type HypervisorStatus struct {
 // +kubebuilder:printcolumn:JSONPath=".spec.highAvailability",name="High Availability",type="boolean"
 // +kubebuilder:printcolumn:JSONPath=".spec.skipTests",name="Skip Tests",type="boolean"
 // +kubebuilder:printcolumn:JSONPath=".status.operatingSystem.prettyVersion",name="Version",type="string"
+// +kubebuilder:printcolumn:JSONPath=".status.internalIp",name="IP",type="string"
 // +kubebuilder:printcolumn:JSONPath=".status.numInstances",name="Instances",type="integer"
 // +kubebuilder:printcolumn:JSONPath=".status.operatingSystem.hardwareModel",name="Hardware",type="string",priority=2
 // +kubebuilder:printcolumn:JSONPath=".status.operatingSystem.kernelRelease",name="Kernel",type="string",priority=2

charts/openstack-hypervisor-operator/crds/hypervisor-crd.yaml

@@ -46,6 +46,9 @@ spec:
     - jsonPath: .status.operatingSystem.prettyVersion
       name: Version
       type: string
+    - jsonPath: .status.internalIp
+      name: IP
+      type: string
     - jsonPath: .status.numInstances
       name: Instances
       type: integer
@@ -271,6 +274,9 @@ spec:
                   - name
                   type: object
                 type: array
+              internalIp:
+                description: InternalIP is the internal IP address of the hypervisor.
+                type: string
               libVirtVersion:
                 default: unknown
                 description: Represents the LibVirt version.

config/crd/bases/kvm.cloud.sap_hypervisors.yaml

@@ -47,6 +47,9 @@ spec:
     - jsonPath: .status.operatingSystem.prettyVersion
       name: Version
       type: string
+    - jsonPath: .status.internalIp
+      name: IP
+      type: string
     - jsonPath: .status.numInstances
       name: Instances
       type: integer
@@ -272,6 +275,9 @@ spec:
                   - name
                   type: object
                 type: array
+              internalIp:
+                description: InternalIP is the internal IP address of the hypervisor.
+                type: string
               libVirtVersion:
                 default: unknown
                 description: Represents the LibVirt version.

internal/controller/hypervisor_controller.go

@@ -94,23 +94,37 @@ func (hv *HypervisorController) Reconcile(ctx context.Context, req ctrl.Request)
 		// continue with creation
 	} else {
 		// update Status if needed
+		changed := false
+
+		// transfer internal IP
+		for _, address := range node.Status.Addresses {
+			if address.Type == corev1.NodeInternalIP && hypervisor.Status.InternalIP != address.Address {
+				hypervisor.Status.InternalIP = address.Address
+				changed = true
+				break
+			}
+		}
+
+		// update terminating condition
 		nodeTerminationCondition := FindNodeStatusCondition(node.Status.Conditions, "Terminating")
 		if nodeTerminationCondition != nil && nodeTerminationCondition.Status == corev1.ConditionTrue {
 			// Node might be terminating, propagate condition to hypervisor
-			changed := meta.SetStatusCondition(&hypervisor.Status.Conditions, metav1.Condition{
+			changed = meta.SetStatusCondition(&hypervisor.Status.Conditions, metav1.Condition{
 				Type:    kvmv1.ConditionTypeReady,
 				Status:  metav1.ConditionFalse,
 				Reason:  nodeTerminationCondition.Reason,
 				Message: nodeTerminationCondition.Message,
-			}) || meta.SetStatusCondition(&hypervisor.Status.Conditions, metav1.Condition{
+			}) || changed
+			changed = meta.SetStatusCondition(&hypervisor.Status.Conditions, metav1.Condition{
 				Type:    kvmv1.ConditionTypeTerminating,
 				Status:  metav1.ConditionStatus(nodeTerminationCondition.Status),
 				Reason:  nodeTerminationCondition.Reason,
 				Message: nodeTerminationCondition.Message,
-			})
-			if changed {
-				return ctrl.Result{}, hv.Status().Update(ctx, hypervisor)
-			}
+			}) || changed
+		}
+
+		if changed {
+			return ctrl.Result{}, hv.Status().Update(ctx, hypervisor)
 		}
 
 		// transport label/anotations changes