Skip to content

OCPBUGS-15659: IPI pre-check for MachineAPI capability #7414

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

Merged
openshift-merge-robot merged 1 commit into from
Aug 25, 2023
Merged

OCPBUGS-15659: IPI pre-check for MachineAPI capability #7414

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
31 changes: 31 additions & 0 deletions pkg/asset/installconfig/platformprovisioncheck.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@ package installconfig

import (
"context"
"errors"
"fmt"

"k8s.io/apimachinery/pkg/util/sets"

configv1 "github.com/openshift/api/config/v1"
"github.com/openshift/installer/pkg/asset"
alibabacloudconfig "github.com/openshift/installer/pkg/asset/installconfig/alibabacloud"
awsconfig "github.com/openshift/installer/pkg/asset/installconfig/aws"
Expand Down Expand Up @@ -51,6 +55,33 @@ func (a *PlatformProvisionCheck) Generate(dependencies asset.Parents) error {
ic := &InstallConfig{}
dependencies.Get(ic)
platform := ic.Config.Platform.Name()

// IPI requires MachineAPI capability
enabledCaps := sets.NewString()
if ic.Config.Capabilities == nil || ic.Config.Capabilities.BaselineCapabilitySet == "" {
// when Capabilities and/or BaselineCapabilitySet is not specified, default is vCurrent
baseSet := configv1.ClusterVersionCapabilitySets[configv1.ClusterVersionCapabilitySetCurrent]
for _, cap := range baseSet {
enabledCaps.Insert(string(cap))
}
}
if ic.Config.Capabilities != nil {
if ic.Config.Capabilities.BaselineCapabilitySet != "" {
baseSet := configv1.ClusterVersionCapabilitySets[ic.Config.Capabilities.BaselineCapabilitySet]
for _, cap := range baseSet {
enabledCaps.Insert(string(cap))
}
}
if ic.Config.Capabilities.AdditionalEnabledCapabilities != nil {
for _, cap := range ic.Config.Capabilities.AdditionalEnabledCapabilities {
enabledCaps.Insert(string(cap))
}
}
}
if !enabledCaps.Has(string(configv1.ClusterVersionCapabilityMachineAPI)) {
return errors.New("IPI requires MachineAPI capability")
}

switch platform {
case aws.Name:
session, err := ic.AWS.Session(context.TODO())
Expand Down