From 774ec493963aa567e1bd4761fcd97a59962f9e6e Mon Sep 17 00:00:00 2001
From: Ryler Hockenbury <rhockenbury@users.noreply.github.com>
Date: Tue, 26 Jan 2021 10:24:35 -0500
Subject: [PATCH] Update azure cloud config (#7208)
* Allow configureable vni and port for flannel overlay
* additional options for azure cloud config
---
docs/azure.md | 16 ++++++++++++++++
inventory/sample/group_vars/all/azure.yml | 2 ++
.../cloud-configs/azure-cloud-config.j2 | 8 +++++---
3 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/docs/azure.md b/docs/azure.md
index 7bb82d55f..042d34e69 100644
--- a/docs/azure.md
+++ b/docs/azure.md
@@ -42,6 +42,10 @@ The type of the vm. Supported values are `standard` or `vmss`. If vm is type of
The name of the virtual network your instances are in, can be retrieved via `az network vnet list`
+### azure\_vnet\_resource\_group
+
+The name of the resource group that contains the vnet.
+
### azure\_subnet\_name
The name of the subnet your instances are in, can be retrieved via `az network vnet subnet list --resource-group RESOURCE_GROUP --vnet-name VNET_NAME`
@@ -50,6 +54,18 @@ The name of the subnet your instances are in, can be retrieved via `az network v
The name of the network security group your instances are in, can be retrieved via `az network nsg list`
+### azure\_security\_group\_resource\_group
+
+The name of the resource group that contains the network security group. Defaults to `azure_vnet_resource_group`
+
+### azure\_route\_table\_name
+
+The name of the route table used with your instances.
+
+### azure\_route\_table\_resource\_group
+
+The name of the resource group that contains the route table. Defaults to `azure_vnet_resource_group`
+
### azure\_aad\_client\_id + azure\_aad\_client\_secret
These will have to be generated first:
diff --git a/inventory/sample/group_vars/all/azure.yml b/inventory/sample/group_vars/all/azure.yml
index 4524edd23..176b0f1bd 100644
--- a/inventory/sample/group_vars/all/azure.yml
+++ b/inventory/sample/group_vars/all/azure.yml
@@ -10,9 +10,11 @@
# azure_location:
# azure_subnet_name:
# azure_security_group_name:
+# azure_security_group_resource_group:
# azure_vnet_name:
# azure_vnet_resource_group:
# azure_route_table_name:
+# azure_route_table_resource_group:
# supported values are 'standard' or 'vmss'
# azure_vmtype: standard
diff --git a/roles/kubernetes/node/templates/cloud-configs/azure-cloud-config.j2 b/roles/kubernetes/node/templates/cloud-configs/azure-cloud-config.j2
index c3964da17..2b1c101aa 100644
--- a/roles/kubernetes/node/templates/cloud-configs/azure-cloud-config.j2
+++ b/roles/kubernetes/node/templates/cloud-configs/azure-cloud-config.j2
@@ -8,17 +8,19 @@
"location": "{{ azure_location }}",
"subnetName": "{{ azure_subnet_name }}",
"securityGroupName": "{{ azure_security_group_name }}",
+ "securityGroupResourceGroup": "{{ azure_security_group_resource_group | default(azure_vnet_resource_group) }}",
"vnetName": "{{ azure_vnet_name }}",
"vnetResourceGroup": "{{ azure_vnet_resource_group }}",
"routeTableName": "{{ azure_route_table_name }}",
+ "routeTableResourceGroup": "{{ azure_route_table_resource_group | default(azure_vnet_resource_group) }}",
"vmType": "{{ azure_vmtype }}",
{% if azure_primary_availability_set_name is defined %}
"primaryAvailabilitySetName": "{{ azure_primary_availability_set_name }}",
{%endif%}
- "useInstanceMetadata": {{azure_use_instance_metadata }},
+ "useInstanceMetadata": {{azure_use_instance_metadata | lower }},
{% if azure_loadbalancer_sku == "standard" %}
- "excludeMasterFromStandardLB": {{ azure_exclude_master_from_standard_lb }},
- "disableOutboundSNAT": {{ azure_disable_outbound_snat }},
+ "excludeMasterFromStandardLB": {{ azure_exclude_master_from_standard_lb | lower }},
+ "disableOutboundSNAT": {{ azure_disable_outbound_snat | lower }},
{% endif%}
"loadBalancerSku": "{{ azure_loadbalancer_sku }}"
}
--
GitLab