Skip to content

Commit

Permalink
Merge pull request #4763 from isabella-janssen/ocpbugs-34586-autoreco…
Browse files Browse the repository at this point in the history
…very

OCPBUGS-34586: Auto-recover from MC with invalid extension
  • Loading branch information
openshift-merge-bot[bot] authored Jan 24, 2025
2 parents 11b9ad0 + 6a53bc9 commit 9871a24
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions pkg/controller/common/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,12 @@ func ValidateMachineConfig(cfg mcfgv1.MachineConfigSpec) error {
if err := ValidateIgnition(ignCfg); err != nil {
return err
}
// Validate MC extensions are in allowlist
if len(cfg.Extensions) > 0 {
if err := ValidateMachineConfigExtensions(cfg); err != nil {
return err
}
}
}
return nil
}
Expand Down

0 comments on commit 9871a24

Please sign in to comment.