Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update azure_rm_aks relate file #170

Merged
merged 5 commits into from
Jun 24, 2020
Merged

Update azure_rm_aks relate file #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
23a3bc9
Update azure_rm_aks relate file
Fred-sun Jun 19, 2020
981339a
update task yaml
Fred-sun Jun 19, 2020
17a5855
resolve conflict
Fred-sun Jun 24, 2020
2a2f976
revert ado.sh
Fred-sun Jun 24, 2020
43e260a
add whitespace
Fred-sun Jun 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions plugins/modules/azure_rm_aks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,8 @@ def create_addon_dict(addon):
addon = addon or dict()
for key in addon.keys():
result[key] = addon[key].config
if result[key] is None:
result[key] = {}
result[key]['enabled'] = addon[key].enabled
return result

Expand Down
2 changes: 1 addition & 1 deletion requirements-azure.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ azure-mgmt-cdn==3.0.0
azure-mgmt-compute==10.0.0
azure-mgmt-containerinstance==1.4.0
azure-mgmt-containerregistry==2.0.0
azure-mgmt-containerservice==4.4.0
azure-mgmt-containerservice==9.1.0
azure-mgmt-dns==2.1.0
azure-mgmt-keyvault==1.1.0
azure-mgmt-marketplaceordering==0.1.0
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/targets/azure_rm_aks/aliases
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
cloud/azure
unsupported
destructive
shippable/azure/group6
15 changes: 8 additions & 7 deletions tests/integration/targets/azure_rm_aks/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
- set_fact:
rpfx: "{{ resource_group | hash('md5') | truncate(8, True, '') }}"
noderpfx: "{{ resource_group | hash('md5') | truncate(4, True, '') }}"

- name: Find available k8s version
azure_rm_aksversion_info:
Expand Down Expand Up @@ -27,7 +28,7 @@
enable_auto_scaling: True
max_count: 3
min_count: 1
node_resource_group: nodetest
node_resource_group: "node{{ noderpfx }}"
enable_rbac: yes
check_mode: yes

Expand Down Expand Up @@ -63,7 +64,7 @@
enable_auto_scaling: True
max_count: 3
min_count: 1
node_resource_group: nodetest
node_resource_group: "node{{ noderpfx }}"
enable_rbac: yes
register: output

Expand Down Expand Up @@ -105,7 +106,7 @@
enable_auto_scaling: True
max_count: 3
min_count: 1
node_resource_group: nodetest
node_resource_group: "node{{ noderpfx }}"
enable_rbac: yes
register: output

Expand Down Expand Up @@ -137,7 +138,7 @@
count: 1
vm_size: Standard_DS1_v2
type: VirtualMachineScaleSets
node_resource_group: nodetest
node_resource_group: "node{{ noderpfx }}"
addon:
http_application_routing: {}
network_profile:
Expand Down Expand Up @@ -171,7 +172,7 @@
count: 1
vm_size: Standard_DS1_v2
type: VirtualMachineScaleSets
node_resource_group: nodetest
node_resource_group: "node{{ noderpfx }}"
addon:
http_application_routing: {}
network_profile:
Expand Down Expand Up @@ -204,7 +205,7 @@
enable_auto_scaling: True
max_count: 6
min_count: 3
node_resource_group: nodetest
node_resource_group: "node{{ noderpfx }}"
enable_rbac: yes
register: output

Expand Down Expand Up @@ -235,7 +236,7 @@
enable_auto_scaling: True
max_count: 6
min_count: 3
node_resource_group: nodetest
node_resource_group: "node{{ noderpfx }}"
enable_rbac: yes
register: output

Expand Down