From 2ea955b612110ccce2faa413c229ccb44e2ae7c7 Mon Sep 17 00:00:00 2001 From: zylxjtu Date: Fri, 15 Aug 2025 21:04:37 +0000 Subject: [PATCH 1/2] Use the right path for falling back to nssm --- capz/templates/gmsa-ci.yaml | 2 +- capz/templates/gmsa-pr.yaml | 2 +- capz/templates/shared-image-gallery-ci.yaml | 2 +- capz/templates/windows-base.yaml | 2 +- capz/templates/windows-ci.yaml | 2 +- capz/templates/windows-pr.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/capz/templates/gmsa-ci.yaml b/capz/templates/gmsa-ci.yaml index 3a7ad58e..fc7085e5 100644 --- a/capz/templates/gmsa-ci.yaml +++ b/capz/templates/gmsa-ci.yaml @@ -108,7 +108,7 @@ spec: & $scriptPath } else { Write-Host "RestartKubelet.ps1 not found. Running fallback command..." - nssm set kubelet start SERVICE_AUTO_START + & "$env:SYSTEMDRIVE\k\nssm" set kubelet start SERVICE_AUTO_START } path: C:/KubeletRestart_nssm_sc.ps1 permissions: "0744" diff --git a/capz/templates/gmsa-pr.yaml b/capz/templates/gmsa-pr.yaml index f28a3066..10cf6aa1 100644 --- a/capz/templates/gmsa-pr.yaml +++ b/capz/templates/gmsa-pr.yaml @@ -108,7 +108,7 @@ spec: & $scriptPath } else { Write-Host "RestartKubelet.ps1 not found. Running fallback command..." - nssm set kubelet start SERVICE_AUTO_START + & "$env:SYSTEMDRIVE\k\nssm" set kubelet start SERVICE_AUTO_START } path: C:/KubeletRestart_nssm_sc.ps1 permissions: "0744" diff --git a/capz/templates/shared-image-gallery-ci.yaml b/capz/templates/shared-image-gallery-ci.yaml index ef7d1721..1764b0ab 100644 --- a/capz/templates/shared-image-gallery-ci.yaml +++ b/capz/templates/shared-image-gallery-ci.yaml @@ -108,7 +108,7 @@ spec: & $scriptPath } else { Write-Host "RestartKubelet.ps1 not found. Running fallback command..." - nssm set kubelet start SERVICE_AUTO_START + & "$env:SYSTEMDRIVE\k\nssm" set kubelet start SERVICE_AUTO_START } path: C:/KubeletRestart_nssm_sc.ps1 permissions: "0744" diff --git a/capz/templates/windows-base.yaml b/capz/templates/windows-base.yaml index 67054cb4..174425c9 100644 --- a/capz/templates/windows-base.yaml +++ b/capz/templates/windows-base.yaml @@ -109,7 +109,7 @@ spec: & $scriptPath } else { Write-Host "RestartKubelet.ps1 not found. Running fallback command..." - nssm set kubelet start SERVICE_AUTO_START + & "$env:SYSTEMDRIVE\k\nssm" set kubelet start SERVICE_AUTO_START } path: C:/KubeletRestart_nssm_sc.ps1 permissions: "0744" diff --git a/capz/templates/windows-ci.yaml b/capz/templates/windows-ci.yaml index d933aef6..7c9d1a76 100644 --- a/capz/templates/windows-ci.yaml +++ b/capz/templates/windows-ci.yaml @@ -108,7 +108,7 @@ spec: & $scriptPath } else { Write-Host "RestartKubelet.ps1 not found. Running fallback command..." - nssm set kubelet start SERVICE_AUTO_START + & "$env:SYSTEMDRIVE\k\nssm" set kubelet start SERVICE_AUTO_START } path: C:/KubeletRestart_nssm_sc.ps1 permissions: "0744" diff --git a/capz/templates/windows-pr.yaml b/capz/templates/windows-pr.yaml index 832de4c2..56f91ccc 100644 --- a/capz/templates/windows-pr.yaml +++ b/capz/templates/windows-pr.yaml @@ -108,7 +108,7 @@ spec: & $scriptPath } else { Write-Host "RestartKubelet.ps1 not found. Running fallback command..." - nssm set kubelet start SERVICE_AUTO_START + & "$env:SYSTEMDRIVE\k\nssm" set kubelet start SERVICE_AUTO_START } path: C:/KubeletRestart_nssm_sc.ps1 permissions: "0744" From b6a1c5b8f0a3a5b220742b95c81caa7f325abcc9 Mon Sep 17 00:00:00 2001 From: zylxjtu Date: Mon, 18 Aug 2025 20:16:57 +0000 Subject: [PATCH 2/2] Address the comment --- capz/templates/gmsa-ci.yaml | 2 +- capz/templates/gmsa-pr.yaml | 2 +- capz/templates/shared-image-gallery-ci.yaml | 2 +- capz/templates/windows-base.yaml | 2 +- capz/templates/windows-ci.yaml | 2 +- capz/templates/windows-pr.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/capz/templates/gmsa-ci.yaml b/capz/templates/gmsa-ci.yaml index fc7085e5..6642a1ad 100644 --- a/capz/templates/gmsa-ci.yaml +++ b/capz/templates/gmsa-ci.yaml @@ -108,7 +108,7 @@ spec: & $scriptPath } else { Write-Host "RestartKubelet.ps1 not found. Running fallback command..." - & "$env:SYSTEMDRIVE\k\nssm" set kubelet start SERVICE_AUTO_START + & "$env:SYSTEMDRIVE\k\nssm.exe" set kubelet start SERVICE_AUTO_START } path: C:/KubeletRestart_nssm_sc.ps1 permissions: "0744" diff --git a/capz/templates/gmsa-pr.yaml b/capz/templates/gmsa-pr.yaml index 10cf6aa1..785d2a9f 100644 --- a/capz/templates/gmsa-pr.yaml +++ b/capz/templates/gmsa-pr.yaml @@ -108,7 +108,7 @@ spec: & $scriptPath } else { Write-Host "RestartKubelet.ps1 not found. Running fallback command..." - & "$env:SYSTEMDRIVE\k\nssm" set kubelet start SERVICE_AUTO_START + & "$env:SYSTEMDRIVE\k\nssm.exe" set kubelet start SERVICE_AUTO_START } path: C:/KubeletRestart_nssm_sc.ps1 permissions: "0744" diff --git a/capz/templates/shared-image-gallery-ci.yaml b/capz/templates/shared-image-gallery-ci.yaml index 1764b0ab..7ca9d318 100644 --- a/capz/templates/shared-image-gallery-ci.yaml +++ b/capz/templates/shared-image-gallery-ci.yaml @@ -108,7 +108,7 @@ spec: & $scriptPath } else { Write-Host "RestartKubelet.ps1 not found. Running fallback command..." - & "$env:SYSTEMDRIVE\k\nssm" set kubelet start SERVICE_AUTO_START + & "$env:SYSTEMDRIVE\k\nssm.exe" set kubelet start SERVICE_AUTO_START } path: C:/KubeletRestart_nssm_sc.ps1 permissions: "0744" diff --git a/capz/templates/windows-base.yaml b/capz/templates/windows-base.yaml index 174425c9..21c75cf2 100644 --- a/capz/templates/windows-base.yaml +++ b/capz/templates/windows-base.yaml @@ -109,7 +109,7 @@ spec: & $scriptPath } else { Write-Host "RestartKubelet.ps1 not found. Running fallback command..." - & "$env:SYSTEMDRIVE\k\nssm" set kubelet start SERVICE_AUTO_START + & "$env:SYSTEMDRIVE\k\nssm.exe" set kubelet start SERVICE_AUTO_START } path: C:/KubeletRestart_nssm_sc.ps1 permissions: "0744" diff --git a/capz/templates/windows-ci.yaml b/capz/templates/windows-ci.yaml index 7c9d1a76..ff3577f2 100644 --- a/capz/templates/windows-ci.yaml +++ b/capz/templates/windows-ci.yaml @@ -108,7 +108,7 @@ spec: & $scriptPath } else { Write-Host "RestartKubelet.ps1 not found. Running fallback command..." - & "$env:SYSTEMDRIVE\k\nssm" set kubelet start SERVICE_AUTO_START + & "$env:SYSTEMDRIVE\k\nssm.exe" set kubelet start SERVICE_AUTO_START } path: C:/KubeletRestart_nssm_sc.ps1 permissions: "0744" diff --git a/capz/templates/windows-pr.yaml b/capz/templates/windows-pr.yaml index 56f91ccc..326bfa72 100644 --- a/capz/templates/windows-pr.yaml +++ b/capz/templates/windows-pr.yaml @@ -108,7 +108,7 @@ spec: & $scriptPath } else { Write-Host "RestartKubelet.ps1 not found. Running fallback command..." - & "$env:SYSTEMDRIVE\k\nssm" set kubelet start SERVICE_AUTO_START + & "$env:SYSTEMDRIVE\k\nssm.exe" set kubelet start SERVICE_AUTO_START } path: C:/KubeletRestart_nssm_sc.ps1 permissions: "0744"