Skip to content

Commit bb62c65

Browse files
committed
update default custom cloud provider config for managed identity
1 parent 53fb683 commit bb62c65

File tree

2 files changed

+28
-1
lines changed

2 files changed

+28
-1
lines changed

hack/create-custom-cloud-provider-config.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,12 @@ source "${REPO_ROOT}/hack/common-vars.sh"
2626
make --directory="${REPO_ROOT}" "${KUBECTL##*/}"
2727

2828
# Test cloud provider config with shorter cache ttl
29-
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"
29+
CLOUD_PROVIDER_CONFIG="file://$(realpath "${REPO_ROOT}")/templates/test/ci/default-custom-cloud-provider-config.json"
3030
if [[ -n "${CUSTOM_CLOUD_PROVIDER_CONFIG:-}" ]]; then
3131
CLOUD_PROVIDER_CONFIG="${CUSTOM_CLOUD_PROVIDER_CONFIG:-}"
3232
fi
3333

34+
echo "curling ${CLOUD_PROVIDER_CONFIG}"
3435
curl --retry 3 -sL -o tmp_azure_json "${CLOUD_PROVIDER_CONFIG}"
3536
"${ENVSUBST}" < tmp_azure_json > azure_json
3637
"${KUBECTL}" delete secret "${CLUSTER_NAME}-control-plane-azure-json" -n default || true
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"cloud": "AzurePublicCloud",
3+
"tenantId": "${AZURE_TENANT_ID}",
4+
"subscriptionId": "${AZURE_SUBSCRIPTION_ID}",
5+
"userAssignedIdentityID": "${AZURE_CLIENT_ID_USER_ASSIGNED_IDENTITY}",
6+
"resourceGroup": "${AZURE_RESOURCE_GROUP}",
7+
"securityGroupName": "${CLUSTER_NAME}-node-nsg",
8+
"securityGroupResourceGroup": "${AZURE_RESOURCE_GROUP}",
9+
"location": "${AZURE_LOCATION}",
10+
"vmType": "vmss",
11+
"vnetName": "${CLUSTER_NAME}-vnet",
12+
"vnetResourceGroup": "${AZURE_RESOURCE_GROUP}",
13+
"subnetName": "node-subnet",
14+
"routeTableName": "${CLUSTER_NAME}-node-routetable",
15+
"loadBalancerSku": "${AZURE_LOADBALANCER_SKU}",
16+
"maximumLoadBalancerRuleCount": 250,
17+
"useManagedIdentityExtension": true,
18+
"useInstanceMetadata": true,
19+
"enableVmssFlexNodes": true,
20+
"nonVmssUniformNodesCacheTTLInSeconds": 450,
21+
"vmssCacheTTLInSeconds": 300,
22+
"vmssVirtualMachinesCacheTTLInSeconds": 300,
23+
"availabilitySetsCacheTTLInSeconds": 300,
24+
"vmssFlexCacheTTLInSeconds": 300,
25+
"vmssFlexVMCacheTTLInSeconds": 300
26+
}

0 commit comments

Comments
 (0)