kubernetes-sigs
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added azure_cloud parameter to Azure's cloud_config (#6321)

pull/5781/head
Mike Dziedziela 2020-06-25 23:35:30 +02:00 committed by GitHub
parent 93cbcb61b8
commit 8ca2a9a7d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docs/azure.md
View File

@ -13,6 +13,13 @@ Before creating the instances you must first set the `azure_` variables in the `
All of the values can be retrieved using the azure cli tool which can be downloaded here: <https://docs.microsoft.com/en-gb/azure/xplat-cli-install> All of the values can be retrieved using the azure cli tool which can be downloaded here: <https://docs.microsoft.com/en-gb/azure/xplat-cli-install>
After installation you have to run `az login` to get access to your account. After installation you have to run `az login` to get access to your account.
### azure_cloud
Azure Stack has different API endpoints, depending on the Azure Stack deployment. These need to be provided to the Azure SDK.
Possible values are: `AzureChinaCloud`, `AzureGermanCloud`, `AzurePublicCloud` and `AzureUSGovernmentCloud`.
The full list of existing settings for the AzureChinaCloud, AzureGermanCloud, AzurePublicCloud and AzureUSGovernmentCloud
is available in the source code [here](https://github.com/kubernetes-sigs/cloud-provider-azure/blob/master/docs/cloud-provider-config.md)
### azure\_tenant\_id + azure\_subscription\_id ### azure\_tenant\_id + azure\_subscription\_id
run `az account show` to retrieve your subscription id and tenant id: run `az account show` to retrieve your subscription id and tenant id:

1
inventory/sample/group_vars/all/azure.yml
View File

@ -1,6 +1,7 @@
## When azure is used, you need to also set the following variables. ## When azure is used, you need to also set the following variables.
## see docs/azure.md for details on how to get these values ## see docs/azure.md for details on how to get these values
# azure_cloud:
# azure_tenant_id: # azure_tenant_id:
# azure_subscription_id: # azure_subscription_id:
# azure_aad_client_id: # azure_aad_client_id:

2
roles/kubernetes/node/defaults/main.yml
View File

@ -143,3 +143,5 @@ azure_exclude_master_from_standard_lb: true
azure_disable_outbound_snat: false azure_disable_outbound_snat: false
# use instance metadata service where possible # use instance metadata service where possible
azure_use_instance_metadata: true azure_use_instance_metadata: true
# use specific Azure API endpoints
azure_cloud: AzurePublicCloud

5
roles/kubernetes/node/tasks/cloud-credentials/azure-credential-check.yml
View File

@ -75,3 +75,8 @@
fail: fail:
msg: "azure_vmtype is missing. Supported values are 'standard' or 'vmss'" msg: "azure_vmtype is missing. Supported values are 'standard' or 'vmss'"
when: azure_vmtype is not defined or not azure_vmtype when: azure_vmtype is not defined or not azure_vmtype
- name: check azure_cloud value
fail:
msg: "azure_cloud has an invalid value '{{ azure_cloud }}'. Supported values are 'AzureChinaCloud', 'AzureGermanCloud', 'AzurePublicCloud', 'AzureUSGovernmentCloud'."
when: azure_cloud not in ["AzureChinaCloud", "AzureGermanCloud", "AzurePublicCloud", "AzureUSGovernmentCloud"]

1
roles/kubernetes/node/templates/cloud-configs/azure-cloud-config.j2
View File

@ -1,4 +1,5 @@
{ {
"cloud": "{{ azure_cloud }}"
"tenantId": "{{ azure_tenant_id }}", "tenantId": "{{ azure_tenant_id }}",
"subscriptionId": "{{ azure_subscription_id }}", "subscriptionId": "{{ azure_subscription_id }}",
"aadClientId": "{{ azure_aad_client_id }}", "aadClientId": "{{ azure_aad_client_id }}",