From a3aa119d037bd70b19df1cc547d2ed61e0006bf3 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 1 Jul 2020 05:51:10 +0000 Subject: [PATCH] resolving comment for akspreview --- src/aks-preview/HISTORY.md | 4 ++++ ...ate_and_update_with_managed_aad_enable_azure_rbac.yaml | 8 ++++---- .../azext_aks_preview/tests/latest/test_aks_commands.py | 2 +- src/aks-preview/setup.py | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/aks-preview/HISTORY.md b/src/aks-preview/HISTORY.md index edcbb18137f..497ca15d388 100644 --- a/src/aks-preview/HISTORY.md +++ b/src/aks-preview/HISTORY.md @@ -2,6 +2,10 @@ Release History =============== +0.4.55 ++++++ +* Add "--enable-azure-rbac" for enabling Azure RBAC for Kubernetes authorization + 0.4.54 +++++ * Support "--enable-aad" for "az aks update" to update an existing AAD-Integrated cluster to the new AKS-managed AAD experience diff --git a/src/aks-preview/azext_aks_preview/tests/latest/recordings/test_aks_create_and_update_with_managed_aad_enable_azure_rbac.yaml b/src/aks-preview/azext_aks_preview/tests/latest/recordings/test_aks_create_and_update_with_managed_aad_enable_azure_rbac.yaml index 9b7ec0b2c1e..d34fda77374 100644 --- a/src/aks-preview/azext_aks_preview/tests/latest/recordings/test_aks_create_and_update_with_managed_aad_enable_azure_rbac.yaml +++ b/src/aks-preview/azext_aks_preview/tests/latest/recordings/test_aks_create_and_update_with_managed_aad_enable_azure_rbac.yaml @@ -52,8 +52,8 @@ interactions: "enableNodePublicIP": false, "scaleSetPriority": "Regular", "scaleSetEvictionPolicy": "Delete", "name": "nodepool1"}], "linuxProfile": {"adminUsername": "azureuser", "ssh": {"publicKeys": [{"keyData": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDiOFgDVZSitF+jMxvBpJmYO8ReNVZMG+n996WvKxFfaR9903Zykxrvu7RUqdpZZ0hzzueeLJPJpiGxvk8ur4vnkXJkX7H8fvZZw6EI5PhuD76xXXRdXp9I2dH91oTqJ0Ne/s01K2PcJC+SzkU+icGLsIqP47QVoBL+H1nMapzcZVYYXzPd2u1bJZbGgJZSxEOJenybNY/1qhJGIEhMqLPXcz8QDuqLMrz3WMGLmfwv5SMTzd9ejfRAJ85RXeciTSjUtT37HUDafiql3JxhrrbUkgyuoVMztGp6DvTHb0XKDS06su1jBxQpGuquCKcpJNIa7Z3pJmWSM/b7VahsHzWP - pmiller@gmail.com\n"}]}}, "servicePrincipalProfile": {"clientId": "709e9be8-2b36-441f-81b5-16bd257fb5cb", - "secret": "b39ff07ddb2703825634$"}, "addonProfiles": {}, "enableRBAC": true, + pmiller@gmail.com\n"}]}}, "servicePrincipalProfile": {"clientId": "", + "secret": ""}, "addonProfiles": {}, "enableRBAC": true, "enablePodSecurityPolicy": false, "networkProfile": {"networkPlugin": "kubenet", "podCidr": "10.244.0.0/16", "serviceCidr": "10.0.0.0/16", "dnsServiceIP": "10.0.0.10", "dockerBridgeCidr": "172.17.0.1/16", "outboundType": "loadBalancer", "loadBalancerSku": @@ -98,7 +98,7 @@ interactions: : {\n \"adminUsername\": \"azureuser\",\n \"ssh\": {\n \"publicKeys\"\ : [\n {\n \"keyData\": \"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDiOFgDVZSitF+jMxvBpJmYO8ReNVZMG+n996WvKxFfaR9903Zykxrvu7RUqdpZZ0hzzueeLJPJpiGxvk8ur4vnkXJkX7H8fvZZw6EI5PhuD76xXXRdXp9I2dH91oTqJ0Ne/s01K2PcJC+SzkU+icGLsIqP47QVoBL+H1nMapzcZVYYXzPd2u1bJZbGgJZSxEOJenybNY/1qhJGIEhMqLPXcz8QDuqLMrz3WMGLmfwv5SMTzd9ejfRAJ85RXeciTSjUtT37HUDafiql3JxhrrbUkgyuoVMztGp6DvTHb0XKDS06su1jBxQpGuquCKcpJNIa7Z3pJmWSM/b7VahsHzWP\ \ pmiller@gmail.com\\n\"\n }\n ]\n }\n },\n \"servicePrincipalProfile\"\ - : {\n \"clientId\": \"709e9be8-2b36-441f-81b5-16bd257fb5cb\"\n },\n \ + : {\n \"clientId\": \"clientId\"\n },\n \ \ \"nodeResourceGroup\": \"MC_clitest000001_cliakstest000002_westus2\",\n\ \ \"enableRBAC\": true,\n \"enablePodSecurityPolicy\": false,\n \"networkProfile\"\ : {\n \"networkPlugin\": \"kubenet\",\n \"loadBalancerSku\": \"standard\"\ @@ -517,7 +517,7 @@ interactions: \ \"linuxProfile\": {\n \"adminUsername\": \"azureuser\",\n \"ssh\"\ : {\n \"publicKeys\": [\n {\n \"keyData\": \"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDiOFgDVZSitF+jMxvBpJmYO8ReNVZMG+n996WvKxFfaR9903Zykxrvu7RUqdpZZ0hzzueeLJPJpiGxvk8ur4vnkXJkX7H8fvZZw6EI5PhuD76xXXRdXp9I2dH91oTqJ0Ne/s01K2PcJC+SzkU+icGLsIqP47QVoBL+H1nMapzcZVYYXzPd2u1bJZbGgJZSxEOJenybNY/1qhJGIEhMqLPXcz8QDuqLMrz3WMGLmfwv5SMTzd9ejfRAJ85RXeciTSjUtT37HUDafiql3JxhrrbUkgyuoVMztGp6DvTHb0XKDS06su1jBxQpGuquCKcpJNIa7Z3pJmWSM/b7VahsHzWP\ \ pmiller@gmail.com\\n\"\n }\n ]\n }\n },\n \"servicePrincipalProfile\"\ - : {\n \"clientId\": \"709e9be8-2b36-441f-81b5-16bd257fb5cb\"\n },\n \ + : {\n \"clientId\": \"clientId\"\n },\n \ \ \"nodeResourceGroup\": \"MC_clitest000001_cliakstest000002_westus2\",\n\ \ \"enableRBAC\": true,\n \"enablePodSecurityPolicy\": false,\n \"networkProfile\"\ : {\n \"networkPlugin\": \"kubenet\",\n \"loadBalancerSku\": \"Standard\"\ diff --git a/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py b/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py index 214ccfb0bb0..b34a48e5ee9 100644 --- a/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py +++ b/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py @@ -120,7 +120,7 @@ def test_aks_create_and_update_with_managed_aad_enable_azure_rbac(self, resource }) create_cmd = 'aks create --resource-group={resource_group} --name={name} ' \ - '--vm-set-type AvailabilitySet -c 1 ' \ + '--vm-set-type VirtualMachineScaleSets AvailabilitySet -c 1 ' \ '--enable-aad --enable-azure-rbac --aad-admin-group-object-ids 00000000-0000-0000-0000-000000000001 -o json' self.cmd(create_cmd, checks=[ self.check('provisioningState', 'Succeeded'), diff --git a/src/aks-preview/setup.py b/src/aks-preview/setup.py index a1efd754dd0..4d2ebdf6888 100644 --- a/src/aks-preview/setup.py +++ b/src/aks-preview/setup.py @@ -8,7 +8,7 @@ from codecs import open as open1 from setuptools import setup, find_packages -VERSION = "0.4.54" +VERSION = "0.4.55" CLASSIFIERS = [ 'Development Status :: 4 - Beta', 'Intended Audience :: Developers',