Skip to content

OCPBUGS-66940: fix default image for confidential VMs #1443

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 1 commit into
base: main
Choose a base branch
from
Open

OCPBUGS-66940: fix default image for confidential VMs #1443

Show file tree
Hide file tree
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
19 changes: 15 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 @@ -65,11 +65,22 @@ var (
defaultAzureNetworkResourceGroup = func(clusterID string) string {
return fmt.Sprintf("%s-rg", clusterID)
}
defaultAzureImage = func() machinev1beta1.Image {
if arch == ARM64 {
defaultAzureGalleryImage = func(clusterID string) machinev1beta1.Image {
// image gallery names cannot have dashes
galleryName := strings.Replace(clusterID, "-", "_", -1)
imageName := fmt.Sprintf("%s-gen2", clusterID) // Confidential VMs are gen2 only
imgID := fmt.Sprintf("/resourceGroups/%s/providers/Microsoft.Compute/galleries/gallery_%s/images/%s/versions/%s", clusterID+"-rg", galleryName, imageName, azureRHCOSVersion)
return machinev1beta1.Image{ResourceID: imgID}
}
defaultAzureImage = func(securityProfile *machinev1beta1.SecurityProfile, clusterID string) machinev1beta1.Image {
switch {
case securityProfile != nil: // Confidential VMs are x86-only
return defaultAzureGalleryImage(clusterID)
case arch == ARM64:
return urnToImage(defaultAzureARMImageURN)
default:
return urnToImage(defaultAzureX86ImageURN)
}
return urnToImage(defaultAzureX86ImageURN)
}
defaultAzureManagedIdentiy = func(clusterID string) string {
return fmt.Sprintf("%s-identity", clusterID)
Expand Down Expand Up @@ -1017,7 +1028,7 @@ func defaultAzure(m *machinev1beta1.Machine, config *admissionConfig) (bool, []s
}

if providerSpec.Image == (machinev1beta1.Image{}) {
providerSpec.Image = defaultAzureImage()
providerSpec.Image = defaultAzureImage(providerSpec.SecurityProfile, config.clusterID)
}

if providerSpec.UserDataSecret == nil {
Expand Down
4 changes: 2 additions & 2 deletions pkg/webhooks/machine_webhook_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1712,7 +1712,7 @@ func TestMachineUpdate(t *testing.T) {
Vnet: defaultAzureVnet(azureClusterID),
Subnet: defaultAzureSubnet(azureClusterID),
NetworkResourceGroup: defaultAzureNetworkResourceGroup(azureClusterID),
Image: defaultAzureImage(),
Image: defaultAzureImage(nil, azureClusterID),
ManagedIdentity: defaultAzureManagedIdentiy(azureClusterID),
ResourceGroup: defaultAzureResourceGroup(azureClusterID),
UserDataSecret: &corev1.SecretReference{
Expand Down Expand Up @@ -3765,7 +3765,7 @@ func TestDefaultAzureProviderSpec(t *testing.T) {
VMSize: defaultInstanceType,
Vnet: defaultAzureVnet(clusterID),
Subnet: defaultAzureSubnet(clusterID),
Image: defaultAzureImage(),
Image: defaultAzureImage(nil, clusterID),
UserDataSecret: &corev1.SecretReference{
Name: defaultUserDataSecret,
},
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 @@ -602,7 +602,7 @@ func TestMachineSetUpdate(t *testing.T) {
Vnet: defaultAzureVnet(azureClusterID),
Subnet: defaultAzureSubnet(azureClusterID),
NetworkResourceGroup: defaultAzureNetworkResourceGroup(azureClusterID),
Image: defaultAzureImage(),
Image: defaultAzureImage(nil, azureClusterID),
ManagedIdentity: defaultAzureManagedIdentiy(azureClusterID),
ResourceGroup: defaultAzureResourceGroup(azureClusterID),
UserDataSecret: &corev1.SecretReference{
Expand Down