Skip to content

OCPBUGS-66071: Fix PPI for ACM #456

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
iurygregory wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −13
Open

OCPBUGS-66071: Fix PPI for ACM #456

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
17 changes: 4 additions & 13 deletions internal/controller/metal3.io/host_state_machine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,19 +358,10 @@ func (hsm *hostStateMachine) ensureRegistered(info *reconcileInfo) (result actio
// In the deleting state the whole idea is to de-register the host
return result
case metal3api.StateRegistering:
case metal3api.StateInspecting, metal3api.StatePreparing:
// The Infrastructure operator in RHACM <=2.4 does not supply a
// controller for PreprovisioningImages with an InfraEnv label, (which
// the default controller ignores) but an image will be required
// if we register in the Preparing state. We know that this version
// never has work to do in Preparing, so it is safe to disable
// registration in that state. In later versions, where the controller
// is available and we need images, inspection will not be disabled.
if _, hasInfraEnv := hsm.Host.Labels["infraenvs.agent-install.openshift.io"]; hsm.NextState == metal3api.StateInspecting || hasInfraEnv {
if hsm.Host.InspectionDisabled() {
// No need to register if we are not actually going to inspect
return
}
case metal3api.StateInspecting:
if hsm.Host.InspectionDisabled() {
// No need to register if we are not actually going to inspect
return
}
fallthrough
default:
Expand Down