Skip to content

OCPBUGS-65731: Skip Azure Confidential Compute Clusters for boot image updates #5432

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 1 commit into from
Dec 9, 2025
Merged

OCPBUGS-65731: Skip Azure Confidential Compute Clusters for boot image updates #5432

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
100 changes: 93 additions & 7 deletions pkg/controller/machine-set-boot-image/machine_set_boot_image_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,13 +332,14 @@ func TestReconcileAzureProviderSpec(t *testing.T) {
fakeClient := fake.NewSimpleClientset(testSecret)

tests := []struct {
name string
arch string
currentImage machinev1beta1.Image
expectedImage machinev1beta1.Image
expectPatch bool
expectSkip bool
streamData *stream.Stream // Custom stream data for specific tests
name string
arch string
currentImage machinev1beta1.Image
expectedImage machinev1beta1.Image
expectPatch bool
expectSkip bool
streamData *stream.Stream // Custom stream data for specific tests
securityProfile *machinev1beta1.SecurityProfile // Custom security profile for specific tests
}{
{
name: "Legacy Gen1 upload image transitions to marketplace Gen1",
Expand Down Expand Up @@ -633,6 +634,90 @@ func TestReconcileAzureProviderSpec(t *testing.T) {
},
},
},
{
name: "Skip machineset with ConfidentialVM SecurityType",
arch: "x86_64",
currentImage: machinev1beta1.Image{
Offer: "aro4",
Publisher: "azureopenshift",
ResourceID: "",
SKU: "419-v2",
Version: "419.94.20250101",
Type: machinev1beta1.AzureImageTypeMarketplaceNoPlan,
},
expectSkip: true,
securityProfile: &machinev1beta1.SecurityProfile{
Settings: machinev1beta1.SecuritySettings{
SecurityType: "ConfidentialVM",
},
},
},
{
name: "Skip machineset with TrustedLaunch SecurityType",
arch: "x86_64",
currentImage: machinev1beta1.Image{
Offer: "aro4",
Publisher: "azureopenshift",
ResourceID: "",
SKU: "419-v2",
Version: "419.94.20250101",
Type: machinev1beta1.AzureImageTypeMarketplaceNoPlan,
},
expectSkip: true,
securityProfile: &machinev1beta1.SecurityProfile{
Settings: machinev1beta1.SecuritySettings{
SecurityType: "TrustedLaunch",
},
},
},
{
name: "Process machineset with SecurityProfile but empty SecurityType",
arch: "x86_64",
currentImage: machinev1beta1.Image{
Offer: "aro4",
Publisher: "azureopenshift",
ResourceID: "",
SKU: "418-v2",
Version: "418.94.20241201",
Type: machinev1beta1.AzureImageTypeMarketplaceNoPlan,
},
expectedImage: machinev1beta1.Image{
Offer: "aro4",
Publisher: "azureopenshift",
ResourceID: "",
SKU: "419-v2",
Version: "419.94.20250101",
Type: machinev1beta1.AzureImageTypeMarketplaceNoPlan,
},
expectPatch: true,
securityProfile: &machinev1beta1.SecurityProfile{
Settings: machinev1beta1.SecuritySettings{
SecurityType: "", // Empty SecurityType should not be skipped
},
},
},
{
name: "Process machineset with nil SecurityProfile",
arch: "x86_64",
currentImage: machinev1beta1.Image{
Offer: "aro4",
Publisher: "azureopenshift",
ResourceID: "",
SKU: "418-v2",
Version: "418.94.20241201",
Type: machinev1beta1.AzureImageTypeMarketplaceNoPlan,
},
expectedImage: machinev1beta1.Image{
Offer: "aro4",
Publisher: "azureopenshift",
ResourceID: "",
SKU: "419-v2",
Version: "419.94.20250101",
Type: machinev1beta1.AzureImageTypeMarketplaceNoPlan,
},
expectPatch: true,
securityProfile: nil, // Nil SecurityProfile should not be skipped
},
}

for _, tt := range tests {
Expand All @@ -643,6 +728,7 @@ func TestReconcileAzureProviderSpec(t *testing.T) {
UserDataSecret: &corev1.SecretReference{
Name: "test-secret",
},
SecurityProfile: tt.securityProfile,
}

// Create a mock infrastructure object
Expand Down
7 changes: 6 additions & 1 deletion pkg/controller/machine-set-boot-image/platform_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,12 @@ func reconcileVSphereProviderSpec(streamData *stream.Stream, arch string, infra
func reconcileAzureProviderSpec(streamData *stream.Stream, arch string, _ *osconfigv1.Infrastructure, providerSpec *machinev1beta1.AzureMachineProviderSpec, machineSetName string, secretClient clientset.Interface) (bool, *machinev1beta1.AzureMachineProviderSpec, error) {

if arch == "ppc64le" || arch == "s390x" {
klog.Infof("Skipping machineset %s, machinesets with arch %s are not supported for Azure", machineSetName, arch)
klog.Infof("Skipping update for %s, machinesets/controlplanemachinesets with arch %s are not supported for Azure", machineSetName, arch)
return false, nil, nil
}

if providerSpec.SecurityProfile != nil && providerSpec.SecurityProfile.Settings.SecurityType != "" {
klog.Infof("Skipping update for %s, machinesets/controlplanemachinesets with a SecurityType defined(%s in this case) is not currently supported for Azure", machineSetName, providerSpec.SecurityProfile.Settings.SecurityType)
return false, nil, nil
}

Expand Down