Skip to content

[release-4.17] Use resource group when generating default Azure image #1481

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
patrickdillon wants to merge 3 commits into
base: release-4.17
Choose a base branch
from
Open

[release-4.17] Use resource group when generating default Azure image #1481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a3f5a93
webhooks: add test for azure image with custom resource group
patrickdillon Mar 13, 2026
d40a0de
OCPBUGS-78424: use resource group when generating default Azure image
patrickdillon Mar 13, 2026
3196d2e
defensively handle empty Azure resource group for default image
patrickdillon Mar 13, 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
12 changes: 8 additions & 4 deletions pkg/webhooks/machine_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ var (
defaultAzureNetworkResourceGroup = func(clusterID string) string {
return fmt.Sprintf("%s-rg", clusterID)
}
defaultAzureImageResourceID = func(clusterID string) string {
defaultAzureImageResourceID = func(clusterID, rg string) string {
// image gallery names cannot have dashes
galleryName := strings.Replace(clusterID, "-", "_", -1)
imageName := clusterID
Expand All @@ -65,7 +65,7 @@ var (
// before that change will have a -gen2 image.
imageName = fmt.Sprintf("%s-gen2", clusterID)
}
return fmt.Sprintf("/resourceGroups/%s/providers/Microsoft.Compute/galleries/gallery_%s/images/%s/versions/%s", clusterID+"-rg", galleryName, imageName, azureRHCOSVersion)
return fmt.Sprintf("/resourceGroups/%s/providers/Microsoft.Compute/galleries/gallery_%s/images/%s/versions/%s", rg, galleryName, imageName, azureRHCOSVersion)
}
defaultAzureManagedIdentiy = func(clusterID string) string {
return fmt.Sprintf("%s-identity", clusterID)
Expand Down Expand Up @@ -415,7 +415,7 @@ func NewMachineDefaulter() (*admission.Webhook, error) {
func createMachineDefaulter(platformStatus *osconfigv1.PlatformStatus, clusterID string) *machineDefaulterHandler {
return &machineDefaulterHandler{
admissionHandler: &admissionHandler{
admissionConfig: &admissionConfig{clusterID: clusterID},
admissionConfig: &admissionConfig{clusterID: clusterID, platformStatus: platformStatus},
webhookOperations: getMachineDefaulterOperation(platformStatus),
},
}
Expand Down Expand Up @@ -857,7 +857,11 @@ func defaultAzure(m *machinev1beta1.Machine, config *admissionConfig) (bool, []s
}

if providerSpec.Image == (machinev1beta1.Image{}) {
providerSpec.Image.ResourceID = defaultAzureImageResourceID(config.clusterID)
rg := defaultAzureResourceGroup(config.clusterID)
if ps := config.platformStatus; ps != nil && ps.Azure != nil && ps.Azure.ResourceGroupName != "" {
rg = ps.Azure.ResourceGroupName
}
providerSpec.Image.ResourceID = defaultAzureImageResourceID(config.clusterID, rg)
}

if providerSpec.UserDataSecret == nil {
Expand Down
37 changes: 33 additions & 4 deletions pkg/webhooks/machine_webhook_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"errors"
"fmt"
"reflect"
"strings"
"testing"

. "github.com/onsi/gomega"
Expand Down Expand Up @@ -1251,7 +1252,7 @@ func TestMachineUpdate(t *testing.T) {
Subnet: defaultAzureSubnet(azureClusterID),
NetworkResourceGroup: defaultAzureNetworkResourceGroup(azureClusterID),
Image: machinev1beta1.Image{
ResourceID: defaultAzureImageResourceID(azureClusterID),
ResourceID: defaultAzureImageResourceID(azureClusterID, defaultAzureResourceGroup(azureClusterID)),
},
ManagedIdentity: defaultAzureManagedIdentiy(azureClusterID),
ResourceGroup: defaultAzureResourceGroup(azureClusterID),
Expand Down Expand Up @@ -3080,6 +3081,7 @@ func TestDefaultAzureProviderSpec(t *testing.T) {
testCase string
providerSpec *machinev1beta1.AzureMachineProviderSpec
modifyDefault func(*machinev1beta1.AzureMachineProviderSpec)
platformStatus *osconfigv1.PlatformStatus
expectedError string
expectedOk bool
expectedWarnings []string
Expand Down Expand Up @@ -3129,6 +3131,29 @@ func TestDefaultAzureProviderSpec(t *testing.T) {
expectedError: "",
expectedWarnings: itWarnings,
},
{
testCase: "it generates azure image ResourceID with custom resource group",
providerSpec: &machinev1beta1.AzureMachineProviderSpec{
Image: machinev1beta1.Image{},
},
platformStatus: &osconfigv1.PlatformStatus{
Type: osconfigv1.AzurePlatformType,
Azure: &osconfigv1.AzurePlatformStatus{
ResourceGroupName: "test-rg",
},
},
modifyDefault: func(p *machinev1beta1.AzureMachineProviderSpec) {
// Generate expected image ID with custom resource group from infra config
galleryName := strings.Replace(clusterID, "-", "_", -1)
imageName := clusterID
p.Image = machinev1beta1.Image{
ResourceID: fmt.Sprintf("/resourceGroups/%s/providers/Microsoft.Compute/galleries/gallery_%s/images/%s/versions/%s", "test-rg", galleryName, imageName, azureRHCOSVersion),
}
},
expectedOk: true,
expectedError: "",
expectedWarnings: itWarnings,
},
{
testCase: "does not overwrite the network resource group if it already exists",
providerSpec: &machinev1beta1.AzureMachineProviderSpec{
Expand Down Expand Up @@ -3175,16 +3200,20 @@ func TestDefaultAzureProviderSpec(t *testing.T) {
},
}

platformStatus := &osconfigv1.PlatformStatus{Type: osconfigv1.AzurePlatformType}
h := createMachineDefaulter(platformStatus, clusterID)
defaultPlatformStatus := &osconfigv1.PlatformStatus{Type: osconfigv1.AzurePlatformType}
for _, tc := range testCases {
t.Run(tc.testCase, func(t *testing.T) {
platformStatus := defaultPlatformStatus
if tc.platformStatus != nil {
platformStatus = tc.platformStatus
}
h := createMachineDefaulter(platformStatus, clusterID)
defaultProviderSpec := &machinev1beta1.AzureMachineProviderSpec{
VMSize: defaultInstanceType,
Vnet: defaultAzureVnet(clusterID),
Subnet: defaultAzureSubnet(clusterID),
Image: machinev1beta1.Image{
ResourceID: defaultAzureImageResourceID(clusterID),
ResourceID: defaultAzureImageResourceID(clusterID, defaultAzureResourceGroup(clusterID)),
},
UserDataSecret: &corev1.SecretReference{
Name: defaultUserDataSecret,
Expand Down
2 changes: 1 addition & 1 deletion pkg/webhooks/machineset_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ func NewMachineSetDefaulter() (*admission.Webhook, error) {
func createMachineSetDefaulter(platformStatus *osconfigv1.PlatformStatus, clusterID string) *admission.Webhook {
return admission.WithCustomDefaulter(scheme.Scheme, &machinev1beta1.MachineSet{}, &machineSetDefaulterHandler{
admissionHandler: &admissionHandler{
admissionConfig: &admissionConfig{clusterID: clusterID},
admissionConfig: &admissionConfig{clusterID: clusterID, platformStatus: platformStatus},
webhookOperations: getMachineDefaulterOperation(platformStatus),
},
})
Expand Down
2 changes: 1 addition & 1 deletion pkg/webhooks/machineset_webhook_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@ func TestMachineSetUpdate(t *testing.T) {
Subnet: defaultAzureSubnet(azureClusterID),
NetworkResourceGroup: defaultAzureNetworkResourceGroup(azureClusterID),
Image: machinev1beta1.Image{
ResourceID: defaultAzureImageResourceID(azureClusterID),
ResourceID: defaultAzureImageResourceID(azureClusterID, defaultAzureResourceGroup(azureClusterID)),
},
ManagedIdentity: defaultAzureManagedIdentiy(azureClusterID),
ResourceGroup: defaultAzureResourceGroup(azureClusterID),
Expand Down