openshift/installer
1
0
Fork 0
mirror of https://github.com/openshift/installer.git synced 2026-02-05 06:46:36 +01:00
Code Issues Releases Activity

Merge pull request #10163 from openshift-cherrypick-robot/cherry-pick-10159-to-release-4.21

Browse Source 
[release-4.21] OCPBUGS-68363: azure: allow hive to pass empty rhcos image string
This commit is contained in:
openshift-merge-bot[bot]
2025-12-17 00:50:42 +00:00
committed by GitHub
parent a4e1c186c1 ddfddb88c3
commit 763d379a9d
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/asset/machines/azure/azuremachines.go
View File

@@ -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",
@@ -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{
@@ -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.
// 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)

12
pkg/asset/machines/azure/machines.go
View File

@@ -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"
@@ -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)