From ddef594a70f20d6bdeb1be983ee50bb57e109a5a Mon Sep 17 00:00:00 2001 From: Jon Huhn Date: Tue, 13 Aug 2024 21:25:22 +0000 Subject: [PATCH] Revert "update default custom cloud provider config for managed identity" This reverts commit bb62c65809c75f20e420967941474a9532468e96. --- hack/create-custom-cloud-provider-config.sh | 2 +- .../default-custom-cloud-provider-config.json | 26 ------------------- 2 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 templates/test/ci/default-custom-cloud-provider-config.json diff --git a/hack/create-custom-cloud-provider-config.sh b/hack/create-custom-cloud-provider-config.sh index f17be9bc0f3..e0e24058621 100755 --- a/hack/create-custom-cloud-provider-config.sh +++ b/hack/create-custom-cloud-provider-config.sh @@ -26,7 +26,7 @@ source "${REPO_ROOT}/hack/common-vars.sh" make --directory="${REPO_ROOT}" "${KUBECTL##*/}" # Test cloud provider config with shorter cache ttl -CLOUD_PROVIDER_CONFIG="file://$(realpath "${REPO_ROOT}")/templates/test/ci/default-custom-cloud-provider-config.json" +CLOUD_PROVIDER_CONFIG="https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/tests/k8s-azure/manifest/cluster-api/cloud-config-vmss-short-cache-ttl.json" if [[ -n "${CUSTOM_CLOUD_PROVIDER_CONFIG:-}" ]]; then CLOUD_PROVIDER_CONFIG="${CUSTOM_CLOUD_PROVIDER_CONFIG:-}" fi diff --git a/templates/test/ci/default-custom-cloud-provider-config.json b/templates/test/ci/default-custom-cloud-provider-config.json deleted file mode 100644 index 761ff12af52..00000000000 --- a/templates/test/ci/default-custom-cloud-provider-config.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "cloud": "AzurePublicCloud", - "tenantId": "${AZURE_TENANT_ID}", - "subscriptionId": "${AZURE_SUBSCRIPTION_ID}", - "userAssignedIdentityID": "${AZURE_CLIENT_ID_USER_ASSIGNED_IDENTITY}", - "resourceGroup": "${AZURE_RESOURCE_GROUP}", - "securityGroupName": "${CLUSTER_NAME}-node-nsg", - "securityGroupResourceGroup": "${AZURE_RESOURCE_GROUP}", - "location": "${AZURE_LOCATION}", - "vmType": "vmss", - "vnetName": "${CLUSTER_NAME}-vnet", - "vnetResourceGroup": "${AZURE_RESOURCE_GROUP}", - "subnetName": "node-subnet", - "routeTableName": "${CLUSTER_NAME}-node-routetable", - "loadBalancerSku": "${AZURE_LOADBALANCER_SKU}", - "maximumLoadBalancerRuleCount": 250, - "useManagedIdentityExtension": true, - "useInstanceMetadata": true, - "enableVmssFlexNodes": true, - "nonVmssUniformNodesCacheTTLInSeconds": 450, - "vmssCacheTTLInSeconds": 300, - "vmssVirtualMachinesCacheTTLInSeconds": 300, - "availabilitySetsCacheTTLInSeconds": 300, - "vmssFlexCacheTTLInSeconds": 300, - "vmssFlexVMCacheTTLInSeconds": 300 -}