diff --git a/src/azure-cli/azure/cli/command_modules/acs/custom.py b/src/azure-cli/azure/cli/command_modules/acs/custom.py index 9854f9620de..6149b8c16de 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/custom.py +++ b/src/azure-cli/azure/cli/command_modules/acs/custom.py @@ -2161,8 +2161,8 @@ def aks_check_acr(cmd, client, resource_group_name, name, acr, node_name=None): # Get kubectl minor version kubectl_minor_version = -1 try: - cmd = f"kubectl version -o json --kubeconfig {browse_path}" - output = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE) + kubectl_cmd = ["kubectl", "version", "-o", "json", "--kubeconfig", browse_path] + output = subprocess.Popen(kubectl_cmd, stdout=subprocess.PIPE) jsonS, _ = output.communicate() kubectl_version = json.loads(jsonS) # Remove any non-numeric characters like + from minor version diff --git a/src/azure-cli/azure/cli/command_modules/acs/tests/latest/test_aks_commands.py b/src/azure-cli/azure/cli/command_modules/acs/tests/latest/test_aks_commands.py index 0dd6815ecc2..93ee3ef724c 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/tests/latest/test_aks_commands.py +++ b/src/azure-cli/azure/cli/command_modules/acs/tests/latest/test_aks_commands.py @@ -7489,16 +7489,13 @@ def test_aks_create_network_cidr(self, resource_group, resource_group_location): @live_only() @AllowLargeResponse() @AKSCustomResourceGroupPreparer(random_name_length=17, name_prefix='clitest', location='westus2') - @AKSCustomRoleBasedServicePrincipalPreparer() - def test_aks_create_attach_acr(self, resource_group, resource_group_location, sp_name, sp_password): + def test_aks_create_attach_acr(self, resource_group, resource_group_location): aks_name = self.create_random_name('cliakstest', 16) acr_name = self.create_random_name('cliaksacr', 16) self.kwargs.update({ 'name': aks_name, 'resource_group': resource_group, 'ssh_key_value': self.generate_ssh_keys(), - 'service_principal': sp_name, - 'client_secret': sp_password, 'acr_name': acr_name }) @@ -7510,18 +7507,9 @@ def test_aks_create_attach_acr(self, resource_group, resource_group_location, sp # create create_cmd = 'aks create --resource-group={resource_group} --name={name} ' \ - '--service-principal={service_principal} --client-secret={client_secret} ' \ '--ssh-key-value={ssh_key_value} --attach-acr={acr_name}' self.cmd(create_cmd, checks=[ self.check('provisioningState', 'Succeeded'), - self.check('servicePrincipalProfile.clientId', sp_name) - ]) - - # add Mariner node pool - node_pool_cmd = 'aks nodepool add --resource-group={resource_group} --cluster-name={name} ' \ - '-n marinerpool --os-sku mariner' - self.cmd(node_pool_cmd, checks=[ - self.check('provisioningState', 'Succeeded') ]) # install kubectl @@ -7554,7 +7542,7 @@ def test_aks_create_attach_acr(self, resource_group, resource_group_location, sp finally: os.close(fd) # get node name - k_get_node_cmd = ["kubectl", "get", "node", "-l", "kubernetes.azure.com/os-sku=Ubuntu", "-o", "name", "--kubeconfig", browse_path] + k_get_node_cmd = ["kubectl", "get", "node", "-o", "name", "--kubeconfig", browse_path] k_get_node_output = subprocess.check_output( k_get_node_cmd, universal_newlines=True, @@ -7567,7 +7555,7 @@ def test_aks_create_attach_acr(self, resource_group, resource_group_location, sp "node_name": node_name, } ) - # check acr from Ubuntu node + # check acr check_cmd = "aks check-acr -n {name} -g {resource_group} --acr {acr_name}.azurecr.io --node-name {node_name}" self.cmd( check_cmd, @@ -7575,27 +7563,6 @@ def test_aks_create_attach_acr(self, resource_group, resource_group_location, sp StringContainCheck("Your cluster can pull images from {}.azurecr.io!".format(acr_name)), ], ) - # check acr from Mariner node - k_get_mariner_node_cmd = ["kubectl", "get", "node", "-l", "kubernetes.azure.com/os-sku=Mariner", "-o", "name", "--kubeconfig", browse_path] - k_get_node_output = subprocess.check_output( - k_get_mariner_node_cmd, - universal_newlines=True, - stderr=subprocess.STDOUT, - ) - mariner_node_names = k_get_node_output.split("\n") - mariner_node_name = mariner_node_names[0].strip().strip("node/").strip() - self.kwargs.update( - { - "mariner_node_name": mariner_node_name, - } - ) - check_mariner_cmd = "aks check-acr -n {name} -g {resource_group} --acr {acr_name}.azurecr.io --node-name {mariner_node_name}" - self.cmd( - check_mariner_cmd, - checks=[ - StringContainCheck("Your cluster can pull images from {}.azurecr.io!".format(acr_name)), - ], - ) # clean up test hook file even if test failed finally: if os.path.exists(hook_file_path):