From a6706802a2dd2f3c658e420a2fdb1f2f89b99700 Mon Sep 17 00:00:00 2001 From: Junjie Zhang Date: Tue, 16 Apr 2024 03:11:31 +0000 Subject: [PATCH] update --- parts/windows/kuberneteswindowssetup.ps1 | 9 +++++---- pkg/agent/testdata/AKSWindows2019+CustomCloud/CustomData | 9 +++++---- pkg/agent/testdata/AKSWindows2019+CustomVnet/CustomData | 9 +++++---- .../CustomData | 9 +++++---- pkg/agent/testdata/AKSWindows2019+K8S116/CustomData | 9 +++++---- pkg/agent/testdata/AKSWindows2019+K8S117/CustomData | 9 +++++---- pkg/agent/testdata/AKSWindows2019+K8S118/CustomData | 9 +++++---- pkg/agent/testdata/AKSWindows2019+K8S119+CSI/CustomData | 9 +++++---- pkg/agent/testdata/AKSWindows2019+K8S119+FIPS/CustomData | 9 +++++---- pkg/agent/testdata/AKSWindows2019+K8S119/CustomData | 9 +++++---- .../CustomData | 9 +++++---- .../testdata/AKSWindows2019+ManagedIdentity/CustomData | 9 +++++---- .../testdata/AKSWindows2019+SecurityProfile/CustomData | 9 +++++---- pkg/templates/templates_generated.go | 9 +++++---- 14 files changed, 70 insertions(+), 56 deletions(-) diff --git a/parts/windows/kuberneteswindowssetup.ps1 b/parts/windows/kuberneteswindowssetup.ps1 index fcde98e9a15..359619f6a0c 100644 --- 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 index 67625969b0a..e6a677ccac5 100644 --- 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 index 9adde8d99a8..576874b110e 100644 --- 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 index 506e4e4792a..309845cba3d 100644 --- 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 index ddd54afa477..40dac01dcab 100644 --- 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 index fb83067fc09..be682329b53 100644 --- 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 index 6ca5a63bb0c..f833c13c939 100644 --- 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 index a85a0a54847..e700792f255 100644 --- 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 index 23250a235d6..0b1020b1416 100644 --- 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 index 9106f88d3bd..32da0b5a8c3 100644 --- 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 index bee935df333..15a5d82b397 100644 --- 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 index db9f2a8fa58..1dc2df3d241 100644 --- 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 index 80ec9baa3b3..ba6939d5439 100644 --- 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 index 62659cf9797..7aef268ccc2 100644 --- a/pkg/templates/templates_generated.go +++ b/pkg/templates/templates_generated.go @@ -8900,6 +8900,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 @@ -8915,10 +8920,6 @@ 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 } `)