Skip to content

OCPBUGS-67310: azure: allow hive to pass empty rhcos image string #10159

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-bot merged 2 commits into from
Dec 15, 2025
Merged

OCPBUGS-67310: azure: allow hive to pass empty rhcos image string #10159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec85cea
azure: allow hive to pass empty rhcos image string
patrickdillon Dec 11, 2025
e4c1357
machines: allow confidential VMs on hive to use image galleries
patrickdillon Dec 12, 2025
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
11 changes: 8 additions & 3 deletions pkg/asset/machines/azure/azuremachines.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ func GenerateMachines(clusterID, resourceGroup, subscriptionID string, session *
if err != nil {
return nil, fmt.Errorf("failed to create machineapi.TagSpecifications from UserTags: %w", err)
}
image := capzImage(mpool.OSImage, in.Environment, in.HyperVGen, resourceGroup, subscriptionID, clusterID, in.RHCOS)
confidentialVM := mpool.Settings != nil && mpool.Settings.SecurityType != ""
image := capzImage(mpool.OSImage, in.Environment, confidentialVM, in.HyperVGen, resourceGroup, subscriptionID, clusterID, in.RHCOS)
// Set up OSDisk
osDisk := capz.OSDisk{
OSType: "Linux",
Expand Down Expand Up @@ -354,7 +355,7 @@ func bootDiagStorageURIBuilder(diag *aztypes.BootDiagnostics, storageEndpointSuf
return ""
}

func capzImage(osImage aztypes.OSImage, azEnv aztypes.CloudEnvironment, gen, rg, sub, infraID, rhcosImg string) *capz.Image {
func capzImage(osImage aztypes.OSImage, azEnv aztypes.CloudEnvironment, confidentialVM bool, gen, rg, sub, infraID, rhcosImg string) *capz.Image {
switch {
case osImage.Publisher != "":
return &capz.Image{
Expand Down Expand Up @@ -386,7 +387,11 @@ func capzImage(osImage aztypes.OSImage, azEnv aztypes.CloudEnvironment, gen, rg,
ThirdPartyImage: false,
},
}
default: // Installer-created image gallery, should only be OKD.
case rhcosImg == "" && !confidentialVM:
// hive calls the machines function, but may pass an empty
// string for rhcos. In which case, allow MAO to choose default.
return nil
default: // Installer-created image gallery, for OKD && confidential VMs.
Comment on lines +390 to +394
Copy link
Member

@tthvo tthvo Dec 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❓ Would this break OKD install since OKD uses image gallery? 👇

installer/pkg/infrastructure/azure/azure.go

Lines 257 to 259 in 7169d1c

// Create a managed image, which is used for OKD or confidential VMs on OCP.
hasConfidentialVM := getMachinePoolSecurityType(installConfig) != ""
if (hasConfidentialVM || installConfig.IsOKD()) && platform.CloudName != aztypes.StackCloud {

I guess I am unsure whether rhcosImg is empty in the case of OKD...

Copy link
Contributor Author

@patrickdillon patrickdillon Dec 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess I am unsure whether rhcosImg is empty in the case of OKD...

It's not empty (rhcosImg does not seem like a great variable name in retrospect).

Copy link
Member

@tthvo tthvo Dec 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh thanks! That clears up my questions :D

// image gallery names cannot have dashes
galleryName := strings.ReplaceAll(infraID, "-", "_")
imageID := fmt.Sprintf("/subscriptions/%s/resourceGroups/%s/providers/Microsoft.Compute/galleries/gallery_%s/images/%s", sub, rg, galleryName, infraID)
Expand Down
12 changes: 9 additions & 3 deletions pkg/asset/machines/azure/machines.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,8 @@ func provider(platform *azure.Platform, mpool *azure.MachinePool, osImage string
}
rg := platform.ClusterResourceGroupName(clusterID)

image := mapiImage(mpool.OSImage, platform.CloudName, hyperVGen, rg, session.Credentials.SubscriptionID, clusterID, osImage)
confidentialVM := mpool.Settings != nil && mpool.Settings.SecurityType != ""
image := mapiImage(mpool.OSImage, platform.CloudName, confidentialVM, hyperVGen, rg, session.Credentials.SubscriptionID, clusterID, osImage)

if mpool.OSDisk.DiskType == "" {
mpool.OSDisk.DiskType = "Premium_LRS"
Expand Down Expand Up @@ -430,9 +431,14 @@ func generateSecurityProfile(mpool *azure.MachinePool) *machineapi.SecurityProfi
return securityProfile
}

func mapiImage(osImage azure.OSImage, azEnv azure.CloudEnvironment, gen, rg, sub, infraID, rhcosImg string) machineapi.Image {
cImg := capzImage(osImage, azEnv, gen, rg, sub, infraID, rhcosImg)
func mapiImage(osImage azure.OSImage, azEnv azure.CloudEnvironment, confidentialVM bool, gen, rg, sub, infraID, rhcosImg string) machineapi.Image {
mImg := machineapi.Image{}
// hive uses this package, but may pass an empty string for rhcosImg,
// in which case we want to depend on MAO default, so return empty.
if rhcosImg == "" {
return mImg
}
cImg := capzImage(osImage, azEnv, confidentialVM, gen, rg, sub, infraID, rhcosImg)

if cImg.ID != nil {
mImg.ResourceID = trimSubscriptionPrefix(*cImg.ID)
Expand Down