From bd269dad32f24629f360cbf9b930dce887aa4225 Mon Sep 17 00:00:00 2001 From: Haitao Chen Date: Sat, 10 Jul 2021 01:00:57 -0700 Subject: [PATCH] Revert "allow disabling of runcommand (#15092)" This reverts commit ec3e241a564d21f5ec914f4aa0b59a96ac7ec0d9. --- ...nagedClustersCreate_DisableRunCommand.json | 245 ------------------ .../stable/2021-07-01/managedClusters.json | 7 - 2 files changed, 252 deletions(-) delete mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2021-07-01/examples/ManagedClustersCreate_DisableRunCommand.json diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2021-07-01/examples/ManagedClustersCreate_DisableRunCommand.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2021-07-01/examples/ManagedClustersCreate_DisableRunCommand.json deleted file mode 100644 index c48cdc9b69ca..000000000000 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2021-07-01/examples/ManagedClustersCreate_DisableRunCommand.json +++ /dev/null @@ -1,245 +0,0 @@ -{ - "parameters": { - "api-version": "2021-07-01", - "subscriptionId": "subid1", - "resourceGroupName": "rg1", - "resourceName": "clustername1", - "parameters": { - "location": "location1", - "tags": { - "tier": "production", - "archv2": "" - }, - "sku": { - "name": "Basic", - "tier": "Free" - }, - "properties": { - "kubernetesVersion": "", - "dnsPrefix": "dnsprefix1", - "agentPoolProfiles": [ - { - "name": "nodepool1", - "count": 3, - "vmSize": "Standard_DS2_v2", - "osType": "Linux", - "type": "VirtualMachineScaleSets", - "enableNodePublicIP": true, - "mode": "System", - "enableEncryptionAtHost": true - } - ], - "linuxProfile": { - "adminUsername": "azureuser", - "ssh": { - "publicKeys": [ - { - "keyData": "keydata" - } - ] - } - }, - "networkProfile": { - "loadBalancerSku": "standard", - "outboundType": "loadBalancer", - "loadBalancerProfile": { - "managedOutboundIPs": { - "count": 2 - } - } - }, - "autoScalerProfile": { - "scan-interval": "20s", - "scale-down-delay-after-add": "15m" - }, - "windowsProfile": { - "adminUsername": "azureuser", - "adminPassword": "replacePassword1234$" - }, - "servicePrincipalProfile": { - "clientId": "clientid", - "secret": "secret" - }, - "apiServerAccessProfile": { - "disableRunCommand": true - }, - "addonProfiles": {}, - "enableRBAC": true, - "enablePodSecurityPolicy": true - } - } - }, - "responses": { - "200": { - "body": { - "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1", - "location": "location1", - "name": "clustername1", - "tags": { - "archv2": "", - "tier": "production" - }, - "type": "Microsoft.ContainerService/ManagedClusters", - "properties": { - "provisioningState": "Succeeded", - "maxAgentPools": 1, - "kubernetesVersion": "1.9.6", - "dnsPrefix": "dnsprefix1", - "agentPoolProfiles": [ - { - "name": "nodepool1", - "count": 3, - "vmSize": "Standard_DS2_v2", - "maxPods": 110, - "osType": "Linux", - "provisioningState": "Succeeded", - "orchestratorVersion": "1.9.6", - "type": "VirtualMachineScaleSets", - "enableNodePublicIP": true, - "mode": "System", - "nodeImageVersion": "AKSUbuntu:1604:2020.03.11", - "enableEncryptionAtHost": true - } - ], - "linuxProfile": { - "adminUsername": "azureuser", - "ssh": { - "publicKeys": [ - { - "keyData": "keydata" - } - ] - } - }, - "windowsProfile": { - "adminUsername": "azureuser" - }, - "servicePrincipalProfile": { - "clientId": "clientid" - }, - "apiServerAccessProfile": { - "disableRunCommand": true - }, - "nodeResourceGroup": "MC_rg1_clustername1_location1", - "enableRBAC": true, - "enablePodSecurityPolicy": true, - "fqdn": "dnsprefix1-ee788a1f.hcp.location1.azmk8s.io", - "privateFQDN": "dnsprefix1-aae7e0f0.5cef6058-b6b5-414d-8cb1-4bd14eb0b15c.privatelink.location1.azmk8s.io", - "networkProfile": { - "loadBalancerSku": "basic", - "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", - "loadBalancerProfile": { - "allocatedOutboundPorts": 2000, - "idleTimeoutInMinutes": 10, - "managedOutboundIPs": { - "count": 2 - }, - "effectiveOutboundIPs": [ - { - "id": "/subscriptions/subid1/resourceGroups/MC_rg1/providers/Microsoft.Network/publicIPAddresses/mgdoutboundip1" - }, - { - "id": "/subscriptions/subid1/resourceGroups/MC_rg1/providers/Microsoft.Network/publicIPAddresses/mgdoutboundip2" - } - ] - } - }, - "autoScalerProfile": { - "scan-interval": "20s", - "scale-down-delay-after-add": "15m" - } - } - } - }, - "201": { - "body": { - "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1", - "location": "location1", - "name": "clustername1", - "tags": { - "archv2": "", - "tier": "production" - }, - "type": "Microsoft.ContainerService/ManagedClusters", - "properties": { - "provisioningState": "Creating", - "maxAgentPools": 1, - "kubernetesVersion": "1.9.6", - "dnsPrefix": "dnsprefix1", - "agentPoolProfiles": [ - { - "name": "nodepool1", - "count": 3, - "vmSize": "Standard_DS2_v2", - "maxPods": 110, - "osType": "Linux", - "provisioningState": "Creating", - "orchestratorVersion": "1.9.6", - "type": "VirtualMachineScaleSets", - "enableNodePublicIP": true, - "mode": "System", - "enableEncryptionAtHost": true - } - ], - "linuxProfile": { - "adminUsername": "azureuser", - "ssh": { - "publicKeys": [ - { - "keyData": "keydata" - } - ] - } - }, - "windowsProfile": { - "adminUsername": "azureuser" - }, - "servicePrincipalProfile": { - "clientId": "clientid" - }, - "apiServerAccessProfile": { - "disableRunCommand": true - }, - "nodeResourceGroup": "MC_rg1_clustername1_location1", - "enableRBAC": true, - "fqdn": "dnsprefix1-ee788a1f.hcp.location1.azmk8s.io", - "privateFQDN": "dnsprefix1-aae7e0f0.5cef6058-b6b5-414d-8cb1-4bd14eb0b15c.privatelink.location1.azmk8s.io", - "enablePodSecurityPolicy": true, - "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", - "loadBalancerSku": "standard", - "outboundType": "loadBalancer", - "loadBalancerProfile": { - "allocatedOutboundPorts": 2000, - "idleTimeoutInMinutes": 10, - "managedOutboundIPs": { - "count": 2 - }, - "effectiveOutboundIPs": [ - { - "id": "/subscriptions/subid1/resourceGroups/MC_rg1/providers/Microsoft.Network/publicIPAddresses/mgdoutboundip1" - }, - { - "id": "/subscriptions/subid1/resourceGroups/MC_rg1/providers/Microsoft.Network/publicIPAddresses/mgdoutboundip2" - } - ] - } - }, - "autoScalerProfile": { - "scan-interval": "20s", - "scale-down-delay-after-add": "15m" - } - } - } - } - } -} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2021-07-01/managedClusters.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2021-07-01/managedClusters.json index ad3dec9eccad..45f11a2cd533 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2021-07-01/managedClusters.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2021-07-01/managedClusters.json @@ -541,9 +541,6 @@ "Create Managed Private Cluster with Public FQDN specified": { "$ref": "./examples/ManagedClustersCreate_PrivateClusterPublicFQDN.json" }, - "Create Managed Cluster with RunCommand disabled": { - "$ref": "./examples/ManagedClustersCreate_DisableRunCommand.json" - }, "Create Managed Cluster with Node Public IP Prefix": { "$ref": "./examples/ManagedClustersCreate_NodePublicIPPrefix.json" }, @@ -3533,10 +3530,6 @@ "enablePrivateClusterPublicFQDN": { "type": "boolean", "description": "Whether to create additional public FQDN for private cluster or not." - }, - "disableRunCommand": { - "type": "boolean", - "description": "Whether to disable run command for the cluster or not." } }, "description": "Access profile for managed cluster API server."