Merge branch 'master' into shafan/cloudprovider

Azure · Feb 25, 2025 · 3ca2c98 · 3ca2c98
2 parents d4c92a4 + adab753
commit 3ca2c98
Show file tree

Hide file tree

Showing 20 changed files with 7 additions and 28 deletions.
diff --git a/e2e/scenario_helpers_test.go b/e2e/scenario_helpers_test.go
@@ -180,9 +180,9 @@ func maybeSkipScenario(ctx context.Context, t *testing.T, s *Scenario) {
 	vhd, err := s.VHD.VHDResourceID(ctx, t)
 	if err != nil {
 		if config.Config.IgnoreScenariosWithMissingVHD && errors.Is(err, config.ErrNotFound) {
-			t.Skipf("skipping scenario %q: could not find image", t.Name())
+			t.Skipf("skipping scenario %q: could not find image for VHD %s due to %s", t.Name(), s.VHD.String(), err)
 		} else {
-			t.Fatalf("could not find image for %q: %s", t.Name(), err)
+			t.Fatalf("could not find image for %q (VHD %s): %s", t.Name(), s.VHD.String(), err)
 		}
 	}
 	t.Logf("VHD: %q, TAGS %+v", vhd, s.Tags)

diff --git a/parts/common/components.json b/parts/common/components.json
@@ -353,8 +353,8 @@
       "multiArchVersionsV2": [
         {
           "renovateTag": "registry=https://mcr.microsoft.com, name=oss/kubernetes-csi/secrets-store/driver",
-          "latestVersion": "v1.4.7",
-          "previousLatestVersion": "v1.4.5"
+          "latestVersion": "v1.4.8",
+          "previousLatestVersion": "v1.4.7"
         }
       ]
     },

diff --git a/parts/windows/kuberneteswindowssetup.ps1 b/parts/windows/kuberneteswindowssetup.ps1
@@ -47,7 +47,6 @@ $Location="{{ GetVariable "location" }}"
 $UserAssignedClientID="{{ GetVariable "userAssignedIdentityID" }}"
 {{ end }}
 $TargetEnvironment="{{ GetTargetEnvironment }}"
-$AgentKey="{{ GetParameter "clientPrivateKey" }}"
 $AADClientId="{{ GetParameter "servicePrincipalClientId" }}"
 $NetworkAPIVersion="2018-08-01"
 

diff --git a/pkg/agent/testdata/AKSWindows2019+CustomCloud+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSWindows2019+CustomCloud+ootcredentialprovider/CustomData
@@ -45,7 +45,6 @@ $MasterFQDNPrefix="uttestdom"
 $Location="southcentralus"
 
 $TargetEnvironment="akscustom"
-$AgentKey=""
 $AADClientId="ClientID"
 $NetworkAPIVersion="2018-08-01"
 

diff --git a/pkg/agent/testdata/AKSWindows2019+CustomCloud/CustomData b/pkg/agent/testdata/AKSWindows2019+CustomCloud/CustomData
@@ -45,7 +45,6 @@ $MasterFQDNPrefix="uttestdom"
 $Location="southcentralus"
 
 $TargetEnvironment="akscustom"
-$AgentKey=""
 $AADClientId="ClientID"
 $NetworkAPIVersion="2018-08-01"
 

diff --git a/pkg/agent/testdata/AKSWindows2019+CustomVnet/CustomData b/pkg/agent/testdata/AKSWindows2019+CustomVnet/CustomData
@@ -45,7 +45,6 @@ $MasterFQDNPrefix="uttestdom"
 $Location="southcentralus"
 
 $TargetEnvironment="AzurePublicCloud"
-$AgentKey=""
 $AADClientId="ClientID"
 $NetworkAPIVersion="2018-08-01"
 

diff --git a/pkg/agent/testdata/AKSWindows2019+EnablePrivateClusterHostsConfigAgent/CustomData b/pkg/agent/testdata/AKSWindows2019+EnablePrivateClusterHostsConfigAgent/CustomData
@@ -45,7 +45,6 @@ $MasterFQDNPrefix="uttestdom"
 $Location="southcentralus"
 
 $TargetEnvironment="AzurePublicCloud"
-$AgentKey=""
 $AADClientId="ClientID"
 $NetworkAPIVersion="2018-08-01"
 

diff --git a/pkg/agent/testdata/AKSWindows2019+K8S116/CustomData b/pkg/agent/testdata/AKSWindows2019+K8S116/CustomData
@@ -45,7 +45,6 @@ $MasterFQDNPrefix="uttestdom"
 $Location="southcentralus"
 
 $TargetEnvironment="AzurePublicCloud"
-$AgentKey=""
 $AADClientId="ClientID"
 $NetworkAPIVersion="2018-08-01"
 

diff --git a/pkg/agent/testdata/AKSWindows2019+K8S117/CustomData b/pkg/agent/testdata/AKSWindows2019+K8S117/CustomData
@@ -45,7 +45,6 @@ $MasterFQDNPrefix="uttestdom"
 $Location="southcentralus"
 
 $TargetEnvironment="AzurePublicCloud"
-$AgentKey=""
 $AADClientId="ClientID"
 $NetworkAPIVersion="2018-08-01"
 

diff --git a/pkg/agent/testdata/AKSWindows2019+K8S118/CustomData b/pkg/agent/testdata/AKSWindows2019+K8S118/CustomData
@@ -45,7 +45,6 @@ $MasterFQDNPrefix="uttestdom"
 $Location="southcentralus"
 
 $TargetEnvironment="AzurePublicCloud"
-$AgentKey=""
 $AADClientId="ClientID"
 $NetworkAPIVersion="2018-08-01"
 

diff --git a/pkg/agent/testdata/AKSWindows2019+K8S119+CSI/CustomData b/pkg/agent/testdata/AKSWindows2019+K8S119+CSI/CustomData
@@ -45,7 +45,6 @@ $MasterFQDNPrefix="uttestdom"
 $Location="southcentralus"
 
 $TargetEnvironment="AzurePublicCloud"
-$AgentKey=""
 $AADClientId="ClientID"
 $NetworkAPIVersion="2018-08-01"
 

diff --git a/pkg/agent/testdata/AKSWindows2019+K8S119+FIPS/CustomData b/pkg/agent/testdata/AKSWindows2019+K8S119+FIPS/CustomData
@@ -45,7 +45,6 @@ $MasterFQDNPrefix="uttestdom"
 $Location="southcentralus"
 
 $TargetEnvironment="AzurePublicCloud"
-$AgentKey=""
 $AADClientId="ClientID"
 $NetworkAPIVersion="2018-08-01"
 

diff --git a/pkg/agent/testdata/AKSWindows2019+K8S119/CustomData b/pkg/agent/testdata/AKSWindows2019+K8S119/CustomData
@@ -45,7 +45,6 @@ $MasterFQDNPrefix="uttestdom"
 $Location="southcentralus"
 
 $TargetEnvironment="AzurePublicCloud"
-$AgentKey=""
 $AADClientId="ClientID"
 $NetworkAPIVersion="2018-08-01"
 

diff --git a/pkg/agent/testdata/AKSWindows2019+KubeletClientTLSBootstrapping/CustomData b/pkg/agent/testdata/AKSWindows2019+KubeletClientTLSBootstrapping/CustomData
@@ -45,7 +45,6 @@ $MasterFQDNPrefix="uttestdom"
 $Location="southcentralus"
 
 $TargetEnvironment="AzurePublicCloud"
-$AgentKey=""
 $AADClientId="ClientID"
 $NetworkAPIVersion="2018-08-01"
 

diff --git a/pkg/agent/testdata/AKSWindows2019+KubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSWindows2019+KubeletServingCertificateRotation/CustomData
@@ -45,7 +45,6 @@ $MasterFQDNPrefix="uttestdom"
 $Location="southcentralus"
 
 $TargetEnvironment="AzurePublicCloud"
-$AgentKey=""
 $AADClientId="ClientID"
 $NetworkAPIVersion="2018-08-01"
 

diff --git a/pkg/agent/testdata/AKSWindows2019+ManagedIdentity/CustomData b/pkg/agent/testdata/AKSWindows2019+ManagedIdentity/CustomData
@@ -47,7 +47,6 @@ $Location="southcentralus"
 $UserAssignedClientID="userAssignedID"
 
 $TargetEnvironment="AzurePublicCloud"
-$AgentKey=""
 $AADClientId="msi"
 $NetworkAPIVersion="2018-08-01"
 

diff --git a/pkg/agent/testdata/AKSWindows2019+SecurityProfile/CustomData b/pkg/agent/testdata/AKSWindows2019+SecurityProfile/CustomData
@@ -45,7 +45,6 @@ $MasterFQDNPrefix="uttestdom"
 $Location="southcentralus"
 
 $TargetEnvironment="AzurePublicCloud"
-$AgentKey=""
 $AADClientId="ClientID"
 $NetworkAPIVersion="2018-08-01"
 

diff --git a/pkg/agent/testdata/AKSWindows2019+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSWindows2019+ootcredentialprovider/CustomData
@@ -45,7 +45,6 @@ $MasterFQDNPrefix="uttestdom"
 $Location="southcentralus"
 
 $TargetEnvironment="AzurePublicCloud"
-$AgentKey=""
 $AADClientId="ClientID"
 $NetworkAPIVersion="2018-08-01"
 

diff --git a/vhdbuilder/packer/convert-sig-to-classic-storage-account-blob.sh b/vhdbuilder/packer/convert-sig-to-classic-storage-account-blob.sh
@@ -119,16 +119,11 @@ capture_benchmark "${SCRIPT_NAME}_grant_access_to_disk"
 echo "Uploading $disk_resource_id to ${CLASSIC_BLOB}/${CAPTURED_SIG_VERSION}.vhd"
 
 echo "Setting azcopy environment variables with pool identity: $AZURE_MSI_RESOURCE_STRING"
-# TBD: Need to investigate why `azcopy-preview login --login-type=MSI` does not work for Windows
 export AZCOPY_AUTO_LOGIN_TYPE="MSI"
 export AZCOPY_MSI_RESOURCE_STRING="$AZURE_MSI_RESOURCE_STRING"
 
-if [[ "${OS_TYPE}" == "Linux" ]]; then
-  export AZCOPY_CONCURRENCY_VALUE="AUTO"
-  azcopy copy "${sas}" "${CLASSIC_BLOB}/${CAPTURED_SIG_VERSION}.vhd" --recursive=true || exit $?
-else
-  azcopy-preview copy "${sas}" "${CLASSIC_BLOB}/${CAPTURED_SIG_VERSION}.vhd" --recursive=true || exit $?
-fi
+export AZCOPY_CONCURRENCY_VALUE="AUTO"
+azcopy copy "${sas}" "${CLASSIC_BLOB}/${CAPTURED_SIG_VERSION}.vhd" --recursive=true || exit $?
 
 echo "Uploaded $disk_resource_id to ${CLASSIC_BLOB}/${CAPTURED_SIG_VERSION}.vhd"
 capture_benchmark "${SCRIPT_NAME}_upload_disk_to_blob"

diff --git a/vhdbuilder/packer/init-variables.sh b/vhdbuilder/packer/init-variables.sh
@@ -386,7 +386,7 @@ if [ "$OS_TYPE" == "Windows" ]; then
 		echo "Copy Windows base image to ${WINDOWS_IMAGE_URL}"
 		export AZCOPY_AUTO_LOGIN_TYPE="MSI"
 		export AZCOPY_MSI_RESOURCE_STRING="${AZURE_MSI_RESOURCE_STRING}"
-		azcopy-preview copy "${WINDOWS_BASE_IMAGE_URL}" "${WINDOWS_IMAGE_URL}"
+		azcopy copy "${WINDOWS_BASE_IMAGE_URL}" "${WINDOWS_IMAGE_URL}"
 		# https://www.packer.io/plugins/builders/azure/arm#image_url
 		# WINDOWS_IMAGE_URL to a custom VHD to use for your base image. If this value is set, image_publisher, image_offer, image_sku, or image_version should not be set.
 		WINDOWS_IMAGE_PUBLISHER=""