From fdda83fd4dd9b726c15cb8aa856efda9cbd333c5 Mon Sep 17 00:00:00 2001 From: Julien Stroheker Date: Thu, 23 Aug 2018 14:38:20 -0400 Subject: [PATCH 01/26] add openshift support --- ...OpenShiftManagedClustersCreate_Update.json | 155 ++++ .../OpenShiftManagedClustersDelete.json | 12 + .../examples/OpenShiftManagedClustersGet.json | 60 ++ .../OpenShiftManagedClustersList.json | 67 ++ ...iftManagedClustersListByResourceGroup.json | 63 ++ .../OpenShiftManagedClustersUpdateTags.json | 66 ++ .../openShiftManagedClusters.json | 877 ++++++++++++++++++ .../resource-manager/readme.md | 9 + 8 files changed, 1309 insertions(+) create mode 100644 specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersCreate_Update.json create mode 100644 specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersDelete.json create mode 100644 specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersGet.json create mode 100644 specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersList.json create mode 100644 specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersListByResourceGroup.json create mode 100644 specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersUpdateTags.json create mode 100644 specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersCreate_Update.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersCreate_Update.json new file mode 100644 index 000000000000..3afcd9aebce1 --- /dev/null +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersCreate_Update.json @@ -0,0 +1,155 @@ +{ + "parameters": { + "api-version": "2018-09-30-preview", + "subscriptionId": "subid1", + "resourceGroupName": "rg1", + "resourceName": "clustername1", + "parameters": { + "location": "location1", + "tags": { + "tier": "production", + "archv2": "" + }, + "properties": { + "openShiftVersion": "v3.10", + "fqdn": "rg1.eastus.cloudapp.azure.com", + "publicHostname": "openshift.rg1.openshift.com", + "masterPoolProfile": { + "name": "master", + "count": 3, + "vmSize": "Standard_D2s_v3", + "osType": "Linux" + }, + "agentPoolProfiles": [ + { + "name": "infra", + "role": "infra", + "count": 1, + "vmSize": "Standard_D2s_v3", + "osType": "Linux" + }, + { + "name": "compute", + "role": "compute", + "count": 3, + "vmSize": "Standard_D2s_v3", + "osType": "Linux" + } + ], + "routerProfiles": [ + { + "fqdn": "rg1-router.location1.cloudapp.azure.com", + "name": "default", + "publicSubdomain": "rg1.openshift.com" + } + ], + "servicePrincipalProfile": { + "clientId": "clientid", + "secret": "secret" + } + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/openShiftManagedClusters/clustername1", + "location": "location1", + "name": "clustername1", + "tags": { + "archv2": "", + "tier": "production" + }, + "type": "Microsoft.ContainerService/OpenShiftManagedClusters", + "properties": { + "provisioningState": "Succeeded", + "openShiftVersion": "1.9.6", + "fqdn": "rg1.eastus.cloudapp.azure.com", + "publicHostname": "openshift.rg1.openshift.com", + "masterPoolProfile": { + "name": "master", + "count": 3, + "vmSize": "Standard_D2s_v3", + "osType": "Linux" + }, + "agentPoolProfiles": [ + { + "name": "infra", + "role": "infra", + "count": 1, + "vmSize": "Standard_D2s_v3", + "osType": "Linux" + }, + { + "name": "compute", + "role": "compute", + "count": 3, + "vmSize": "Standard_D2s_v3", + "osType": "Linux" + } + ], + "routerProfiles": [ + { + "fqdn": "rg1-router.location1.cloudapp.azure.com", + "name": "default", + "publicSubdomain": "rg1.openshift.com" + } + ], + "servicePrincipalProfile": { + "clientId": "clientid" + } + } + } + }, + "201": { + "body": { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/openShiftManagedClusters/clustername1", + "location": "location1", + "name": "clustername1", + "tags": { + "archv2": "", + "tier": "production" + }, + "type": "Microsoft.ContainerService/OpenShiftManagedClusters", + "properties": { + "provisioningState": "Creating", + "openShiftVersion": "v3.10", + "fqdn": "rg1.eastus.cloudapp.azure.com", + "publicHostname": "openshift.rg1.openshift.com", + "masterPoolProfile": { + "name": "master", + "count": 3, + "vmSize": "Standard_D2s_v3", + "osType": "Linux" + }, + "agentPoolProfiles": [ + { + "name": "infra", + "role": "infra", + "count": 1, + "vmSize": "Standard_D2s_v3", + "osType": "Linux" + }, + { + "name": "compute", + "role": "compute", + "count": 3, + "vmSize": "Standard_D2s_v3", + "osType": "Linux" + } + ], + "routerProfiles": [ + { + "fqdn": "rg1-router.location1.cloudapp.azure.com", + "name": "default", + "publicSubdomain": "rg1.openshift.com" + } + ], + "servicePrincipalProfile": { + "clientId": "clientid" + } + } + } + } + } +} diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersDelete.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersDelete.json new file mode 100644 index 000000000000..efe2349b9ef0 --- /dev/null +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersDelete.json @@ -0,0 +1,12 @@ +{ + "parameters": { + "api-version": "2018-09-30-preview", + "subscriptionId": "subid1", + "resourceGroupName": "rg1", + "resourceName": "clustername1" + }, + "responses": { + "202": {}, + "204": {} + } +} diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersGet.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersGet.json new file mode 100644 index 000000000000..f9bde3b72a1d --- /dev/null +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersGet.json @@ -0,0 +1,60 @@ +{ + "parameters": { + "api-version": "2018-03-31", + "subscriptionId": "subid1", + "resourceGroupName": "rg1", + "resourceName": "clustername1" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/openShiftManagedClusters/clustername1", + "location": "location1", + "name": "clustername1", + "tags": { + "archv2": "", + "tier": "production" + }, + "type": "Microsoft.ContainerService/OpenShiftManagedClusters", + "properties": { + "provisioningState": "Succeeded", + "openShiftVersion": "1.9.6", + "fqdn": "rg1.eastus.cloudapp.azure.com", + "publicHostname": "openshift.rg1.openshift.com", + "masterPoolProfile": { + "name": "master", + "count": 3, + "vmSize": "Standard_D2s_v3", + "osType": "Linux" + }, + "agentPoolProfiles": [ + { + "name": "infra", + "role": "infra", + "count": 1, + "vmSize": "Standard_D2s_v3", + "osType": "Linux" + }, + { + "name": "compute", + "role": "compute", + "count": 3, + "vmSize": "Standard_D2s_v3", + "osType": "Linux" + } + ], + "routerProfiles": [ + { + "fqdn": "rg1-router.location1.cloudapp.azure.com", + "name": "default", + "publicSubdomain": "rg1.openshift.com" + } + ], + "servicePrincipalProfile": { + "clientId": "clientid" + } + } + } + } + } +} diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersList.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersList.json new file mode 100644 index 000000000000..dee3c92d8bee --- /dev/null +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersList.json @@ -0,0 +1,67 @@ +{ + "parameters": { + "api-version": "2018-09-30-preview", + "subscriptionId": "subid1" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/subid1/providers/Microsoft.ContainerService/openShiftManagedClusters", + "location": "location1", + "name": "clustername1", + "tags": { + "archv2": "", + "tier": "production" + }, + "type": "Microsoft.ContainerService/OpenShiftManagedClusters", + "plan" : { + + }, + "properties": { + "provisioningState": "Succeeded", + "openShiftVersion": "v3.10", + "publicHostname": "openshift.rg1.openshift.test", + "fqdn": "rg1.eastus.cloudapp.azure.com", + "routerProfiles": [ + { + "name": "default", + "publicSubdomain": "rg1.openshift.test", + "fqdn": "rg1-router.eastus.cloudapp.azure.com" + } + ], + "masterPoolProfile": [ + { + "name": "master", + "count": 3, + "vmSize": "Standard_D2s_v3", + "osType": "Linux" + } + ], + "agentPoolProfiles": [ + { + "name": "infra", + "count": 1, + "vmSize": "Standard_D2s_v3", + "osType": "Linux", + "role": "infra" + }, + { + "name": "compute", + "count": 3, + "vmSize": "Standard_D2s_v3", + "osType": "Linux", + "role": "compute" + } + ], + "servicePrincipalProfile": { + "clientId": "clientid" + } + } + } + ] + } + } + } +} diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersListByResourceGroup.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersListByResourceGroup.json new file mode 100644 index 000000000000..5687ade6221e --- /dev/null +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersListByResourceGroup.json @@ -0,0 +1,63 @@ +{ + "parameters": { + "api-version": "2018-03-31", + "subscriptionId": "subid1", + "resourceGroupName": "rg1" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/openShiftManagedClusters", + "location": "location1", + "name": "clustername1", + "tags": { + "archv2": "", + "tier": "production" + }, + "type": "Microsoft.ContainerService/OpenShiftManagedClusters", + "properties": { + "provisioningState": "Succeeded", + "openShiftVersion": "1.9.6", + "fqdn": "rg1.eastus.cloudapp.azure.com", + "publicHostname": "openshift.rg1.openshift.com", + "masterPoolProfile": { + "name": "master", + "count": 3, + "vmSize": "Standard_D2s_v3", + "osType": "Linux" + }, + "agentPoolProfiles": [ + { + "name": "infra", + "role": "infra", + "count": 1, + "vmSize": "Standard_D2s_v3", + "osType": "Linux" + }, + { + "name": "compute", + "role": "compute", + "count": 3, + "vmSize": "Standard_D2s_v3", + "osType": "Linux" + } + ], + "routerProfiles": [ + { + "fqdn": "rg1-router.location1.cloudapp.azure.com", + "name": "default", + "publicSubdomain": "rg1.openshift.com" + } + ], + "servicePrincipalProfile": { + "clientId": "clientid" + } + } + } + ] + } + } + } +} diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersUpdateTags.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersUpdateTags.json new file mode 100644 index 000000000000..b5ca3cec9f2d --- /dev/null +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersUpdateTags.json @@ -0,0 +1,66 @@ +{ + "parameters": { + "api-version": "2018-09-30-preview", + "subscriptionId": "subid1", + "resourceGroupName": "rg1", + "resourceName": "clustername1", + "parameters": { + "tags": { + "tier": "testing", + "archv3": "" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/openShiftManagedClusters/clustername1", + "location": "location1", + "name": "clustername1", + "tags": { + "archv3": "", + "tier": "testing" + }, + "type": "Microsoft.ContainerService/OpenShiftManagedClusters", + "properties": { + "provisioningState": "Succeeded", + "openShiftVersion": "v3.10", + "fqdn": "rg1.eastus.cloudapp.azure.com", + "publicHostname": "openshift.rg1.openshift.com", + "masterPoolProfile": { + "name": "master", + "count": 3, + "vmSize": "Standard_D2s_v3", + "osType": "Linux" + }, + "agentPoolProfiles": [ + { + "name": "infra", + "role": "infra", + "count": 1, + "vmSize": "Standard_D2s_v3", + "osType": "Linux" + }, + { + "name": "compute", + "role": "compute", + "count": 3, + "vmSize": "Standard_D2s_v3", + "osType": "Linux" + } + ], + "routerProfiles": [ + { + "fqdn": "rg1-router.location1.cloudapp.azure.com", + "name": "default", + "publicSubdomain": "rg1.openshift.com" + } + ], + "servicePrincipalProfile": { + "clientId": "clientid" + } + } + } + } + } +} diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json new file mode 100644 index 000000000000..8a3a65478643 --- /dev/null +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json @@ -0,0 +1,877 @@ +{ + "swagger": "2.0", + "info": { + "title": "ContainerServiceClient", + "description": "The Container Service Client.", + "version": "2018-09-30-preview" + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ], + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "paths": { + "/providers/Microsoft.ContainerService/operations": { + "get": { + "tags": [ + "managedClusters" + ], + "operationId": "Operations_List", + "description": "Gets a list of compute operations.", + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/OperationListResult" + } + } + }, + "x-ms-pageable": { + "nextLinkName": null + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerService/openShiftManagedClusters": { + "get": { + "tags": [ + "OpenShiftManagedClusters" + ], + "operationId": "OpenShiftManagedClusters_List", + "summary": "Gets a list of openshift managed clusters in the specified subscription.", + "description": "Gets a list of openshift managed clusters in the specified subscription. The operation returns properties of each OpenShift managed cluster.", + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/OpenShiftManagedClusterListResult" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "List OpenShift Managed Clusters": { + "$ref": "./examples/OpenShiftManagedClustersList.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/openShiftManagedClusters": { + "get": { + "tags": [ + "OpenShiftManagedClusters" + ], + "operationId": "OpenShiftManagedClusters_ListByResourceGroup", + "summary": "Lists of openshift managed clusters in the specified subscription and resource group.", + "description": "Lists of openshift managed clusters in the specified subscription and resource group. The operation returns properties of each openshift managed cluster.", + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/OpenShiftManagedClusterListResult" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "Get OpenShift Managed Clusters by Resource Group": { + "$ref": "./examples/OpenShiftManagedClustersListByResourceGroup.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/openShiftManagedClusters/{resourceName}": { + "get": { + "tags": [ + "OpenShiftManagedClusters" + ], + "operationId": "OpenShiftManagedClusters_Get", + "summary": "Gets a openshift managed cluster.", + "description": "Gets the details of the managed openshift cluster with a specified resource group and name.", + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group." + }, + { + "name": "resourceName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the openshift managed cluster resource." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/OpenShiftManagedCluster" + } + } + }, + "x-ms-examples": { + "Get OpenShift Managed Cluster": { + "$ref": "./examples/OpenShiftManagedClustersGet.json" + } + } + }, + "put": { + "tags": [ + "OpenShiftManagedClusters" + ], + "operationId": "OpenShiftManagedClusters_CreateOrUpdate", + "summary": "Creates or updates a openshift managed cluster.", + "description": "Creates or updates a openshift managed cluster with the specified configuration for agents and OpenShift version.", + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group." + }, + { + "name": "resourceName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the openshift managed cluster resource." + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/OpenShiftManagedCluster" + }, + "description": "Parameters supplied to the Create or Update an OpenShift Managed Cluster operation." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/OpenShiftManagedCluster" + } + }, + "201": { + "description": "Created", + "schema": { + "$ref": "#/definitions/OpenShiftManagedCluster" + } + } + }, + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Create/Update OpenShift Managed Cluster": { + "$ref": "./examples/OpenShiftManagedClustersCreate_Update.json" + } + } + }, + "patch": { + "tags": [ + "OpenShiftManagedClusters" + ], + "operationId": "OpenShiftManagedClusters_UpdateTags", + "summary": "Updates tags on a openshift managed cluster.", + "description": "Updates an openshift managed cluster with the specified tags.", + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group." + }, + { + "name": "resourceName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the openshift managed cluster resource." + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/TagsObject" + }, + "description": "Parameters supplied to the Update Managed Cluster Tags operation." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/OpenShiftManagedCluster" + } + } + }, + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Update OpenShift Managed Cluster Tags": { + "$ref": "./examples/OpenShiftManagedClustersUpdateTags.json" + } + } + }, + "delete": { + "tags": [ + "OpenShiftManagedClusters" + ], + "operationId": "OpenShiftManagedClusters_Delete", + "summary": "Deletes an openshift managed cluster.", + "description": "Deletes the openshift managed cluster with a specified resource group and name.", + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group." + }, + { + "name": "resourceName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the openshift managed cluster resource." + } + ], + "responses": { + "202": { + "description": "Accepted" + }, + "204": { + "description": "NoContent" + } + }, + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Delete OpenShift Managed Cluster": { + "$ref": "./examples/OpenShiftManagedClustersDelete.json" + } + } + } + } + }, + "definitions": { + "OperationListResult": { + "properties": { + "value": { + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/OperationValue" + }, + "description": "The list of compute operations" + } + }, + "description": "The List Compute Operation operation response." + }, + "OperationValue": { + "properties": { + "origin": { + "type": "string", + "readOnly": true, + "description": "The origin of the compute operation." + }, + "name": { + "type": "string", + "readOnly": true, + "description": "The name of the compute operation." + }, + "display": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/OperationValueDisplay", + "description": "Describes the properties of a Compute Operation Value Display." + } + }, + "description": "Describes the properties of a Compute Operation value." + }, + "OperationValueDisplay": { + "properties": { + "operation": { + "type": "string", + "readOnly": true, + "description": "The display name of the compute operation." + }, + "resource": { + "type": "string", + "readOnly": true, + "description": "The display name of the resource the operation applies to." + }, + "description": { + "type": "string", + "readOnly": true, + "description": "The description of the operation." + }, + "provider": { + "type": "string", + "readOnly": true, + "description": "The resource provider for the operation." + } + }, + "description": "Describes the properties of a Compute Operation Value Display." + }, + "Resource": { + "description": "The Resource model definition.", + "properties": { + "id": { + "readOnly": true, + "type": "string", + "description": "Resource Id" + }, + "name": { + "readOnly": true, + "type": "string", + "description": "Resource name" + }, + "type": { + "readOnly": true, + "type": "string", + "description": "Resource type" + }, + "location": { + "type": "string", + "description": "Resource location", + "x-ms-mutability": [ + "read", + "create" + ] + }, + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Resource tags" + } + }, + "required": [ + "location" + ], + "x-ms-azure-resource": true + }, + "TagsObject": { + "properties": { + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Resource tags." + } + }, + "description": "Tags object for patch operations." + }, + "ContainerServiceVnetSubnetID": { + "type": "string", + "description": "VNet SubnetID specifies the vnet's subnet identifier." + }, + "ContainerServiceVMSize": { + "type": "string", + "x-ms-enum": { + "name": "ContainerServiceVMSizeTypes", + "modelAsString": true + }, + "description": "Size of agent VMs.", + "enum": [ + "Standard_A1", + "Standard_A10", + "Standard_A11", + "Standard_A1_v2", + "Standard_A2", + "Standard_A2_v2", + "Standard_A2m_v2", + "Standard_A3", + "Standard_A4", + "Standard_A4_v2", + "Standard_A4m_v2", + "Standard_A5", + "Standard_A6", + "Standard_A7", + "Standard_A8", + "Standard_A8_v2", + "Standard_A8m_v2", + "Standard_A9", + "Standard_B2ms", + "Standard_B2s", + "Standard_B4ms", + "Standard_B8ms", + "Standard_D1", + "Standard_D11", + "Standard_D11_v2", + "Standard_D11_v2_Promo", + "Standard_D12", + "Standard_D12_v2", + "Standard_D12_v2_Promo", + "Standard_D13", + "Standard_D13_v2", + "Standard_D13_v2_Promo", + "Standard_D14", + "Standard_D14_v2", + "Standard_D14_v2_Promo", + "Standard_D15_v2", + "Standard_D16_v3", + "Standard_D16s_v3", + "Standard_D1_v2", + "Standard_D2", + "Standard_D2_v2", + "Standard_D2_v2_Promo", + "Standard_D2_v3", + "Standard_D2s_v3", + "Standard_D3", + "Standard_D32_v3", + "Standard_D32s_v3", + "Standard_D3_v2", + "Standard_D3_v2_Promo", + "Standard_D4", + "Standard_D4_v2", + "Standard_D4_v2_Promo", + "Standard_D4_v3", + "Standard_D4s_v3", + "Standard_D5_v2", + "Standard_D5_v2_Promo", + "Standard_D64_v3", + "Standard_D64s_v3", + "Standard_D8_v3", + "Standard_D8s_v3", + "Standard_DS1", + "Standard_DS11", + "Standard_DS11_v2", + "Standard_DS11_v2_Promo", + "Standard_DS12", + "Standard_DS12_v2", + "Standard_DS12_v2_Promo", + "Standard_DS13", + "Standard_DS13-2_v2", + "Standard_DS13-4_v2", + "Standard_DS13_v2", + "Standard_DS13_v2_Promo", + "Standard_DS14", + "Standard_DS14-4_v2", + "Standard_DS14-8_v2", + "Standard_DS14_v2", + "Standard_DS14_v2_Promo", + "Standard_DS15_v2", + "Standard_DS1_v2", + "Standard_DS2", + "Standard_DS2_v2", + "Standard_DS2_v2_Promo", + "Standard_DS3", + "Standard_DS3_v2", + "Standard_DS3_v2_Promo", + "Standard_DS4", + "Standard_DS4_v2", + "Standard_DS4_v2_Promo", + "Standard_DS5_v2", + "Standard_DS5_v2_Promo", + "Standard_E16_v3", + "Standard_E16s_v3", + "Standard_E2_v3", + "Standard_E2s_v3", + "Standard_E32-16s_v3", + "Standard_E32-8s_v3", + "Standard_E32_v3", + "Standard_E32s_v3", + "Standard_E4_v3", + "Standard_E4s_v3", + "Standard_E64-16s_v3", + "Standard_E64-32s_v3", + "Standard_E64_v3", + "Standard_E64s_v3", + "Standard_E8_v3", + "Standard_E8s_v3", + "Standard_F1", + "Standard_F16", + "Standard_F16s", + "Standard_F16s_v2", + "Standard_F1s", + "Standard_F2", + "Standard_F2s", + "Standard_F2s_v2", + "Standard_F32s_v2", + "Standard_F4", + "Standard_F4s", + "Standard_F4s_v2", + "Standard_F64s_v2", + "Standard_F72s_v2", + "Standard_F8", + "Standard_F8s", + "Standard_F8s_v2", + "Standard_G1", + "Standard_G2", + "Standard_G3", + "Standard_G4", + "Standard_G5", + "Standard_GS1", + "Standard_GS2", + "Standard_GS3", + "Standard_GS4", + "Standard_GS4-4", + "Standard_GS4-8", + "Standard_GS5", + "Standard_GS5-16", + "Standard_GS5-8", + "Standard_H16", + "Standard_H16m", + "Standard_H16mr", + "Standard_H16r", + "Standard_H8", + "Standard_H8m", + "Standard_L16s", + "Standard_L32s", + "Standard_L4s", + "Standard_L8s", + "Standard_M128-32ms", + "Standard_M128-64ms", + "Standard_M128ms", + "Standard_M128s", + "Standard_M64-16ms", + "Standard_M64-32ms", + "Standard_M64ms", + "Standard_M64s", + "Standard_NC12", + "Standard_NC12s_v2", + "Standard_NC12s_v3", + "Standard_NC24", + "Standard_NC24r", + "Standard_NC24rs_v2", + "Standard_NC24rs_v3", + "Standard_NC24s_v2", + "Standard_NC24s_v3", + "Standard_NC6", + "Standard_NC6s_v2", + "Standard_NC6s_v3", + "Standard_ND12s", + "Standard_ND24rs", + "Standard_ND24s", + "Standard_ND6s", + "Standard_NV12", + "Standard_NV24", + "Standard_NV6" + ] + }, + "ManagedClusterServicePrincipalProfile": { + "properties": { + "clientId": { + "type": "string", + "description": "The ID for the service principal." + }, + "secret": { + "type": "string", + "description": "The secret password associated with the service principal in plain text." + } + }, + "description": "Information about a service principal identity for the cluster to use for manipulating Azure APIs.", + "required": [ + "clientId" + ] + }, + "OSType": { + "type": "string", + "default": "Linux", + "enum": [ + "Linux", + "Windows" + ], + "x-ms-enum": { + "name": "OSType", + "modelAsString": true + }, + "description": "OsType to be used to specify os type. Choose from Linux and Windows. Default to Linux." + }, + "PurchasePlan": { + "properties": { + "name": { + "type": "string", + "description": "The plan ID." + }, + "product": { + "type": "string", + "description": "Specifies the product of the image from the marketplace. This is the same value as Offer under the imageReference element." + }, + "promtionCode": { + "type": "string", + "description": "The promotion code." + }, + "publisher": { + "type": "string", + "description": "The plan ID." + } + }, + "description": "Used for establishing the purchase context of any 3rd Party artifact through MarketPlace." + }, + "OpenShiftManagedClusterListResult": { + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/OpenShiftManagedCluster" + }, + "description": "The list of openshift managed clusters." + }, + "nextLink": { + "type": "string", + "description": "The URL to get the next set of openshift managed cluster results.", + "readOnly": true + } + }, + "description": "The response from the List OpenShift Managed Clusters operation." + }, + "OpenShiftRouterProfile": { + "properties": { + "name": { + "type": "string", + "description": "Name of the router profile." + }, + "publicSubdomain" : { + "type": "string", + "description": "DNS subdomain for openshift router." + }, + "fqdn": { + "readOnly": true, + "type": "string", + "description": "Auto-allocated FQDN for the OpenShift router." + } + }, + "description": "Represents an OpenShift router" + }, + "OpenShiftAgentPoolProfileRole": { + "type": "string", + "enum": [ + "compute", + "infra" + ], + "x-ms-enum": { + "name": "OpenShiftAgentPoolProfileRole", + "modelAsString": true + }, + "description": "OsType to be used to specify os type. Choose from Linux and Windows. Default to Linux." + }, + "OpenShiftManagedClusterProfileSpec": { + "properties": { + "name": { + "type": "string", + "description": "Unique name of the pool profile in the context of the subscription and resource group." + }, + "count": { + "type": "integer", + "format": "int32", + "maximum": 100, + "minimum": 1, + "description": "Number of agents (VMs) to host docker containers. Allowed values must be in the range of 1 to 100 (inclusive). The default value is 1. ", + "default": 1 + }, + "vmSize": { + "$ref": "#/definitions/ContainerServiceVMSize", + "description": "Size of agent VMs." + }, + "vnetSubnetID": { + "$ref": "#/definitions/ContainerServiceVnetSubnetID", + "description": "VNet SubnetID specifies the vnet's subnet identifier." + }, + "osType": { + "$ref": "#/definitions/OSType", + "description": "OsType to be used to specify os type. Choose from Linux and Windows. Default to Linux." + } + }, + "required": [ + "name", + "count", + "vmSize" + ], + "description": "Profile for the container service agent pool." + }, + "OpenShiftManagedClusterAgentPoolProfile": { + "allOf": [ + { + "$ref": "#/definitions/OpenShiftManagedClusterProfileSpec" + }, + { + "properties": { + "role" : { + "description": "Define the role of the AgentPoolProfile.", + "$ref": "#/definitions/OpenShiftAgentPoolProfileRole" + } + } + } + ], + "description": "OpenShift's configuration of the AgentPoolProfile." + }, + "OpenShiftManagedClusterMasterPoolProfile": { + "allOf": [ + { + "$ref": "#/definitions/OpenShiftManagedClusterProfileSpec" + } + ], + "description": "OpenShift's configuration of the MasterPoolProfile." + }, + "OpenShiftManagedCluster": { + "allOf": [ + { + "$ref": "#/definitions/Resource" + }, + { + "properties": { + "plan" : { + "description": "Define the resource plan as required by ARM for billing purposes", + "$ref": "#/definitions/PurchasePlan" + }, + "properties": { + "description": "Properties of a openshift managed cluster.", + "$ref": "#/definitions/OpenShiftManagedClusterProperties", + "x-ms-client-flatten": true + } + } + } + ], + "description": "OpenShift Managed cluster." + }, + "OpenShiftManagedClusterProperties": { + "properties": { + "provisioningState": { + "readOnly": true, + "type": "string", + "description": "The current deployment or provisioning state, which only appears in the response." + }, + "openShiftVersion": { + "type": "string", + "description": "Version of OpenShift specified when creating the cluster." + }, + "publicHostname": { + "type": "string", + "description": "Public Hostname of the openshift managed cluster." + }, + "fqdn": { + "readOnly": true, + "type": "string", + "description": "Auto-allocated FQDN for OpenShift API server." + }, + "routerProfiles": { + "type": "array", + "items": { + "$ref": "#/definitions/OpenShiftRouterProfile" + }, + "description": "Configuration for OpenShift router(s)." + }, + "masterPoolProfile": { + "$ref": "#/definitions/OpenShiftManagedClusterMasterPoolProfile", + "description": "Configuration for OpenShift master VMs." + }, + "agentPoolProfiles": { + "type": "array", + "items": { + "$ref": "#/definitions/OpenShiftManagedClusterAgentPoolProfile" + }, + "description": "Configuration of OpenShift cluster VMs." + }, + "servicePrincipalProfile": { + "$ref": "#/definitions/ManagedClusterServicePrincipalProfile", + "description": "Service principal for OpenShift cluster." + } + }, + "description": "Properties of the openshift managed cluster." + } + }, + "parameters": { + "SubscriptionIdParameter": { + "name": "subscriptionId", + "in": "path", + "required": true, + "type": "string", + "description": "Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.", + "x-ms-parameter-location": "client" + }, + "ApiVersionParameter": { + "name": "api-version", + "in": "query", + "required": true, + "type": "string", + "description": "Client Api Version.", + "x-ms-parameter-location": "client" + } + } +} diff --git a/specification/containerservices/resource-manager/readme.md b/specification/containerservices/resource-manager/readme.md index 0a85d3b35182..c5199a0256a3 100644 --- a/specification/containerservices/resource-manager/readme.md +++ b/specification/containerservices/resource-manager/readme.md @@ -37,6 +37,15 @@ openapi-type: arm tag: package-2018-03 ``` +### Tag: package-2018-09-30-preview + +These settings apply only when `--tag=package-2018-09-30-preview` is specified on the command line. + +``` yaml $(tag) == 'package-2018-09-30-preview' +input-file: +- Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json +``` + ### Tag: package-2018-03 These settings apply only when `--tag=package-2018-03` is specified on the command line. From 30e98ccaad692b6113ceaa418bce1603de989e07 Mon Sep 17 00:00:00 2001 From: Julien Stroheker Date: Thu, 23 Aug 2018 14:55:06 -0400 Subject: [PATCH 02/26] update python sdk version --- specification/containerservices/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/containerservices/resource-manager/readme.md b/specification/containerservices/resource-manager/readme.md index c5199a0256a3..8e08a37114e7 100644 --- a/specification/containerservices/resource-manager/readme.md +++ b/specification/containerservices/resource-manager/readme.md @@ -228,7 +228,7 @@ python: payload-flattening-threshold: 2 namespace: azure.mgmt.containerservice package-name: azure-mgmt-containerservice - package-version: 4.1.0 + package-version: 4.2.2 clear-output-folder: true ``` ``` yaml $(python) && $(python-mode) == 'update' From 857efa1eccae55cfb056879a7565d3239aa72946 Mon Sep 17 00:00:00 2001 From: Julien Stroheker Date: Thu, 23 Aug 2018 15:14:39 -0400 Subject: [PATCH 03/26] including others definitions --- specification/containerservices/resource-manager/readme.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/specification/containerservices/resource-manager/readme.md b/specification/containerservices/resource-manager/readme.md index 8e08a37114e7..f04a560a895e 100644 --- a/specification/containerservices/resource-manager/readme.md +++ b/specification/containerservices/resource-manager/readme.md @@ -2,7 +2,7 @@ > see https://aka.ms/autorest -This is the AutoRest configuration file for ContainerServices (ACS/AKS). +This is the AutoRest configuration file for ContainerServices (ACS/AKS/OpenShift). The ContainerServices RPv2 consists of two similar services: ContainerServices and ManagedClusters. Each service has its own swagger spec. @@ -44,6 +44,9 @@ These settings apply only when `--tag=package-2018-09-30-preview` is specified o ``` yaml $(tag) == 'package-2018-09-30-preview' input-file: - Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json +- Microsoft.ContainerService/stable/2017-07-01/containerService.json +- Microsoft.ContainerService/stable/2018-03-31/managedClusters.json +- Microsoft.ContainerService/stable/2017-09-30/location.json ``` ### Tag: package-2018-03 From 900ca4e4bca04eedbd2e7f5197d89645ecaa2995 Mon Sep 17 00:00:00 2001 From: Julien Stroheker Date: Thu, 23 Aug 2018 15:17:46 -0400 Subject: [PATCH 04/26] bump default version --- specification/containerservices/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/containerservices/resource-manager/readme.md b/specification/containerservices/resource-manager/readme.md index f04a560a895e..beb341a4b901 100644 --- a/specification/containerservices/resource-manager/readme.md +++ b/specification/containerservices/resource-manager/readme.md @@ -34,7 +34,7 @@ These are the global settings for the ContainerServices API. ```yaml openapi-type: arm -tag: package-2018-03 +tag: package-2018-09-30-preview ``` ### Tag: package-2018-09-30-preview From 445505723d432cbce693378eba43564779454870 Mon Sep 17 00:00:00 2001 From: Julien Stroheker Date: Thu, 23 Aug 2018 15:34:29 -0400 Subject: [PATCH 05/26] remove operation duplicate --- .../openShiftManagedClusters.json | 25 ------------------- 1 file changed, 25 deletions(-) diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json index 8a3a65478643..4be2336ac008 100644 --- a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json @@ -34,31 +34,6 @@ } }, "paths": { - "/providers/Microsoft.ContainerService/operations": { - "get": { - "tags": [ - "managedClusters" - ], - "operationId": "Operations_List", - "description": "Gets a list of compute operations.", - "parameters": [ - { - "$ref": "#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OperationListResult" - } - } - }, - "x-ms-pageable": { - "nextLinkName": null - } - } - }, "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerService/openShiftManagedClusters": { "get": { "tags": [ From c7bdb067fd73159dc8c01586deabf5f9b41b5bc1 Mon Sep 17 00:00:00 2001 From: Julien Stroheker Date: Tue, 4 Sep 2018 10:04:38 -0400 Subject: [PATCH 06/26] Update the model --- .../openShiftManagedClusters.json | 301 ++++++++++-------- 1 file changed, 171 insertions(+), 130 deletions(-) diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json index 4be2336ac008..a757d8237aba 100644 --- a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json @@ -409,21 +409,44 @@ ], "x-ms-azure-resource": true }, - "TagsObject": { + "PurchasePlan": { "properties": { - "tags": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "Resource tags." + "name": { + "type": "string", + "description": "The plan ID." + }, + "product": { + "type": "string", + "description": "Specifies the product of the image from the marketplace. This is the same value as Offer under the imageReference element." + }, + "promotionCode": { + "type": "string", + "description": "The promotion code." + }, + "publisher": { + "type": "string", + "description": "The plan ID." } }, - "description": "Tags object for patch operations." + "description": "Used for establishing the purchase context of any 3rd Party artifact through MarketPlace." }, - "ContainerServiceVnetSubnetID": { - "type": "string", - "description": "VNet SubnetID specifies the vnet's subnet identifier." + "OpenShiftRouterProfile": { + "properties": { + "name": { + "type": "string", + "description": "Name of the router profile." + }, + "publicSubdomain" : { + "type": "string", + "description": "DNS subdomain for openshift router." + }, + "fqdn": { + "readOnly": true, + "type": "string", + "description": "Auto-allocated FQDN for the OpenShift router." + } + }, + "description": "Represents an OpenShift router" }, "ContainerServiceVMSize": { "type": "string", @@ -609,21 +632,9 @@ "Standard_NV6" ] }, - "ManagedClusterServicePrincipalProfile": { - "properties": { - "clientId": { - "type": "string", - "description": "The ID for the service principal." - }, - "secret": { - "type": "string", - "description": "The secret password associated with the service principal in plain text." - } - }, - "description": "Information about a service principal identity for the cluster to use for manipulating Azure APIs.", - "required": [ - "clientId" - ] + "ContainerServiceVnetSubnetID": { + "type": "string", + "description": "VNet SubnetID specifies the vnet's subnet identifier." }, "OSType": { "type": "string", @@ -638,75 +649,20 @@ }, "description": "OsType to be used to specify os type. Choose from Linux and Windows. Default to Linux." }, - "PurchasePlan": { - "properties": { - "name": { - "type": "string", - "description": "The plan ID." - }, - "product": { - "type": "string", - "description": "Specifies the product of the image from the marketplace. This is the same value as Offer under the imageReference element." - }, - "promtionCode": { - "type": "string", - "description": "The promotion code." - }, - "publisher": { - "type": "string", - "description": "The plan ID." - } - }, - "description": "Used for establishing the purchase context of any 3rd Party artifact through MarketPlace." - }, - "OpenShiftManagedClusterListResult": { - "properties": { - "value": { - "type": "array", - "items": { - "$ref": "#/definitions/OpenShiftManagedCluster" - }, - "description": "The list of openshift managed clusters." - }, - "nextLink": { - "type": "string", - "description": "The URL to get the next set of openshift managed cluster results.", - "readOnly": true - } - }, - "description": "The response from the List OpenShift Managed Clusters operation." - }, - "OpenShiftRouterProfile": { - "properties": { - "name": { - "type": "string", - "description": "Name of the router profile." - }, - "publicSubdomain" : { - "type": "string", - "description": "DNS subdomain for openshift router." - }, - "fqdn": { - "readOnly": true, - "type": "string", - "description": "Auto-allocated FQDN for the OpenShift router." - } - }, - "description": "Represents an OpenShift router" - }, "OpenShiftAgentPoolProfileRole": { "type": "string", "enum": [ "compute", - "infra" + "infra", + "master" ], "x-ms-enum": { "name": "OpenShiftAgentPoolProfileRole", "modelAsString": true }, - "description": "OsType to be used to specify os type. Choose from Linux and Windows. Default to Linux." + "description": "OpenShiftAgentPoolProfileRole represents the role of the AgentPoolProfile." }, - "OpenShiftManagedClusterProfileSpec": { + "OpenShiftManagedClusterAgentPoolProfile": { "properties": { "name": { "type": "string", @@ -731,6 +687,10 @@ "osType": { "$ref": "#/definitions/OSType", "description": "OsType to be used to specify os type. Choose from Linux and Windows. Default to Linux." + }, + "role" : { + "description": "Define the role of the AgentPoolProfile.", + "$ref": "#/definitions/OpenShiftAgentPoolProfileRole" } }, "required": [ @@ -738,52 +698,60 @@ "count", "vmSize" ], - "description": "Profile for the container service agent pool." + "description": "OpenShiftManagedClusterAgentPoolProfile represents configuration of OpenShift cluster VMs." }, - "OpenShiftManagedClusterAgentPoolProfile": { - "allOf": [ - { - "$ref": "#/definitions/OpenShiftManagedClusterProfileSpec" + "OpenShiftManagedClusterIdentityProvider": { + "properties": { + "name": { + "type": "string", + "description": "Name of the provider." }, - { - "properties": { - "role" : { - "description": "Define the role of the AgentPoolProfile.", - "$ref": "#/definitions/OpenShiftAgentPoolProfileRole" - } - } + "provider": { + "type": "object", + "description": "Configuration of the provider." } - ], - "description": "OpenShift's configuration of the AgentPoolProfile." + }, + "description": "OpenShiftManagedClusterIdentityProvider is heavily cut down equivalent to IdentityProvider in the upstream." }, - "OpenShiftManagedClusterMasterPoolProfile": { - "allOf": [ - { - "$ref": "#/definitions/OpenShiftManagedClusterProfileSpec" + "OpenShiftManagedClusterAuthProfile": { + "type": "array", + "items" : { + "$ref": "#/definitions/OpenShiftManagedClusterIdentityProvider" + }, + "description": "OpenShiftManagedClusterAuthProfile defines all possible authentication profiles for the OpenShift cluster." + }, + "ManagedClusterServicePrincipalProfile": { + "properties": { + "clientId": { + "type": "string", + "description": "The ID for the service principal." + }, + "secret": { + "type": "string", + "description": "The secret password associated with the service principal in plain text." } - ], - "description": "OpenShift's configuration of the MasterPoolProfile." + }, + "description": "Information about a service principal identity for the cluster to use for manipulating Azure APIs.", + "required": [ + "clientId" + ] }, - "OpenShiftManagedCluster": { - "allOf": [ - { - "$ref": "#/definitions/Resource" + "OpenShiftManagedClusterAzProfile": { + "properties": { + "tenantId": { + "type": "string", + "description": "The tenantId of the subscription where the cluster resides." }, - { - "properties": { - "plan" : { - "description": "Define the resource plan as required by ARM for billing purposes", - "$ref": "#/definitions/PurchasePlan" - }, - "properties": { - "description": "Properties of a openshift managed cluster.", - "$ref": "#/definitions/OpenShiftManagedClusterProperties", - "x-ms-client-flatten": true - } - } + "subscriptionId": { + "type": "string", + "description": "The subscriptionId f the subscription where the cluster resides." + }, + "resourceGroup": { + "type": "string", + "description": "The resourceGroup f the subscription where the cluster resides." } - ], - "description": "OpenShift Managed cluster." + }, + "description": "AzProfile holds the azure context for where the cluster resides." }, "OpenShiftManagedClusterProperties": { "properties": { @@ -798,12 +766,11 @@ }, "publicHostname": { "type": "string", - "description": "Public Hostname of the openshift managed cluster." + "description": "Optional user-specified FQDN for OpenShift API server." }, "fqdn": { - "readOnly": true, "type": "string", - "description": "Auto-allocated FQDN for OpenShift API server." + "description": "User-specified FQDN for OpenShift API server loadbalancer internal hostname." }, "routerProfiles": { "type": "array", @@ -812,10 +779,6 @@ }, "description": "Configuration for OpenShift router(s)." }, - "masterPoolProfile": { - "$ref": "#/definitions/OpenShiftManagedClusterMasterPoolProfile", - "description": "Configuration for OpenShift master VMs." - }, "agentPoolProfiles": { "type": "array", "items": { @@ -823,12 +786,90 @@ }, "description": "Configuration of OpenShift cluster VMs." }, + "authProfile": { + "$ref": "#/definitions/OpenShiftManagedClusterAuthProfile", + "description": "Configures OpenShift authentication." + }, "servicePrincipalProfile": { "$ref": "#/definitions/ManagedClusterServicePrincipalProfile", "description": "Service principal for OpenShift cluster." + }, + "azProfile": { + "$ref": "#/definitions/OpenShiftManagedClusterAzProfile", + "description": "Azure context for where the cluster resides." } }, + "required": [ + "openShiftVersion" + ], "description": "Properties of the openshift managed cluster." + }, + "OpenShiftManagedCluster": { + "allOf": [ + { + "$ref": "#/definitions/Resource" + }, + { + "properties": { + "plan" : { + "description": "Define the resource plan as required by ARM for billing purposes", + "$ref": "#/definitions/PurchasePlan" + }, + "properties": { + "description": "Properties of a openshift managed cluster.", + "$ref": "#/definitions/OpenShiftManagedClusterProperties", + "x-ms-client-flatten": true + } + } + } + ], + "description": "OpenShift Managed cluster." + }, + "OpenShiftManagedClusterServiceAADIdentityProvider": { + "properties": { + "kind": { + "type": "string", + "description": "The kind of the provider." + }, + "clientId": { + "type": "string", + "description": "The clientId password associated with the provider." + }, + "secret": { + "type": "string", + "description": "The secret password associated with the provider." + } + }, + "description": "AADIdentityProvider defines Identity provider for MS AAD." + }, + "TagsObject": { + "properties": { + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Resource tags." + } + }, + "description": "Tags object for patch operations." + }, + "OpenShiftManagedClusterListResult": { + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/OpenShiftManagedCluster" + }, + "description": "The list of openshift managed clusters." + }, + "nextLink": { + "type": "string", + "description": "The URL to get the next set of openshift managed cluster results.", + "readOnly": true + } + }, + "description": "The response from the List OpenShift Managed Clusters operation." } }, "parameters": { From 60b6d7ae63aedd5b917369cc6b1a34350c8425b1 Mon Sep 17 00:00:00 2001 From: Julien Stroheker Date: Fri, 7 Sep 2018 15:38:58 -0400 Subject: [PATCH 07/26] update OpenShift API --- .../openShiftManagedClusters.json | 284 ++++-------------- 1 file changed, 56 insertions(+), 228 deletions(-) diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json index a757d8237aba..acb06730ee61 100644 --- a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json @@ -448,190 +448,6 @@ }, "description": "Represents an OpenShift router" }, - "ContainerServiceVMSize": { - "type": "string", - "x-ms-enum": { - "name": "ContainerServiceVMSizeTypes", - "modelAsString": true - }, - "description": "Size of agent VMs.", - "enum": [ - "Standard_A1", - "Standard_A10", - "Standard_A11", - "Standard_A1_v2", - "Standard_A2", - "Standard_A2_v2", - "Standard_A2m_v2", - "Standard_A3", - "Standard_A4", - "Standard_A4_v2", - "Standard_A4m_v2", - "Standard_A5", - "Standard_A6", - "Standard_A7", - "Standard_A8", - "Standard_A8_v2", - "Standard_A8m_v2", - "Standard_A9", - "Standard_B2ms", - "Standard_B2s", - "Standard_B4ms", - "Standard_B8ms", - "Standard_D1", - "Standard_D11", - "Standard_D11_v2", - "Standard_D11_v2_Promo", - "Standard_D12", - "Standard_D12_v2", - "Standard_D12_v2_Promo", - "Standard_D13", - "Standard_D13_v2", - "Standard_D13_v2_Promo", - "Standard_D14", - "Standard_D14_v2", - "Standard_D14_v2_Promo", - "Standard_D15_v2", - "Standard_D16_v3", - "Standard_D16s_v3", - "Standard_D1_v2", - "Standard_D2", - "Standard_D2_v2", - "Standard_D2_v2_Promo", - "Standard_D2_v3", - "Standard_D2s_v3", - "Standard_D3", - "Standard_D32_v3", - "Standard_D32s_v3", - "Standard_D3_v2", - "Standard_D3_v2_Promo", - "Standard_D4", - "Standard_D4_v2", - "Standard_D4_v2_Promo", - "Standard_D4_v3", - "Standard_D4s_v3", - "Standard_D5_v2", - "Standard_D5_v2_Promo", - "Standard_D64_v3", - "Standard_D64s_v3", - "Standard_D8_v3", - "Standard_D8s_v3", - "Standard_DS1", - "Standard_DS11", - "Standard_DS11_v2", - "Standard_DS11_v2_Promo", - "Standard_DS12", - "Standard_DS12_v2", - "Standard_DS12_v2_Promo", - "Standard_DS13", - "Standard_DS13-2_v2", - "Standard_DS13-4_v2", - "Standard_DS13_v2", - "Standard_DS13_v2_Promo", - "Standard_DS14", - "Standard_DS14-4_v2", - "Standard_DS14-8_v2", - "Standard_DS14_v2", - "Standard_DS14_v2_Promo", - "Standard_DS15_v2", - "Standard_DS1_v2", - "Standard_DS2", - "Standard_DS2_v2", - "Standard_DS2_v2_Promo", - "Standard_DS3", - "Standard_DS3_v2", - "Standard_DS3_v2_Promo", - "Standard_DS4", - "Standard_DS4_v2", - "Standard_DS4_v2_Promo", - "Standard_DS5_v2", - "Standard_DS5_v2_Promo", - "Standard_E16_v3", - "Standard_E16s_v3", - "Standard_E2_v3", - "Standard_E2s_v3", - "Standard_E32-16s_v3", - "Standard_E32-8s_v3", - "Standard_E32_v3", - "Standard_E32s_v3", - "Standard_E4_v3", - "Standard_E4s_v3", - "Standard_E64-16s_v3", - "Standard_E64-32s_v3", - "Standard_E64_v3", - "Standard_E64s_v3", - "Standard_E8_v3", - "Standard_E8s_v3", - "Standard_F1", - "Standard_F16", - "Standard_F16s", - "Standard_F16s_v2", - "Standard_F1s", - "Standard_F2", - "Standard_F2s", - "Standard_F2s_v2", - "Standard_F32s_v2", - "Standard_F4", - "Standard_F4s", - "Standard_F4s_v2", - "Standard_F64s_v2", - "Standard_F72s_v2", - "Standard_F8", - "Standard_F8s", - "Standard_F8s_v2", - "Standard_G1", - "Standard_G2", - "Standard_G3", - "Standard_G4", - "Standard_G5", - "Standard_GS1", - "Standard_GS2", - "Standard_GS3", - "Standard_GS4", - "Standard_GS4-4", - "Standard_GS4-8", - "Standard_GS5", - "Standard_GS5-16", - "Standard_GS5-8", - "Standard_H16", - "Standard_H16m", - "Standard_H16mr", - "Standard_H16r", - "Standard_H8", - "Standard_H8m", - "Standard_L16s", - "Standard_L32s", - "Standard_L4s", - "Standard_L8s", - "Standard_M128-32ms", - "Standard_M128-64ms", - "Standard_M128ms", - "Standard_M128s", - "Standard_M64-16ms", - "Standard_M64-32ms", - "Standard_M64ms", - "Standard_M64s", - "Standard_NC12", - "Standard_NC12s_v2", - "Standard_NC12s_v3", - "Standard_NC24", - "Standard_NC24r", - "Standard_NC24rs_v2", - "Standard_NC24rs_v3", - "Standard_NC24s_v2", - "Standard_NC24s_v3", - "Standard_NC6", - "Standard_NC6s_v2", - "Standard_NC6s_v3", - "Standard_ND12s", - "Standard_ND24rs", - "Standard_ND24s", - "Standard_ND6s", - "Standard_NV12", - "Standard_NV24", - "Standard_NV6" - ] - }, "ContainerServiceVnetSubnetID": { "type": "string", "description": "VNet SubnetID specifies the vnet's subnet identifier." @@ -649,12 +465,23 @@ }, "description": "OsType to be used to specify os type. Choose from Linux and Windows. Default to Linux." }, + "OpenShiftContainerServiceVMSize": { + "type": "string", + "x-ms-enum": { + "name": "OpenShiftContainerServiceVMSize", + "modelAsString": true + }, + "description": "Size of OpenShift VMs.", + "enum": [ + "Standard_D2s_v3", + "Standard_D4s_v3" + ] + }, "OpenShiftAgentPoolProfileRole": { "type": "string", "enum": [ "compute", - "infra", - "master" + "infra" ], "x-ms-enum": { "name": "OpenShiftAgentPoolProfileRole", @@ -662,6 +489,40 @@ }, "description": "OpenShiftAgentPoolProfileRole represents the role of the AgentPoolProfile." }, + "OpenShiftManagedClusterMasterPoolProfile": { + "properties": { + "name": { + "type": "string", + "description": "Unique name of the master pool profile in the context of the subscription and resource group." + }, + "count": { + "type": "integer", + "format": "int32", + "maximum": 10, + "minimum": 1, + "description": "Number of masters (VMs) to host docker containers. The default value is 3.", + "default": 3 + }, + "vmSize": { + "$ref": "#/definitions/OpenShiftContainerServiceVMSize", + "description": "Size of agent VMs." + }, + "vnetSubnetID": { + "$ref": "#/definitions/ContainerServiceVnetSubnetID", + "description": "VNet SubnetID specifies the vnet's subnet identifier." + }, + "osType": { + "$ref": "#/definitions/OSType", + "description": "OsType to be used to specify os type. Choose from Linux and Windows. Default to Linux." + } + }, + "required": [ + "name", + "count", + "vmSize" + ], + "description": "OpenShiftManagedClusterMaterPoolProfile contains configuration for OpenShift master VMs." + }, "OpenShiftManagedClusterAgentPoolProfile": { "properties": { "name": { @@ -677,7 +538,7 @@ "default": 1 }, "vmSize": { - "$ref": "#/definitions/ContainerServiceVMSize", + "$ref": "#/definitions/OpenShiftContainerServiceVMSize", "description": "Size of agent VMs." }, "vnetSubnetID": { @@ -720,39 +581,6 @@ }, "description": "OpenShiftManagedClusterAuthProfile defines all possible authentication profiles for the OpenShift cluster." }, - "ManagedClusterServicePrincipalProfile": { - "properties": { - "clientId": { - "type": "string", - "description": "The ID for the service principal." - }, - "secret": { - "type": "string", - "description": "The secret password associated with the service principal in plain text." - } - }, - "description": "Information about a service principal identity for the cluster to use for manipulating Azure APIs.", - "required": [ - "clientId" - ] - }, - "OpenShiftManagedClusterAzProfile": { - "properties": { - "tenantId": { - "type": "string", - "description": "The tenantId of the subscription where the cluster resides." - }, - "subscriptionId": { - "type": "string", - "description": "The subscriptionId f the subscription where the cluster resides." - }, - "resourceGroup": { - "type": "string", - "description": "The resourceGroup f the subscription where the cluster resides." - } - }, - "description": "AzProfile holds the azure context for where the cluster resides." - }, "OpenShiftManagedClusterProperties": { "properties": { "provisioningState": { @@ -779,6 +607,10 @@ }, "description": "Configuration for OpenShift router(s)." }, + "masterPoolProfiles": { + "$ref": "#/definitions/OpenShiftManagedClusterMasterPoolProfile", + "description": "Configuration for OpenShift master VMs." + }, "agentPoolProfiles": { "type": "array", "items": { @@ -789,14 +621,6 @@ "authProfile": { "$ref": "#/definitions/OpenShiftManagedClusterAuthProfile", "description": "Configures OpenShift authentication." - }, - "servicePrincipalProfile": { - "$ref": "#/definitions/ManagedClusterServicePrincipalProfile", - "description": "Service principal for OpenShift cluster." - }, - "azProfile": { - "$ref": "#/definitions/OpenShiftManagedClusterAzProfile", - "description": "Azure context for where the cluster resides." } }, "required": [ @@ -838,6 +662,10 @@ "secret": { "type": "string", "description": "The secret password associated with the provider." + }, + "tenantId": { + "type": "string", + "description": "The tenantId associated with the provider." } }, "description": "AADIdentityProvider defines Identity provider for MS AAD." From 67b876bc9f5bc896531c2df72685667354bea565 Mon Sep 17 00:00:00 2001 From: Julien Stroheker Date: Fri, 7 Sep 2018 17:04:28 -0400 Subject: [PATCH 08/26] typo and update model --- .../2018-09-30-preview/openShiftManagedClusters.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json index acb06730ee61..08480ebc641e 100644 --- a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json @@ -561,7 +561,7 @@ ], "description": "OpenShiftManagedClusterAgentPoolProfile represents configuration of OpenShift cluster VMs." }, - "OpenShiftManagedClusterIdentityProvider": { + "OpenShiftManagedClusterIdentityProviders": { "properties": { "name": { "type": "string", @@ -577,7 +577,7 @@ "OpenShiftManagedClusterAuthProfile": { "type": "array", "items" : { - "$ref": "#/definitions/OpenShiftManagedClusterIdentityProvider" + "$ref": "#/definitions/OpenShiftManagedClusterIdentityProviders" }, "description": "OpenShiftManagedClusterAuthProfile defines all possible authentication profiles for the OpenShift cluster." }, @@ -607,7 +607,7 @@ }, "description": "Configuration for OpenShift router(s)." }, - "masterPoolProfiles": { + "masterPoolProfile": { "$ref": "#/definitions/OpenShiftManagedClusterMasterPoolProfile", "description": "Configuration for OpenShift master VMs." }, From 320a8eb035600259ca27e92cd5c154ebb6c09c4a Mon Sep 17 00:00:00 2001 From: Julien Stroheker Date: Fri, 7 Sep 2018 17:43:29 -0400 Subject: [PATCH 09/26] add ClusterAuthProfile definition --- .../openShiftManagedClusters.json | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json index 08480ebc641e..5c4ebf5ffd65 100644 --- a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json @@ -575,11 +575,15 @@ "description": "OpenShiftManagedClusterIdentityProvider is heavily cut down equivalent to IdentityProvider in the upstream." }, "OpenShiftManagedClusterAuthProfile": { - "type": "array", - "items" : { - "$ref": "#/definitions/OpenShiftManagedClusterIdentityProviders" - }, - "description": "OpenShiftManagedClusterAuthProfile defines all possible authentication profiles for the OpenShift cluster." + "properties": { + "value": { + "type": "array", + "items" : { + "$ref": "#/definitions/OpenShiftManagedClusterIdentityProviders" + }, + "description": "OpenShiftManagedClusterAuthProfile defines all possible authentication profiles for the OpenShift cluster." + } + } }, "OpenShiftManagedClusterProperties": { "properties": { From 7b99cf0b85259c896cd7e09e40c904a56103eb1e Mon Sep 17 00:00:00 2001 From: Julien Stroheker Date: Fri, 7 Sep 2018 22:10:53 -0400 Subject: [PATCH 10/26] change params name --- .../preview/2018-09-30-preview/openShiftManagedClusters.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json index 5c4ebf5ffd65..09f757568fad 100644 --- a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json @@ -576,7 +576,7 @@ }, "OpenShiftManagedClusterAuthProfile": { "properties": { - "value": { + "identityProviders": { "type": "array", "items" : { "$ref": "#/definitions/OpenShiftManagedClusterIdentityProviders" From f730c88c01a2dd30b212f891a31485b76d352d19 Mon Sep 17 00:00:00 2001 From: Julien Stroheker Date: Thu, 20 Sep 2018 18:33:56 -0400 Subject: [PATCH 11/26] Clean and update osa deifinitions --- ...OpenShiftManagedClustersCreate_Update.json | 88 +++++++----- .../examples/OpenShiftManagedClustersGet.json | 35 +++-- .../OpenShiftManagedClustersList.json | 67 --------- ...iftManagedClustersListByResourceGroup.json | 63 --------- .../OpenShiftManagedClustersUpdateTags.json | 66 --------- .../openShiftManagedClusters.json | 132 +----------------- 6 files changed, 72 insertions(+), 379 deletions(-) delete mode 100644 specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersList.json delete mode 100644 specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersListByResourceGroup.json delete mode 100644 specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersUpdateTags.json diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersCreate_Update.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersCreate_Update.json index 3afcd9aebce1..45088d973b1b 100644 --- a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersCreate_Update.json +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersCreate_Update.json @@ -12,8 +12,7 @@ }, "properties": { "openShiftVersion": "v3.10", - "fqdn": "rg1.eastus.cloudapp.azure.com", - "publicHostname": "openshift.rg1.openshift.com", + "fqdn": "clustername1.location1.cloudapp.azure.com", "masterPoolProfile": { "name": "master", "count": 3, @@ -24,28 +23,33 @@ { "name": "infra", "role": "infra", - "count": 1, - "vmSize": "Standard_D2s_v3", + "count": 2, + "vmSize": "Standard_D4s_v3", "osType": "Linux" }, { "name": "compute", "role": "compute", - "count": 3, - "vmSize": "Standard_D2s_v3", + "count": 4, + "vmSize": "Standard_D4s_v3", "osType": "Linux" } ], "routerProfiles": [ { - "fqdn": "rg1-router.location1.cloudapp.azure.com", - "name": "default", - "publicSubdomain": "rg1.openshift.com" + "name": "default" } ], - "servicePrincipalProfile": { - "clientId": "clientid", - "secret": "secret" + "authProfile": { + "identityProviders": [{ + "name": "Azure AD", + "provider": { + "kind": "AADIdentityProvider", + "clientId": "clientId", + "secret": "secret", + "tenantId": "tenantId" + } + }] } } } @@ -63,40 +67,44 @@ "type": "Microsoft.ContainerService/OpenShiftManagedClusters", "properties": { "provisioningState": "Succeeded", - "openShiftVersion": "1.9.6", - "fqdn": "rg1.eastus.cloudapp.azure.com", - "publicHostname": "openshift.rg1.openshift.com", + "openShiftVersion": "v3.10", + "fqdn": "clustername1.location1.cloudapp.azure.com", "masterPoolProfile": { - "name": "master", "count": 3, - "vmSize": "Standard_D2s_v3", - "osType": "Linux" + "vmSize": "Standard_D2s_v3" }, "agentPoolProfiles": [ { "name": "infra", "role": "infra", - "count": 1, - "vmSize": "Standard_D2s_v3", + "count": 2, + "vmSize": "Standard_D4s_v3", "osType": "Linux" }, { "name": "compute", "role": "compute", - "count": 3, - "vmSize": "Standard_D2s_v3", + "count": 4, + "vmSize": "Standard_D4s_v3", "osType": "Linux" } ], "routerProfiles": [ { - "fqdn": "rg1-router.location1.cloudapp.azure.com", "name": "default", - "publicSubdomain": "rg1.openshift.com" + "fqdn": "2925bdf9337748f4bd3b.location1.cloudapp.azure.com", + "publicSubdomain": "bc309ee87c164153871c.location1.int.aksapp.io" } ], - "servicePrincipalProfile": { - "clientId": "clientid" + "authProfile": { + "identityProviders": [{ + "name": "Azure AD", + "provider": { + "kind": "AADIdentityProvider", + "clientId": "clientId", + "tenantId": "tenantId" + } + }] } } } @@ -114,8 +122,7 @@ "properties": { "provisioningState": "Creating", "openShiftVersion": "v3.10", - "fqdn": "rg1.eastus.cloudapp.azure.com", - "publicHostname": "openshift.rg1.openshift.com", + "fqdn": "clustername1.location1.cloudapp.azure.com", "masterPoolProfile": { "name": "master", "count": 3, @@ -126,29 +133,34 @@ { "name": "infra", "role": "infra", - "count": 1, - "vmSize": "Standard_D2s_v3", + "count": 2, + "vmSize": "Standard_D4s_v3", "osType": "Linux" }, { "name": "compute", "role": "compute", - "count": 3, - "vmSize": "Standard_D2s_v3", + "count": 4, + "vmSize": "Standard_D4s_v3", "osType": "Linux" } ], "routerProfiles": [ { - "fqdn": "rg1-router.location1.cloudapp.azure.com", - "name": "default", - "publicSubdomain": "rg1.openshift.com" + "name": "default" } ], - "servicePrincipalProfile": { - "clientId": "clientid" + "authProfile": { + "identityProviders": [{ + "name": "Azure AD", + "provider": { + "kind": "AADIdentityProvider", + "clientId": "clientId", + "tenantId": "tenantId" + } + }] } - } + } } } } diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersGet.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersGet.json index f9bde3b72a1d..a84f5b6cdfa3 100644 --- a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersGet.json +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersGet.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-03-31", + "api-version": "2018-09-30-preview", "subscriptionId": "subid1", "resourceGroupName": "rg1", "resourceName": "clustername1" @@ -18,40 +18,45 @@ "type": "Microsoft.ContainerService/OpenShiftManagedClusters", "properties": { "provisioningState": "Succeeded", - "openShiftVersion": "1.9.6", - "fqdn": "rg1.eastus.cloudapp.azure.com", - "publicHostname": "openshift.rg1.openshift.com", + "openShiftVersion": "v3.10", + "fqdn": "clustername1.location1.cloudapp.azure.com", "masterPoolProfile": { - "name": "master", "count": 3, - "vmSize": "Standard_D2s_v3", - "osType": "Linux" + "vmSize": "Standard_D2s_v3" }, "agentPoolProfiles": [ { "name": "infra", "role": "infra", - "count": 1, - "vmSize": "Standard_D2s_v3", + "count": 2, + "vmSize": "Standard_D4s_v3", "osType": "Linux" }, { "name": "compute", "role": "compute", - "count": 3, - "vmSize": "Standard_D2s_v3", + "count": 4, + "vmSize": "Standard_D4s_v3", "osType": "Linux" } ], "routerProfiles": [ { - "fqdn": "rg1-router.location1.cloudapp.azure.com", + "fqdn": "dce5faa189c841b99f8a.location1.cloudapp.azure.com", "name": "default", - "publicSubdomain": "rg1.openshift.com" + "publicSubdomain": "b788fade68d345da9b77.location1.int.aksapp.io" } ], - "servicePrincipalProfile": { - "clientId": "clientid" + "authProfile": { + "identityProviders": [ + { + "name": "Azure AD", + "provider": { + "kind": "AADIdentityProvider", + "clientId": "clientId", + "tenantId": "tenantId" + } + }] } } } diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersList.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersList.json deleted file mode 100644 index dee3c92d8bee..000000000000 --- a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersList.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "parameters": { - "api-version": "2018-09-30-preview", - "subscriptionId": "subid1" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "id": "/subscriptions/subid1/providers/Microsoft.ContainerService/openShiftManagedClusters", - "location": "location1", - "name": "clustername1", - "tags": { - "archv2": "", - "tier": "production" - }, - "type": "Microsoft.ContainerService/OpenShiftManagedClusters", - "plan" : { - - }, - "properties": { - "provisioningState": "Succeeded", - "openShiftVersion": "v3.10", - "publicHostname": "openshift.rg1.openshift.test", - "fqdn": "rg1.eastus.cloudapp.azure.com", - "routerProfiles": [ - { - "name": "default", - "publicSubdomain": "rg1.openshift.test", - "fqdn": "rg1-router.eastus.cloudapp.azure.com" - } - ], - "masterPoolProfile": [ - { - "name": "master", - "count": 3, - "vmSize": "Standard_D2s_v3", - "osType": "Linux" - } - ], - "agentPoolProfiles": [ - { - "name": "infra", - "count": 1, - "vmSize": "Standard_D2s_v3", - "osType": "Linux", - "role": "infra" - }, - { - "name": "compute", - "count": 3, - "vmSize": "Standard_D2s_v3", - "osType": "Linux", - "role": "compute" - } - ], - "servicePrincipalProfile": { - "clientId": "clientid" - } - } - } - ] - } - } - } -} diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersListByResourceGroup.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersListByResourceGroup.json deleted file mode 100644 index 5687ade6221e..000000000000 --- a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersListByResourceGroup.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "parameters": { - "api-version": "2018-03-31", - "subscriptionId": "subid1", - "resourceGroupName": "rg1" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/openShiftManagedClusters", - "location": "location1", - "name": "clustername1", - "tags": { - "archv2": "", - "tier": "production" - }, - "type": "Microsoft.ContainerService/OpenShiftManagedClusters", - "properties": { - "provisioningState": "Succeeded", - "openShiftVersion": "1.9.6", - "fqdn": "rg1.eastus.cloudapp.azure.com", - "publicHostname": "openshift.rg1.openshift.com", - "masterPoolProfile": { - "name": "master", - "count": 3, - "vmSize": "Standard_D2s_v3", - "osType": "Linux" - }, - "agentPoolProfiles": [ - { - "name": "infra", - "role": "infra", - "count": 1, - "vmSize": "Standard_D2s_v3", - "osType": "Linux" - }, - { - "name": "compute", - "role": "compute", - "count": 3, - "vmSize": "Standard_D2s_v3", - "osType": "Linux" - } - ], - "routerProfiles": [ - { - "fqdn": "rg1-router.location1.cloudapp.azure.com", - "name": "default", - "publicSubdomain": "rg1.openshift.com" - } - ], - "servicePrincipalProfile": { - "clientId": "clientid" - } - } - } - ] - } - } - } -} diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersUpdateTags.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersUpdateTags.json deleted file mode 100644 index b5ca3cec9f2d..000000000000 --- a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersUpdateTags.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "parameters": { - "api-version": "2018-09-30-preview", - "subscriptionId": "subid1", - "resourceGroupName": "rg1", - "resourceName": "clustername1", - "parameters": { - "tags": { - "tier": "testing", - "archv3": "" - } - } - }, - "responses": { - "200": { - "body": { - "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/openShiftManagedClusters/clustername1", - "location": "location1", - "name": "clustername1", - "tags": { - "archv3": "", - "tier": "testing" - }, - "type": "Microsoft.ContainerService/OpenShiftManagedClusters", - "properties": { - "provisioningState": "Succeeded", - "openShiftVersion": "v3.10", - "fqdn": "rg1.eastus.cloudapp.azure.com", - "publicHostname": "openshift.rg1.openshift.com", - "masterPoolProfile": { - "name": "master", - "count": 3, - "vmSize": "Standard_D2s_v3", - "osType": "Linux" - }, - "agentPoolProfiles": [ - { - "name": "infra", - "role": "infra", - "count": 1, - "vmSize": "Standard_D2s_v3", - "osType": "Linux" - }, - { - "name": "compute", - "role": "compute", - "count": 3, - "vmSize": "Standard_D2s_v3", - "osType": "Linux" - } - ], - "routerProfiles": [ - { - "fqdn": "rg1-router.location1.cloudapp.azure.com", - "name": "default", - "publicSubdomain": "rg1.openshift.com" - } - ], - "servicePrincipalProfile": { - "clientId": "clientid" - } - } - } - } - } -} diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json index 09f757568fad..a9b294e0baa2 100644 --- a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json @@ -34,81 +34,6 @@ } }, "paths": { - "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerService/openShiftManagedClusters": { - "get": { - "tags": [ - "OpenShiftManagedClusters" - ], - "operationId": "OpenShiftManagedClusters_List", - "summary": "Gets a list of openshift managed clusters in the specified subscription.", - "description": "Gets a list of openshift managed clusters in the specified subscription. The operation returns properties of each OpenShift managed cluster.", - "parameters": [ - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "$ref": "#/parameters/SubscriptionIdParameter" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OpenShiftManagedClusterListResult" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - }, - "x-ms-examples": { - "List OpenShift Managed Clusters": { - "$ref": "./examples/OpenShiftManagedClustersList.json" - } - } - } - }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/openShiftManagedClusters": { - "get": { - "tags": [ - "OpenShiftManagedClusters" - ], - "operationId": "OpenShiftManagedClusters_ListByResourceGroup", - "summary": "Lists of openshift managed clusters in the specified subscription and resource group.", - "description": "Lists of openshift managed clusters in the specified subscription and resource group. The operation returns properties of each openshift managed cluster.", - "parameters": [ - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "name": "resourceGroupName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the resource group." - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OpenShiftManagedClusterListResult" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - }, - "x-ms-examples": { - "Get OpenShift Managed Clusters by Resource Group": { - "$ref": "./examples/OpenShiftManagedClustersListByResourceGroup.json" - } - } - } - }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/openShiftManagedClusters/{resourceName}": { "get": { "tags": [ @@ -212,59 +137,6 @@ } } }, - "patch": { - "tags": [ - "OpenShiftManagedClusters" - ], - "operationId": "OpenShiftManagedClusters_UpdateTags", - "summary": "Updates tags on a openshift managed cluster.", - "description": "Updates an openshift managed cluster with the specified tags.", - "parameters": [ - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "name": "resourceGroupName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the resource group." - }, - { - "name": "resourceName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the openshift managed cluster resource." - }, - { - "name": "parameters", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/TagsObject" - }, - "description": "Parameters supplied to the Update Managed Cluster Tags operation." - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OpenShiftManagedCluster" - } - } - }, - "x-ms-long-running-operation": true, - "x-ms-examples": { - "Update OpenShift Managed Cluster Tags": { - "$ref": "./examples/OpenShiftManagedClustersUpdateTags.json" - } - } - }, "delete": { "tags": [ "OpenShiftManagedClusters" @@ -532,9 +404,9 @@ "count": { "type": "integer", "format": "int32", - "maximum": 100, + "maximum": 5, "minimum": 1, - "description": "Number of agents (VMs) to host docker containers. Allowed values must be in the range of 1 to 100 (inclusive). The default value is 1. ", + "description": "Number of agents (VMs) to host docker containers. Allowed values must be in the range of 1 to 5 (inclusive). The default value is 1. ", "default": 1 }, "vmSize": { From 9bbc8d722485e3a97c697bfed12fa5116b800dd3 Mon Sep 17 00:00:00 2001 From: Julien Stroheker Date: Mon, 24 Sep 2018 13:05:52 -0400 Subject: [PATCH 12/26] Add PATCH route and update examples --- .../OpenShiftManagedClustersUpdateTags.json | 68 +++++++++++++++++++ .../openShiftManagedClusters.json | 60 +++++++++++++++- 2 files changed, 125 insertions(+), 3 deletions(-) create mode 100644 specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersUpdateTags.json diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersUpdateTags.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersUpdateTags.json new file mode 100644 index 000000000000..da0d1ab20873 --- /dev/null +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersUpdateTags.json @@ -0,0 +1,68 @@ +{ + "parameters": { + "api-version": "2018-09-30-preview", + "subscriptionId": "subid1", + "resourceGroupName": "rg1", + "resourceName": "clustername1", + "tags": { + "tier": "testing", + "archv3": "" + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/openShiftManagedClusters/clustername1", + "location": "location1", + "name": "clustername1", + "tags": { + "archv3": "", + "tier": "testing" + }, + "type": "Microsoft.ContainerService/OpenShiftManagedClusters", + "properties": { + "provisioningState": "Succeeded", + "openShiftVersion": "v3.10", + "fqdn": "clustername1.location1.cloudapp.azure.com", + "masterPoolProfile": { + "count": 3, + "vmSize": "Standard_D2s_v3" + }, + "agentPoolProfiles": [ + { + "name": "infra", + "role": "infra", + "count": 2, + "vmSize": "Standard_D4s_v3", + "osType": "Linux" + }, + { + "name": "compute", + "role": "compute", + "count": 4, + "vmSize": "Standard_D4s_v3", + "osType": "Linux" + } + ], + "routerProfiles": [ + { + "name": "default", + "fqdn": "2925bdf9337748f4bd3b.location1.cloudapp.azure.com", + "publicSubdomain": "bc309ee87c164153871c.location1.int.aksapp.io" + } + ], + "authProfile": { + "identityProviders": [{ + "name": "Azure AD", + "provider": { + "kind": "AADIdentityProvider", + "clientId": "clientId", + "tenantId": "tenantId" + } + }] + } + } + } + } + } +} diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json index a9b294e0baa2..00e3a87469ec 100644 --- a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json @@ -83,7 +83,7 @@ "OpenShiftManagedClusters" ], "operationId": "OpenShiftManagedClusters_CreateOrUpdate", - "summary": "Creates or updates a openshift managed cluster.", + "summary": "Creates or updates an openshift managed cluster.", "description": "Creates or updates a openshift managed cluster with the specified configuration for agents and OpenShift version.", "parameters": [ { @@ -137,6 +137,59 @@ } } }, + "patch": { + "tags": [ + "OpenShiftManagedClusters" + ], + "operationId": "OpenShiftManagedClusters_UpdateTags", + "summary": "Updates tags on an openshift managed cluster.", + "description": "Updates an openshift managed cluster with the specified tags.", + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group." + }, + { + "name": "resourceName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the openshift managed cluster resource." + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/TagsObject" + }, + "description": "Parameters supplied to the Update OpenShift Managed Cluster Tags operation." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/OpenShiftManagedCluster" + } + } + }, + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Update OpenShift Managed Cluster Tags": { + "$ref": "./examples/OpenShiftManagedClustersUpdateTags.json" + } + } + }, "delete": { "tags": [ "OpenShiftManagedClusters" @@ -453,9 +506,10 @@ "items" : { "$ref": "#/definitions/OpenShiftManagedClusterIdentityProviders" }, - "description": "OpenShiftManagedClusterAuthProfile defines all possible authentication profiles for the OpenShift cluster." + "description": "Type of authentication profile to use." } - } + }, + "description": "OpenShiftManagedClusterAuthProfile defines all possible authentication profiles for the OpenShift cluster." }, "OpenShiftManagedClusterProperties": { "properties": { From c2a8c578ce2f7c0083e4523659b4ad811e712d8e Mon Sep 17 00:00:00 2001 From: Julien Stroheker Date: Mon, 24 Sep 2018 14:44:26 -0400 Subject: [PATCH 13/26] Update examples --- .../examples/OpenShiftManagedClustersUpdateTags.json | 8 +++++--- .../2018-09-30-preview/openShiftManagedClusters.json | 1 - 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersUpdateTags.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersUpdateTags.json index da0d1ab20873..5bfa61f5c46a 100644 --- a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersUpdateTags.json +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersUpdateTags.json @@ -4,9 +4,11 @@ "subscriptionId": "subid1", "resourceGroupName": "rg1", "resourceName": "clustername1", - "tags": { - "tier": "testing", - "archv3": "" + "parameters": { + "tags": { + "tier": "testing", + "archv3": "" + } } }, "responses": { diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json index 00e3a87469ec..881bae562372 100644 --- a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json @@ -442,7 +442,6 @@ } }, "required": [ - "name", "count", "vmSize" ], From 5fec66c577a01520d50541c66b9e0ef2d2af0969 Mon Sep 17 00:00:00 2001 From: Julien Stroheker Date: Tue, 25 Sep 2018 15:57:49 -0400 Subject: [PATCH 14/26] Add golang package --- .../containerservices/resource-manager/readme.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/specification/containerservices/resource-manager/readme.md b/specification/containerservices/resource-manager/readme.md index beb341a4b901..eb2a4395b9ce 100644 --- a/specification/containerservices/resource-manager/readme.md +++ b/specification/containerservices/resource-manager/readme.md @@ -171,11 +171,21 @@ go: ``` yaml $(go) && $(multiapi) batch: + - tag: package-2018-09-30-preview - tag: package-2018-03 - tag: package-2017-09 - tag: package-2017-08 - tag: package-2017-07 ``` +### Tag: package-2018-09-30-preview and go + +These settings apply only when `--package-2018-09-30-preview --go` is specified on the command line. +Please also specify `--go-sdk-folder=`. + +``` yaml $(tag)=='package-2018-09-30-preview' && $(go) +namespace: containerservice +output-folder: $(go-sdk-folder)/services/containerservice/mgmt/2018-09-30-preview/containerservice +``` ### Tag: package-2018-03 and go From 32ce1d97c6a93ca1433f3ba12f398f05b7401797 Mon Sep 17 00:00:00 2001 From: Julien Stroheker Date: Tue, 25 Sep 2018 16:31:24 -0400 Subject: [PATCH 15/26] Apply review --- .../openShiftManagedClusters.json | 85 ++----------------- 1 file changed, 5 insertions(+), 80 deletions(-) diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json index 881bae562372..6c161c56f843 100644 --- a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json @@ -237,64 +237,6 @@ } }, "definitions": { - "OperationListResult": { - "properties": { - "value": { - "type": "array", - "readOnly": true, - "items": { - "$ref": "#/definitions/OperationValue" - }, - "description": "The list of compute operations" - } - }, - "description": "The List Compute Operation operation response." - }, - "OperationValue": { - "properties": { - "origin": { - "type": "string", - "readOnly": true, - "description": "The origin of the compute operation." - }, - "name": { - "type": "string", - "readOnly": true, - "description": "The name of the compute operation." - }, - "display": { - "x-ms-client-flatten": true, - "$ref": "#/definitions/OperationValueDisplay", - "description": "Describes the properties of a Compute Operation Value Display." - } - }, - "description": "Describes the properties of a Compute Operation value." - }, - "OperationValueDisplay": { - "properties": { - "operation": { - "type": "string", - "readOnly": true, - "description": "The display name of the compute operation." - }, - "resource": { - "type": "string", - "readOnly": true, - "description": "The display name of the resource the operation applies to." - }, - "description": { - "type": "string", - "readOnly": true, - "description": "The description of the operation." - }, - "provider": { - "type": "string", - "readOnly": true, - "description": "The resource provider for the operation." - } - }, - "description": "Describes the properties of a Compute Operation Value Display." - }, "Resource": { "description": "The Resource model definition.", "properties": { @@ -458,8 +400,8 @@ "format": "int32", "maximum": 5, "minimum": 1, - "description": "Number of agents (VMs) to host docker containers. Allowed values must be in the range of 1 to 5 (inclusive). The default value is 1. ", - "default": 1 + "description": "Number of agents (VMs) to host docker containers. Allowed values must be in the range of 1 to 5 (inclusive). The default value is 2. ", + "default": 2 }, "vmSize": { "$ref": "#/definitions/OpenShiftContainerServiceVMSize", @@ -483,7 +425,7 @@ "count", "vmSize" ], - "description": "OpenShiftManagedClusterAgentPoolProfile represents configuration of OpenShift cluster VMs." + "description": "Defines the configuration of the OpenShift cluster VMs." }, "OpenShiftManagedClusterIdentityProviders": { "properties": { @@ -496,7 +438,7 @@ "description": "Configuration of the provider." } }, - "description": "OpenShiftManagedClusterIdentityProvider is heavily cut down equivalent to IdentityProvider in the upstream." + "description": "Defines the configuration of the identity providers to be used in the OpenShift cluster." }, "OpenShiftManagedClusterAuthProfile": { "properties": { @@ -508,7 +450,7 @@ "description": "Type of authentication profile to use." } }, - "description": "OpenShiftManagedClusterAuthProfile defines all possible authentication profiles for the OpenShift cluster." + "description": "Defines all possible authentication profiles for the OpenShift cluster." }, "OpenShiftManagedClusterProperties": { "properties": { @@ -610,23 +552,6 @@ } }, "description": "Tags object for patch operations." - }, - "OpenShiftManagedClusterListResult": { - "properties": { - "value": { - "type": "array", - "items": { - "$ref": "#/definitions/OpenShiftManagedCluster" - }, - "description": "The list of openshift managed clusters." - }, - "nextLink": { - "type": "string", - "description": "The URL to get the next set of openshift managed cluster results.", - "readOnly": true - } - }, - "description": "The response from the List OpenShift Managed Clusters operation." } }, "parameters": { From 1dae12f825a1a5c4f007c8236eaa3ef705dd044c Mon Sep 17 00:00:00 2001 From: Julien Stroheker Date: Mon, 1 Oct 2018 14:08:13 -0400 Subject: [PATCH 16/26] Update Vnet Integration + Examples --- ...OpenShiftManagedClustersCreate_Update.json | 36 ++++++++++++++----- .../examples/OpenShiftManagedClustersGet.json | 12 +++++-- .../OpenShiftManagedClustersUpdateTags.json | 12 +++++-- .../openShiftManagedClusters.json | 33 ++++++++++++----- 4 files changed, 69 insertions(+), 24 deletions(-) diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersCreate_Update.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersCreate_Update.json index 45088d973b1b..2335c65d538b 100644 --- a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersCreate_Update.json +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersCreate_Update.json @@ -13,11 +13,15 @@ "properties": { "openShiftVersion": "v3.10", "fqdn": "clustername1.location1.cloudapp.azure.com", + "networkProfile":{ + "vnetCIDR":"10.0.0.0/8" + }, "masterPoolProfile": { "name": "master", "count": 3, "vmSize": "Standard_D2s_v3", - "osType": "Linux" + "osType": "Linux", + "subnetCidr": "10.0.0.0/24" }, "agentPoolProfiles": [ { @@ -25,14 +29,16 @@ "role": "infra", "count": 2, "vmSize": "Standard_D4s_v3", - "osType": "Linux" + "osType": "Linux", + "subnetCidr": "10.0.0.0/24" }, { "name": "compute", "role": "compute", "count": 4, "vmSize": "Standard_D4s_v3", - "osType": "Linux" + "osType": "Linux", + "subnetCidr": "10.0.0.0/24" } ], "routerProfiles": [ @@ -69,9 +75,13 @@ "provisioningState": "Succeeded", "openShiftVersion": "v3.10", "fqdn": "clustername1.location1.cloudapp.azure.com", + "networkProfile":{ + "vnetCIDR":"10.0.0.0/8" + }, "masterPoolProfile": { "count": 3, - "vmSize": "Standard_D2s_v3" + "vmSize": "Standard_D2s_v3", + "subnetCidr": "10.0.0.0/24" }, "agentPoolProfiles": [ { @@ -79,14 +89,16 @@ "role": "infra", "count": 2, "vmSize": "Standard_D4s_v3", - "osType": "Linux" + "osType": "Linux", + "subnetCidr": "10.0.0.0/24" }, { "name": "compute", "role": "compute", "count": 4, "vmSize": "Standard_D4s_v3", - "osType": "Linux" + "osType": "Linux", + "subnetCidr": "10.0.0.0/24" } ], "routerProfiles": [ @@ -123,11 +135,15 @@ "provisioningState": "Creating", "openShiftVersion": "v3.10", "fqdn": "clustername1.location1.cloudapp.azure.com", + "networkProfile":{ + "vnetCIDR":"10.0.0.0/8" + }, "masterPoolProfile": { "name": "master", "count": 3, "vmSize": "Standard_D2s_v3", - "osType": "Linux" + "osType": "Linux", + "subnetCidr": "10.0.0.0/24" }, "agentPoolProfiles": [ { @@ -135,14 +151,16 @@ "role": "infra", "count": 2, "vmSize": "Standard_D4s_v3", - "osType": "Linux" + "osType": "Linux", + "subnetCidr": "10.0.0.0/24" }, { "name": "compute", "role": "compute", "count": 4, "vmSize": "Standard_D4s_v3", - "osType": "Linux" + "osType": "Linux", + "subnetCidr": "10.0.0.0/24" } ], "routerProfiles": [ diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersGet.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersGet.json index a84f5b6cdfa3..9bcb2fb48a4a 100644 --- a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersGet.json +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersGet.json @@ -20,9 +20,13 @@ "provisioningState": "Succeeded", "openShiftVersion": "v3.10", "fqdn": "clustername1.location1.cloudapp.azure.com", + "networkProfile":{ + "vnetCIDR":"10.0.0.0/8" + }, "masterPoolProfile": { "count": 3, - "vmSize": "Standard_D2s_v3" + "vmSize": "Standard_D2s_v3", + "subnetCidr": "10.0.0.0/24" }, "agentPoolProfiles": [ { @@ -30,14 +34,16 @@ "role": "infra", "count": 2, "vmSize": "Standard_D4s_v3", - "osType": "Linux" + "osType": "Linux", + "subnetCidr": "10.0.0.0/24" }, { "name": "compute", "role": "compute", "count": 4, "vmSize": "Standard_D4s_v3", - "osType": "Linux" + "osType": "Linux", + "subnetCidr": "10.0.0.0/24" } ], "routerProfiles": [ diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersUpdateTags.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersUpdateTags.json index 5bfa61f5c46a..54c8c1c80db1 100644 --- a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersUpdateTags.json +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersUpdateTags.json @@ -26,9 +26,13 @@ "provisioningState": "Succeeded", "openShiftVersion": "v3.10", "fqdn": "clustername1.location1.cloudapp.azure.com", + "networkProfile":{ + "vnetCIDR":"10.0.0.0/8" + }, "masterPoolProfile": { "count": 3, - "vmSize": "Standard_D2s_v3" + "vmSize": "Standard_D2s_v3", + "subnetCidr": "10.0.0.0/24" }, "agentPoolProfiles": [ { @@ -36,14 +40,16 @@ "role": "infra", "count": 2, "vmSize": "Standard_D4s_v3", - "osType": "Linux" + "osType": "Linux", + "subnetCidr": "10.0.0.0/24" }, { "name": "compute", "role": "compute", "count": 4, "vmSize": "Standard_D4s_v3", - "osType": "Linux" + "osType": "Linux", + "subnetCidr": "10.0.0.0/24" } ], "routerProfiles": [ diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json index 6c161c56f843..103220571a42 100644 --- a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json @@ -315,9 +315,19 @@ }, "description": "Represents an OpenShift router" }, - "ContainerServiceVnetSubnetID": { - "type": "string", - "description": "VNet SubnetID specifies the vnet's subnet identifier." + "NetworkProfile": { + "properties": { + "vnetCIDR": { + "type": "string", + "description": "CIDR for the OpenShift Vnet.", + "default": "10.0.0.0/8" + }, + "peerVnetID" : { + "type": "string", + "description": "CIDR of the Vnet to peer." + } + }, + "description": "Represents the OpenShift networking configuration" }, "OSType": { "type": "string", @@ -374,9 +384,9 @@ "$ref": "#/definitions/OpenShiftContainerServiceVMSize", "description": "Size of agent VMs." }, - "vnetSubnetID": { - "$ref": "#/definitions/ContainerServiceVnetSubnetID", - "description": "VNet SubnetID specifies the vnet's subnet identifier." + "subnetCIDR": { + "type": "string", + "description": "Subnet CIDR for the peering." }, "osType": { "$ref": "#/definitions/OSType", @@ -407,9 +417,10 @@ "$ref": "#/definitions/OpenShiftContainerServiceVMSize", "description": "Size of agent VMs." }, - "vnetSubnetID": { - "$ref": "#/definitions/ContainerServiceVnetSubnetID", - "description": "VNet SubnetID specifies the vnet's subnet identifier." + "subnetCIDR": { + "type": "string", + "description": "Subnet CIDR for the peering.", + "default": "10.0.0.0/24" }, "osType": { "$ref": "#/definitions/OSType", @@ -471,6 +482,10 @@ "type": "string", "description": "User-specified FQDN for OpenShift API server loadbalancer internal hostname." }, + "networkProfile": { + "$ref": "#/definitions/NetworkProfile", + "description": "Configuration for OpenShift networking." + }, "routerProfiles": { "type": "array", "items": { From 8043740bf3611785dab2f794f30dd4fb9ca1f295 Mon Sep 17 00:00:00 2001 From: Julien Stroheker Date: Tue, 2 Oct 2018 17:44:23 -0400 Subject: [PATCH 17/26] Caps / no Caps --- .../examples/OpenShiftManagedClustersCreate_Update.json | 6 +++--- .../examples/OpenShiftManagedClustersGet.json | 2 +- .../examples/OpenShiftManagedClustersUpdateTags.json | 2 +- .../2018-09-30-preview/openShiftManagedClusters.json | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersCreate_Update.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersCreate_Update.json index 2335c65d538b..01bff520aec2 100644 --- a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersCreate_Update.json +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersCreate_Update.json @@ -14,7 +14,7 @@ "openShiftVersion": "v3.10", "fqdn": "clustername1.location1.cloudapp.azure.com", "networkProfile":{ - "vnetCIDR":"10.0.0.0/8" + "vnetCidr":"10.0.0.0/8" }, "masterPoolProfile": { "name": "master", @@ -76,7 +76,7 @@ "openShiftVersion": "v3.10", "fqdn": "clustername1.location1.cloudapp.azure.com", "networkProfile":{ - "vnetCIDR":"10.0.0.0/8" + "vnetCidr":"10.0.0.0/8" }, "masterPoolProfile": { "count": 3, @@ -136,7 +136,7 @@ "openShiftVersion": "v3.10", "fqdn": "clustername1.location1.cloudapp.azure.com", "networkProfile":{ - "vnetCIDR":"10.0.0.0/8" + "vnetCidr":"10.0.0.0/8" }, "masterPoolProfile": { "name": "master", diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersGet.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersGet.json index 9bcb2fb48a4a..d54e3a4110bb 100644 --- a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersGet.json +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersGet.json @@ -21,7 +21,7 @@ "openShiftVersion": "v3.10", "fqdn": "clustername1.location1.cloudapp.azure.com", "networkProfile":{ - "vnetCIDR":"10.0.0.0/8" + "vnetCidr":"10.0.0.0/8" }, "masterPoolProfile": { "count": 3, diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersUpdateTags.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersUpdateTags.json index 54c8c1c80db1..fc939f348e06 100644 --- a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersUpdateTags.json +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersUpdateTags.json @@ -27,7 +27,7 @@ "openShiftVersion": "v3.10", "fqdn": "clustername1.location1.cloudapp.azure.com", "networkProfile":{ - "vnetCIDR":"10.0.0.0/8" + "vnetCidr":"10.0.0.0/8" }, "masterPoolProfile": { "count": 3, diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json index 103220571a42..bc55435e4070 100644 --- a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json @@ -317,12 +317,12 @@ }, "NetworkProfile": { "properties": { - "vnetCIDR": { + "vnetCidr": { "type": "string", "description": "CIDR for the OpenShift Vnet.", "default": "10.0.0.0/8" }, - "peerVnetID" : { + "peerVnetId" : { "type": "string", "description": "CIDR of the Vnet to peer." } @@ -384,7 +384,7 @@ "$ref": "#/definitions/OpenShiftContainerServiceVMSize", "description": "Size of agent VMs." }, - "subnetCIDR": { + "subnetCidr": { "type": "string", "description": "Subnet CIDR for the peering." }, @@ -417,7 +417,7 @@ "$ref": "#/definitions/OpenShiftContainerServiceVMSize", "description": "Size of agent VMs." }, - "subnetCIDR": { + "subnetCidr": { "type": "string", "description": "Subnet CIDR for the peering.", "default": "10.0.0.0/24" From 2ea238bf5cd893102bf68263fe05523f32846bdc Mon Sep 17 00:00:00 2001 From: Julien Stroheker Date: Tue, 2 Oct 2018 22:14:58 -0400 Subject: [PATCH 18/26] Add default response --- .../2018-09-30-preview/openShiftManagedClusters.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json index bc55435e4070..663cc0b6ceef 100644 --- a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json @@ -70,6 +70,9 @@ "schema": { "$ref": "#/definitions/OpenShiftManagedCluster" } + }, + "default": { + "description": "Error response describing why the operation failed. If the cluster doesn't exist, 404 (Not found) is returned." } }, "x-ms-examples": { @@ -128,6 +131,9 @@ "schema": { "$ref": "#/definitions/OpenShiftManagedCluster" } + }, + "default": { + "description": "Error response describing why the operation failed. If the cluster doesn't exist, 404 (Not found) is returned.If any of the input parameters is wrong, 400(Bad Request) is returned." } }, "x-ms-long-running-operation": true, @@ -181,6 +187,9 @@ "schema": { "$ref": "#/definitions/OpenShiftManagedCluster" } + }, + "default": { + "description": "Error response describing why the operation failed. If the cluster doesn't exist, 404 (Not found) is returned. If any of the input parameters is wrong, 400(Bad Request) is returned." } }, "x-ms-long-running-operation": true, @@ -225,6 +234,9 @@ }, "204": { "description": "NoContent" + }, + "default": { + "description": "Error response describing why the operation failed." } }, "x-ms-long-running-operation": true, From 0d9c4151655c6d4b032b58665d0ea5f24e3c9912 Mon Sep 17 00:00:00 2001 From: Julien Stroheker Date: Wed, 10 Oct 2018 11:27:04 -0400 Subject: [PATCH 19/26] adding the schema for the default response --- .../openShiftManagedClusters.json | 54 +++++++++++++++++-- 1 file changed, 50 insertions(+), 4 deletions(-) diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json index 663cc0b6ceef..ee5c66e563b5 100644 --- a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json @@ -72,7 +72,10 @@ } }, "default": { - "description": "Error response describing why the operation failed. If the cluster doesn't exist, 404 (Not found) is returned." + "description": "Error response describing why the operation failed. If the cluster doesn't exist, 404 (Not found) is returned.", + "schema": { + "$ref": "#/definitions/CloudError" + } } }, "x-ms-examples": { @@ -133,7 +136,10 @@ } }, "default": { - "description": "Error response describing why the operation failed. If the cluster doesn't exist, 404 (Not found) is returned.If any of the input parameters is wrong, 400(Bad Request) is returned." + "description": "Error response describing why the operation failed. If the cluster doesn't exist, 404 (Not found) is returned.If any of the input parameters is wrong, 400(Bad Request) is returned.", + "schema": { + "$ref": "#/definitions/CloudError" + } } }, "x-ms-long-running-operation": true, @@ -189,7 +195,10 @@ } }, "default": { - "description": "Error response describing why the operation failed. If the cluster doesn't exist, 404 (Not found) is returned. If any of the input parameters is wrong, 400(Bad Request) is returned." + "description": "Error response describing why the operation failed. If the cluster doesn't exist, 404 (Not found) is returned. If any of the input parameters is wrong, 400(Bad Request) is returned.", + "schema": { + "$ref": "#/definitions/CloudError" + } } }, "x-ms-long-running-operation": true, @@ -236,7 +245,10 @@ "description": "NoContent" }, "default": { - "description": "Error response describing why the operation failed." + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } } }, "x-ms-long-running-operation": true, @@ -288,6 +300,40 @@ ], "x-ms-azure-resource": true }, + "CloudError": { + "x-ms-external": true, + "properties": { + "error": { + "$ref": "#/definitions/CloudErrorBody" + } + }, + "description": "An error response from the Container service." + }, + "CloudErrorBody": { + "x-ms-external": true, + "properties": { + "code": { + "type": "string", + "description": "An identifier for the error. Codes are invariant and are intended to be consumed programmatically." + }, + "message": { + "type": "string", + "description": "A message describing the error, intended to be suitable for display in a user interface." + }, + "target": { + "type": "string", + "description": "The target of the particular error. For example, the name of the property in error." + }, + "details": { + "type": "array", + "items": { + "$ref": "#/definitions/CloudErrorBody" + }, + "description": "A list of additional details about the error." + } + }, + "description": "An error response from the Container service." + }, "PurchasePlan": { "properties": { "name": { From 06f0477423bb5794fba1f2e2f0b6ef1d0b0e8895 Mon Sep 17 00:00:00 2001 From: Julien Stroheker Date: Wed, 10 Oct 2018 11:32:33 -0400 Subject: [PATCH 20/26] Add Go Package --- .../containerservices/resource-manager/readme.go.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/specification/containerservices/resource-manager/readme.go.md b/specification/containerservices/resource-manager/readme.go.md index ee6ef1d97125..29d293455a13 100644 --- a/specification/containerservices/resource-manager/readme.go.md +++ b/specification/containerservices/resource-manager/readme.go.md @@ -12,12 +12,23 @@ go: ``` yaml $(go) && $(multiapi) batch: + - tag: package-2018-09-30-preview - tag: package-2018-03 - tag: package-2017-09 - tag: package-2017-08 - tag: package-2017-07 ``` +### Tag: package-2018-09-30-preview and go + +These settings apply only when `--package-2018-09-30-preview --go` is specified on the command line. +Please also specify `--go-sdk-folder=`. + +``` yaml $(tag)=='package-2018-09-30-preview' && $(go) +namespace: containerservice +output-folder: $(go-sdk-folder)/services/containerservice/mgmt/2018-09-30-preview/containerservice +``` + ### Tag: package-2018-03 and go These settings apply only when `--tag=package-2018-03 --go` is specified on the command line. From 2f9a701382898645dad3a6b3bd45ae3e223dc04e Mon Sep 17 00:00:00 2001 From: Julien Stroheker Date: Wed, 10 Oct 2018 11:37:39 -0400 Subject: [PATCH 21/26] Bump Python version --- specification/containerservices/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/containerservices/resource-manager/readme.md b/specification/containerservices/resource-manager/readme.md index bacaa647065f..459aaad0fc7d 100644 --- a/specification/containerservices/resource-manager/readme.md +++ b/specification/containerservices/resource-manager/readme.md @@ -170,7 +170,7 @@ python: payload-flattening-threshold: 2 namespace: azure.mgmt.containerservice package-name: azure-mgmt-containerservice - package-version: 4.2.2 + package-version: 4.2.3 clear-output-folder: true ``` ``` yaml $(python) && $(python-mode) == 'update' From a3e455b09584f9abb4911afbcc203663903a7002 Mon Sep 17 00:00:00 2001 From: Julien Stroheker Date: Thu, 11 Oct 2018 10:31:00 -0400 Subject: [PATCH 22/26] Enum kind of OpenShiftManagedClusterServiceAADIdentityProvider --- .../2018-09-30-preview/openShiftManagedClusters.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json index ee5c66e563b5..017306661cc6 100644 --- a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json @@ -597,6 +597,13 @@ "properties": { "kind": { "type": "string", + "enum": [ + "AADIdentityProvider" + ], + "x-ms-enum": { + "name": "Kind", + "modelAsString": true + }, "description": "The kind of the provider." }, "clientId": { From 1654a1984082906718d7244f9625d9c53b25c2bb Mon Sep 17 00:00:00 2001 From: Julien Stroheker Date: Thu, 11 Oct 2018 13:46:58 -0400 Subject: [PATCH 23/26] Add Kind as required --- .../2018-09-30-preview/openShiftManagedClusters.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json index 017306661cc6..071fbb95ce85 100644 --- a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json @@ -600,10 +600,6 @@ "enum": [ "AADIdentityProvider" ], - "x-ms-enum": { - "name": "Kind", - "modelAsString": true - }, "description": "The kind of the provider." }, "clientId": { @@ -619,6 +615,9 @@ "description": "The tenantId associated with the provider." } }, + "required": [ + "kind" + ], "description": "AADIdentityProvider defines Identity provider for MS AAD." }, "TagsObject": { From 4e40c606f9da0b2bc4d5fc95cb7d6fe072cf2170 Mon Sep 17 00:00:00 2001 From: Julien Stroheker Date: Fri, 12 Oct 2018 11:43:05 -0400 Subject: [PATCH 24/26] Adding OpenShiftManagedClusterBaseIdentityProvider and rename properties --- .../openShiftManagedClusters.json | 60 +++++++++++-------- 1 file changed, 35 insertions(+), 25 deletions(-) diff --git a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json index 071fbb95ce85..f43a0f78f1cb 100644 --- a/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json @@ -496,14 +496,14 @@ ], "description": "Defines the configuration of the OpenShift cluster VMs." }, - "OpenShiftManagedClusterIdentityProviders": { + "OpenShiftManagedClusterIdentityProvider": { "properties": { "name": { "type": "string", "description": "Name of the provider." }, "provider": { - "type": "object", + "$ref": "#/definitions/OpenShiftManagedClusterBaseIdentityProvider", "description": "Configuration of the provider." } }, @@ -514,7 +514,7 @@ "identityProviders": { "type": "array", "items" : { - "$ref": "#/definitions/OpenShiftManagedClusterIdentityProviders" + "$ref": "#/definitions/OpenShiftManagedClusterIdentityProvider" }, "description": "Type of authentication profile to use." } @@ -593,32 +593,42 @@ ], "description": "OpenShift Managed cluster." }, - "OpenShiftManagedClusterServiceAADIdentityProvider": { + "OpenShiftManagedClusterBaseIdentityProvider": + { + "discriminator": "kind", + "required": ["kind"], "properties": { - "kind": { - "type": "string", - "enum": [ - "AADIdentityProvider" - ], - "description": "The kind of the provider." - }, - "clientId": { - "type": "string", - "description": "The clientId password associated with the provider." - }, - "secret": { - "type": "string", - "description": "The secret password associated with the provider." + "kind": { + "type": "string", + "description": "The kind of the provider." + } }, - "tenantId": { - "type": "string", - "description": "The tenantId associated with the provider." - } + "description": "Structure for any Identity provider." + }, + "OpenShiftManagedClusterAADIdentityProvider": { + "x-ms-discriminator-value": "AADIdentityProvider", + "allOf": [ + { + "$ref": "#/definitions/OpenShiftManagedClusterBaseIdentityProvider" }, - "required": [ - "kind" + { + "properties": { + "clientId": { + "type": "string", + "description": "The clientId password associated with the provider." + }, + "secret": { + "type": "string", + "description": "The secret password associated with the provider." + }, + "tenantId": { + "type": "string", + "description": "The tenantId associated with the provider." + } + } + } ], - "description": "AADIdentityProvider defines Identity provider for MS AAD." + "description": "Defines the Identity provider for MS AAD." }, "TagsObject": { "properties": { From f85fed868f73b980e54a375799bd14401e9cb2a0 Mon Sep 17 00:00:00 2001 From: Julien Stroheker Date: Fri, 12 Oct 2018 11:52:14 -0400 Subject: [PATCH 25/26] Sync Python version --- specification/containerservices/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/containerservices/resource-manager/readme.md b/specification/containerservices/resource-manager/readme.md index 459aaad0fc7d..ca063edc2414 100644 --- a/specification/containerservices/resource-manager/readme.md +++ b/specification/containerservices/resource-manager/readme.md @@ -170,7 +170,7 @@ python: payload-flattening-threshold: 2 namespace: azure.mgmt.containerservice package-name: azure-mgmt-containerservice - package-version: 4.2.3 + package-version: 4.2.0 clear-output-folder: true ``` ``` yaml $(python) && $(python-mode) == 'update' From 9a7d174db220a953c824cdac1f974329595f90cf Mon Sep 17 00:00:00 2001 From: Julien Stroheker Date: Fri, 12 Oct 2018 11:55:35 -0400 Subject: [PATCH 26/26] Bump Python version --- specification/containerservices/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/containerservices/resource-manager/readme.md b/specification/containerservices/resource-manager/readme.md index ca063edc2414..3b6e71525880 100644 --- a/specification/containerservices/resource-manager/readme.md +++ b/specification/containerservices/resource-manager/readme.md @@ -170,7 +170,7 @@ python: payload-flattening-threshold: 2 namespace: azure.mgmt.containerservice package-name: azure-mgmt-containerservice - package-version: 4.2.0 + package-version: 4.3.0 clear-output-folder: true ``` ``` yaml $(python) && $(python-mode) == 'update'