Skip to content

DNM: WIP: Handle RHCOS image information extraction in a separate method #10654

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
sadasu wants to merge 2 commits into
base: main
Choose a base branch
from
+93 −49
Open

DNM: WIP: Handle RHCOS image information extraction in a separate method #10654

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
a12b31d
Handle RHCOS image information extraction in a seperate method
sadasu Jun 15, 2026
d11b869
Fix install-config validation for Azure DualStack
sadasu Jun 24, 2026
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
121 changes: 76 additions & 45 deletions pkg/infrastructure/azure/azure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,17 @@ const (
stackDNSAPIVersion = "2018-05-01"
)

// rhcosImageInfo holds the RHCos image information extracted from stream metadata.
type rhcosImageInfo struct {
ImageURL string
ImageLength int64
GalleryName string
GalleryImageName string
GalleryImageVersionName string
GalleryGen2ImageName string
GalleryGen2ImageVersionName string
}

// Provider implements Azure CAPI installation.
type Provider struct {
ResourceGroupName string
Expand Down Expand Up @@ -97,6 +108,53 @@ func (p Provider) ProvisionTimeout() time.Duration {
// in the status and should use the API load balancer when gathering bootstrap log bundles.
func (*Provider) PublicGatherEndpoint() clusterapi.GatherEndpoint { return clusterapi.APILoadBalancer }

// getRHCOSImageInfo fetches the RHCOS stream metadata and computes Azure-specific
// image information including gallery names, image URL, and validates image alignment.
func getRHCOSImageInfo(ctx context.Context, installConfig *types.InstallConfig, infraID string) (*rhcosImageInfo, error) {
stream, err := rhcos.FetchCoreOSBuild(ctx, installConfig.OSImageStream)
if err != nil {
return nil, fmt.Errorf("failed to get rhcos stream: %w", err)
}

archName := arch.RpmArch(string(installConfig.ControlPlane.Architecture))
streamArch, err := stream.GetArchitecture(archName)
if err != nil {
return nil, fmt.Errorf("failed to get rhcos architecture: %w", err)
}

azureDisk := streamArch.RHELCoreOSExtensions.AzureDisk
imageURL := azureDisk.URL

rawImageVersion := strings.ReplaceAll(azureDisk.Release, "-", "_")
imageVersion := rawImageVersion[:len(rawImageVersion)-6]

galleryName := fmt.Sprintf("gallery_%s", strings.ReplaceAll(infraID, "-", "_"))
galleryImageName := infraID
galleryImageVersionName := imageVersion
galleryGen2ImageName := fmt.Sprintf("%s-gen2", infraID)
galleryGen2ImageVersionName := imageVersion

headResponse, err := http.Head(imageURL) // nolint:gosec
if err != nil {
return nil, fmt.Errorf("failed HEAD request for image URL %s: %w", imageURL, err)
}

imageLength := headResponse.ContentLength
if imageLength%512 != 0 {
return nil, fmt.Errorf("image length is not aligned on a 512 byte boundary")
}

return &rhcosImageInfo{
ImageURL: imageURL,
ImageLength: imageLength,
GalleryName: galleryName,
GalleryImageName: galleryImageName,
GalleryImageVersionName: galleryImageVersionName,
GalleryGen2ImageName: galleryGen2ImageName,
GalleryGen2ImageVersionName: galleryGen2ImageVersionName,
}, nil
}

// InfraReady is called once the installer infrastructure is ready.
func (p *Provider) InfraReady(ctx context.Context, in clusterapi.InfraReadyInput) error {
session, err := in.InstallConfig.Azure.Session()
Expand Down Expand Up @@ -188,43 +246,16 @@ func (p *Provider) InfraReady(ctx context.Context, in clusterapi.InfraReadyInput
architecture = armcompute.ArchitectureX64
}

// Get information regarding the RHCOS Image Stream
imageInfo, err := getRHCOSImageInfo(ctx, installConfig, in.InfraID)
if err != nil {
return err
}
resourceGroupName := p.ResourceGroupName
storageAccountName := aztypes.GetStorageAccountName(in.InfraID)
containerName := "vhd"
blobName := fmt.Sprintf("rhcos%s.vhd", randomString(5))

stream, err := rhcos.FetchCoreOSBuild(ctx, in.InstallConfig.Config.OSImageStream)
if err != nil {
return fmt.Errorf("failed to get rhcos stream: %w", err)
}
archName := arch.RpmArch(string(installConfig.ControlPlane.Architecture))
streamArch, err := stream.GetArchitecture(archName)
if err != nil {
return fmt.Errorf("failed to get rhcos architecture: %w", err)
}

azureDisk := streamArch.RHELCoreOSExtensions.AzureDisk
imageURL := azureDisk.URL

rawImageVersion := strings.ReplaceAll(azureDisk.Release, "-", "_")
imageVersion := rawImageVersion[:len(rawImageVersion)-6]

galleryName := fmt.Sprintf("gallery_%s", strings.ReplaceAll(in.InfraID, "-", "_"))
galleryImageName := in.InfraID
galleryImageVersionName := imageVersion
galleryGen2ImageName := fmt.Sprintf("%s-gen2", in.InfraID)
galleryGen2ImageVersionName := imageVersion

headResponse, err := http.Head(imageURL) // nolint:gosec
if err != nil {
return fmt.Errorf("failed HEAD request for image URL %s: %w", imageURL, err)
}

imageLength := headResponse.ContentLength
if imageLength%512 != 0 {
return fmt.Errorf("image length is not aligned on a 512 byte boundary")
}

storageURL := fmt.Sprintf("https://%s.blob.%s", storageAccountName, session.Environment.StorageEndpointSuffix)
blobURL := fmt.Sprintf("%s/%s/%s", storageURL, containerName, blobName)

Expand Down Expand Up @@ -286,8 +317,8 @@ func (p *Provider) InfraReady(ctx context.Context, in clusterapi.InfraReadyInput
_, err = CreatePageBlob(ctx, &CreatePageBlobInput{
StorageURL: storageURL,
BlobURL: blobURL,
ImageURL: imageURL,
ImageLength: imageLength,
ImageURL: imageInfo.ImageURL,
ImageLength: imageInfo.ImageLength,
CloudEnvironment: in.InstallConfig.Azure.CloudName,
AllowSharedKeyAccess: sharedKey,
TokenCredential: session.TokenCreds,
Expand All @@ -303,7 +334,7 @@ func (p *Provider) InfraReady(ctx context.Context, in clusterapi.InfraReadyInput
createImageGalleryOutput, err := CreateImageGallery(ctx, &CreateImageGalleryInput{
SubscriptionID: subscriptionID,
ResourceGroupName: resourceGroupName,
GalleryName: galleryName,
GalleryName: imageInfo.GalleryName,
Region: platform.Region,
Tags: tags,
TokenCredential: p.TokenCredential,
Expand All @@ -318,8 +349,8 @@ func (p *Provider) InfraReady(ctx context.Context, in clusterapi.InfraReadyInput
// Create gallery images
_, err = CreateGalleryImage(ctx, &CreateGalleryImageInput{
ResourceGroupName: resourceGroupName,
GalleryName: galleryName,
GalleryImageName: galleryImageName,
GalleryName: imageInfo.GalleryName,
GalleryImageName: imageInfo.GalleryImageName,
Region: platform.Region,
Publisher: "RedHat",
Offer: "rhcos",
Expand All @@ -344,8 +375,8 @@ func (p *Provider) InfraReady(ctx context.Context, in clusterapi.InfraReadyInput

_, err = CreateGalleryImage(ctx, &CreateGalleryImageInput{
ResourceGroupName: resourceGroupName,
GalleryName: galleryName,
GalleryImageName: galleryGen2ImageName,
GalleryName: imageInfo.GalleryName,
GalleryImageName: imageInfo.GalleryGen2ImageName,
Region: platform.Region,
Publisher: "RedHat-gen2",
Offer: "rhcos-gen2",
Expand All @@ -368,9 +399,9 @@ func (p *Provider) InfraReady(ctx context.Context, in clusterapi.InfraReadyInput
_, err = CreateGalleryImageVersion(ctx, &CreateGalleryImageVersionInput{
ResourceGroupName: resourceGroupName,
StorageAccountID: *storageAccount.ID,
GalleryName: galleryName,
GalleryImageName: galleryImageName,
GalleryImageVersionName: galleryImageVersionName,
GalleryName: imageInfo.GalleryName,
GalleryImageName: imageInfo.GalleryImageName,
GalleryImageVersionName: imageInfo.GalleryImageVersionName,
Region: platform.Region,
BlobURL: blobURL,
RegionalReplicaCount: int32(1),
Expand All @@ -383,9 +414,9 @@ func (p *Provider) InfraReady(ctx context.Context, in clusterapi.InfraReadyInput
_, err = CreateGalleryImageVersion(ctx, &CreateGalleryImageVersionInput{
ResourceGroupName: resourceGroupName,
StorageAccountID: *storageAccount.ID,
GalleryName: galleryName,
GalleryImageName: galleryGen2ImageName,
GalleryImageVersionName: galleryGen2ImageVersionName,
GalleryName: imageInfo.GalleryName,
GalleryImageName: imageInfo.GalleryGen2ImageName,
GalleryImageVersionName: imageInfo.GalleryGen2ImageVersionName,
Region: platform.Region,
BlobURL: blobURL,
RegionalReplicaCount: int32(1),
Expand Down
21 changes: 17 additions & 4 deletions pkg/types/validation/installconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
utilsnet "k8s.io/utils/net"

configv1 "github.com/openshift/api/config/v1"
features "github.com/openshift/api/features"
operv1 "github.com/openshift/api/operator/v1"
"github.com/openshift/installer/pkg/hostcrypt"
"github.com/openshift/installer/pkg/ipnet"
Expand Down Expand Up @@ -133,7 +134,7 @@ func ValidateInstallConfig(c *types.InstallConfig, usingAgentMethod bool) field.
}
if c.Networking != nil {
allErrs = append(allErrs, validateNetworking(c.Networking, field.NewPath("networking"))...)
allErrs = append(allErrs, validateNetworkingIPVersion(c.Networking, &c.Platform)...)
allErrs = append(allErrs, validateNetworkingIPVersion(c)...)
allErrs = append(allErrs, validateNetworkingClusterNetworkMTU(c, field.NewPath("networking", "clusterNetworkMTU"))...)
allErrs = append(allErrs, validateVIPsForPlatform(c.Networking, &c.Platform, usingAgentMethod, field.NewPath("platform"))...)
allErrs = append(allErrs, validateOVNKubernetesConfig(c.Networking, field.NewPath("networking"))...)
Expand Down Expand Up @@ -365,9 +366,13 @@ func ipnetworksToStrings(networks []ipnet.IPNet) []string {

// validateNetworkingIPVersion checks parameters for consistency when the user
// requests single-stack IPv6 or dual-stack modes.
func validateNetworkingIPVersion(n *types.Networking, p *types.Platform) field.ErrorList {
func validateNetworkingIPVersion(c *types.InstallConfig) field.ErrorList {
var allErrs field.ErrorList

n := c.Networking
p := &c.Platform
fg := c.EnabledFeatureGates()

hasIPv4, hasIPv6, presence, addresses := inferIPVersionFromInstallConfig(n)

switch {
Expand All @@ -379,8 +384,16 @@ func validateNetworkingIPVersion(n *types.Networking, p *types.Platform) field.E
allowV6Primary := false
experimentalDualStackEnabled, _ := strconv.ParseBool(os.Getenv("OPENSHIFT_INSTALL_EXPERIMENTAL_DUAL_STACK"))
switch {
case p.Azure != nil && experimentalDualStackEnabled:
logrus.Warnf("Using experimental Azure dual-stack support")
case p.Azure != nil:
logrus.Info("Dual Stack support on Azure is still in Dev Preview")
// Dualstack is only allowed if platform.azure.ipFamily is set to dual-stack variants
if ipFamily := p.Azure.IPFamily; ipFamily.DualStackEnabled() {
if ipFamily == network.DualStackIPv6Primary {
allowV6Primary = true
}
break
}
allErrs = append(allErrs, field.Invalid(field.NewPath("networking"), "DualStack", fmt.Sprintf("dual-stack IPv4/IPv6 can only be specified when platform.azure.ipFamily is %s or %s", network.DualStackIPv4Primary, network.DualStackIPv6Primary)))
case p.BareMetal != nil:
// We now support ipv6-primary dual stack on baremetal
allowV6Primary = true
Expand Down