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..01bff520aec2 --- /dev/null +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersCreate_Update.json @@ -0,0 +1,185 @@ +{ + "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": "clustername1.location1.cloudapp.azure.com", + "networkProfile":{ + "vnetCidr":"10.0.0.0/8" + }, + "masterPoolProfile": { + "name": "master", + "count": 3, + "vmSize": "Standard_D2s_v3", + "osType": "Linux", + "subnetCidr": "10.0.0.0/24" + }, + "agentPoolProfiles": [ + { + "name": "infra", + "role": "infra", + "count": 2, + "vmSize": "Standard_D4s_v3", + "osType": "Linux", + "subnetCidr": "10.0.0.0/24" + }, + { + "name": "compute", + "role": "compute", + "count": 4, + "vmSize": "Standard_D4s_v3", + "osType": "Linux", + "subnetCidr": "10.0.0.0/24" + } + ], + "routerProfiles": [ + { + "name": "default" + } + ], + "authProfile": { + "identityProviders": [{ + "name": "Azure AD", + "provider": { + "kind": "AADIdentityProvider", + "clientId": "clientId", + "secret": "secret", + "tenantId": "tenantId" + } + }] + } + } + } + }, + "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": "v3.10", + "fqdn": "clustername1.location1.cloudapp.azure.com", + "networkProfile":{ + "vnetCidr":"10.0.0.0/8" + }, + "masterPoolProfile": { + "count": 3, + "vmSize": "Standard_D2s_v3", + "subnetCidr": "10.0.0.0/24" + }, + "agentPoolProfiles": [ + { + "name": "infra", + "role": "infra", + "count": 2, + "vmSize": "Standard_D4s_v3", + "osType": "Linux", + "subnetCidr": "10.0.0.0/24" + }, + { + "name": "compute", + "role": "compute", + "count": 4, + "vmSize": "Standard_D4s_v3", + "osType": "Linux", + "subnetCidr": "10.0.0.0/24" + } + ], + "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" + } + }] + } + } + } + }, + "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": "clustername1.location1.cloudapp.azure.com", + "networkProfile":{ + "vnetCidr":"10.0.0.0/8" + }, + "masterPoolProfile": { + "name": "master", + "count": 3, + "vmSize": "Standard_D2s_v3", + "osType": "Linux", + "subnetCidr": "10.0.0.0/24" + }, + "agentPoolProfiles": [ + { + "name": "infra", + "role": "infra", + "count": 2, + "vmSize": "Standard_D4s_v3", + "osType": "Linux", + "subnetCidr": "10.0.0.0/24" + }, + { + "name": "compute", + "role": "compute", + "count": 4, + "vmSize": "Standard_D4s_v3", + "osType": "Linux", + "subnetCidr": "10.0.0.0/24" + } + ], + "routerProfiles": [ + { + "name": "default" + } + ], + "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/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..d54e3a4110bb --- /dev/null +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersGet.json @@ -0,0 +1,71 @@ +{ + "parameters": { + "api-version": "2018-09-30-preview", + "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": "v3.10", + "fqdn": "clustername1.location1.cloudapp.azure.com", + "networkProfile":{ + "vnetCidr":"10.0.0.0/8" + }, + "masterPoolProfile": { + "count": 3, + "vmSize": "Standard_D2s_v3", + "subnetCidr": "10.0.0.0/24" + }, + "agentPoolProfiles": [ + { + "name": "infra", + "role": "infra", + "count": 2, + "vmSize": "Standard_D4s_v3", + "osType": "Linux", + "subnetCidr": "10.0.0.0/24" + }, + { + "name": "compute", + "role": "compute", + "count": 4, + "vmSize": "Standard_D4s_v3", + "osType": "Linux", + "subnetCidr": "10.0.0.0/24" + } + ], + "routerProfiles": [ + { + "fqdn": "dce5faa189c841b99f8a.location1.cloudapp.azure.com", + "name": "default", + "publicSubdomain": "b788fade68d345da9b77.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/examples/OpenShiftManagedClustersUpdateTags.json b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersUpdateTags.json new file mode 100644 index 000000000000..fc939f348e06 --- /dev/null +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/examples/OpenShiftManagedClustersUpdateTags.json @@ -0,0 +1,76 @@ +{ + "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": "clustername1.location1.cloudapp.azure.com", + "networkProfile":{ + "vnetCidr":"10.0.0.0/8" + }, + "masterPoolProfile": { + "count": 3, + "vmSize": "Standard_D2s_v3", + "subnetCidr": "10.0.0.0/24" + }, + "agentPoolProfiles": [ + { + "name": "infra", + "role": "infra", + "count": 2, + "vmSize": "Standard_D4s_v3", + "osType": "Linux", + "subnetCidr": "10.0.0.0/24" + }, + { + "name": "compute", + "role": "compute", + "count": 4, + "vmSize": "Standard_D4s_v3", + "osType": "Linux", + "subnetCidr": "10.0.0.0/24" + } + ], + "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 new file mode 100644 index 000000000000..f43a0f78f1cb --- /dev/null +++ b/specification/containerservices/resource-manager/Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json @@ -0,0 +1,664 @@ +{ + "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": { + "/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" + } + }, + "default": { + "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": { + "Get OpenShift Managed Cluster": { + "$ref": "./examples/OpenShiftManagedClustersGet.json" + } + } + }, + "put": { + "tags": [ + "OpenShiftManagedClusters" + ], + "operationId": "OpenShiftManagedClusters_CreateOrUpdate", + "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": [ + { + "$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" + } + }, + "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.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "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 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" + } + }, + "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.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "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" + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Delete OpenShift Managed Cluster": { + "$ref": "./examples/OpenShiftManagedClustersDelete.json" + } + } + } + } + }, + "definitions": { + "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 + }, + "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": { + "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": "Used for establishing the purchase context of any 3rd Party artifact through MarketPlace." + }, + "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" + }, + "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", + "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." + }, + "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" + ], + "x-ms-enum": { + "name": "OpenShiftAgentPoolProfileRole", + "modelAsString": true + }, + "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." + }, + "subnetCidr": { + "type": "string", + "description": "Subnet CIDR for the peering." + }, + "osType": { + "$ref": "#/definitions/OSType", + "description": "OsType to be used to specify os type. Choose from Linux and Windows. Default to Linux." + } + }, + "required": [ + "count", + "vmSize" + ], + "description": "OpenShiftManagedClusterMaterPoolProfile contains configuration for OpenShift master VMs." + }, + "OpenShiftManagedClusterAgentPoolProfile": { + "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": 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 2. ", + "default": 2 + }, + "vmSize": { + "$ref": "#/definitions/OpenShiftContainerServiceVMSize", + "description": "Size of agent VMs." + }, + "subnetCidr": { + "type": "string", + "description": "Subnet CIDR for the peering.", + "default": "10.0.0.0/24" + }, + "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": [ + "name", + "count", + "vmSize" + ], + "description": "Defines the configuration of the OpenShift cluster VMs." + }, + "OpenShiftManagedClusterIdentityProvider": { + "properties": { + "name": { + "type": "string", + "description": "Name of the provider." + }, + "provider": { + "$ref": "#/definitions/OpenShiftManagedClusterBaseIdentityProvider", + "description": "Configuration of the provider." + } + }, + "description": "Defines the configuration of the identity providers to be used in the OpenShift cluster." + }, + "OpenShiftManagedClusterAuthProfile": { + "properties": { + "identityProviders": { + "type": "array", + "items" : { + "$ref": "#/definitions/OpenShiftManagedClusterIdentityProvider" + }, + "description": "Type of authentication profile to use." + } + }, + "description": "Defines all possible authentication profiles for the OpenShift 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": "Optional user-specified FQDN for OpenShift API server." + }, + "fqdn": { + "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": { + "$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." + }, + "authProfile": { + "$ref": "#/definitions/OpenShiftManagedClusterAuthProfile", + "description": "Configures OpenShift authentication." + } + }, + "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." + }, + "OpenShiftManagedClusterBaseIdentityProvider": + { + "discriminator": "kind", + "required": ["kind"], + "properties": { + "kind": { + "type": "string", + "description": "The kind of the provider." + } + }, + "description": "Structure for any Identity provider." + }, + "OpenShiftManagedClusterAADIdentityProvider": { + "x-ms-discriminator-value": "AADIdentityProvider", + "allOf": [ + { + "$ref": "#/definitions/OpenShiftManagedClusterBaseIdentityProvider" + }, + { + "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": "Defines the Identity provider for MS AAD." + }, + "TagsObject": { + "properties": { + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Resource tags." + } + }, + "description": "Tags object for patch operations." + } + }, + "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.go.md b/specification/containerservices/resource-manager/readme.go.md index 7332628dea57..c15fd1eae818 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. diff --git a/specification/containerservices/resource-manager/readme.md b/specification/containerservices/resource-manager/readme.md index db7e421d1f87..fa3b702e8477 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. @@ -34,7 +34,19 @@ 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 + +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 +- 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 @@ -159,7 +171,7 @@ python: payload-flattening-threshold: 2 namespace: azure.mgmt.containerservice package-name: azure-mgmt-containerservice - package-version: 4.1.0 + package-version: 4.3.0 clear-output-folder: true ``` ``` yaml $(python) && $(python-mode) == 'update'