adding customerAdminGroupId to osa cluster spec (#5491)

JackQuincy · praries880 · commit 8e9cb1d67ee6 · 2019-04-02T10:46:51.000-07:00
diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersCreate_Update.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/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/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersGet.json b/specification/containerservice/resource-manager/Microsoft.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/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersList.json b/specification/containerservice/resource-manager/Microsoft.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/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersListByResourceGroup.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/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/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersUpdateTags.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/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/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json b/specification/containerservice/resource-manager/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."
             }
           }
         }

Original file line number	Diff line number	Diff line change
`@@ -52,9 +52,10 @@`
`52`	`52`	`"name": "Azure AD",`
`53`	`53`	`"provider": {`
`54`	`54`	`"kind": "AADIdentityProvider",`
`55`		`- "clientId": "clientId",`
	`55`	`+ "clientId": "{clientId}",`
`56`	`56`	`"secret": "secret",`
`57`		`- "tenantId": "tenantId"`
	`57`	`+ "tenantId": "{tenantId}",`
	`58`	`+ "customerAdminGroupId": "{customerAdminGroupId}"`
`58`	`59`	`}`
`59`	`60`	`}`
`60`	`61`	`]`
`@@ -117,7 +118,8 @@`
`117`	`118`	`"provider": {`
`118`	`119`	`"kind": "AADIdentityProvider",`
`119`	`120`	`"clientId": "clientId",`
`120`		`- "tenantId": "tenantId"`
	`121`	`+ "tenantId": "tenantId",`
	`122`	`+ "customerAdminGroupId": "{customerAdminGroupId}"`
`121`	`123`	`}`
`122`	`124`	`}`
`123`	`125`	`]`
`@@ -178,8 +180,9 @@`
`178`	`180`	`"name": "Azure AD",`
`179`	`181`	`"provider": {`
`180`	`182`	`"kind": "AADIdentityProvider",`
`181`		`- "clientId": "clientId",`
`182`		`- "tenantId": "tenantId"`
	`183`	`+ "clientId": "{clientId}",`
	`184`	`+ "tenantId": "{tenantId}",`
	`185`	`+ "customerAdminGroupId": "{customerAdminGroupId}"`
`183`	`186`	`}`
`184`	`187`	`}`
`185`	`188`	`]`
Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,9 @@`
`59`	`59`	`"name": "Azure AD",`
`60`	`60`	`"provider": {`
`61`	`61`	`"kind": "AADIdentityProvider",`
`62`		`- "clientId": "clientId",`
`63`		`- "tenantId": "tenantId"`
	`62`	`+ "clientId": "{clientId}",`
	`63`	`+ "tenantId": "{tenantId}",`
	`64`	`+ "customerAdminGroupId": "{customerAdminGroupId}"`
`64`	`65`	`}`
`65`	`66`	`}`
`66`	`67`	`]`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,8 @@`
`60`	`60`	`"provider": {`
`61`	`61`	`"kind": "AADIdentityProvider",`
`62`	`62`	`"clientId": "clientId",`
`63`		`- "tenantId": "tenantId"`
	`63`	`+ "tenantId": "tenantId",`
	`64`	`+ "customerAdminGroupId": "{customerAdminGroupId}"`
`64`	`65`	`}`
`65`	`66`	`}`
`66`	`67`	`]`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,8 @@`
`61`	`61`	`"provider": {`
`62`	`62`	`"kind": "AADIdentityProvider",`
`63`	`63`	`"clientId": "clientId",`
`64`		`- "tenantId": "tenantId"`
	`64`	`+ "tenantId": "tenantId",`
	`65`	`+ "customerAdminGroupId": "{customerAdminGroupId}"`
`65`	`66`	`}`
`66`	`67`	`}`
`67`	`68`	`]`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,8 @@`
`66`	`66`	`"provider": {`
`67`	`67`	`"kind": "AADIdentityProvider",`
`68`	`68`	`"clientId": "clientId",`
`69`		`- "tenantId": "tenantId"`
	`69`	`+ "tenantId": "tenantId",`
	`70`	`+ "customerAdminGroupId": "{customerAdminGroupId}"`
`70`	`71`	`}`
`71`	`72`	`}`
`72`	`73`	`]`
Original file line number	Diff line number	Diff line change
`@@ -731,6 +731,10 @@`
`731`	`731`	`"tenantId": {`
`732`	`732`	`"type": "string",`
`733`	`733`	`"description": "The tenantId associated with the provider."`
	`734`	`+ },`
	`735`	`+ "customerAdminGroupId": {`
	`736`	`+ "type": "string",`
	`737`	`+ "description": "The groupId to be granted cluster admin role."`
`734`	`738`	`}`
`735`	`739`	`}`
`736`	`740`	`}`