Merge pull request #193 from EcovadisCode/adoAgentTweaks2

Refactored preStop windows script

Author: mskwierczynski982

charts/ado-build-agents/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
 description: A Helm chart with Keda scalable Azure Devops build agent for Kubernetes
 name: charts-ado-build-agents
-version: 3.6.0
+version: 3.6.1
 appVersion: "1.0"

charts/ado-build-agents/templates/scalejob-staging.yaml

@@ -145,11 +145,19 @@ spec:
             preStop:
               exec:
                 command:
-                  - "powershell.exe"
-                  - "-NoLogo"
-                  - "-NoProfile"
-                  - "-Command"
-                  - "Start-Sleep -Seconds {{ .Values.agent.terminationGracePeriodSeconds }}"
+                  - powershell.exe
+                  - -NoLogo
+                  - -NoProfile
+                  - -Command
+                  - |
+                    $token = Get-Content C:\azp\.token
+                    while($true) {
+                      C:\azp\agent\config.cmd remove --unattended --auth PAT --token $token >> C:\azp\cleanup.log 2>&1
+                      if ($LASTEXITCODE -eq 0) {
+                        break
+                      }
+                      Start-Sleep -Seconds 30
+                    }
           {{- end }}
           imagePullPolicy: IfNotPresent
           {{- with .Values.agent.securityContext }}

charts/ado-build-agents/templates/scalejob.yaml

@@ -144,11 +144,19 @@ spec:
             preStop:
               exec:
                 command:
-                  - "powershell.exe"
-                  - "-NoLogo"
-                  - "-NoProfile"
-                  - "-Command"
-                  - "Start-Sleep -Seconds {{ .Values.agent.terminationGracePeriodSeconds }}"
+                  - powershell.exe
+                  - -NoLogo
+                  - -NoProfile
+                  - -Command
+                  - |
+                    $token = Get-Content C:\azp\.token
+                    while($true) {
+                      C:\azp\agent\config.cmd remove --unattended --auth PAT --token $token >> C:\azp\cleanup.log 2>&1
+                      if ($LASTEXITCODE -eq 0) {
+                        break
+                      }
+                      Start-Sleep -Seconds 30
+                    }
           {{- end }}
           imagePullPolicy: IfNotPresent
           {{- with .Values.agent.securityContext }}