Skip to content

[release-5.0] OCPBUGS-115467: Guard against empty workspace field on vsphere #419

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

Open
openshift-cherrypick-robot wants to merge 1 commit into
base: release-5.0
Choose a base branch
from
+16 −0
Open

[release-5.0] OCPBUGS-115467: Guard against empty workspace field on vsphere #419

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
5 changes: 5 additions & 0 deletions 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 @@ -168,6 +168,11 @@ func (v VSphereProviderConfig) InjectFailureDomain(fd machinev1.VSphereFailureDo
func (v VSphereProviderConfig) ExtractFailureDomain() machinev1.VSphereFailureDomain { //nolint:cyclop
workspace := v.providerConfig.Workspace

// If workspace is not set on the CPMS's config, the Machines will have one injected from the Infra object.
if workspace == nil {
return machinev1.VSphereFailureDomain{}
}

if v.infrastructure.Spec.PlatformSpec.Type != configv1.VSpherePlatformType {
return machinev1.VSphereFailureDomain{}
}
Expand Down
11 changes: 11 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 @@ -300,4 +300,15 @@ var _ = Describe("VSphere Provider Config", Label("vSphereProviderConfig"), func
Expect(expected).To(Equal(v1.VSphereFailureDomain{}))
})
})

Context("no workspace configured in provider spec", func() {
BeforeEach(func() {
providerConfig.providerConfig.Workspace = nil
})

It("should return empty failure domain without panicking", func() {
Expect(providerConfig.ExtractFailureDomain()).To(Equal(v1.VSphereFailureDomain{}),
"expected empty failure domain when workspace is nil, but ExtractFailureDomain panicked")
})
})
})