bug fixing in azure_rm_aks module(#170)

* bug fixing in azure_rm_aks module
ansible-collections · Jun 24, 2020 · 56d53e4 · 56d53e4
1 parent 9791422
commit 56d53e4
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/plugins/modules/azure_rm_aks.py b/plugins/modules/azure_rm_aks.py
@@ -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
 

diff --git a/requirements-azure.txt b/requirements-azure.txt
@@ -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

diff --git a/tests/integration/targets/azure_rm_aks/aliases b/tests/integration/targets/azure_rm_aks/aliases
@@ -1,3 +1,3 @@
 cloud/azure
-unsupported
 destructive
+shippable/azure/group6
diff --git a/tests/integration/targets/azure_rm_aks/tasks/main.yml b/tests/integration/targets/azure_rm_aks/tasks/main.yml
@@ -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:
@@ -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
 
@@ -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
 
@@ -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
 
@@ -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:
@@ -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:
@@ -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
 
@@ -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