From 77548bd67765c3ada433af0e9d2d565f5ae95c87 Mon Sep 17 00:00:00 2001
From: Thomas Aure <thomas.aure@dnb.no>
Date: Sat, 4 Feb 2023 17:34:15 +0100
Subject: [PATCH 1/3] Included oidc issuer url as output.

---
 .../managedClusters/deploy.bicep              |   3 +
 .../managedClusters/readme.md                 | 469 +++++++++---------
 2 files changed, 238 insertions(+), 234 deletions(-)

diff --git a/modules/Microsoft.ContainerService/managedClusters/deploy.bicep b/modules/Microsoft.ContainerService/managedClusters/deploy.bicep
index 04b4a0532f..2e3771a9cb 100644
--- a/modules/Microsoft.ContainerService/managedClusters/deploy.bicep
+++ b/modules/Microsoft.ContainerService/managedClusters/deploy.bicep
@@ -611,3 +611,6 @@ output omsagentIdentityObjectId string = contains(managedCluster.properties, 'ad
 
 @description('The location the resource was deployed into.')
 output location string = managedCluster.location
+
+@description('The OIDC token issuer Url.')
+output oidcIssuerUrl string = managedCluster.properties.oidcIssuerProfile.issuerURL
diff --git a/modules/Microsoft.ContainerService/managedClusters/readme.md b/modules/Microsoft.ContainerService/managedClusters/readme.md
index 510d76a2a0..2fbf1c20b7 100644
--- a/modules/Microsoft.ContainerService/managedClusters/readme.md
+++ b/modules/Microsoft.ContainerService/managedClusters/readme.md
@@ -357,6 +357,7 @@ userAssignedIdentities: {
 | `kubeletidentityObjectId` | string | The Object ID of the AKS identity. |
 | `location` | string | The location the resource was deployed into. |
 | `name` | string | The name of the managed cluster. |
+| `oidcIssuerUrl` | string | The OIDC token issuer Url. |
 | `omsagentIdentityObjectId` | string | The Object ID of the OMS agent identity. |
 | `resourceGroupName` | string | The resource group the managed cluster was deployed into. |
 | `resourceId` | string | The resource ID of the managed cluster. |
@@ -384,100 +385,100 @@ module managedClusters './Microsoft.ContainerService/managedClusters/deploy.bice
   name: '${uniqueString(deployment().name, location)}-test-csmaz'
   params: {
     // Required parameters
-    name: '<<namePrefix>>csmaz001'
     primaryAgentPoolProfile: [
       {
         availabilityZones: [
           '1'
         ]
-        count: 1
-        enableAutoScaling: true
-        maxCount: 3
-        maxPods: 30
         minCount: 1
+        maxCount: 3
         mode: 'System'
-        name: 'systempool'
+        enableAutoScaling: true
         osDiskSizeGB: 0
-        osType: 'Linux'
         serviceCidr: ''
-        storageProfile: 'ManagedDisks'
+        maxPods: 30
         type: 'VirtualMachineScaleSets'
         vmSize: 'Standard_DS2_v2'
+        count: 1
+        osType: 'Linux'
         vnetSubnetID: '<vnetSubnetID>'
+        name: 'systempool'
+        storageProfile: 'ManagedDisks'
       }
     ]
     // Non-required parameters
-    agentPools: [
+    name: '<<namePrefix>>csmaz001'
+    systemAssignedIdentity: true
+    diagnosticStorageAccountId: '<diagnosticStorageAccountId>'
+    diagnosticLogsRetentionInDays: 7
+    lock: 'CanNotDelete'
+    roleAssignments: [
       {
-        availabilityZones: [
-          '1'
+        principalIds: [
+          '<managedIdentityPrincipalId>'
         ]
+        principalType: 'ServicePrincipal'
+        roleDefinitionIdOrName: 'Reader'
+      }
+    ]
+    aksClusterNetworkPlugin: 'azure'
+    diagnosticEventHubName: '<diagnosticEventHubName>'
+    diskEncryptionSetID: '<diskEncryptionSetID>'
+    diagnosticWorkspaceId: '<diagnosticWorkspaceId>'
+    enableDefaultTelemetry: '<enableDefaultTelemetry>'
+    agentPools: [
+      {
+        osType: 'Linux'
+        scaleSetPriority: 'Regular'
         count: 2
-        enableAutoScaling: true
-        maxCount: 3
         maxPods: 30
-        minCount: 1
         minPods: 2
-        mode: 'User'
-        name: 'userpool1'
-        nodeLabels: {}
+        type: 'VirtualMachineScaleSets'
+        enableAutoScaling: true
+        maxCount: 3
         nodeTaints: [
           'CriticalAddonsOnly=true:NoSchedule'
         ]
-        osDiskSizeGB: 128
-        osType: 'Linux'
+        availabilityZones: [
+          '1'
+        ]
         scaleSetEvictionPolicy: 'Delete'
-        scaleSetPriority: 'Regular'
-        storageProfile: 'ManagedDisks'
-        type: 'VirtualMachineScaleSets'
+        nodeLabels: {}
         vmSize: 'Standard_DS2_v2'
+        name: 'userpool1'
+        osDiskSizeGB: 128
+        minCount: 1
         vnetSubnetID: '<vnetSubnetID>'
+        mode: 'User'
+        storageProfile: 'ManagedDisks'
       }
       {
-        availabilityZones: [
-          '1'
-        ]
+        osType: 'Linux'
+        scaleSetPriority: 'Regular'
         count: 2
-        enableAutoScaling: true
-        maxCount: 3
         maxPods: 30
-        minCount: 1
         minPods: 2
-        mode: 'User'
-        name: 'userpool2'
-        nodeLabels: {}
+        type: 'VirtualMachineScaleSets'
+        enableAutoScaling: true
+        maxCount: 3
         nodeTaints: [
           'CriticalAddonsOnly=true:NoSchedule'
         ]
-        osDiskSizeGB: 128
-        osType: 'Linux'
+        availabilityZones: [
+          '1'
+        ]
         scaleSetEvictionPolicy: 'Delete'
-        scaleSetPriority: 'Regular'
-        storageProfile: 'ManagedDisks'
-        type: 'VirtualMachineScaleSets'
+        nodeLabels: {}
         vmSize: 'Standard_DS2_v2'
+        name: 'userpool2'
+        osDiskSizeGB: 128
+        minCount: 1
         vnetSubnetID: '<vnetSubnetID>'
+        mode: 'User'
+        storageProfile: 'ManagedDisks'
       }
     ]
-    aksClusterNetworkPlugin: 'azure'
     diagnosticEventHubAuthorizationRuleId: '<diagnosticEventHubAuthorizationRuleId>'
-    diagnosticEventHubName: '<diagnosticEventHubName>'
-    diagnosticLogsRetentionInDays: 7
-    diagnosticStorageAccountId: '<diagnosticStorageAccountId>'
-    diagnosticWorkspaceId: '<diagnosticWorkspaceId>'
-    diskEncryptionSetID: '<diskEncryptionSetID>'
-    enableDefaultTelemetry: '<enableDefaultTelemetry>'
-    lock: 'CanNotDelete'
-    roleAssignments: [
-      {
-        principalIds: [
-          '<managedIdentityPrincipalId>'
-        ]
-        principalType: 'ServicePrincipal'
-        roleDefinitionIdOrName: 'Reader'
-      }
-    ]
-    systemAssignedIdentity: true
   }
 }
 ```
@@ -495,127 +496,127 @@ module managedClusters './Microsoft.ContainerService/managedClusters/deploy.bice
   "contentVersion": "1.0.0.0",
   "parameters": {
     // Required parameters
-    "name": {
-      "value": "<<namePrefix>>csmaz001"
-    },
     "primaryAgentPoolProfile": {
       "value": [
         {
           "availabilityZones": [
             "1"
           ],
-          "count": 1,
-          "enableAutoScaling": true,
-          "maxCount": 3,
-          "maxPods": 30,
           "minCount": 1,
+          "maxCount": 3,
           "mode": "System",
-          "name": "systempool",
+          "enableAutoScaling": true,
           "osDiskSizeGB": 0,
-          "osType": "Linux",
           "serviceCidr": "",
-          "storageProfile": "ManagedDisks",
+          "maxPods": 30,
           "type": "VirtualMachineScaleSets",
           "vmSize": "Standard_DS2_v2",
-          "vnetSubnetID": "<vnetSubnetID>"
+          "count": 1,
+          "osType": "Linux",
+          "vnetSubnetID": "<vnetSubnetID>",
+          "name": "systempool",
+          "storageProfile": "ManagedDisks"
         }
       ]
     },
     // Non-required parameters
-    "agentPools": {
+    "name": {
+      "value": "<<namePrefix>>csmaz001"
+    },
+    "aksClusterNetworkPlugin": {
+      "value": "azure"
+    },
+    "diagnosticStorageAccountId": {
+      "value": "<diagnosticStorageAccountId>"
+    },
+    "diagnosticLogsRetentionInDays": {
+      "value": 7
+    },
+    "lock": {
+      "value": "CanNotDelete"
+    },
+    "roleAssignments": {
       "value": [
         {
-          "availabilityZones": [
-            "1"
+          "principalIds": [
+            "<managedIdentityPrincipalId>"
           ],
+          "principalType": "ServicePrincipal",
+          "roleDefinitionIdOrName": "Reader"
+        }
+      ]
+    },
+    "diagnosticEventHubName": {
+      "value": "<diagnosticEventHubName>"
+    },
+    "systemAssignedIdentity": {
+      "value": true
+    },
+    "diskEncryptionSetID": {
+      "value": "<diskEncryptionSetID>"
+    },
+    "diagnosticWorkspaceId": {
+      "value": "<diagnosticWorkspaceId>"
+    },
+    "enableDefaultTelemetry": {
+      "value": "<enableDefaultTelemetry>"
+    },
+    "agentPools": {
+      "value": [
+        {
+          "osType": "Linux",
+          "scaleSetPriority": "Regular",
           "count": 2,
-          "enableAutoScaling": true,
-          "maxCount": 3,
           "maxPods": 30,
-          "minCount": 1,
           "minPods": 2,
-          "mode": "User",
-          "name": "userpool1",
-          "nodeLabels": {},
+          "type": "VirtualMachineScaleSets",
+          "enableAutoScaling": true,
+          "maxCount": 3,
           "nodeTaints": [
             "CriticalAddonsOnly=true:NoSchedule"
           ],
-          "osDiskSizeGB": 128,
-          "osType": "Linux",
+          "availabilityZones": [
+            "1"
+          ],
           "scaleSetEvictionPolicy": "Delete",
-          "scaleSetPriority": "Regular",
-          "storageProfile": "ManagedDisks",
-          "type": "VirtualMachineScaleSets",
+          "nodeLabels": {},
           "vmSize": "Standard_DS2_v2",
-          "vnetSubnetID": "<vnetSubnetID>"
+          "name": "userpool1",
+          "osDiskSizeGB": 128,
+          "minCount": 1,
+          "vnetSubnetID": "<vnetSubnetID>",
+          "mode": "User",
+          "storageProfile": "ManagedDisks"
         },
         {
-          "availabilityZones": [
-            "1"
-          ],
+          "osType": "Linux",
+          "scaleSetPriority": "Regular",
           "count": 2,
-          "enableAutoScaling": true,
-          "maxCount": 3,
           "maxPods": 30,
-          "minCount": 1,
           "minPods": 2,
-          "mode": "User",
-          "name": "userpool2",
-          "nodeLabels": {},
+          "type": "VirtualMachineScaleSets",
+          "enableAutoScaling": true,
+          "maxCount": 3,
           "nodeTaints": [
             "CriticalAddonsOnly=true:NoSchedule"
           ],
-          "osDiskSizeGB": 128,
-          "osType": "Linux",
+          "availabilityZones": [
+            "1"
+          ],
           "scaleSetEvictionPolicy": "Delete",
-          "scaleSetPriority": "Regular",
-          "storageProfile": "ManagedDisks",
-          "type": "VirtualMachineScaleSets",
+          "nodeLabels": {},
           "vmSize": "Standard_DS2_v2",
-          "vnetSubnetID": "<vnetSubnetID>"
+          "name": "userpool2",
+          "osDiskSizeGB": 128,
+          "minCount": 1,
+          "vnetSubnetID": "<vnetSubnetID>",
+          "mode": "User",
+          "storageProfile": "ManagedDisks"
         }
       ]
     },
-    "aksClusterNetworkPlugin": {
-      "value": "azure"
-    },
     "diagnosticEventHubAuthorizationRuleId": {
       "value": "<diagnosticEventHubAuthorizationRuleId>"
-    },
-    "diagnosticEventHubName": {
-      "value": "<diagnosticEventHubName>"
-    },
-    "diagnosticLogsRetentionInDays": {
-      "value": 7
-    },
-    "diagnosticStorageAccountId": {
-      "value": "<diagnosticStorageAccountId>"
-    },
-    "diagnosticWorkspaceId": {
-      "value": "<diagnosticWorkspaceId>"
-    },
-    "diskEncryptionSetID": {
-      "value": "<diskEncryptionSetID>"
-    },
-    "enableDefaultTelemetry": {
-      "value": "<enableDefaultTelemetry>"
-    },
-    "lock": {
-      "value": "CanNotDelete"
-    },
-    "roleAssignments": {
-      "value": [
-        {
-          "principalIds": [
-            "<managedIdentityPrincipalId>"
-          ],
-          "principalType": "ServicePrincipal",
-          "roleDefinitionIdOrName": "Reader"
-        }
-      ]
-    },
-    "systemAssignedIdentity": {
-      "value": true
     }
   }
 }
@@ -635,85 +636,88 @@ module managedClusters './Microsoft.ContainerService/managedClusters/deploy.bice
   name: '${uniqueString(deployment().name, location)}-test-csmkube'
   params: {
     // Required parameters
-    name: '<<namePrefix>>csmkube001'
     primaryAgentPoolProfile: [
       {
         availabilityZones: [
           '1'
         ]
-        count: 1
-        enableAutoScaling: true
-        maxCount: 3
-        maxPods: 30
         minCount: 1
+        maxCount: 3
         mode: 'System'
-        name: 'systempool'
+        enableAutoScaling: true
         osDiskSizeGB: 0
-        osType: 'Linux'
         serviceCidr: ''
-        storageProfile: 'ManagedDisks'
         type: 'VirtualMachineScaleSets'
         vmSize: 'Standard_DS2_v2'
+        count: 1
+        osType: 'Linux'
+        maxPods: 30
+        name: 'systempool'
+        storageProfile: 'ManagedDisks'
       }
     ]
     // Non-required parameters
+    name: '<<namePrefix>>csmkube001'
+    diagnosticStorageAccountId: '<diagnosticStorageAccountId>'
+    diagnosticWorkspaceId: '<diagnosticWorkspaceId>'
+    diagnosticEventHubName: '<diagnosticEventHubName>'
     agentPools: [
       {
-        availabilityZones: [
-          '1'
-        ]
+        osType: 'Linux'
         count: 2
-        enableAutoScaling: true
-        maxCount: 3
         maxPods: 30
-        minCount: 1
         minPods: 2
-        mode: 'User'
-        name: 'userpool1'
-        nodeLabels: {}
+        type: 'VirtualMachineScaleSets'
+        enableAutoScaling: true
+        maxCount: 3
         nodeTaints: [
           'CriticalAddonsOnly=true:NoSchedule'
         ]
-        osDiskSizeGB: 128
-        osType: 'Linux'
+        availabilityZones: [
+          '1'
+        ]
         scaleSetEvictionPolicy: 'Delete'
-        scaleSetPriority: 'Regular'
-        storageProfile: 'ManagedDisks'
-        type: 'VirtualMachineScaleSets'
+        nodeLabels: {}
         vmSize: 'Standard_DS2_v2'
+        name: 'userpool1'
+        osDiskSizeGB: 128
+        storageProfile: 'ManagedDisks'
+        minCount: 1
+        mode: 'User'
+        scaleSetPriority: 'Regular'
       }
       {
-        availabilityZones: [
-          '1'
-        ]
+        osType: 'Linux'
         count: 2
-        enableAutoScaling: true
-        maxCount: 3
         maxPods: 30
-        minCount: 1
         minPods: 2
-        mode: 'User'
-        name: 'userpool2'
-        nodeLabels: {}
+        type: 'VirtualMachineScaleSets'
+        enableAutoScaling: true
+        maxCount: 3
         nodeTaints: [
           'CriticalAddonsOnly=true:NoSchedule'
         ]
-        osDiskSizeGB: 128
-        osType: 'Linux'
+        availabilityZones: [
+          '1'
+        ]
         scaleSetEvictionPolicy: 'Delete'
-        scaleSetPriority: 'Regular'
-        storageProfile: 'ManagedDisks'
-        type: 'VirtualMachineScaleSets'
+        nodeLabels: {}
         vmSize: 'Standard_DS2_v2'
+        name: 'userpool2'
+        osDiskSizeGB: 128
+        storageProfile: 'ManagedDisks'
+        minCount: 1
+        mode: 'User'
+        scaleSetPriority: 'Regular'
       }
     ]
-    aksClusterNetworkPlugin: 'kubenet'
     diagnosticEventHubAuthorizationRuleId: '<diagnosticEventHubAuthorizationRuleId>'
-    diagnosticEventHubName: '<diagnosticEventHubName>'
-    diagnosticLogsRetentionInDays: 7
-    diagnosticStorageAccountId: '<diagnosticStorageAccountId>'
-    diagnosticWorkspaceId: '<diagnosticWorkspaceId>'
+    userAssignedIdentities: {
+      '<managedIdentityResourceId>': {}
+    }
     enableDefaultTelemetry: '<enableDefaultTelemetry>'
+    aksClusterNetworkPlugin: 'kubenet'
+    diagnosticLogsRetentionInDays: 7
     roleAssignments: [
       {
         principalIds: [
@@ -723,9 +727,6 @@ module managedClusters './Microsoft.ContainerService/managedClusters/deploy.bice
         roleDefinitionIdOrName: 'Reader'
       }
     ]
-    userAssignedIdentities: {
-      '<managedIdentityResourceId>': {}
-    }
   }
 }
 ```
@@ -743,105 +744,110 @@ module managedClusters './Microsoft.ContainerService/managedClusters/deploy.bice
   "contentVersion": "1.0.0.0",
   "parameters": {
     // Required parameters
-    "name": {
-      "value": "<<namePrefix>>csmkube001"
-    },
     "primaryAgentPoolProfile": {
       "value": [
         {
           "availabilityZones": [
             "1"
           ],
-          "count": 1,
-          "enableAutoScaling": true,
-          "maxCount": 3,
-          "maxPods": 30,
           "minCount": 1,
+          "maxCount": 3,
           "mode": "System",
-          "name": "systempool",
+          "enableAutoScaling": true,
           "osDiskSizeGB": 0,
-          "osType": "Linux",
           "serviceCidr": "",
-          "storageProfile": "ManagedDisks",
           "type": "VirtualMachineScaleSets",
-          "vmSize": "Standard_DS2_v2"
+          "vmSize": "Standard_DS2_v2",
+          "count": 1,
+          "osType": "Linux",
+          "maxPods": 30,
+          "name": "systempool",
+          "storageProfile": "ManagedDisks"
         }
       ]
     },
     // Non-required parameters
+    "name": {
+      "value": "<<namePrefix>>csmkube001"
+    },
+    "diagnosticStorageAccountId": {
+      "value": "<diagnosticStorageAccountId>"
+    },
+    "diagnosticWorkspaceId": {
+      "value": "<diagnosticWorkspaceId>"
+    },
+    "diagnosticEventHubName": {
+      "value": "<diagnosticEventHubName>"
+    },
     "agentPools": {
       "value": [
         {
-          "availabilityZones": [
-            "1"
-          ],
+          "osType": "Linux",
           "count": 2,
-          "enableAutoScaling": true,
-          "maxCount": 3,
           "maxPods": 30,
-          "minCount": 1,
           "minPods": 2,
-          "mode": "User",
-          "name": "userpool1",
-          "nodeLabels": {},
+          "type": "VirtualMachineScaleSets",
+          "enableAutoScaling": true,
+          "maxCount": 3,
           "nodeTaints": [
             "CriticalAddonsOnly=true:NoSchedule"
           ],
-          "osDiskSizeGB": 128,
-          "osType": "Linux",
+          "availabilityZones": [
+            "1"
+          ],
           "scaleSetEvictionPolicy": "Delete",
-          "scaleSetPriority": "Regular",
+          "nodeLabels": {},
+          "vmSize": "Standard_DS2_v2",
+          "name": "userpool1",
+          "osDiskSizeGB": 128,
           "storageProfile": "ManagedDisks",
-          "type": "VirtualMachineScaleSets",
-          "vmSize": "Standard_DS2_v2"
+          "minCount": 1,
+          "mode": "User",
+          "scaleSetPriority": "Regular"
         },
         {
-          "availabilityZones": [
-            "1"
-          ],
+          "osType": "Linux",
           "count": 2,
-          "enableAutoScaling": true,
-          "maxCount": 3,
           "maxPods": 30,
-          "minCount": 1,
           "minPods": 2,
-          "mode": "User",
-          "name": "userpool2",
-          "nodeLabels": {},
+          "type": "VirtualMachineScaleSets",
+          "enableAutoScaling": true,
+          "maxCount": 3,
           "nodeTaints": [
             "CriticalAddonsOnly=true:NoSchedule"
           ],
-          "osDiskSizeGB": 128,
-          "osType": "Linux",
+          "availabilityZones": [
+            "1"
+          ],
           "scaleSetEvictionPolicy": "Delete",
-          "scaleSetPriority": "Regular",
+          "nodeLabels": {},
+          "vmSize": "Standard_DS2_v2",
+          "name": "userpool2",
+          "osDiskSizeGB": 128,
           "storageProfile": "ManagedDisks",
-          "type": "VirtualMachineScaleSets",
-          "vmSize": "Standard_DS2_v2"
+          "minCount": 1,
+          "mode": "User",
+          "scaleSetPriority": "Regular"
         }
       ]
     },
-    "aksClusterNetworkPlugin": {
-      "value": "kubenet"
-    },
-    "diagnosticEventHubAuthorizationRuleId": {
-      "value": "<diagnosticEventHubAuthorizationRuleId>"
-    },
-    "diagnosticEventHubName": {
-      "value": "<diagnosticEventHubName>"
-    },
     "diagnosticLogsRetentionInDays": {
       "value": 7
     },
-    "diagnosticStorageAccountId": {
-      "value": "<diagnosticStorageAccountId>"
+    "diagnosticEventHubAuthorizationRuleId": {
+      "value": "<diagnosticEventHubAuthorizationRuleId>"
     },
-    "diagnosticWorkspaceId": {
-      "value": "<diagnosticWorkspaceId>"
+    "userAssignedIdentities": {
+      "value": {
+        "<managedIdentityResourceId>": {}
+      }
     },
     "enableDefaultTelemetry": {
       "value": "<enableDefaultTelemetry>"
     },
+    "aksClusterNetworkPlugin": {
+      "value": "kubenet"
+    },
     "roleAssignments": {
       "value": [
         {
@@ -852,11 +858,6 @@ module managedClusters './Microsoft.ContainerService/managedClusters/deploy.bice
           "roleDefinitionIdOrName": "Reader"
         }
       ]
-    },
-    "userAssignedIdentities": {
-      "value": {
-        "<managedIdentityResourceId>": {}
-      }
     }
   }
 }

From 77f580b327544ef99377bd3d3542c6498d632646 Mon Sep 17 00:00:00 2001
From: Thomas Aure <thomas.aure@dnb.no>
Date: Sat, 4 Feb 2023 17:42:30 +0100
Subject: [PATCH 2/3] Included the condition to output this.

---
 modules/Microsoft.ContainerService/managedClusters/deploy.bicep | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/Microsoft.ContainerService/managedClusters/deploy.bicep b/modules/Microsoft.ContainerService/managedClusters/deploy.bicep
index 2e3771a9cb..53ac8e1856 100644
--- a/modules/Microsoft.ContainerService/managedClusters/deploy.bicep
+++ b/modules/Microsoft.ContainerService/managedClusters/deploy.bicep
@@ -613,4 +613,4 @@ output omsagentIdentityObjectId string = contains(managedCluster.properties, 'ad
 output location string = managedCluster.location
 
 @description('The OIDC token issuer Url.')
-output oidcIssuerUrl string = managedCluster.properties.oidcIssuerProfile.issuerURL
+output oidcIssuerUrl string = enableOidcIssuerProfile ? managedCluster.properties.oidcIssuerProfile.issuerURL : ''

From 06232648ca9db0fe0fe1b1fa2122ef02c75b8d43 Mon Sep 17 00:00:00 2001
From: Thomas Aure <thomas.aure@dnb.no>
Date: Thu, 9 Feb 2023 13:16:49 +0100
Subject: [PATCH 3/3] Updated README.md

---
 .../managedClusters/readme.md                 | 468 +++++++++---------
 1 file changed, 234 insertions(+), 234 deletions(-)

diff --git a/modules/Microsoft.ContainerService/managedClusters/readme.md b/modules/Microsoft.ContainerService/managedClusters/readme.md
index 2fbf1c20b7..357423610f 100644
--- a/modules/Microsoft.ContainerService/managedClusters/readme.md
+++ b/modules/Microsoft.ContainerService/managedClusters/readme.md
@@ -385,100 +385,100 @@ module managedClusters './Microsoft.ContainerService/managedClusters/deploy.bice
   name: '${uniqueString(deployment().name, location)}-test-csmaz'
   params: {
     // Required parameters
+    name: '<<namePrefix>>csmaz001'
     primaryAgentPoolProfile: [
       {
         availabilityZones: [
           '1'
         ]
-        minCount: 1
+        count: 1
+        enableAutoScaling: true
         maxCount: 3
+        maxPods: 30
+        minCount: 1
         mode: 'System'
-        enableAutoScaling: true
+        name: 'systempool'
         osDiskSizeGB: 0
+        osType: 'Linux'
         serviceCidr: ''
-        maxPods: 30
+        storageProfile: 'ManagedDisks'
         type: 'VirtualMachineScaleSets'
         vmSize: 'Standard_DS2_v2'
-        count: 1
-        osType: 'Linux'
         vnetSubnetID: '<vnetSubnetID>'
-        name: 'systempool'
-        storageProfile: 'ManagedDisks'
       }
     ]
     // Non-required parameters
-    name: '<<namePrefix>>csmaz001'
-    systemAssignedIdentity: true
-    diagnosticStorageAccountId: '<diagnosticStorageAccountId>'
-    diagnosticLogsRetentionInDays: 7
-    lock: 'CanNotDelete'
-    roleAssignments: [
-      {
-        principalIds: [
-          '<managedIdentityPrincipalId>'
-        ]
-        principalType: 'ServicePrincipal'
-        roleDefinitionIdOrName: 'Reader'
-      }
-    ]
-    aksClusterNetworkPlugin: 'azure'
-    diagnosticEventHubName: '<diagnosticEventHubName>'
-    diskEncryptionSetID: '<diskEncryptionSetID>'
-    diagnosticWorkspaceId: '<diagnosticWorkspaceId>'
-    enableDefaultTelemetry: '<enableDefaultTelemetry>'
     agentPools: [
       {
-        osType: 'Linux'
-        scaleSetPriority: 'Regular'
+        availabilityZones: [
+          '1'
+        ]
         count: 2
-        maxPods: 30
-        minPods: 2
-        type: 'VirtualMachineScaleSets'
         enableAutoScaling: true
         maxCount: 3
+        maxPods: 30
+        minCount: 1
+        minPods: 2
+        mode: 'User'
+        name: 'userpool1'
+        nodeLabels: {}
         nodeTaints: [
           'CriticalAddonsOnly=true:NoSchedule'
         ]
-        availabilityZones: [
-          '1'
-        ]
+        osDiskSizeGB: 128
+        osType: 'Linux'
         scaleSetEvictionPolicy: 'Delete'
-        nodeLabels: {}
+        scaleSetPriority: 'Regular'
+        storageProfile: 'ManagedDisks'
+        type: 'VirtualMachineScaleSets'
         vmSize: 'Standard_DS2_v2'
-        name: 'userpool1'
-        osDiskSizeGB: 128
-        minCount: 1
         vnetSubnetID: '<vnetSubnetID>'
-        mode: 'User'
-        storageProfile: 'ManagedDisks'
       }
       {
-        osType: 'Linux'
-        scaleSetPriority: 'Regular'
+        availabilityZones: [
+          '1'
+        ]
         count: 2
-        maxPods: 30
-        minPods: 2
-        type: 'VirtualMachineScaleSets'
         enableAutoScaling: true
         maxCount: 3
+        maxPods: 30
+        minCount: 1
+        minPods: 2
+        mode: 'User'
+        name: 'userpool2'
+        nodeLabels: {}
         nodeTaints: [
           'CriticalAddonsOnly=true:NoSchedule'
         ]
-        availabilityZones: [
-          '1'
-        ]
+        osDiskSizeGB: 128
+        osType: 'Linux'
         scaleSetEvictionPolicy: 'Delete'
-        nodeLabels: {}
+        scaleSetPriority: 'Regular'
+        storageProfile: 'ManagedDisks'
+        type: 'VirtualMachineScaleSets'
         vmSize: 'Standard_DS2_v2'
-        name: 'userpool2'
-        osDiskSizeGB: 128
-        minCount: 1
         vnetSubnetID: '<vnetSubnetID>'
-        mode: 'User'
-        storageProfile: 'ManagedDisks'
       }
     ]
+    aksClusterNetworkPlugin: 'azure'
     diagnosticEventHubAuthorizationRuleId: '<diagnosticEventHubAuthorizationRuleId>'
+    diagnosticEventHubName: '<diagnosticEventHubName>'
+    diagnosticLogsRetentionInDays: 7
+    diagnosticStorageAccountId: '<diagnosticStorageAccountId>'
+    diagnosticWorkspaceId: '<diagnosticWorkspaceId>'
+    diskEncryptionSetID: '<diskEncryptionSetID>'
+    enableDefaultTelemetry: '<enableDefaultTelemetry>'
+    lock: 'CanNotDelete'
+    roleAssignments: [
+      {
+        principalIds: [
+          '<managedIdentityPrincipalId>'
+        ]
+        principalType: 'ServicePrincipal'
+        roleDefinitionIdOrName: 'Reader'
+      }
+    ]
+    systemAssignedIdentity: true
   }
 }
 ```
@@ -496,127 +496,127 @@ module managedClusters './Microsoft.ContainerService/managedClusters/deploy.bice
   "contentVersion": "1.0.0.0",
   "parameters": {
     // Required parameters
+    "name": {
+      "value": "<<namePrefix>>csmaz001"
+    },
     "primaryAgentPoolProfile": {
       "value": [
         {
           "availabilityZones": [
             "1"
           ],
-          "minCount": 1,
+          "count": 1,
+          "enableAutoScaling": true,
           "maxCount": 3,
+          "maxPods": 30,
+          "minCount": 1,
           "mode": "System",
-          "enableAutoScaling": true,
+          "name": "systempool",
           "osDiskSizeGB": 0,
+          "osType": "Linux",
           "serviceCidr": "",
-          "maxPods": 30,
+          "storageProfile": "ManagedDisks",
           "type": "VirtualMachineScaleSets",
           "vmSize": "Standard_DS2_v2",
-          "count": 1,
-          "osType": "Linux",
-          "vnetSubnetID": "<vnetSubnetID>",
-          "name": "systempool",
-          "storageProfile": "ManagedDisks"
+          "vnetSubnetID": "<vnetSubnetID>"
         }
       ]
     },
     // Non-required parameters
-    "name": {
-      "value": "<<namePrefix>>csmaz001"
-    },
-    "aksClusterNetworkPlugin": {
-      "value": "azure"
-    },
-    "diagnosticStorageAccountId": {
-      "value": "<diagnosticStorageAccountId>"
-    },
-    "diagnosticLogsRetentionInDays": {
-      "value": 7
-    },
-    "lock": {
-      "value": "CanNotDelete"
-    },
-    "roleAssignments": {
-      "value": [
-        {
-          "principalIds": [
-            "<managedIdentityPrincipalId>"
-          ],
-          "principalType": "ServicePrincipal",
-          "roleDefinitionIdOrName": "Reader"
-        }
-      ]
-    },
-    "diagnosticEventHubName": {
-      "value": "<diagnosticEventHubName>"
-    },
-    "systemAssignedIdentity": {
-      "value": true
-    },
-    "diskEncryptionSetID": {
-      "value": "<diskEncryptionSetID>"
-    },
-    "diagnosticWorkspaceId": {
-      "value": "<diagnosticWorkspaceId>"
-    },
-    "enableDefaultTelemetry": {
-      "value": "<enableDefaultTelemetry>"
-    },
     "agentPools": {
       "value": [
         {
-          "osType": "Linux",
-          "scaleSetPriority": "Regular",
+          "availabilityZones": [
+            "1"
+          ],
           "count": 2,
-          "maxPods": 30,
-          "minPods": 2,
-          "type": "VirtualMachineScaleSets",
           "enableAutoScaling": true,
           "maxCount": 3,
+          "maxPods": 30,
+          "minCount": 1,
+          "minPods": 2,
+          "mode": "User",
+          "name": "userpool1",
+          "nodeLabels": {},
           "nodeTaints": [
             "CriticalAddonsOnly=true:NoSchedule"
           ],
-          "availabilityZones": [
-            "1"
-          ],
+          "osDiskSizeGB": 128,
+          "osType": "Linux",
           "scaleSetEvictionPolicy": "Delete",
-          "nodeLabels": {},
+          "scaleSetPriority": "Regular",
+          "storageProfile": "ManagedDisks",
+          "type": "VirtualMachineScaleSets",
           "vmSize": "Standard_DS2_v2",
-          "name": "userpool1",
-          "osDiskSizeGB": 128,
-          "minCount": 1,
-          "vnetSubnetID": "<vnetSubnetID>",
-          "mode": "User",
-          "storageProfile": "ManagedDisks"
+          "vnetSubnetID": "<vnetSubnetID>"
         },
         {
-          "osType": "Linux",
-          "scaleSetPriority": "Regular",
+          "availabilityZones": [
+            "1"
+          ],
           "count": 2,
-          "maxPods": 30,
-          "minPods": 2,
-          "type": "VirtualMachineScaleSets",
           "enableAutoScaling": true,
           "maxCount": 3,
+          "maxPods": 30,
+          "minCount": 1,
+          "minPods": 2,
+          "mode": "User",
+          "name": "userpool2",
+          "nodeLabels": {},
           "nodeTaints": [
             "CriticalAddonsOnly=true:NoSchedule"
           ],
-          "availabilityZones": [
-            "1"
-          ],
+          "osDiskSizeGB": 128,
+          "osType": "Linux",
           "scaleSetEvictionPolicy": "Delete",
-          "nodeLabels": {},
+          "scaleSetPriority": "Regular",
+          "storageProfile": "ManagedDisks",
+          "type": "VirtualMachineScaleSets",
           "vmSize": "Standard_DS2_v2",
-          "name": "userpool2",
-          "osDiskSizeGB": 128,
-          "minCount": 1,
-          "vnetSubnetID": "<vnetSubnetID>",
-          "mode": "User",
-          "storageProfile": "ManagedDisks"
+          "vnetSubnetID": "<vnetSubnetID>"
         }
       ]
     },
+    "aksClusterNetworkPlugin": {
+      "value": "azure"
+    },
     "diagnosticEventHubAuthorizationRuleId": {
       "value": "<diagnosticEventHubAuthorizationRuleId>"
+    },
+    "diagnosticEventHubName": {
+      "value": "<diagnosticEventHubName>"
+    },
+    "diagnosticLogsRetentionInDays": {
+      "value": 7
+    },
+    "diagnosticStorageAccountId": {
+      "value": "<diagnosticStorageAccountId>"
+    },
+    "diagnosticWorkspaceId": {
+      "value": "<diagnosticWorkspaceId>"
+    },
+    "diskEncryptionSetID": {
+      "value": "<diskEncryptionSetID>"
+    },
+    "enableDefaultTelemetry": {
+      "value": "<enableDefaultTelemetry>"
+    },
+    "lock": {
+      "value": "CanNotDelete"
+    },
+    "roleAssignments": {
+      "value": [
+        {
+          "principalIds": [
+            "<managedIdentityPrincipalId>"
+          ],
+          "principalType": "ServicePrincipal",
+          "roleDefinitionIdOrName": "Reader"
+        }
+      ]
+    },
+    "systemAssignedIdentity": {
+      "value": true
     }
   }
 }
@@ -636,88 +636,85 @@ module managedClusters './Microsoft.ContainerService/managedClusters/deploy.bice
   name: '${uniqueString(deployment().name, location)}-test-csmkube'
   params: {
     // Required parameters
+    name: '<<namePrefix>>csmkube001'
     primaryAgentPoolProfile: [
       {
         availabilityZones: [
           '1'
         ]
-        minCount: 1
+        count: 1
+        enableAutoScaling: true
         maxCount: 3
+        maxPods: 30
+        minCount: 1
         mode: 'System'
-        enableAutoScaling: true
+        name: 'systempool'
         osDiskSizeGB: 0
+        osType: 'Linux'
         serviceCidr: ''
+        storageProfile: 'ManagedDisks'
         type: 'VirtualMachineScaleSets'
         vmSize: 'Standard_DS2_v2'
-        count: 1
-        osType: 'Linux'
-        maxPods: 30
-        name: 'systempool'
-        storageProfile: 'ManagedDisks'
       }
     ]
     // Non-required parameters
-    name: '<<namePrefix>>csmkube001'
-    diagnosticStorageAccountId: '<diagnosticStorageAccountId>'
-    diagnosticWorkspaceId: '<diagnosticWorkspaceId>'
-    diagnosticEventHubName: '<diagnosticEventHubName>'
     agentPools: [
       {
-        osType: 'Linux'
+        availabilityZones: [
+          '1'
+        ]
         count: 2
-        maxPods: 30
-        minPods: 2
-        type: 'VirtualMachineScaleSets'
         enableAutoScaling: true
         maxCount: 3
+        maxPods: 30
+        minCount: 1
+        minPods: 2
+        mode: 'User'
+        name: 'userpool1'
+        nodeLabels: {}
         nodeTaints: [
           'CriticalAddonsOnly=true:NoSchedule'
         ]
-        availabilityZones: [
-          '1'
-        ]
-        scaleSetEvictionPolicy: 'Delete'
-        nodeLabels: {}
-        vmSize: 'Standard_DS2_v2'
-        name: 'userpool1'
         osDiskSizeGB: 128
-        storageProfile: 'ManagedDisks'
-        minCount: 1
-        mode: 'User'
+        osType: 'Linux'
+        scaleSetEvictionPolicy: 'Delete'
         scaleSetPriority: 'Regular'
+        storageProfile: 'ManagedDisks'
+        type: 'VirtualMachineScaleSets'
+        vmSize: 'Standard_DS2_v2'
       }
       {
-        osType: 'Linux'
+        availabilityZones: [
+          '1'
+        ]
         count: 2
-        maxPods: 30
-        minPods: 2
-        type: 'VirtualMachineScaleSets'
         enableAutoScaling: true
         maxCount: 3
+        maxPods: 30
+        minCount: 1
+        minPods: 2
+        mode: 'User'
+        name: 'userpool2'
+        nodeLabels: {}
         nodeTaints: [
           'CriticalAddonsOnly=true:NoSchedule'
         ]
-        availabilityZones: [
-          '1'
-        ]
-        scaleSetEvictionPolicy: 'Delete'
-        nodeLabels: {}
-        vmSize: 'Standard_DS2_v2'
-        name: 'userpool2'
         osDiskSizeGB: 128
-        storageProfile: 'ManagedDisks'
-        minCount: 1
-        mode: 'User'
+        osType: 'Linux'
+        scaleSetEvictionPolicy: 'Delete'
         scaleSetPriority: 'Regular'
+        storageProfile: 'ManagedDisks'
+        type: 'VirtualMachineScaleSets'
+        vmSize: 'Standard_DS2_v2'
       }
     ]
-    diagnosticEventHubAuthorizationRuleId: '<diagnosticEventHubAuthorizationRuleId>'
-    userAssignedIdentities: {
-      '<managedIdentityResourceId>': {}
-    }
-    enableDefaultTelemetry: '<enableDefaultTelemetry>'
     aksClusterNetworkPlugin: 'kubenet'
+    diagnosticEventHubAuthorizationRuleId: '<diagnosticEventHubAuthorizationRuleId>'
+    diagnosticEventHubName: '<diagnosticEventHubName>'
     diagnosticLogsRetentionInDays: 7
+    diagnosticStorageAccountId: '<diagnosticStorageAccountId>'
+    diagnosticWorkspaceId: '<diagnosticWorkspaceId>'
+    enableDefaultTelemetry: '<enableDefaultTelemetry>'
     roleAssignments: [
       {
         principalIds: [
@@ -727,6 +724,9 @@ module managedClusters './Microsoft.ContainerService/managedClusters/deploy.bice
         roleDefinitionIdOrName: 'Reader'
       }
     ]
+    userAssignedIdentities: {
+      '<managedIdentityResourceId>': {}
+    }
   }
 }
 ```
@@ -744,110 +744,105 @@ module managedClusters './Microsoft.ContainerService/managedClusters/deploy.bice
   "contentVersion": "1.0.0.0",
   "parameters": {
     // Required parameters
+    "name": {
+      "value": "<<namePrefix>>csmkube001"
+    },
     "primaryAgentPoolProfile": {
       "value": [
         {
           "availabilityZones": [
             "1"
           ],
-          "minCount": 1,
+          "count": 1,
+          "enableAutoScaling": true,
           "maxCount": 3,
+          "maxPods": 30,
+          "minCount": 1,
           "mode": "System",
-          "enableAutoScaling": true,
+          "name": "systempool",
           "osDiskSizeGB": 0,
+          "osType": "Linux",
           "serviceCidr": "",
+          "storageProfile": "ManagedDisks",
           "type": "VirtualMachineScaleSets",
-          "vmSize": "Standard_DS2_v2",
-          "count": 1,
-          "osType": "Linux",
-          "maxPods": 30,
-          "name": "systempool",
-          "storageProfile": "ManagedDisks"
+          "vmSize": "Standard_DS2_v2"
         }
       ]
     },
     // Non-required parameters
-    "name": {
-      "value": "<<namePrefix>>csmkube001"
-    },
-    "diagnosticStorageAccountId": {
-      "value": "<diagnosticStorageAccountId>"
-    },
-    "diagnosticWorkspaceId": {
-      "value": "<diagnosticWorkspaceId>"
-    },
-    "diagnosticEventHubName": {
-      "value": "<diagnosticEventHubName>"
-    },
     "agentPools": {
       "value": [
         {
-          "osType": "Linux",
+          "availabilityZones": [
+            "1"
+          ],
           "count": 2,
-          "maxPods": 30,
-          "minPods": 2,
-          "type": "VirtualMachineScaleSets",
           "enableAutoScaling": true,
           "maxCount": 3,
+          "maxPods": 30,
+          "minCount": 1,
+          "minPods": 2,
+          "mode": "User",
+          "name": "userpool1",
+          "nodeLabels": {},
           "nodeTaints": [
             "CriticalAddonsOnly=true:NoSchedule"
           ],
-          "availabilityZones": [
-            "1"
-          ],
-          "scaleSetEvictionPolicy": "Delete",
-          "nodeLabels": {},
-          "vmSize": "Standard_DS2_v2",
-          "name": "userpool1",
           "osDiskSizeGB": 128,
+          "osType": "Linux",
+          "scaleSetEvictionPolicy": "Delete",
+          "scaleSetPriority": "Regular",
           "storageProfile": "ManagedDisks",
-          "minCount": 1,
-          "mode": "User",
-          "scaleSetPriority": "Regular"
+          "type": "VirtualMachineScaleSets",
+          "vmSize": "Standard_DS2_v2"
         },
         {
-          "osType": "Linux",
+          "availabilityZones": [
+            "1"
+          ],
           "count": 2,
-          "maxPods": 30,
-          "minPods": 2,
-          "type": "VirtualMachineScaleSets",
           "enableAutoScaling": true,
           "maxCount": 3,
+          "maxPods": 30,
+          "minCount": 1,
+          "minPods": 2,
+          "mode": "User",
+          "name": "userpool2",
+          "nodeLabels": {},
           "nodeTaints": [
             "CriticalAddonsOnly=true:NoSchedule"
           ],
-          "availabilityZones": [
-            "1"
-          ],
-          "scaleSetEvictionPolicy": "Delete",
-          "nodeLabels": {},
-          "vmSize": "Standard_DS2_v2",
-          "name": "userpool2",
           "osDiskSizeGB": 128,
+          "osType": "Linux",
+          "scaleSetEvictionPolicy": "Delete",
+          "scaleSetPriority": "Regular",
           "storageProfile": "ManagedDisks",
-          "minCount": 1,
-          "mode": "User",
-          "scaleSetPriority": "Regular"
+          "type": "VirtualMachineScaleSets",
+          "vmSize": "Standard_DS2_v2"
         }
       ]
     },
-    "diagnosticLogsRetentionInDays": {
-      "value": 7
+    "aksClusterNetworkPlugin": {
+      "value": "kubenet"
     },
     "diagnosticEventHubAuthorizationRuleId": {
       "value": "<diagnosticEventHubAuthorizationRuleId>"
     },
-    "userAssignedIdentities": {
-      "value": {
-        "<managedIdentityResourceId>": {}
-      }
+    "diagnosticEventHubName": {
+      "value": "<diagnosticEventHubName>"
+    },
+    "diagnosticLogsRetentionInDays": {
+      "value": 7
+    },
+    "diagnosticStorageAccountId": {
+      "value": "<diagnosticStorageAccountId>"
+    },
+    "diagnosticWorkspaceId": {
+      "value": "<diagnosticWorkspaceId>"
     },
     "enableDefaultTelemetry": {
       "value": "<enableDefaultTelemetry>"
     },
-    "aksClusterNetworkPlugin": {
-      "value": "kubenet"
-    },
     "roleAssignments": {
       "value": [
         {
@@ -858,6 +853,11 @@ module managedClusters './Microsoft.ContainerService/managedClusters/deploy.bice
           "roleDefinitionIdOrName": "Reader"
         }
       ]
+    },
+    "userAssignedIdentities": {
+      "value": {
+        "<managedIdentityResourceId>": {}
+      }
     }
   }
 }