Merge pull request #2795 from vr4manta/SPLAT-2503

SPLAT-2503: Fixed "null" value for vSphere api and ingress VIP in UPI scenario

Author: openshift-merge-bot[bot]

pkg/controller/infrastructureconfig/sync_specstatus.go

@@ -182,6 +182,12 @@ func syncVips(spec *[]configv1.IP, status *[]string) error {
 	if spec == nil || status == nil {
 		return fmt.Errorf("passed nil value as spec or status vip")
 	}
+
+	// If status is not initialized, it will cause issues when committing "null" value to update
+	if *status == nil {
+		*status = []string{}
+	}
+
 	// `spec` is empty, `status` with value: copy status to spec
 	if len(*spec) == 0 {
 		*spec = ip.StringsToIPs(*status)

pkg/controller/infrastructureconfig/sync_specstatus_test.go

@@ -911,6 +911,53 @@ func Test_SpecStatusSynchronizer(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "should handle vSphere UPI: empty unset apiServerInternalIPs and ingressIPs",
+			givenInfra: configv1.Infrastructure{
+				ObjectMeta: metav1.ObjectMeta{Name: "cluster"},
+				Spec: configv1.InfrastructureSpec{
+					PlatformSpec: configv1.PlatformSpec{
+						VSphere: &configv1.VSpherePlatformSpec{
+							APIServerInternalIPs: []configv1.IP{},
+							IngressIPs:           []configv1.IP{},
+							MachineNetworks:      []configv1.CIDR{"224.0.0.1/24", "224.0.1.1/24"},
+						},
+					},
+				},
+				Status: configv1.InfrastructureStatus{
+					Platform: configv1.VSpherePlatformType,
+					PlatformStatus: &configv1.PlatformStatus{
+						Type: "VSphere",
+						VSphere: &configv1.VSpherePlatformStatus{
+							MachineNetworks: []configv1.CIDR{"224.0.0.1/24", "224.0.1.1/24"},
+						},
+					},
+				},
+			},
+			wantedInfra: configv1.Infrastructure{
+				ObjectMeta: metav1.ObjectMeta{Name: "cluster"},
+				Spec: configv1.InfrastructureSpec{
+					PlatformSpec: configv1.PlatformSpec{
+						VSphere: &configv1.VSpherePlatformSpec{
+							APIServerInternalIPs: []configv1.IP{},
+							IngressIPs:           []configv1.IP{},
+							MachineNetworks:      []configv1.CIDR{"224.0.0.1/24", "224.0.1.1/24"},
+						},
+					},
+				},
+				Status: configv1.InfrastructureStatus{
+					Platform: configv1.VSpherePlatformType,
+					PlatformStatus: &configv1.PlatformStatus{
+						Type: "VSphere",
+						VSphere: &configv1.VSpherePlatformStatus{
+							APIServerInternalIPs: []string{},
+							IngressIPs:           []string{},
+							MachineNetworks:      []configv1.CIDR{"224.0.0.1/24", "224.0.1.1/24"},
+						},
+					},
+				},
+			},
+		},
 	}
 
 	for _, tt := range tests {