Add swagger definition for user assigned identity (#9737)

Azure · Jun 16, 2020 · 85bfc31 · 85bfc31
1 parent b633249
commit 85bfc31
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 0 deletions.
diff --git a/...r/Microsoft.ContainerService/stable/2020-06-01/examples/ManagedClustersCreate_Update.json b/...r/Microsoft.ContainerService/stable/2020-06-01/examples/ManagedClustersCreate_Update.json
@@ -69,6 +69,12 @@
         "enableRBAC": true,
         "diskEncryptionSetID": "/subscriptions/subid1/resourceGroups/rg1/providers/Microsoft.Compute/diskEncryptionSets/des",
         "enablePodSecurityPolicy": true
+      },
+      "identity": {
+        "type": "UserAssigned",
+        "userAssignedIdentities": {
+          "/subscriptions/subid1/resourceGroups/rgName1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1": {}
+        }
       }
     }
   },
@@ -157,6 +163,15 @@
             "scan-interval": "20s",
             "scale-down-delay-after-add": "15m"
           }
+        },
+        "identity": {
+          "type": "UserAssigned",
+          "userAssignedIdentities": {
+            "/subscriptions/subid1/resourceGroups/rgName1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1": {
+              "principalId": "principalId1",
+              "clientId": "clientId1"
+            }
+          }
         }
       }
     },
@@ -242,6 +257,15 @@
             "scan-interval": "20s",
             "scale-down-delay-after-add": "15m"
           }
+        },
+        "identity": {
+          "type": "UserAssigned",
+          "userAssignedIdentities": {
+            "/subscriptions/subid1/resourceGroups/rgName1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1": {
+              "principalId": "principalId1",
+              "clientId": "clientId1"
+            }
+          }
         }
       }
     }

diff --git a/...ervice/resource-manager/Microsoft.ContainerService/stable/2020-06-01/managedClusters.json b/...ervice/resource-manager/Microsoft.ContainerService/stable/2020-06-01/managedClusters.json
@@ -2307,12 +2307,32 @@
           "description": "The type of identity used for the managed cluster. Type 'SystemAssigned' will use an implicitly created identity in master components and an auto-created user assigned identity in MC_ resource group in agent nodes. Type 'None' will not use MSI for the managed cluster, service principal will be used instead.",
           "enum": [
             "SystemAssigned",
+            "UserAssigned",
             "None"
           ],
           "x-ms-enum": {
             "name": "ResourceIdentityType",
             "modelAsString": false
           }
+        },
+        "userAssignedIdentities": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "object",
+            "properties": {
+              "principalId": {
+                "readOnly": true,
+                "type": "string",
+                "description": "The principal id of user assigned identity."
+              },
+              "clientId": {
+                "readOnly": true,
+                "type": "string",
+                "description": "The client id of user assigned identity."
+              }
+            }
+          },
+          "description": "The user identity associated with the managed cluster. This identity will be used in control plane and only one user assigned identity is allowed. The user identity dictionary key references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'."
         }
       },
       "description": "Identity for the managed cluster."