Merge pull request #66 from nutanix-cloud-native/OCPBUGS-27390

OCPBUGS-27390: IPI install fails on Nutanix when using DHCP

go.mod

@@ -127,5 +127,3 @@ require (
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )
-
-replace k8s.io/kubectl => k8s.io/kubectl v0.28.2

go.sum

@@ -869,8 +869,8 @@ k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0=
 k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo=
 k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780=
 k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
-k8s.io/kubectl v0.28.2 h1:fOWOtU6S0smdNjG1PB9WFbqEIMlkzU5ahyHkc7ESHgM=
-k8s.io/kubectl v0.28.2/go.mod h1:6EQWTPySF1fn7yKoQZHYf9TPwIl2AygHEcJoxFekr64=
+k8s.io/kubectl v0.29.0 h1:Oqi48gXjikDhrBF67AYuZRTcJV4lg2l42GmvsP7FmYI=
+k8s.io/kubectl v0.29.0/go.mod h1:0jMjGWIcMIQzmUaMgAzhSELv5WtHo2a8pq67DtviAJs=
 k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCfRziVtos3ofG/sQ=
 k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=

pkg/actuators/machine/machine_scope.go

@@ -288,26 +288,39 @@ func (s *machineScope) setProviderStatus(vm *nutanixClientV3.VMIntentResponse, c
 	s.providerStatus.VmUUID = vm.Metadata.UUID
 
 	// update machine.status.addresses
-	addresses := s.machine.Status.Addresses
-	addr := getExistingAddress(addresses, corev1.NodeInternalIP)
-	if addr != nil {
-		addr.Address = *vm.Status.Resources.NicList[0].IPEndpointList[0].IP
-	} else {
-		addresses = append(addresses, corev1.NodeAddress{
-			Type:    corev1.NodeInternalIP,
-			Address: *vm.Status.Resources.NicList[0].IPEndpointList[0].IP,
-		})
+	machineAddresses := []corev1.NodeAddress{}
+	vmIPEndpoints := make(map[string]bool)
+
+	for _, nic := range vm.Status.Resources.NicList {
+		for _, ipEndpoint := range nic.IPEndpointList {
+			if ipEndpoint.IP != nil && *ipEndpoint.IP != "" {
+				vmIPEndpoints[*ipEndpoint.IP] = true
+			}
+		}
 	}
-	addr = getExistingAddress(addresses, corev1.NodeInternalDNS)
-	if addr != nil {
-		addr.Address = *vm.Spec.Name
-	} else {
-		addresses = append(addresses, corev1.NodeAddress{
-			Type:    corev1.NodeInternalDNS,
-			Address: *vm.Spec.Name,
+
+	// add the NodeInternalIP addresses to the Machine object using the vm's vmIPEndpoints
+	for ip, _ := range vmIPEndpoints {
+		// add the ip address to the Machine object.
+		machineAddresses = append(machineAddresses, corev1.NodeAddress{
+			Type:    corev1.NodeInternalIP,
+			Address: ip,
 		})
 	}
-	s.machine.Status.Addresses = addresses
+
+	// add the NodeInternalDNS and NodeHostName addresses to the Machine object using the vm name
+	vmName := *vm.Spec.Name
+	machineAddresses = append(machineAddresses, corev1.NodeAddress{
+		Type:    corev1.NodeInternalDNS,
+		Address: vmName,
+	})
+	machineAddresses = append(machineAddresses, corev1.NodeAddress{
+		Type:    corev1.NodeHostName,
+		Address: vmName,
+	})
+
+	s.machine.Status.Addresses = machineAddresses
+	klog.V(3).Infof("%s: the machine status.addresses=%+v.", s.machine.Name, s.machine.Status.Addresses)
 
 	s.providerStatus.Conditions = setNutanixProviderConditions([]metav1.Condition{condition}, s.providerStatus.Conditions)
 

vendor/modules.txt

@@ -805,8 +805,8 @@ k8s.io/kube-openapi/pkg/spec3
 k8s.io/kube-openapi/pkg/util/proto
 k8s.io/kube-openapi/pkg/util/proto/validation
 k8s.io/kube-openapi/pkg/validation/spec
-# k8s.io/kubectl v0.29.0 => k8s.io/kubectl v0.28.2
-## explicit; go 1.20
+# k8s.io/kubectl v0.29.0
+## explicit; go 1.21
 k8s.io/kubectl/pkg/cmd/util
 k8s.io/kubectl/pkg/drain
 k8s.io/kubectl/pkg/scheme
@@ -1001,4 +1001,3 @@ sigs.k8s.io/structured-merge-diff/v4/value
 ## explicit; go 1.12
 sigs.k8s.io/yaml
 sigs.k8s.io/yaml/goyaml.v2
-# k8s.io/kubectl => k8s.io/kubectl v0.28.2