Skip to content

OCPBUGS-56770: Honor user-specified bootDiagnostics on Azure Stack Hub #10223

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
Jan 19, 2026
Merged

OCPBUGS-56770: Honor user-specified bootDiagnostics on Azure Stack Hub #10223

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
30 changes: 18 additions & 12 deletions pkg/asset/machines/azure/azuremachines.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,13 +204,16 @@ func GenerateMachines(clusterID, resourceGroup, subscriptionID string, session *
}

if in.Platform.CloudName == aztypes.StackCloud {
azureMachine.Spec.Diagnostics = &capz.Diagnostics{
Boot: &capz.BootDiagnostics{
StorageAccountType: capz.UserManagedDiagnosticsStorage,
UserManaged: &capz.UserManagedBootDiagnostics{
StorageAccountURI: fmt.Sprintf("https://%s.blob.%s", storageAccountName, in.StorageSuffix),
// For Azure Stack Cloud, apply default diagnostics only if user hasn't specified bootDiagnostics
if mpool.BootDiagnostics == nil {
azureMachine.Spec.Diagnostics = &capz.Diagnostics{
Boot: &capz.BootDiagnostics{
StorageAccountType: capz.UserManagedDiagnosticsStorage,
UserManaged: &capz.UserManagedBootDiagnostics{
StorageAccountURI: fmt.Sprintf("https://%s.blob.%s", storageAccountName, in.StorageSuffix),
},
},
},
}
}
}

Expand Down Expand Up @@ -278,13 +281,16 @@ func GenerateMachines(clusterID, resourceGroup, subscriptionID string, session *
}

if in.Platform.CloudName == aztypes.StackCloud {
bootstrapAzureMachine.Spec.Diagnostics = &capz.Diagnostics{
Boot: &capz.BootDiagnostics{
StorageAccountType: capz.UserManagedDiagnosticsStorage,
UserManaged: &capz.UserManagedBootDiagnostics{
StorageAccountURI: fmt.Sprintf("https://%s.blob.%s", storageAccountName, in.StorageSuffix),
// For Azure Stack Cloud, apply default diagnostics only if user hasn't specified bootDiagnostics
if mpool.BootDiagnostics == nil {
bootstrapAzureMachine.Spec.Diagnostics = &capz.Diagnostics{
Boot: &capz.BootDiagnostics{
StorageAccountType: capz.UserManagedDiagnosticsStorage,
UserManaged: &capz.UserManagedBootDiagnostics{
StorageAccountURI: fmt.Sprintf("https://%s.blob.%s", storageAccountName, in.StorageSuffix),
},
},
},
}
}
}

Expand Down