Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SPLAT-1410: Fix vSphere machineprovider InjectFailureDomain to handle empty network device list. #281

Merged
merged 1 commit into from
Feb 21, 2024
Merged

SPLAT-1410: Fix vSphere machineprovider InjectFailureDomain to handle empty network device list. #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion pkg/machineproviders/providers/openshift/machine/v1beta1/providerconfig/vsphere.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,15 @@ func (v VSphereProviderConfig) InjectFailureDomain(fd machinev1.VSphereFailureDo

newVSphereProviderConfig.providerConfig.Workspace = newVSphereProviderConfig.getWorkspaceFromFailureDomain(failureDomain)
topology := failureDomain.Topology
network := newVSphereProviderConfig.providerConfig.Network

logNetworkInfo(newVSphereProviderConfig.providerConfig.Network, "control plane machine set network before failure domain: %v", v.logger)

if len(topology.Networks) > 0 {
networkSpec := machinev1beta1.NetworkSpec{}
// If original has AddressesFromPools, that means static IP is desired for the CPMS. Keep that and just add the FD info.
if len(newVSphereProviderConfig.providerConfig.Network.Devices[0].AddressesFromPools) > 0 {
// Note, CPMS may have no network devices defined relying on FD to provide.
if len(network.Devices) > 0 && len(network.Devices[0].AddressesFromPools) > 0 {
networkSpec.Devices = newVSphereProviderConfig.providerConfig.Network.Devices
}

Expand Down
13 changes: 13 additions & 0 deletions pkg/machineproviders/providers/openshift/machine/v1beta1/providerconfig/vsphere_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,4 +209,17 @@ var _ = Describe("VSphere Provider Config", Label("vSphereProviderConfig"), func
Expect(newProviderSpec.VSphere().providerConfig.Network.Devices[0].Nameservers).To(BeNil())
})
})

Context("no network configured", func() {
BeforeEach(func() {
providerConfig.providerConfig.Network = machinev1beta1.NetworkSpec{}
})

It("should not fail after injectFailureDomain", func() {
expected, err := providerConfig.InjectFailureDomain(providerConfig.ExtractFailureDomain())
Expect(err).To(Not(HaveOccurred()))
Expect(expected.providerConfig.Network.Devices[0].NetworkName).To(Equal(providerConfig.infrastructure.Spec.PlatformSpec.VSphere.FailureDomains[0].Topology.Networks[0]),
"expected NetworkName to still be equal to the the original after injection of the Failure Domain")
})
})
})