update

Azure · Apr 16, 2024 · a670680 · a670680
1 parent 38632fc
commit a670680
Show file tree

Hide file tree

Showing 14 changed files with 70 additions and 56 deletions.
diff --git a/parts/windows/kuberneteswindowssetup.ps1 b/parts/windows/kuberneteswindowssetup.ps1
@@ -496,6 +496,11 @@ finally
     # $CSEResultFilePath is used to avoid running CSE multiple times
     Set-Content -Path $CSEResultFilePath -Value $global:ExitCode -Force
     Logs-To-Event -TaskName "AKS.WindowsCSE.cse_main" -TaskMessage "ExitCode: $global:ExitCode. ErrorMessage: $global:ErrorMessage." 
+
+    Write-Log "Start to enable full support of CimFS"
+    c:\AzureData\windows\StagingTool.exe /enable 44354424 47273241 47273202 48004466 48230524
+    Postpone-RestartComputer
+
     # Please not use Write-Log or Logs-To-Events after Stop-Transcript
     Stop-Transcript
 
@@ -511,8 +516,4 @@ finally
         $turncatedErrorMessage = $global:ErrorMessage.Substring(0, [Math]::Min(240 - $errorMessageLength, $global:ErrorMessage.Length))
         throw "ExitCode: |$global:ExitCode|, Output: |$($global:ErrorCodeNames[$global:ExitCode])|, Error: |$turncatedErrorMessage|"
     }
-
-    Write-Log "Start to enable full support of CimFS"
-    c:\AzureData\windows\StagingTool.exe /enable 44354424 47273241 47273202 48004466 48230524
-    Postpone-RestartComputer
 }
diff --git a/pkg/agent/testdata/AKSWindows2019+CustomCloud/CustomData b/pkg/agent/testdata/AKSWindows2019+CustomCloud/CustomData
@@ -492,6 +492,11 @@ finally
     # $CSEResultFilePath is used to avoid running CSE multiple times
     Set-Content -Path $CSEResultFilePath -Value $global:ExitCode -Force
     Logs-To-Event -TaskName "AKS.WindowsCSE.cse_main" -TaskMessage "ExitCode: $global:ExitCode. ErrorMessage: $global:ErrorMessage." 
+
+    Write-Log "Start to enable full support of CimFS"
+    c:\AzureData\windows\StagingTool.exe /enable 44354424 47273241 47273202 48004466 48230524
+    Postpone-RestartComputer
+
     # Please not use Write-Log or Logs-To-Events after Stop-Transcript
     Stop-Transcript
 
@@ -507,8 +512,4 @@ finally
         $turncatedErrorMessage = $global:ErrorMessage.Substring(0, [Math]::Min(240 - $errorMessageLength, $global:ErrorMessage.Length))
         throw "ExitCode: |$global:ExitCode|, Output: |$($global:ErrorCodeNames[$global:ExitCode])|, Error: |$turncatedErrorMessage|"
     }
-
-    Write-Log "Start to enable full support of CimFS"
-    c:\AzureData\windows\StagingTool.exe /enable 44354424 47273241 47273202 48004466 48230524
-    Postpone-RestartComputer
 }
diff --git a/pkg/agent/testdata/AKSWindows2019+CustomVnet/CustomData b/pkg/agent/testdata/AKSWindows2019+CustomVnet/CustomData
@@ -486,6 +486,11 @@ finally
     # $CSEResultFilePath is used to avoid running CSE multiple times
     Set-Content -Path $CSEResultFilePath -Value $global:ExitCode -Force
     Logs-To-Event -TaskName "AKS.WindowsCSE.cse_main" -TaskMessage "ExitCode: $global:ExitCode. ErrorMessage: $global:ErrorMessage." 
+
+    Write-Log "Start to enable full support of CimFS"
+    c:\AzureData\windows\StagingTool.exe /enable 44354424 47273241 47273202 48004466 48230524
+    Postpone-RestartComputer
+
     # Please not use Write-Log or Logs-To-Events after Stop-Transcript
     Stop-Transcript
 
@@ -501,8 +506,4 @@ finally
         $turncatedErrorMessage = $global:ErrorMessage.Substring(0, [Math]::Min(240 - $errorMessageLength, $global:ErrorMessage.Length))
         throw "ExitCode: |$global:ExitCode|, Output: |$($global:ErrorCodeNames[$global:ExitCode])|, Error: |$turncatedErrorMessage|"
     }
-
-    Write-Log "Start to enable full support of CimFS"
-    c:\AzureData\windows\StagingTool.exe /enable 44354424 47273241 47273202 48004466 48230524
-    Postpone-RestartComputer
 }
diff --git a/pkg/agent/testdata/AKSWindows2019+EnablePrivateClusterHostsConfigAgent/CustomData b/pkg/agent/testdata/AKSWindows2019+EnablePrivateClusterHostsConfigAgent/CustomData
@@ -486,6 +486,11 @@ finally
     # $CSEResultFilePath is used to avoid running CSE multiple times
     Set-Content -Path $CSEResultFilePath -Value $global:ExitCode -Force
     Logs-To-Event -TaskName "AKS.WindowsCSE.cse_main" -TaskMessage "ExitCode: $global:ExitCode. ErrorMessage: $global:ErrorMessage." 
+
+    Write-Log "Start to enable full support of CimFS"
+    c:\AzureData\windows\StagingTool.exe /enable 44354424 47273241 47273202 48004466 48230524
+    Postpone-RestartComputer
+
     # Please not use Write-Log or Logs-To-Events after Stop-Transcript
     Stop-Transcript
 
@@ -501,8 +506,4 @@ finally
         $turncatedErrorMessage = $global:ErrorMessage.Substring(0, [Math]::Min(240 - $errorMessageLength, $global:ErrorMessage.Length))
         throw "ExitCode: |$global:ExitCode|, Output: |$($global:ErrorCodeNames[$global:ExitCode])|, Error: |$turncatedErrorMessage|"
     }
-
-    Write-Log "Start to enable full support of CimFS"
-    c:\AzureData\windows\StagingTool.exe /enable 44354424 47273241 47273202 48004466 48230524
-    Postpone-RestartComputer
 }
diff --git a/pkg/agent/testdata/AKSWindows2019+K8S116/CustomData b/pkg/agent/testdata/AKSWindows2019+K8S116/CustomData
@@ -486,6 +486,11 @@ finally
     # $CSEResultFilePath is used to avoid running CSE multiple times
     Set-Content -Path $CSEResultFilePath -Value $global:ExitCode -Force
     Logs-To-Event -TaskName "AKS.WindowsCSE.cse_main" -TaskMessage "ExitCode: $global:ExitCode. ErrorMessage: $global:ErrorMessage." 
+
+    Write-Log "Start to enable full support of CimFS"
+    c:\AzureData\windows\StagingTool.exe /enable 44354424 47273241 47273202 48004466 48230524
+    Postpone-RestartComputer
+
     # Please not use Write-Log or Logs-To-Events after Stop-Transcript
     Stop-Transcript
 
@@ -501,8 +506,4 @@ finally
         $turncatedErrorMessage = $global:ErrorMessage.Substring(0, [Math]::Min(240 - $errorMessageLength, $global:ErrorMessage.Length))
         throw "ExitCode: |$global:ExitCode|, Output: |$($global:ErrorCodeNames[$global:ExitCode])|, Error: |$turncatedErrorMessage|"
     }
-
-    Write-Log "Start to enable full support of CimFS"
-    c:\AzureData\windows\StagingTool.exe /enable 44354424 47273241 47273202 48004466 48230524
-    Postpone-RestartComputer
 }
diff --git a/pkg/agent/testdata/AKSWindows2019+K8S117/CustomData b/pkg/agent/testdata/AKSWindows2019+K8S117/CustomData
@@ -486,6 +486,11 @@ finally
     # $CSEResultFilePath is used to avoid running CSE multiple times
     Set-Content -Path $CSEResultFilePath -Value $global:ExitCode -Force
     Logs-To-Event -TaskName "AKS.WindowsCSE.cse_main" -TaskMessage "ExitCode: $global:ExitCode. ErrorMessage: $global:ErrorMessage." 
+
+    Write-Log "Start to enable full support of CimFS"
+    c:\AzureData\windows\StagingTool.exe /enable 44354424 47273241 47273202 48004466 48230524
+    Postpone-RestartComputer
+
     # Please not use Write-Log or Logs-To-Events after Stop-Transcript
     Stop-Transcript
 
@@ -501,8 +506,4 @@ finally
         $turncatedErrorMessage = $global:ErrorMessage.Substring(0, [Math]::Min(240 - $errorMessageLength, $global:ErrorMessage.Length))
         throw "ExitCode: |$global:ExitCode|, Output: |$($global:ErrorCodeNames[$global:ExitCode])|, Error: |$turncatedErrorMessage|"
     }
-
-    Write-Log "Start to enable full support of CimFS"
-    c:\AzureData\windows\StagingTool.exe /enable 44354424 47273241 47273202 48004466 48230524
-    Postpone-RestartComputer
 }
diff --git a/pkg/agent/testdata/AKSWindows2019+K8S118/CustomData b/pkg/agent/testdata/AKSWindows2019+K8S118/CustomData
@@ -486,6 +486,11 @@ finally
     # $CSEResultFilePath is used to avoid running CSE multiple times
     Set-Content -Path $CSEResultFilePath -Value $global:ExitCode -Force
     Logs-To-Event -TaskName "AKS.WindowsCSE.cse_main" -TaskMessage "ExitCode: $global:ExitCode. ErrorMessage: $global:ErrorMessage." 
+
+    Write-Log "Start to enable full support of CimFS"
+    c:\AzureData\windows\StagingTool.exe /enable 44354424 47273241 47273202 48004466 48230524
+    Postpone-RestartComputer
+
     # Please not use Write-Log or Logs-To-Events after Stop-Transcript
     Stop-Transcript
 
@@ -501,8 +506,4 @@ finally
         $turncatedErrorMessage = $global:ErrorMessage.Substring(0, [Math]::Min(240 - $errorMessageLength, $global:ErrorMessage.Length))
         throw "ExitCode: |$global:ExitCode|, Output: |$($global:ErrorCodeNames[$global:ExitCode])|, Error: |$turncatedErrorMessage|"
     }
-
-    Write-Log "Start to enable full support of CimFS"
-    c:\AzureData\windows\StagingTool.exe /enable 44354424 47273241 47273202 48004466 48230524
-    Postpone-RestartComputer
 }
diff --git a/pkg/agent/testdata/AKSWindows2019+K8S119+CSI/CustomData b/pkg/agent/testdata/AKSWindows2019+K8S119+CSI/CustomData
@@ -486,6 +486,11 @@ finally
     # $CSEResultFilePath is used to avoid running CSE multiple times
     Set-Content -Path $CSEResultFilePath -Value $global:ExitCode -Force
     Logs-To-Event -TaskName "AKS.WindowsCSE.cse_main" -TaskMessage "ExitCode: $global:ExitCode. ErrorMessage: $global:ErrorMessage." 
+
+    Write-Log "Start to enable full support of CimFS"
+    c:\AzureData\windows\StagingTool.exe /enable 44354424 47273241 47273202 48004466 48230524
+    Postpone-RestartComputer
+
     # Please not use Write-Log or Logs-To-Events after Stop-Transcript
     Stop-Transcript
 
@@ -501,8 +506,4 @@ finally
         $turncatedErrorMessage = $global:ErrorMessage.Substring(0, [Math]::Min(240 - $errorMessageLength, $global:ErrorMessage.Length))
         throw "ExitCode: |$global:ExitCode|, Output: |$($global:ErrorCodeNames[$global:ExitCode])|, Error: |$turncatedErrorMessage|"
     }
-
-    Write-Log "Start to enable full support of CimFS"
-    c:\AzureData\windows\StagingTool.exe /enable 44354424 47273241 47273202 48004466 48230524
-    Postpone-RestartComputer
 }
diff --git a/pkg/agent/testdata/AKSWindows2019+K8S119+FIPS/CustomData b/pkg/agent/testdata/AKSWindows2019+K8S119+FIPS/CustomData
@@ -486,6 +486,11 @@ finally
     # $CSEResultFilePath is used to avoid running CSE multiple times
     Set-Content -Path $CSEResultFilePath -Value $global:ExitCode -Force
     Logs-To-Event -TaskName "AKS.WindowsCSE.cse_main" -TaskMessage "ExitCode: $global:ExitCode. ErrorMessage: $global:ErrorMessage." 
+
+    Write-Log "Start to enable full support of CimFS"
+    c:\AzureData\windows\StagingTool.exe /enable 44354424 47273241 47273202 48004466 48230524
+    Postpone-RestartComputer
+
     # Please not use Write-Log or Logs-To-Events after Stop-Transcript
     Stop-Transcript
 
@@ -501,8 +506,4 @@ finally
         $turncatedErrorMessage = $global:ErrorMessage.Substring(0, [Math]::Min(240 - $errorMessageLength, $global:ErrorMessage.Length))
         throw "ExitCode: |$global:ExitCode|, Output: |$($global:ErrorCodeNames[$global:ExitCode])|, Error: |$turncatedErrorMessage|"
     }
-
-    Write-Log "Start to enable full support of CimFS"
-    c:\AzureData\windows\StagingTool.exe /enable 44354424 47273241 47273202 48004466 48230524
-    Postpone-RestartComputer
 }
diff --git a/pkg/agent/testdata/AKSWindows2019+K8S119/CustomData b/pkg/agent/testdata/AKSWindows2019+K8S119/CustomData
@@ -486,6 +486,11 @@ finally
     # $CSEResultFilePath is used to avoid running CSE multiple times
     Set-Content -Path $CSEResultFilePath -Value $global:ExitCode -Force
     Logs-To-Event -TaskName "AKS.WindowsCSE.cse_main" -TaskMessage "ExitCode: $global:ExitCode. ErrorMessage: $global:ErrorMessage." 
+
+    Write-Log "Start to enable full support of CimFS"
+    c:\AzureData\windows\StagingTool.exe /enable 44354424 47273241 47273202 48004466 48230524
+    Postpone-RestartComputer
+
     # Please not use Write-Log or Logs-To-Events after Stop-Transcript
     Stop-Transcript
 
@@ -501,8 +506,4 @@ finally
         $turncatedErrorMessage = $global:ErrorMessage.Substring(0, [Math]::Min(240 - $errorMessageLength, $global:ErrorMessage.Length))
         throw "ExitCode: |$global:ExitCode|, Output: |$($global:ErrorCodeNames[$global:ExitCode])|, Error: |$turncatedErrorMessage|"
     }
-
-    Write-Log "Start to enable full support of CimFS"
-    c:\AzureData\windows\StagingTool.exe /enable 44354424 47273241 47273202 48004466 48230524
-    Postpone-RestartComputer
 }
diff --git a/pkg/agent/testdata/AKSWindows2019+KubeletClientTLSBootstrapping/CustomData b/pkg/agent/testdata/AKSWindows2019+KubeletClientTLSBootstrapping/CustomData
@@ -486,6 +486,11 @@ finally
     # $CSEResultFilePath is used to avoid running CSE multiple times
     Set-Content -Path $CSEResultFilePath -Value $global:ExitCode -Force
     Logs-To-Event -TaskName "AKS.WindowsCSE.cse_main" -TaskMessage "ExitCode: $global:ExitCode. ErrorMessage: $global:ErrorMessage." 
+
+    Write-Log "Start to enable full support of CimFS"
+    c:\AzureData\windows\StagingTool.exe /enable 44354424 47273241 47273202 48004466 48230524
+    Postpone-RestartComputer
+
     # Please not use Write-Log or Logs-To-Events after Stop-Transcript
     Stop-Transcript
 
@@ -501,8 +506,4 @@ finally
         $turncatedErrorMessage = $global:ErrorMessage.Substring(0, [Math]::Min(240 - $errorMessageLength, $global:ErrorMessage.Length))
         throw "ExitCode: |$global:ExitCode|, Output: |$($global:ErrorCodeNames[$global:ExitCode])|, Error: |$turncatedErrorMessage|"
     }
-
-    Write-Log "Start to enable full support of CimFS"
-    c:\AzureData\windows\StagingTool.exe /enable 44354424 47273241 47273202 48004466 48230524
-    Postpone-RestartComputer
 }
diff --git a/pkg/agent/testdata/AKSWindows2019+ManagedIdentity/CustomData b/pkg/agent/testdata/AKSWindows2019+ManagedIdentity/CustomData
@@ -486,6 +486,11 @@ finally
     # $CSEResultFilePath is used to avoid running CSE multiple times
     Set-Content -Path $CSEResultFilePath -Value $global:ExitCode -Force
     Logs-To-Event -TaskName "AKS.WindowsCSE.cse_main" -TaskMessage "ExitCode: $global:ExitCode. ErrorMessage: $global:ErrorMessage." 
+
+    Write-Log "Start to enable full support of CimFS"
+    c:\AzureData\windows\StagingTool.exe /enable 44354424 47273241 47273202 48004466 48230524
+    Postpone-RestartComputer
+
     # Please not use Write-Log or Logs-To-Events after Stop-Transcript
     Stop-Transcript
 
@@ -501,8 +506,4 @@ finally
         $turncatedErrorMessage = $global:ErrorMessage.Substring(0, [Math]::Min(240 - $errorMessageLength, $global:ErrorMessage.Length))
         throw "ExitCode: |$global:ExitCode|, Output: |$($global:ErrorCodeNames[$global:ExitCode])|, Error: |$turncatedErrorMessage|"
     }
-
-    Write-Log "Start to enable full support of CimFS"
-    c:\AzureData\windows\StagingTool.exe /enable 44354424 47273241 47273202 48004466 48230524
-    Postpone-RestartComputer
 }
diff --git a/pkg/agent/testdata/AKSWindows2019+SecurityProfile/CustomData b/pkg/agent/testdata/AKSWindows2019+SecurityProfile/CustomData
@@ -486,6 +486,11 @@ finally
     # $CSEResultFilePath is used to avoid running CSE multiple times
     Set-Content -Path $CSEResultFilePath -Value $global:ExitCode -Force
     Logs-To-Event -TaskName "AKS.WindowsCSE.cse_main" -TaskMessage "ExitCode: $global:ExitCode. ErrorMessage: $global:ErrorMessage." 
+
+    Write-Log "Start to enable full support of CimFS"
+    c:\AzureData\windows\StagingTool.exe /enable 44354424 47273241 47273202 48004466 48230524
+    Postpone-RestartComputer
+
     # Please not use Write-Log or Logs-To-Events after Stop-Transcript
     Stop-Transcript
 
@@ -501,8 +506,4 @@ finally
         $turncatedErrorMessage = $global:ErrorMessage.Substring(0, [Math]::Min(240 - $errorMessageLength, $global:ErrorMessage.Length))
         throw "ExitCode: |$global:ExitCode|, Output: |$($global:ErrorCodeNames[$global:ExitCode])|, Error: |$turncatedErrorMessage|"
     }
-
-    Write-Log "Start to enable full support of CimFS"
-    c:\AzureData\windows\StagingTool.exe /enable 44354424 47273241 47273202 48004466 48230524
-    Postpone-RestartComputer
 }
diff --git a/pkg/templates/templates_generated.go b/pkg/templates/templates_generated.go