Merge pull request #901 from CecileRobertMichon/boot-diagnostics

✨ Enable VM boot diagnostics
kubernetes-sigs · Sep 1, 2020 · 3c0b4df · 3c0b4df
2 parents 3386cdd + 0ccb197
commit 3c0b4df
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 0 deletions.
diff --git a/cloud/services/scalesets/vmss.go b/cloud/services/scalesets/vmss.go
@@ -141,6 +141,11 @@ func (s *Service) Reconcile(ctx context.Context) error {
 					},
 				},
 				StorageProfile: storageProfile,
+				DiagnosticsProfile: &compute.DiagnosticsProfile{
+					BootDiagnostics: &compute.BootDiagnostics{
+						Enabled: to.BoolPtr(true),
+					},
+				},
 				NetworkProfile: &compute.VirtualMachineScaleSetNetworkProfile{
 					NetworkInterfaceConfigurations: &[]compute.VirtualMachineScaleSetNetworkConfiguration{
 						{

diff --git a/cloud/services/scalesets/vmss_test.go b/cloud/services/scalesets/vmss_test.go
@@ -313,6 +313,11 @@ func TestReconcileVMSS(t *testing.T) {
 									},
 								},
 							},
+							DiagnosticsProfile: &compute.DiagnosticsProfile{
+								BootDiagnostics: &compute.BootDiagnostics{
+									Enabled: to.BoolPtr(true),
+								},
+							},
 							NetworkProfile: &compute.VirtualMachineScaleSetNetworkProfile{
 								NetworkInterfaceConfigurations: &[]compute.VirtualMachineScaleSetNetworkConfiguration{
 									{
@@ -453,6 +458,11 @@ func TestReconcileVMSS(t *testing.T) {
 									},
 								},
 							},
+							DiagnosticsProfile: &compute.DiagnosticsProfile{
+								BootDiagnostics: &compute.BootDiagnostics{
+									Enabled: to.BoolPtr(true),
+								},
+							},
 							NetworkProfile: &compute.VirtualMachineScaleSetNetworkProfile{
 								NetworkInterfaceConfigurations: &[]compute.VirtualMachineScaleSetNetworkConfiguration{
 									{
@@ -580,6 +590,11 @@ func TestReconcileVMSS(t *testing.T) {
 										},
 									},
 								},
+								DiagnosticsProfile: &compute.DiagnosticsProfile{
+									BootDiagnostics: &compute.BootDiagnostics{
+										Enabled: to.BoolPtr(true),
+									},
+								},
 								NetworkProfile: &compute.VirtualMachineScaleSetNetworkProfile{
 									NetworkInterfaceConfigurations: &[]compute.VirtualMachineScaleSetNetworkConfiguration{
 										{
@@ -660,6 +675,11 @@ func TestReconcileVMSS(t *testing.T) {
 									DisablePasswordAuthentication: to.BoolPtr(true),
 								},
 							},
+							DiagnosticsProfile: &compute.DiagnosticsProfile{
+								BootDiagnostics: &compute.BootDiagnostics{
+									Enabled: to.BoolPtr(true),
+								},
+							},
 							StorageProfile: &compute.VirtualMachineScaleSetUpdateStorageProfile{
 								ImageReference: &compute.ImageReference{
 									Publisher: to.StringPtr("fake-publisher"),

diff --git a/cloud/services/virtualmachines/virtualmachines.go b/cloud/services/virtualmachines/virtualmachines.go
@@ -137,6 +137,11 @@ func (s *Service) Reconcile(ctx context.Context) error {
 					Priority:       priority,
 					EvictionPolicy: evictionPolicy,
 					BillingProfile: billingProfile,
+					DiagnosticsProfile: &compute.DiagnosticsProfile{
+						BootDiagnostics: &compute.BootDiagnostics{
+							Enabled: to.BoolPtr(true),
+						},
+					},
 				},
 			}
 

diff --git a/cloud/services/virtualmachines/virtualmachines_test.go b/cloud/services/virtualmachines/virtualmachines_test.go
@@ -376,6 +376,11 @@ func TestReconcileVM(t *testing.T) {
 								},
 							},
 						},
+						DiagnosticsProfile: &compute.DiagnosticsProfile{
+							BootDiagnostics: &compute.BootDiagnostics{
+								Enabled: to.BoolPtr(true),
+							},
+						},
 						NetworkProfile: &compute.NetworkProfile{
 							NetworkInterfaces: &[]compute.NetworkInterfaceReference{
 								{
@@ -1013,6 +1018,11 @@ func TestReconcileVM(t *testing.T) {
 								},
 							},
 						},
+						DiagnosticsProfile: &compute.DiagnosticsProfile{
+							BootDiagnostics: &compute.BootDiagnostics{
+								Enabled: to.BoolPtr(true),
+							},
+						},
 						OsProfile: &compute.OSProfile{
 							ComputerName:  to.StringPtr("my-vm"),
 							AdminUsername: to.StringPtr("capi"),