adding customerAdminGroupId to osa cluster spec (#5491)

Azure · Apr 2, 2019 · 8e9cb1d · 8e9cb1d
1 parent 38bde49
commit 8e9cb1d
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 10 deletions.
diff --git a/...nerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersCreate_Update.json b/...nerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersCreate_Update.json
@@ -52,9 +52,10 @@
               "name": "Azure AD",
               "provider": {
                 "kind": "AADIdentityProvider",
-                "clientId": "clientId",
+                "clientId": "{clientId}",
                 "secret": "secret",
-                "tenantId": "tenantId"
+                "tenantId": "{tenantId}",
+                "customerAdminGroupId": "{customerAdminGroupId}"
               }
             }
           ]
@@ -117,7 +118,8 @@
                 "provider": {
                   "kind": "AADIdentityProvider",
                   "clientId": "clientId",
-                  "tenantId": "tenantId"
+                  "tenantId": "tenantId",
+                  "customerAdminGroupId": "{customerAdminGroupId}"
                 }
               }
             ]
@@ -178,8 +180,9 @@
                 "name": "Azure AD",
                 "provider": {
                   "kind": "AADIdentityProvider",
-                  "clientId": "clientId",
-                  "tenantId": "tenantId"
+                  "clientId": "{clientId}",
+                  "tenantId": "{tenantId}",
+                  "customerAdminGroupId": "{customerAdminGroupId}"
                 }
               }
             ]

diff --git a/...oft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersGet.json b/...oft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersGet.json
@@ -59,8 +59,9 @@
                 "name": "Azure AD",
                 "provider": {
                   "kind": "AADIdentityProvider",
-                  "clientId": "clientId",
-                  "tenantId": "tenantId"
+                  "clientId": "{clientId}",
+                  "tenantId": "{tenantId}",
+                  "customerAdminGroupId": "{customerAdminGroupId}"
                 }
               }
             ]

diff --git a/...ft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersList.json b/...ft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersList.json
@@ -60,7 +60,8 @@
                     "provider": {
                       "kind": "AADIdentityProvider",
                       "clientId": "clientId",
-                      "tenantId": "tenantId"
+                      "tenantId": "tenantId",
+                      "customerAdminGroupId": "{customerAdminGroupId}"
                     }
                   }
                 ]

diff --git a/...vice/preview/2018-09-30-preview/examples/OpenShiftManagedClustersListByResourceGroup.json b/...vice/preview/2018-09-30-preview/examples/OpenShiftManagedClustersListByResourceGroup.json
@@ -61,7 +61,8 @@
                     "provider": {
                       "kind": "AADIdentityProvider",
                       "clientId": "clientId",
-                      "tenantId": "tenantId"
+                      "tenantId": "tenantId",
+                      "customerAdminGroupId": "{customerAdminGroupId}"
                     }
                   }
                 ]

diff --git a/...tainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersUpdateTags.json b/...tainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersUpdateTags.json
@@ -66,7 +66,8 @@
                 "provider": {
                   "kind": "AADIdentityProvider",
                   "clientId": "clientId",
-                  "tenantId": "tenantId"
+                  "tenantId": "tenantId",
+                  "customerAdminGroupId": "{customerAdminGroupId}"
                 }
               }
             ]

diff --git a/...nager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json b/...nager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json
@@ -731,6 +731,10 @@
             "tenantId": {
               "type": "string",
               "description": "The tenantId associated with the provider."
+            },
+            "customerAdminGroupId": {
+              "type": "string",
+              "description": "The groupId to be granted cluster admin role."
             }
           }
         }