github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add missing config for Azure integration

Browse Source
This commit is contained in:
Cory Johns
2018-08-22 12:03:16 -04:00
committed by cdkbot
parent 99a631fc80
commit ef10295e89
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py
View File

@@ -1891,6 +1891,11 @@ def _write_azure_snap_config(component):
cloud_config_path.write_text(json.dumps({ cloud_config_path.write_text(json.dumps({
'useInstanceMetadata': True, 'useInstanceMetadata': True,
'useManagedIdentityExtension': True, 'useManagedIdentityExtension': True,
'resourceGroup': azure.resource_group,
'subscriptionId': azure.subscription_id, 'subscriptionId': azure.subscription_id,
'resourceGroup': azure.resource_group,
'location': azure.resource_group_location,
'vnetName': azure.vnet_name,
'vnetResourceGroup': azure.vnet_resource_group,
'subnetName': azure.subnet_name,
'securityGroupName': azure.security_group_name,
})) }))

7
cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py
View File

@@ -1425,8 +1425,13 @@ def _write_azure_snap_config(component):
cloud_config_path.write_text(json.dumps({ cloud_config_path.write_text(json.dumps({
'useInstanceMetadata': True, 'useInstanceMetadata': True,
'useManagedIdentityExtension': True, 'useManagedIdentityExtension': True,
'resourceGroup': azure.resource_group,
'subscriptionId': azure.subscription_id, 'subscriptionId': azure.subscription_id,
'resourceGroup': azure.resource_group,
'location': azure.resource_group_location,
'vnetName': azure.vnet_name,
'vnetResourceGroup': azure.vnet_resource_group,
'subnetName': azure.subnet_name,
'securityGroupName': azure.security_group_name,
})) }))