openshift/installer
1
0
Fork 0
mirror of https://github.com/openshift/installer.git synced 2026-02-05 06:46:36 +01:00
Code Issues Releases Activity

Merge pull request #10223 from gpei/fix-OCPBUGS-56770

Browse Source 
OCPBUGS-56770: Honor user-specified bootDiagnostics on Azure Stack Hub
This commit is contained in:
openshift-merge-bot[bot]
2026-01-19 16:35:56 +00:00
committed by GitHub
parent 19e15798a0 e7bd4cae84
commit 617269249e
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
pkg/asset/machines/azure/azuremachines.go
View File

@@ -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),
},
},
},
}
}
}
@@ -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),
},
},
},
}
}
}