re-run generate after rebase

Azure · Sep 25, 2024 · a3f1dcf · a3f1dcf
1 parent b6059a1
commit a3f1dcf
Show file tree

Hide file tree

Showing 102 changed files with 323 additions and 278 deletions.
diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CSECommand b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData
diff --git a/...ata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData b/...ata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData
diff --git a/...gent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData b/...gent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData
diff --git a/...t/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData b/...t/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData
diff --git a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData
diff --git a/pkg/agent/testdata/AKSWindows2019+CustomCloud+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSWindows2019+CustomCloud+ootcredentialprovider/CustomData
@@ -125,7 +125,6 @@ $global:KubeproxyConfigArgs = @( "--metrics-bind-address=0.0.0.0:10249" )
 $global:KubeproxyFeatureGates = @( "WinDSR=true", "WinOverlay=false" )
 
 $global:UseManagedIdentityExtension = "false"
-$global:SkipExternalHnsNetwork = $false
 $global:UseInstanceMetadata = "true"
 
 $global:LoadBalancerSku = "Standard"
@@ -220,7 +219,15 @@ Expand-Archive scripts.zip -DestinationPath "C:\\AzureData\\" -Force
 . c:\AzureData\windows\windowscsehelper.ps1
 # util functions only can be used after this line, for example, Write-Log
 
+# make sure the global logging directory exists. If the script is not being running as a CSE then it won't exist.
+md $global:EventsLoggingDir -ea 0
+
 $global:OperationId = New-Guid
+if ("$global:OperationId2" -eq "") {
+    $global:OperationId = "00000000-0000-0000-0000-000000000000"
+}
+
+$env:Path += ';C:\Program Files\containerd'
 
 try
 {
@@ -420,12 +427,8 @@ try
             -IdentitySystem "azure_ad"
     }
 
-    if ( -not ( $global:SkipExternalHnsNetwork ) ) {
-        Write-Log "Setting up ExternalHnsNetwork"
-        New-ExternalHnsNetwork -IsDualStackEnabled $global:IsDualStackEnabled
-    } else {
-        Write-Log "Skipping ExternalHnsNetwork setup"
-    }
+    Write-Log "Setting up ExternalHnsNetwork"
+    New-ExternalHnsNetwork -IsDualStackEnabled $global:IsDualStackEnabled
 
     Install-KubernetesServices `
         -KubeDir $global:KubeDir

diff --git a/pkg/agent/testdata/AKSWindows2019+CustomCloud/CustomData b/pkg/agent/testdata/AKSWindows2019+CustomCloud/CustomData
@@ -125,7 +125,6 @@ $global:KubeproxyConfigArgs = @( "--metrics-bind-address=0.0.0.0:10249" )
 $global:KubeproxyFeatureGates = @( "WinDSR=true", "WinOverlay=false" )
 
 $global:UseManagedIdentityExtension = "false"
-$global:SkipExternalHnsNetwork = $false
 $global:UseInstanceMetadata = "true"
 
 $global:LoadBalancerSku = "Standard"
@@ -220,7 +219,15 @@ Expand-Archive scripts.zip -DestinationPath "C:\\AzureData\\" -Force
 . c:\AzureData\windows\windowscsehelper.ps1
 # util functions only can be used after this line, for example, Write-Log
 
+# make sure the global logging directory exists. If the script is not being running as a CSE then it won't exist.
+md $global:EventsLoggingDir -ea 0
+
 $global:OperationId = New-Guid
+if ("$global:OperationId2" -eq "") {
+    $global:OperationId = "00000000-0000-0000-0000-000000000000"
+}
+
+$env:Path += ';C:\Program Files\containerd'
 
 try
 {
@@ -420,12 +427,8 @@ try
             -IdentitySystem "azure_ad"
     }
 
-    if ( -not ( $global:SkipExternalHnsNetwork ) ) {
-        Write-Log "Setting up ExternalHnsNetwork"
-        New-ExternalHnsNetwork -IsDualStackEnabled $global:IsDualStackEnabled
-    } else {
-        Write-Log "Skipping ExternalHnsNetwork setup"
-    }
+    Write-Log "Setting up ExternalHnsNetwork"
+    New-ExternalHnsNetwork -IsDualStackEnabled $global:IsDualStackEnabled
 
     Install-KubernetesServices `
         -KubeDir $global:KubeDir

diff --git a/pkg/agent/testdata/AKSWindows2019+CustomVnet/CustomData b/pkg/agent/testdata/AKSWindows2019+CustomVnet/CustomData
@@ -125,7 +125,6 @@ $global:KubeproxyConfigArgs = @( "--metrics-bind-address=0.0.0.0:10249" )
 $global:KubeproxyFeatureGates = @( "WinDSR=true", "WinOverlay=false" )
 
 $global:UseManagedIdentityExtension = "false"
-$global:SkipExternalHnsNetwork = $false
 $global:UseInstanceMetadata = "true"
 
 $global:LoadBalancerSku = "Standard"
@@ -220,7 +219,15 @@ Expand-Archive scripts.zip -DestinationPath "C:\\AzureData\\" -Force
 . c:\AzureData\windows\windowscsehelper.ps1
 # util functions only can be used after this line, for example, Write-Log
 
+# make sure the global logging directory exists. If the script is not being running as a CSE then it won't exist.
+md $global:EventsLoggingDir -ea 0
+
 $global:OperationId = New-Guid
+if ("$global:OperationId2" -eq "") {
+    $global:OperationId = "00000000-0000-0000-0000-000000000000"
+}
+
+$env:Path += ';C:\Program Files\containerd'
 
 try
 {
@@ -414,12 +421,8 @@ try
             -IdentitySystem "azure_ad"
     }
 
-    if ( -not ( $global:SkipExternalHnsNetwork ) ) {
-        Write-Log "Setting up ExternalHnsNetwork"
-        New-ExternalHnsNetwork -IsDualStackEnabled $global:IsDualStackEnabled
-    } else {
-        Write-Log "Skipping ExternalHnsNetwork setup"
-    }
+    Write-Log "Setting up ExternalHnsNetwork"
+    New-ExternalHnsNetwork -IsDualStackEnabled $global:IsDualStackEnabled
 
     Install-KubernetesServices `
         -KubeDir $global:KubeDir

diff --git a/pkg/agent/testdata/AKSWindows2019+EnablePrivateClusterHostsConfigAgent/CustomData b/pkg/agent/testdata/AKSWindows2019+EnablePrivateClusterHostsConfigAgent/CustomData
@@ -125,7 +125,6 @@ $global:KubeproxyConfigArgs = @( "--metrics-bind-address=0.0.0.0:10249" )
 $global:KubeproxyFeatureGates = @( "WinDSR=true", "WinOverlay=false" )
 
 $global:UseManagedIdentityExtension = "false"
-$global:SkipExternalHnsNetwork = $false
 $global:UseInstanceMetadata = "true"
 
 $global:LoadBalancerSku = "Standard"
@@ -220,7 +219,15 @@ Expand-Archive scripts.zip -DestinationPath "C:\\AzureData\\" -Force
 . c:\AzureData\windows\windowscsehelper.ps1
 # util functions only can be used after this line, for example, Write-Log
 
+# make sure the global logging directory exists. If the script is not being running as a CSE then it won't exist.
+md $global:EventsLoggingDir -ea 0
+
 $global:OperationId = New-Guid
+if ("$global:OperationId2" -eq "") {
+    $global:OperationId = "00000000-0000-0000-0000-000000000000"
+}
+
+$env:Path += ';C:\Program Files\containerd'
 
 try
 {
@@ -414,12 +421,8 @@ try
             -IdentitySystem "azure_ad"
     }
 
-    if ( -not ( $global:SkipExternalHnsNetwork ) ) {
-        Write-Log "Setting up ExternalHnsNetwork"
-        New-ExternalHnsNetwork -IsDualStackEnabled $global:IsDualStackEnabled
-    } else {
-        Write-Log "Skipping ExternalHnsNetwork setup"
-    }
+    Write-Log "Setting up ExternalHnsNetwork"
+    New-ExternalHnsNetwork -IsDualStackEnabled $global:IsDualStackEnabled
 
     Install-KubernetesServices `
         -KubeDir $global:KubeDir

diff --git a/pkg/agent/testdata/AKSWindows2019+K8S116/CustomData b/pkg/agent/testdata/AKSWindows2019+K8S116/CustomData
@@ -125,7 +125,6 @@ $global:KubeproxyConfigArgs = @( "--metrics-bind-address=0.0.0.0:10249" )
 $global:KubeproxyFeatureGates = @(  )
 
 $global:UseManagedIdentityExtension = "false"
-$global:SkipExternalHnsNetwork = $false
 $global:UseInstanceMetadata = "true"
 
 $global:LoadBalancerSku = "Standard"
@@ -220,7 +219,15 @@ Expand-Archive scripts.zip -DestinationPath "C:\\AzureData\\" -Force
 . c:\AzureData\windows\windowscsehelper.ps1
 # util functions only can be used after this line, for example, Write-Log
 
+# make sure the global logging directory exists. If the script is not being running as a CSE then it won't exist.
+md $global:EventsLoggingDir -ea 0
+
 $global:OperationId = New-Guid
+if ("$global:OperationId2" -eq "") {
+    $global:OperationId = "00000000-0000-0000-0000-000000000000"
+}
+
+$env:Path += ';C:\Program Files\containerd'
 
 try
 {
@@ -414,12 +421,8 @@ try
             -IdentitySystem "azure_ad"
     }
 
-    if ( -not ( $global:SkipExternalHnsNetwork ) ) {
-        Write-Log "Setting up ExternalHnsNetwork"
-        New-ExternalHnsNetwork -IsDualStackEnabled $global:IsDualStackEnabled
-    } else {
-        Write-Log "Skipping ExternalHnsNetwork setup"
-    }
+    Write-Log "Setting up ExternalHnsNetwork"
+    New-ExternalHnsNetwork -IsDualStackEnabled $global:IsDualStackEnabled
 
     Install-KubernetesServices `
         -KubeDir $global:KubeDir

diff --git a/pkg/agent/testdata/AKSWindows2019+K8S117/CustomData b/pkg/agent/testdata/AKSWindows2019+K8S117/CustomData
@@ -125,7 +125,6 @@ $global:KubeproxyConfigArgs = @( "--metrics-bind-address=0.0.0.0:10249" )
 $global:KubeproxyFeatureGates = @(  )
 
 $global:UseManagedIdentityExtension = "false"
-$global:SkipExternalHnsNetwork = $false
 $global:UseInstanceMetadata = "true"
 
 $global:LoadBalancerSku = "Standard"
@@ -220,7 +219,15 @@ Expand-Archive scripts.zip -DestinationPath "C:\\AzureData\\" -Force
 . c:\AzureData\windows\windowscsehelper.ps1
 # util functions only can be used after this line, for example, Write-Log
 
+# make sure the global logging directory exists. If the script is not being running as a CSE then it won't exist.
+md $global:EventsLoggingDir -ea 0
+
 $global:OperationId = New-Guid
+if ("$global:OperationId2" -eq "") {
+    $global:OperationId = "00000000-0000-0000-0000-000000000000"
+}
+
+$env:Path += ';C:\Program Files\containerd'
 
 try
 {
@@ -414,12 +421,8 @@ try
             -IdentitySystem "azure_ad"
     }
 
-    if ( -not ( $global:SkipExternalHnsNetwork ) ) {
-        Write-Log "Setting up ExternalHnsNetwork"
-        New-ExternalHnsNetwork -IsDualStackEnabled $global:IsDualStackEnabled
-    } else {
-        Write-Log "Skipping ExternalHnsNetwork setup"
-    }
+    Write-Log "Setting up ExternalHnsNetwork"
+    New-ExternalHnsNetwork -IsDualStackEnabled $global:IsDualStackEnabled
 
     Install-KubernetesServices `
         -KubeDir $global:KubeDir

diff --git a/pkg/agent/testdata/AKSWindows2019+K8S118/CustomData b/pkg/agent/testdata/AKSWindows2019+K8S118/CustomData
@@ -125,7 +125,6 @@ $global:KubeproxyConfigArgs = @( "--metrics-bind-address=0.0.0.0:10249" )
 $global:KubeproxyFeatureGates = @(  )
 
 $global:UseManagedIdentityExtension = "false"
-$global:SkipExternalHnsNetwork = $false
 $global:UseInstanceMetadata = "true"
 
 $global:LoadBalancerSku = "Standard"
@@ -220,7 +219,15 @@ Expand-Archive scripts.zip -DestinationPath "C:\\AzureData\\" -Force
 . c:\AzureData\windows\windowscsehelper.ps1
 # util functions only can be used after this line, for example, Write-Log
 
+# make sure the global logging directory exists. If the script is not being running as a CSE then it won't exist.
+md $global:EventsLoggingDir -ea 0
+
 $global:OperationId = New-Guid
+if ("$global:OperationId2" -eq "") {
+    $global:OperationId = "00000000-0000-0000-0000-000000000000"
+}
+
+$env:Path += ';C:\Program Files\containerd'
 
 try
 {
@@ -414,12 +421,8 @@ try
             -IdentitySystem "azure_ad"
     }
 
-    if ( -not ( $global:SkipExternalHnsNetwork ) ) {
-        Write-Log "Setting up ExternalHnsNetwork"
-        New-ExternalHnsNetwork -IsDualStackEnabled $global:IsDualStackEnabled
-    } else {
-        Write-Log "Skipping ExternalHnsNetwork setup"
-    }
+    Write-Log "Setting up ExternalHnsNetwork"
+    New-ExternalHnsNetwork -IsDualStackEnabled $global:IsDualStackEnabled
 
     Install-KubernetesServices `
         -KubeDir $global:KubeDir

diff --git a/pkg/agent/testdata/AKSWindows2019+K8S119+CSI/CustomData b/pkg/agent/testdata/AKSWindows2019+K8S119+CSI/CustomData
@@ -125,7 +125,6 @@ $global:KubeproxyConfigArgs = @( "--metrics-bind-address=0.0.0.0:10249" )
 $global:KubeproxyFeatureGates = @( "WinDSR=true", "WinOverlay=false" )
 
 $global:UseManagedIdentityExtension = "false"
-$global:SkipExternalHnsNetwork = $false
 $global:UseInstanceMetadata = "true"
 
 $global:LoadBalancerSku = "Standard"
@@ -220,7 +219,15 @@ Expand-Archive scripts.zip -DestinationPath "C:\\AzureData\\" -Force
 . c:\AzureData\windows\windowscsehelper.ps1
 # util functions only can be used after this line, for example, Write-Log
 
+# make sure the global logging directory exists. If the script is not being running as a CSE then it won't exist.
+md $global:EventsLoggingDir -ea 0
+
 $global:OperationId = New-Guid
+if ("$global:OperationId2" -eq "") {
+    $global:OperationId = "00000000-0000-0000-0000-000000000000"
+}
+
+$env:Path += ';C:\Program Files\containerd'
 
 try
 {
@@ -414,12 +421,8 @@ try
             -IdentitySystem "azure_ad"
     }
 
-    if ( -not ( $global:SkipExternalHnsNetwork ) ) {
-        Write-Log "Setting up ExternalHnsNetwork"
-        New-ExternalHnsNetwork -IsDualStackEnabled $global:IsDualStackEnabled
-    } else {
-        Write-Log "Skipping ExternalHnsNetwork setup"
-    }
+    Write-Log "Setting up ExternalHnsNetwork"
+    New-ExternalHnsNetwork -IsDualStackEnabled $global:IsDualStackEnabled
 
     Install-KubernetesServices `
         -KubeDir $global:KubeDir

diff --git a/pkg/agent/testdata/AKSWindows2019+K8S119+FIPS/CustomData b/pkg/agent/testdata/AKSWindows2019+K8S119+FIPS/CustomData
@@ -125,7 +125,6 @@ $global:KubeproxyConfigArgs = @( "--metrics-bind-address=0.0.0.0:10249" )
 $global:KubeproxyFeatureGates = @( "WinDSR=true", "WinOverlay=false" )
 
 $global:UseManagedIdentityExtension = "false"
-$global:SkipExternalHnsNetwork = $false
 $global:UseInstanceMetadata = "true"
 
 $global:LoadBalancerSku = "Standard"
@@ -220,7 +219,15 @@ Expand-Archive scripts.zip -DestinationPath "C:\\AzureData\\" -Force
 . c:\AzureData\windows\windowscsehelper.ps1
 # util functions only can be used after this line, for example, Write-Log
 
+# make sure the global logging directory exists. If the script is not being running as a CSE then it won't exist.
+md $global:EventsLoggingDir -ea 0
+
 $global:OperationId = New-Guid
+if ("$global:OperationId2" -eq "") {
+    $global:OperationId = "00000000-0000-0000-0000-000000000000"
+}
+
+$env:Path += ';C:\Program Files\containerd'
 
 try
 {
@@ -414,12 +421,8 @@ try
             -IdentitySystem "azure_ad"
     }
 
-    if ( -not ( $global:SkipExternalHnsNetwork ) ) {
-        Write-Log "Setting up ExternalHnsNetwork"
-        New-ExternalHnsNetwork -IsDualStackEnabled $global:IsDualStackEnabled
-    } else {
-        Write-Log "Skipping ExternalHnsNetwork setup"
-    }
+    Write-Log "Setting up ExternalHnsNetwork"
+    New-ExternalHnsNetwork -IsDualStackEnabled $global:IsDualStackEnabled
 
     Install-KubernetesServices `
         -KubeDir $global:KubeDir

diff --git a/pkg/agent/testdata/AKSWindows2019+K8S119/CustomData b/pkg/agent/testdata/AKSWindows2019+K8S119/CustomData
@@ -125,7 +125,6 @@ $global:KubeproxyConfigArgs = @( "--metrics-bind-address=0.0.0.0:10249" )
 $global:KubeproxyFeatureGates = @( "WinDSR=true", "WinOverlay=false" )
 
 $global:UseManagedIdentityExtension = "false"
-$global:SkipExternalHnsNetwork = $false
 $global:UseInstanceMetadata = "true"
 
 $global:LoadBalancerSku = "Standard"
@@ -220,7 +219,15 @@ Expand-Archive scripts.zip -DestinationPath "C:\\AzureData\\" -Force
 . c:\AzureData\windows\windowscsehelper.ps1
 # util functions only can be used after this line, for example, Write-Log
 
+# make sure the global logging directory exists. If the script is not being running as a CSE then it won't exist.
+md $global:EventsLoggingDir -ea 0
+
 $global:OperationId = New-Guid
+if ("$global:OperationId2" -eq "") {
+    $global:OperationId = "00000000-0000-0000-0000-000000000000"
+}
+
+$env:Path += ';C:\Program Files\containerd'
 
 try
 {
@@ -414,12 +421,8 @@ try
             -IdentitySystem "azure_ad"
     }
 
-    if ( -not ( $global:SkipExternalHnsNetwork ) ) {
-        Write-Log "Setting up ExternalHnsNetwork"
-        New-ExternalHnsNetwork -IsDualStackEnabled $global:IsDualStackEnabled
-    } else {
-        Write-Log "Skipping ExternalHnsNetwork setup"
-    }
+    Write-Log "Setting up ExternalHnsNetwork"
+    New-ExternalHnsNetwork -IsDualStackEnabled $global:IsDualStackEnabled
 
     Install-KubernetesServices `
         -KubeDir $global:KubeDir