From 10a3f115c0e33d3cd51802abcbf05b9394cd4327 Mon Sep 17 00:00:00 2001 From: Jack Quincy Date: Thu, 12 Sep 2019 17:25:42 -0700 Subject: [PATCH 01/12] adding swagger spec for api version 2019-09-30-preview --- ...OpenShiftManagedClustersCreate_Update.json | 205 +++++ .../OpenShiftManagedClustersDelete.json | 12 + .../examples/OpenShiftManagedClustersGet.json | 78 ++ .../OpenShiftManagedClustersList.json | 80 ++ ...iftManagedClustersListByResourceGroup.json | 80 ++ .../OpenShiftManagedClustersUpdateTags.json | 83 ++ .../openShiftManagedClusters.json | 804 ++++++++++++++++++ 7 files changed, 1342 insertions(+) create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersCreate_Update.json create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersDelete.json create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersGet.json create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersList.json create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersListByResourceGroup.json create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersUpdateTags.json create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/openShiftManagedClusters.json diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersCreate_Update.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersCreate_Update.json new file mode 100644 index 000000000000..621cae6b7c60 --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersCreate_Update.json @@ -0,0 +1,205 @@ +{ + "parameters": { + "api-version": "2019-04-30", + "subscriptionId": "subid1", + "resourceGroupName": "rg1", + "resourceName": "clustername1", + "parameters": { + "location": "location1", + "tags": { + "tier": "production", + "archv2": "" + }, + "properties": { + "openShiftVersion": "v3.11", + "networkProfile": { + "vnetCidr": "10.0.0.0/8" + }, + "masterPoolProfile": { + "name": "master", + "count": 3, + "vmSize": "Standard_D4s_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", + "customerAdminGroupId": "customerAdminGroupId" + } + } + ] + }, + "monitorProfile": { + "workspaceResourceID": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.OperationalInsights/workspaces/workspacename1" + } + } + } + }, + "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": "Updating", + "openShiftVersion": "v3.11", + "clusterVersion": "osa.1", + "fqdn": "df9337748a4b.location1.cloudapp.azure.com", + "publicHostname": "openshift.1225bdf9337748a4bd3a.location1.azmosa.io", + "networkProfile": { + "vnetCidr": "10.0.0.0/8" + }, + "masterPoolProfile": { + "count": 3, + "vmSize": "Standard_D4s_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": "osa2925bdf9337748f4bd3b.location1.cloudapp.azure.com", + "publicSubdomain": "apps.bc309ee87c164153871c.location1.azmosa.io" + } + ], + "authProfile": { + "identityProviders": [ + { + "name": "Azure AD", + "provider": { + "kind": "AADIdentityProvider", + "clientId": "clientId", + "tenantId": "tenantId", + "customerAdminGroupId": "customerAdminGroupId" + } + } + ] + }, + "monitorProfile": { + "workspaceResourceID": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.OperationalInsights/workspaces/workspacename1" + } + } + } + }, + "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.11", + "clusterVersion": "osa.1", + "fqdn": "df9337748a4b.location1.cloudapp.azure.com", + "networkProfile": { + "vnetCidr": "10.0.0.0/8" + }, + "masterPoolProfile": { + "name": "master", + "count": 3, + "vmSize": "Standard_D4s_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", + "customerAdminGroupId": "customerAdminGroupId" + } + } + ] + }, + "monitorProfile": { + "workspaceResourceID": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.OperationalInsights/workspaces/workspacename1" + } + } + } + } + } +} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersDelete.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersDelete.json new file mode 100644 index 000000000000..43c149041644 --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersDelete.json @@ -0,0 +1,12 @@ +{ + "parameters": { + "api-version": "2019-04-30", + "subscriptionId": "subid1", + "resourceGroupName": "rg1", + "resourceName": "clustername1" + }, + "responses": { + "202": {}, + "204": {} + } +} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersGet.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersGet.json new file mode 100644 index 000000000000..f8d664e6d2ef --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersGet.json @@ -0,0 +1,78 @@ +{ + "parameters": { + "api-version": "2019-04-30", + "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.11", + "clusterVersion": "osa.1", + "fqdn": "df9337748a4b.location1.cloudapp.azure.com", + "publicHostname": "openshift.1225bdf9337748a4bd3a.location1.azmosa.io", + "networkProfile": { + "vnetCidr": "10.0.0.0/8" + }, + "masterPoolProfile": { + "count": 3, + "vmSize": "Standard_D4s_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": "osa2925bdf9337748f4bd3b.location1.cloudapp.azure.com", + "publicSubdomain": "apps.bc309ee87c164153871c.location1.azmosa.io" + } + ], + "authProfile": { + "identityProviders": [ + { + "name": "Azure AD", + "provider": { + "kind": "AADIdentityProvider", + "clientId": "clientId", + "tenantId": "tenantId", + "customerAdminGroupId": "customerAdminGroupId" + } + } + ] + }, + "monitorProfile": { + "workspaceResourceID": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.OperationalInsights/workspaces/workspacename1" + } + } + } + } + } +} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersList.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersList.json new file mode 100644 index 000000000000..86726bdb9d12 --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersList.json @@ -0,0 +1,80 @@ +{ + "parameters": { + "api-version": "2019-04-30", + "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", + "properties": { + "provisioningState": "Succeeded", + "openShiftVersion": "v3.11", + "clusterVersion": "osa.1", + "fqdn": "df9337748a4b.location1.cloudapp.azure.com", + "publicHostname": "openshift.1225bdf9337748a4bd3a.location1.azmosa.io", + "networkProfile": { + "vnetCidr": "10.0.0.0/8" + }, + "masterPoolProfile": { + "count": 3, + "vmSize": "Standard_D4s_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": "osa2925bdf9337748f4bd3b.location1.cloudapp.azure.com", + "publicSubdomain": "apps.bc309ee87c164153871c.location1.azmosa.io" + } + ], + "authProfile": { + "identityProviders": [ + { + "name": "Azure AD", + "provider": { + "kind": "AADIdentityProvider", + "clientId": "clientId", + "tenantId": "tenantId", + "customerAdminGroupId": "customerAdminGroupId" + } + } + ] + }, + "monitorProfile": { + "workspaceResourceID": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.OperationalInsights/workspaces/workspacename1" + } + } + } + ] + } + } + } +} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersListByResourceGroup.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersListByResourceGroup.json new file mode 100644 index 000000000000..0cb288484b7c --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersListByResourceGroup.json @@ -0,0 +1,80 @@ +{ + "parameters": { + "api-version": "2018-09-30-preview", + "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": "v3.11", + "clusterVersion": "osa.1", + "fqdn": "df9337748a4b.location1.cloudapp.azure.com", + "networkProfile": { + "vnetCidr": "10.0.0.0/8" + }, + "masterPoolProfile": { + "count": 3, + "vmSize": "Standard_D4s_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": "dce5faa189c841b99f8a.location1.cloudapp.azure.com", + "publicSubdomain": "b788fade68d345da9b77.location1.int.aksapp.io" + } + ], + "authProfile": { + "identityProviders": [ + { + "name": "Azure AD", + "provider": { + "kind": "AADIdentityProvider", + "clientId": "clientId", + "tenantId": "tenantId", + "customerAdminGroupId": "customerAdminGroupId" + } + } + ] + }, + "monitorProfile": { + "workspaceResourceID": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.OperationalInsights/workspaces/workspacename1" + } + } + } + ] + } + } + } +} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersUpdateTags.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersUpdateTags.json new file mode 100644 index 000000000000..b6d484ed7a80 --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersUpdateTags.json @@ -0,0 +1,83 @@ +{ + "parameters": { + "api-version": "2019-04-30", + "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.11", + "fqdn": "df9337748a4b.location1.cloudapp.azure.com", + "publicHostname": "openshift.1225bdf9337748a4bd3a.location1.azmosa.io", + "networkProfile": { + "vnetCidr": "10.0.0.0/8" + }, + "masterPoolProfile": { + "count": 3, + "vmSize": "Standard_D4s_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": "osa2925bdf9337748f4bd3b.location1.cloudapp.azure.com", + "publicSubdomain": "apps.bc309ee87c164153871c.location1.azmosa.io" + } + ], + "authProfile": { + "identityProviders": [ + { + "name": "Azure AD", + "provider": { + "kind": "AADIdentityProvider", + "clientId": "clientId", + "tenantId": "tenantId", + "customerAdminGroupId": "customerAdminGroupId" + } + } + ] + }, + "monitorProfile": { + "workspaceResourceID": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.OperationalInsights/workspaces/workspacename1" + } + } + } + } + } +} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/openShiftManagedClusters.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/openShiftManagedClusters.json new file mode 100644 index 000000000000..cddc755178db --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/openShiftManagedClusters.json @@ -0,0 +1,804 @@ +{ + "swagger": "2.0", + "info": { + "title": "ContainerServiceClient", + "description": "The Container Service Client.", + "version": "2019-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}/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 Managed Clusters": { + "$ref": "./examples/OpenShiftManagedClustersList.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/openShiftManagedClusters": { + "get": { + "tags": [ + "OpenShiftManagedClusters" + ], + "operationId": "OpenShiftManagedClusters_ListByResourceGroup", + "summary": "Lists OpenShift managed clusters in the specified subscription and resource group.", + "description": "Lists 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", + "minLength": 1, + "description": "The name of the resource group." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/OpenShiftManagedClusterListResult" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "Get 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", + "minLength": 1, + "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", + "minLength": 1, + "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", + "minLength": 1, + "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", + "minLength": 1, + "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": "Details about the error." + } + }, + "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", + "readOnly": true, + "description": "DNS subdomain for OpenShift router." + }, + "fqdn": { + "type": "string", + "readOnly": true, + "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." + }, + "vnetId": { + "type": "string", + "description": "ID of the Vnet created for OSA cluster." + } + }, + "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", + "Standard_D8s_v3", + "Standard_D16s_v3", + "Standard_D32s_v3", + "Standard_D64s_v3", + "Standard_DS4_v2", + "Standard_DS5_v2", + "Standard_F8s_v2", + "Standard_F16s_v2", + "Standard_F32s_v2", + "Standard_F64s_v2", + "Standard_F72s_v2", + "Standard_F8s", + "Standard_F16s", + "Standard_E4s_v3", + "Standard_E8s_v3", + "Standard_E16s_v3", + "Standard_E20s_v3", + "Standard_E32s_v3", + "Standard_E64s_v3", + "Standard_GS2", + "Standard_GS3", + "Standard_GS4", + "Standard_GS5", + "Standard_DS12_v2", + "Standard_DS13_v2", + "Standard_DS14_v2", + "Standard_DS15_v2", + "Standard_L4s", + "Standard_L8s", + "Standard_L16s", + "Standard_L32s" + ] + }, + "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", + "description": "Number of masters (VMs) to host docker containers. The default value is 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", + "description": "Number of agents (VMs) to host docker containers." + }, + "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." + }, + "clusterVersion": { + "readOnly": true, + "type": "string", + "description": "Version of OpenShift specified when creating the cluster." + }, + "publicHostname": { + "type": "string", + "readOnly": true, + "description": "Service generated FQDN for OpenShift API server." + }, + "fqdn": { + "type": "string", + "readOnly": true, + "description": "Service generated 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." + }, + "customerAdminGroupId": { + "type": "string", + "description": "The groupId to be granted cluster admin role." + } + } + } + ], + "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." + }, + "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": { + "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" + } + } +} From 87d2679cf2457b4045670685f9821329eb5573f3 Mon Sep 17 00:00:00 2001 From: Jack Quincy Date: Thu, 12 Sep 2019 17:45:35 -0700 Subject: [PATCH 02/12] adding the datamodel update --- .../openShiftManagedClusters.json | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/openShiftManagedClusters.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/openShiftManagedClusters.json index cddc755178db..5181576b0948 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/openShiftManagedClusters.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/openShiftManagedClusters.json @@ -3,7 +3,7 @@ "info": { "title": "ContainerServiceClient", "description": "The Container Service Client.", - "version": "2019-09-30-preview" + "version": "2019-04-30" }, "host": "management.azure.com", "schemes": [ @@ -632,6 +632,15 @@ }, "description": "Defines all possible authentication profiles for the OpenShift cluster." }, + "OpenShiftManagedClusterMonitorProfile":{ + "properties": { + "workspaceResourceID":{ + "type": "string", + "description": "Azure Resource Manager Resource ID for the Log Analytics workspace to integrate with." + } + }, + "description": "Defines the configuration for Log Analytics integration." + }, "OpenShiftManagedClusterProperties": { "properties": { "provisioningState": { @@ -683,6 +692,10 @@ "authProfile": { "$ref": "#/definitions/OpenShiftManagedClusterAuthProfile", "description": "Configures OpenShift authentication." + }, + "monitorProfile":{ + "$ref": "#/definitions/OpenShiftManagedClusterMonitorProfile", + "description": "Configures Log Analytics intergration." } }, "required": [ From 377cff43e9bd0ae313d86ed97b1935c27a0f8faa Mon Sep 17 00:00:00 2001 From: Jack Quincy Date: Fri, 13 Sep 2019 15:59:24 -0700 Subject: [PATCH 03/12] updating readmes for new api version --- .../containerservice/resource-manager/readme.go.md | 11 +++++++++++ .../containerservice/resource-manager/readme.md | 13 +++++++++++++ .../resource-manager/readme.python.md | 12 ++++++++++++ 3 files changed, 36 insertions(+) diff --git a/specification/containerservice/resource-manager/readme.go.md b/specification/containerservice/resource-manager/readme.go.md index 5f6a07e8b77b..a0cc0ff00cc0 100644 --- a/specification/containerservice/resource-manager/readme.go.md +++ b/specification/containerservice/resource-manager/readme.go.md @@ -16,6 +16,7 @@ batch: - tag: package-2019-06 - tag: package-2019-04 - tag: package-2019-02 + - tag: package-2019-09-30-preview - tag: package-2018-09-30-preview - tag: package-2018-08-preview - tag: package-2018-03 @@ -74,6 +75,16 @@ namespace: containerservice output-folder: $(go-sdk-folder)/services/preview/containerservice/mgmt/2018-09-30-preview/containerservice ``` +### Tag: package-2019-09-30-preview and go + +These settings apply only when `--package-2019-09-30-preview --go` is specified on the command line. +Please also specify `--go-sdk-folder=`. + +``` yaml $(tag)=='package-2019-09-30-preview' && $(go) +namespace: containerservice +output-folder: $(go-sdk-folder)/services/preview/containerservice/mgmt/2019-09-30-preview/containerservice +``` + ### Tag: package-2018-08-preview and go These settings apply only when `--package-2018-08-preview --go` is specified on the command line. diff --git a/specification/containerservice/resource-manager/readme.md b/specification/containerservice/resource-manager/readme.md index ed0ece1b2398..0def0e36b63b 100644 --- a/specification/containerservice/resource-manager/readme.md +++ b/specification/containerservice/resource-manager/readme.md @@ -37,6 +37,18 @@ openapi-type: arm tag: package-2019-08 ``` +### Tag: package-2019-09-30-preview + +These settings apply only when `--tag=package-2019-09-30-preview` is specified on the command line. + +``` yaml $(tag) == 'package-2019-09-30-preview' +input-file: + - Microsoft.ContainerService/preview/2019-09-30-preview/openShiftManagedClusters.json + - Microsoft.ContainerService/stable/2017-07-01/containerService.json + - Microsoft.ContainerService/stable/2019-08-01/managedClusters.json + - Microsoft.ContainerService/stable/2019-08-01/location.json +``` + ### Tag: package-2019-08 @@ -369,6 +381,7 @@ input-file: - $(this-folder)/Microsoft.ContainerService/stable/2017-01-31/containerService.json - $(this-folder)/Microsoft.ContainerService/stable/2016-09-30/containerService.json - $(this-folder)/Microsoft.ContainerService/stable/2016-03-30/containerService.json + - $(this-folder)/Microsoft.ContainerService/preview/2019-09-30-preview/openShiftManagedClusters.json ``` diff --git a/specification/containerservice/resource-manager/readme.python.md b/specification/containerservice/resource-manager/readme.python.md index 6823a0015142..77af14d2ecbf 100644 --- a/specification/containerservice/resource-manager/readme.python.md +++ b/specification/containerservice/resource-manager/readme.python.md @@ -24,6 +24,7 @@ batch: - tag: package-2019-04-01-only - tag: package-2019-02-only - tag: package-2018-09-preview-only + - tag: package-2019-09-preview-only - tag: package-2018-08-preview-only - tag: package-2018-03-only - tag: package-2017-07-only-extended @@ -126,3 +127,14 @@ python: namespace: azure.mgmt.containerservice.v2017_07_01 output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2017_07_01 ``` + +### Tag: package-2019-09-preview-only and python + +These settings apply only when `--tag=package-2019-08-preview-only --python` is specified on the command line. +Please also specify `--python-sdks-folder=`. + +``` yaml $(tag) == 'package-2019-09-preview-only' && $(python) +python: + namespace: azure.mgmt.containerservice.v2019_09_30_preview + output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_09_30_preview +``` From f66a8dda0377899f5aebb9e8033dfc0476d869ec Mon Sep 17 00:00:00 2001 From: Jack Quincy Date: Fri, 13 Sep 2019 16:09:26 -0700 Subject: [PATCH 04/12] adding input file for 2019-09-30-preview tag --- .../containerservice/resource-manager/readme.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/specification/containerservice/resource-manager/readme.md b/specification/containerservice/resource-manager/readme.md index 0def0e36b63b..d3c268a3a7f5 100644 --- a/specification/containerservice/resource-manager/readme.md +++ b/specification/containerservice/resource-manager/readme.md @@ -225,6 +225,15 @@ input-file: - Microsoft.ContainerService/preview/2018-09-30-preview/openShiftManagedClusters.json ``` +### Tag: package-2019-09-preview-only + +These settings apply only when `--tag=package-2019-09-preview-only` is specified on the command line. + +``` yaml $(tag) == 'package-2019-09-preview-only' +input-file: +- Microsoft.ContainerService/preview/2019-09-30-preview/openShiftManagedClusters.json +``` + ### Tag: package-2018-03-only These settings apply only when `--tag=package-2018-03-only` is specified on the command line. From d40c07cd128fcdb278efe332344f0a6474a56282 Mon Sep 17 00:00:00 2001 From: Jack Quincy Date: Fri, 13 Sep 2019 16:13:32 -0700 Subject: [PATCH 05/12] fixing spelling mistake --- .../preview/2019-09-30-preview/openShiftManagedClusters.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/openShiftManagedClusters.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/openShiftManagedClusters.json index 5181576b0948..032f0e3db0a2 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/openShiftManagedClusters.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/openShiftManagedClusters.json @@ -695,7 +695,7 @@ }, "monitorProfile":{ "$ref": "#/definitions/OpenShiftManagedClusterMonitorProfile", - "description": "Configures Log Analytics intergration." + "description": "Configures Log Analytics integration." } }, "required": [ From 3eec9ac88d2693e3a61c8d72b43b8d8d80405539 Mon Sep 17 00:00:00 2001 From: Jack Quincy Date: Tue, 17 Sep 2019 16:50:02 -0700 Subject: [PATCH 06/12] copying current version to new folder --- ...OpenShiftManagedClustersCreate_Update.json | 196 +++++ .../OpenShiftManagedClustersDelete.json | 12 + .../examples/OpenShiftManagedClustersGet.json | 75 ++ .../OpenShiftManagedClustersList.json | 77 ++ ...iftManagedClustersListByResourceGroup.json | 77 ++ .../OpenShiftManagedClustersUpdateTags.json | 80 ++ .../2019-09-30/openShiftManagedClusters.json | 804 ++++++++++++++++++ 7 files changed, 1321 insertions(+) create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersCreate_Update.json create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersDelete.json create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersGet.json create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersList.json create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersListByResourceGroup.json create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersUpdateTags.json create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/openShiftManagedClusters.json diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersCreate_Update.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersCreate_Update.json new file mode 100644 index 000000000000..619fde12b970 --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersCreate_Update.json @@ -0,0 +1,196 @@ +{ + "parameters": { + "api-version": "2019-04-30", + "subscriptionId": "subid1", + "resourceGroupName": "rg1", + "resourceName": "clustername1", + "parameters": { + "location": "location1", + "tags": { + "tier": "production", + "archv2": "" + }, + "properties": { + "openShiftVersion": "v3.11", + "networkProfile": { + "vnetCidr": "10.0.0.0/8" + }, + "masterPoolProfile": { + "name": "master", + "count": 3, + "vmSize": "Standard_D4s_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", + "customerAdminGroupId": "customerAdminGroupId" + } + } + ] + } + } + } + }, + "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": "Updating", + "openShiftVersion": "v3.11", + "clusterVersion": "osa.1", + "fqdn": "df9337748a4b.location1.cloudapp.azure.com", + "publicHostname": "openshift.1225bdf9337748a4bd3a.location1.azmosa.io", + "networkProfile": { + "vnetCidr": "10.0.0.0/8" + }, + "masterPoolProfile": { + "count": 3, + "vmSize": "Standard_D4s_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": "osa2925bdf9337748f4bd3b.location1.cloudapp.azure.com", + "publicSubdomain": "apps.bc309ee87c164153871c.location1.azmosa.io" + } + ], + "authProfile": { + "identityProviders": [ + { + "name": "Azure AD", + "provider": { + "kind": "AADIdentityProvider", + "clientId": "clientId", + "tenantId": "tenantId", + "customerAdminGroupId": "customerAdminGroupId" + } + } + ] + } + } + } + }, + "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.11", + "clusterVersion": "osa.1", + "fqdn": "df9337748a4b.location1.cloudapp.azure.com", + "networkProfile": { + "vnetCidr": "10.0.0.0/8" + }, + "masterPoolProfile": { + "name": "master", + "count": 3, + "vmSize": "Standard_D4s_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", + "customerAdminGroupId": "customerAdminGroupId" + } + } + ] + } + } + } + } + } +} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersDelete.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersDelete.json new file mode 100644 index 000000000000..43c149041644 --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersDelete.json @@ -0,0 +1,12 @@ +{ + "parameters": { + "api-version": "2019-04-30", + "subscriptionId": "subid1", + "resourceGroupName": "rg1", + "resourceName": "clustername1" + }, + "responses": { + "202": {}, + "204": {} + } +} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersGet.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersGet.json new file mode 100644 index 000000000000..37bab0b570c1 --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersGet.json @@ -0,0 +1,75 @@ +{ + "parameters": { + "api-version": "2019-04-30", + "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.11", + "clusterVersion": "osa.1", + "fqdn": "df9337748a4b.location1.cloudapp.azure.com", + "publicHostname": "openshift.1225bdf9337748a4bd3a.location1.azmosa.io", + "networkProfile": { + "vnetCidr": "10.0.0.0/8" + }, + "masterPoolProfile": { + "count": 3, + "vmSize": "Standard_D4s_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": "osa2925bdf9337748f4bd3b.location1.cloudapp.azure.com", + "publicSubdomain": "apps.bc309ee87c164153871c.location1.azmosa.io" + } + ], + "authProfile": { + "identityProviders": [ + { + "name": "Azure AD", + "provider": { + "kind": "AADIdentityProvider", + "clientId": "clientId", + "tenantId": "tenantId", + "customerAdminGroupId": "customerAdminGroupId" + } + } + ] + } + } + } + } + } +} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersList.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersList.json new file mode 100644 index 000000000000..133f47178c77 --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersList.json @@ -0,0 +1,77 @@ +{ + "parameters": { + "api-version": "2019-04-30", + "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", + "properties": { + "provisioningState": "Succeeded", + "openShiftVersion": "v3.11", + "clusterVersion": "osa.1", + "fqdn": "df9337748a4b.location1.cloudapp.azure.com", + "publicHostname": "openshift.1225bdf9337748a4bd3a.location1.azmosa.io", + "networkProfile": { + "vnetCidr": "10.0.0.0/8" + }, + "masterPoolProfile": { + "count": 3, + "vmSize": "Standard_D4s_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": "osa2925bdf9337748f4bd3b.location1.cloudapp.azure.com", + "publicSubdomain": "apps.bc309ee87c164153871c.location1.azmosa.io" + } + ], + "authProfile": { + "identityProviders": [ + { + "name": "Azure AD", + "provider": { + "kind": "AADIdentityProvider", + "clientId": "clientId", + "tenantId": "tenantId", + "customerAdminGroupId": "customerAdminGroupId" + } + } + ] + } + } + } + ] + } + } + } +} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersListByResourceGroup.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersListByResourceGroup.json new file mode 100644 index 000000000000..0254f9e8e8dd --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersListByResourceGroup.json @@ -0,0 +1,77 @@ +{ + "parameters": { + "api-version": "2018-09-30-preview", + "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": "v3.11", + "clusterVersion": "osa.1", + "fqdn": "df9337748a4b.location1.cloudapp.azure.com", + "networkProfile": { + "vnetCidr": "10.0.0.0/8" + }, + "masterPoolProfile": { + "count": 3, + "vmSize": "Standard_D4s_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": "dce5faa189c841b99f8a.location1.cloudapp.azure.com", + "publicSubdomain": "b788fade68d345da9b77.location1.int.aksapp.io" + } + ], + "authProfile": { + "identityProviders": [ + { + "name": "Azure AD", + "provider": { + "kind": "AADIdentityProvider", + "clientId": "clientId", + "tenantId": "tenantId", + "customerAdminGroupId": "customerAdminGroupId" + } + } + ] + } + } + } + ] + } + } + } +} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersUpdateTags.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersUpdateTags.json new file mode 100644 index 000000000000..4b688527ebf8 --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersUpdateTags.json @@ -0,0 +1,80 @@ +{ + "parameters": { + "api-version": "2019-04-30", + "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.11", + "fqdn": "df9337748a4b.location1.cloudapp.azure.com", + "publicHostname": "openshift.1225bdf9337748a4bd3a.location1.azmosa.io", + "networkProfile": { + "vnetCidr": "10.0.0.0/8" + }, + "masterPoolProfile": { + "count": 3, + "vmSize": "Standard_D4s_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": "osa2925bdf9337748f4bd3b.location1.cloudapp.azure.com", + "publicSubdomain": "apps.bc309ee87c164153871c.location1.azmosa.io" + } + ], + "authProfile": { + "identityProviders": [ + { + "name": "Azure AD", + "provider": { + "kind": "AADIdentityProvider", + "clientId": "clientId", + "tenantId": "tenantId", + "customerAdminGroupId": "customerAdminGroupId" + } + } + ] + } + } + } + } + } +} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/openShiftManagedClusters.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/openShiftManagedClusters.json new file mode 100644 index 000000000000..5c2305de6f10 --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/openShiftManagedClusters.json @@ -0,0 +1,804 @@ +{ + "swagger": "2.0", + "info": { + "title": "ContainerServiceClient", + "description": "The Container Service Client.", + "version": "2019-04-30" + }, + "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}/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 Managed Clusters": { + "$ref": "./examples/OpenShiftManagedClustersList.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/openShiftManagedClusters": { + "get": { + "tags": [ + "OpenShiftManagedClusters" + ], + "operationId": "OpenShiftManagedClusters_ListByResourceGroup", + "summary": "Lists OpenShift managed clusters in the specified subscription and resource group.", + "description": "Lists 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", + "minLength": 1, + "description": "The name of the resource group." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/OpenShiftManagedClusterListResult" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "Get 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", + "minLength": 1, + "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", + "minLength": 1, + "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", + "minLength": 1, + "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", + "minLength": 1, + "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": "Details about the error." + } + }, + "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", + "readOnly": true, + "description": "DNS subdomain for OpenShift router." + }, + "fqdn": { + "type": "string", + "readOnly": true, + "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." + }, + "vnetId": { + "type": "string", + "description": "ID of the Vnet created for OSA cluster." + } + }, + "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", + "Standard_D8s_v3", + "Standard_D16s_v3", + "Standard_D32s_v3", + "Standard_D64s_v3", + "Standard_DS4_v2", + "Standard_DS5_v2", + "Standard_F8s_v2", + "Standard_F16s_v2", + "Standard_F32s_v2", + "Standard_F64s_v2", + "Standard_F72s_v2", + "Standard_F8s", + "Standard_F16s", + "Standard_E4s_v3", + "Standard_E8s_v3", + "Standard_E16s_v3", + "Standard_E20s_v3", + "Standard_E32s_v3", + "Standard_E64s_v3", + "Standard_GS2", + "Standard_GS3", + "Standard_GS4", + "Standard_GS5", + "Standard_DS12_v2", + "Standard_DS13_v2", + "Standard_DS14_v2", + "Standard_DS15_v2", + "Standard_L4s", + "Standard_L8s", + "Standard_L16s", + "Standard_L32s" + ] + }, + "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", + "description": "Number of masters (VMs) to host docker containers. The default value is 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", + "description": "Number of agents (VMs) to host docker containers." + }, + "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." + }, + "clusterVersion": { + "readOnly": true, + "type": "string", + "description": "Version of OpenShift specified when creating the cluster." + }, + "publicHostname": { + "type": "string", + "readOnly": true, + "description": "Service generated FQDN for OpenShift API server." + }, + "fqdn": { + "type": "string", + "readOnly": true, + "description": "Service generated 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." + }, + "customerAdminGroupId": { + "type": "string", + "description": "The groupId to be granted cluster admin role." + } + } + } + ], + "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." + }, + "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": { + "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" + } + } +} From bc678f6deca6b4f4c1d0ff0552f1490a5f7ea9fe Mon Sep 17 00:00:00 2001 From: Jack Quincy Date: Tue, 17 Sep 2019 16:53:29 -0700 Subject: [PATCH 07/12] deleting preview named file and moving changes to the new version folder --- .../OpenShiftManagedClustersCreate_Update.json | 9 +++++++++ .../examples/OpenShiftManagedClustersGet.json | 3 +++ .../examples/OpenShiftManagedClustersList.json | 3 +++ ...OpenShiftManagedClustersListByResourceGroup.json | 3 +++ .../OpenShiftManagedClustersUpdateTags.json | 3 +++ .../2019-09-30/openShiftManagedClusters.json | 13 +++++++++++++ .../containerservice/resource-manager/readme.md | 6 +++--- 7 files changed, 37 insertions(+), 3 deletions(-) diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersCreate_Update.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersCreate_Update.json index 619fde12b970..621cae6b7c60 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersCreate_Update.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersCreate_Update.json @@ -58,6 +58,9 @@ } } ] + }, + "monitorProfile": { + "workspaceResourceID": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.OperationalInsights/workspaces/workspacename1" } } } @@ -124,6 +127,9 @@ } } ] + }, + "monitorProfile": { + "workspaceResourceID": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.OperationalInsights/workspaces/workspacename1" } } } @@ -188,6 +194,9 @@ } } ] + }, + "monitorProfile": { + "workspaceResourceID": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.OperationalInsights/workspaces/workspacename1" } } } diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersGet.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersGet.json index 37bab0b570c1..f8d664e6d2ef 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersGet.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersGet.json @@ -67,6 +67,9 @@ } } ] + }, + "monitorProfile": { + "workspaceResourceID": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.OperationalInsights/workspaces/workspacename1" } } } diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersList.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersList.json index 133f47178c77..86726bdb9d12 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersList.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersList.json @@ -67,6 +67,9 @@ } } ] + }, + "monitorProfile": { + "workspaceResourceID": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.OperationalInsights/workspaces/workspacename1" } } } diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersListByResourceGroup.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersListByResourceGroup.json index 0254f9e8e8dd..0cb288484b7c 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersListByResourceGroup.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersListByResourceGroup.json @@ -67,6 +67,9 @@ } } ] + }, + "monitorProfile": { + "workspaceResourceID": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.OperationalInsights/workspaces/workspacename1" } } } diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersUpdateTags.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersUpdateTags.json index 4b688527ebf8..b6d484ed7a80 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersUpdateTags.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersUpdateTags.json @@ -72,6 +72,9 @@ } } ] + }, + "monitorProfile": { + "workspaceResourceID": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.OperationalInsights/workspaces/workspacename1" } } } diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/openShiftManagedClusters.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/openShiftManagedClusters.json index 5c2305de6f10..032f0e3db0a2 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/openShiftManagedClusters.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/openShiftManagedClusters.json @@ -632,6 +632,15 @@ }, "description": "Defines all possible authentication profiles for the OpenShift cluster." }, + "OpenShiftManagedClusterMonitorProfile":{ + "properties": { + "workspaceResourceID":{ + "type": "string", + "description": "Azure Resource Manager Resource ID for the Log Analytics workspace to integrate with." + } + }, + "description": "Defines the configuration for Log Analytics integration." + }, "OpenShiftManagedClusterProperties": { "properties": { "provisioningState": { @@ -683,6 +692,10 @@ "authProfile": { "$ref": "#/definitions/OpenShiftManagedClusterAuthProfile", "description": "Configures OpenShift authentication." + }, + "monitorProfile":{ + "$ref": "#/definitions/OpenShiftManagedClusterMonitorProfile", + "description": "Configures Log Analytics integration." } }, "required": [ diff --git a/specification/containerservice/resource-manager/readme.md b/specification/containerservice/resource-manager/readme.md index d3c268a3a7f5..3c88f31f00b4 100644 --- a/specification/containerservice/resource-manager/readme.md +++ b/specification/containerservice/resource-manager/readme.md @@ -43,7 +43,7 @@ These settings apply only when `--tag=package-2019-09-30-preview` is specified o ``` yaml $(tag) == 'package-2019-09-30-preview' input-file: - - Microsoft.ContainerService/preview/2019-09-30-preview/openShiftManagedClusters.json + - Microsoft.ContainerService/preview/2019-09-30/openShiftManagedClusters.json - Microsoft.ContainerService/stable/2017-07-01/containerService.json - Microsoft.ContainerService/stable/2019-08-01/managedClusters.json - Microsoft.ContainerService/stable/2019-08-01/location.json @@ -231,7 +231,7 @@ These settings apply only when `--tag=package-2019-09-preview-only` is specified ``` yaml $(tag) == 'package-2019-09-preview-only' input-file: -- Microsoft.ContainerService/preview/2019-09-30-preview/openShiftManagedClusters.json +- Microsoft.ContainerService/preview/2019-09-30/openShiftManagedClusters.json ``` ### Tag: package-2018-03-only @@ -390,7 +390,7 @@ input-file: - $(this-folder)/Microsoft.ContainerService/stable/2017-01-31/containerService.json - $(this-folder)/Microsoft.ContainerService/stable/2016-09-30/containerService.json - $(this-folder)/Microsoft.ContainerService/stable/2016-03-30/containerService.json - - $(this-folder)/Microsoft.ContainerService/preview/2019-09-30-preview/openShiftManagedClusters.json + - $(this-folder)/Microsoft.ContainerService/preview/2019-09-30/openShiftManagedClusters.json ``` From c962b08311b6bd0f6d7e34bde4edc594a311c544 Mon Sep 17 00:00:00 2001 From: Jack Quincy Date: Tue, 17 Sep 2019 17:03:13 -0700 Subject: [PATCH 08/12] removing -preview file per pull request comments --- ...OpenShiftManagedClustersCreate_Update.json | 205 ----- .../OpenShiftManagedClustersDelete.json | 12 - .../examples/OpenShiftManagedClustersGet.json | 78 -- .../OpenShiftManagedClustersList.json | 80 -- ...iftManagedClustersListByResourceGroup.json | 80 -- .../OpenShiftManagedClustersUpdateTags.json | 83 -- .../openShiftManagedClusters.json | 817 ------------------ 7 files changed, 1355 deletions(-) delete mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersCreate_Update.json delete mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersDelete.json delete mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersGet.json delete mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersList.json delete mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersListByResourceGroup.json delete mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersUpdateTags.json delete mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/openShiftManagedClusters.json diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersCreate_Update.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersCreate_Update.json deleted file mode 100644 index 621cae6b7c60..000000000000 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersCreate_Update.json +++ /dev/null @@ -1,205 +0,0 @@ -{ - "parameters": { - "api-version": "2019-04-30", - "subscriptionId": "subid1", - "resourceGroupName": "rg1", - "resourceName": "clustername1", - "parameters": { - "location": "location1", - "tags": { - "tier": "production", - "archv2": "" - }, - "properties": { - "openShiftVersion": "v3.11", - "networkProfile": { - "vnetCidr": "10.0.0.0/8" - }, - "masterPoolProfile": { - "name": "master", - "count": 3, - "vmSize": "Standard_D4s_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", - "customerAdminGroupId": "customerAdminGroupId" - } - } - ] - }, - "monitorProfile": { - "workspaceResourceID": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.OperationalInsights/workspaces/workspacename1" - } - } - } - }, - "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": "Updating", - "openShiftVersion": "v3.11", - "clusterVersion": "osa.1", - "fqdn": "df9337748a4b.location1.cloudapp.azure.com", - "publicHostname": "openshift.1225bdf9337748a4bd3a.location1.azmosa.io", - "networkProfile": { - "vnetCidr": "10.0.0.0/8" - }, - "masterPoolProfile": { - "count": 3, - "vmSize": "Standard_D4s_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": "osa2925bdf9337748f4bd3b.location1.cloudapp.azure.com", - "publicSubdomain": "apps.bc309ee87c164153871c.location1.azmosa.io" - } - ], - "authProfile": { - "identityProviders": [ - { - "name": "Azure AD", - "provider": { - "kind": "AADIdentityProvider", - "clientId": "clientId", - "tenantId": "tenantId", - "customerAdminGroupId": "customerAdminGroupId" - } - } - ] - }, - "monitorProfile": { - "workspaceResourceID": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.OperationalInsights/workspaces/workspacename1" - } - } - } - }, - "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.11", - "clusterVersion": "osa.1", - "fqdn": "df9337748a4b.location1.cloudapp.azure.com", - "networkProfile": { - "vnetCidr": "10.0.0.0/8" - }, - "masterPoolProfile": { - "name": "master", - "count": 3, - "vmSize": "Standard_D4s_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", - "customerAdminGroupId": "customerAdminGroupId" - } - } - ] - }, - "monitorProfile": { - "workspaceResourceID": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.OperationalInsights/workspaces/workspacename1" - } - } - } - } - } -} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersDelete.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersDelete.json deleted file mode 100644 index 43c149041644..000000000000 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersDelete.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parameters": { - "api-version": "2019-04-30", - "subscriptionId": "subid1", - "resourceGroupName": "rg1", - "resourceName": "clustername1" - }, - "responses": { - "202": {}, - "204": {} - } -} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersGet.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersGet.json deleted file mode 100644 index f8d664e6d2ef..000000000000 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersGet.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "parameters": { - "api-version": "2019-04-30", - "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.11", - "clusterVersion": "osa.1", - "fqdn": "df9337748a4b.location1.cloudapp.azure.com", - "publicHostname": "openshift.1225bdf9337748a4bd3a.location1.azmosa.io", - "networkProfile": { - "vnetCidr": "10.0.0.0/8" - }, - "masterPoolProfile": { - "count": 3, - "vmSize": "Standard_D4s_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": "osa2925bdf9337748f4bd3b.location1.cloudapp.azure.com", - "publicSubdomain": "apps.bc309ee87c164153871c.location1.azmosa.io" - } - ], - "authProfile": { - "identityProviders": [ - { - "name": "Azure AD", - "provider": { - "kind": "AADIdentityProvider", - "clientId": "clientId", - "tenantId": "tenantId", - "customerAdminGroupId": "customerAdminGroupId" - } - } - ] - }, - "monitorProfile": { - "workspaceResourceID": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.OperationalInsights/workspaces/workspacename1" - } - } - } - } - } -} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersList.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersList.json deleted file mode 100644 index 86726bdb9d12..000000000000 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersList.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "parameters": { - "api-version": "2019-04-30", - "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", - "properties": { - "provisioningState": "Succeeded", - "openShiftVersion": "v3.11", - "clusterVersion": "osa.1", - "fqdn": "df9337748a4b.location1.cloudapp.azure.com", - "publicHostname": "openshift.1225bdf9337748a4bd3a.location1.azmosa.io", - "networkProfile": { - "vnetCidr": "10.0.0.0/8" - }, - "masterPoolProfile": { - "count": 3, - "vmSize": "Standard_D4s_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": "osa2925bdf9337748f4bd3b.location1.cloudapp.azure.com", - "publicSubdomain": "apps.bc309ee87c164153871c.location1.azmosa.io" - } - ], - "authProfile": { - "identityProviders": [ - { - "name": "Azure AD", - "provider": { - "kind": "AADIdentityProvider", - "clientId": "clientId", - "tenantId": "tenantId", - "customerAdminGroupId": "customerAdminGroupId" - } - } - ] - }, - "monitorProfile": { - "workspaceResourceID": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.OperationalInsights/workspaces/workspacename1" - } - } - } - ] - } - } - } -} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersListByResourceGroup.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersListByResourceGroup.json deleted file mode 100644 index 0cb288484b7c..000000000000 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersListByResourceGroup.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "parameters": { - "api-version": "2018-09-30-preview", - "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": "v3.11", - "clusterVersion": "osa.1", - "fqdn": "df9337748a4b.location1.cloudapp.azure.com", - "networkProfile": { - "vnetCidr": "10.0.0.0/8" - }, - "masterPoolProfile": { - "count": 3, - "vmSize": "Standard_D4s_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": "dce5faa189c841b99f8a.location1.cloudapp.azure.com", - "publicSubdomain": "b788fade68d345da9b77.location1.int.aksapp.io" - } - ], - "authProfile": { - "identityProviders": [ - { - "name": "Azure AD", - "provider": { - "kind": "AADIdentityProvider", - "clientId": "clientId", - "tenantId": "tenantId", - "customerAdminGroupId": "customerAdminGroupId" - } - } - ] - }, - "monitorProfile": { - "workspaceResourceID": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.OperationalInsights/workspaces/workspacename1" - } - } - } - ] - } - } - } -} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersUpdateTags.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersUpdateTags.json deleted file mode 100644 index b6d484ed7a80..000000000000 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/examples/OpenShiftManagedClustersUpdateTags.json +++ /dev/null @@ -1,83 +0,0 @@ -{ - "parameters": { - "api-version": "2019-04-30", - "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.11", - "fqdn": "df9337748a4b.location1.cloudapp.azure.com", - "publicHostname": "openshift.1225bdf9337748a4bd3a.location1.azmosa.io", - "networkProfile": { - "vnetCidr": "10.0.0.0/8" - }, - "masterPoolProfile": { - "count": 3, - "vmSize": "Standard_D4s_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": "osa2925bdf9337748f4bd3b.location1.cloudapp.azure.com", - "publicSubdomain": "apps.bc309ee87c164153871c.location1.azmosa.io" - } - ], - "authProfile": { - "identityProviders": [ - { - "name": "Azure AD", - "provider": { - "kind": "AADIdentityProvider", - "clientId": "clientId", - "tenantId": "tenantId", - "customerAdminGroupId": "customerAdminGroupId" - } - } - ] - }, - "monitorProfile": { - "workspaceResourceID": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.OperationalInsights/workspaces/workspacename1" - } - } - } - } - } -} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/openShiftManagedClusters.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/openShiftManagedClusters.json deleted file mode 100644 index 032f0e3db0a2..000000000000 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30-preview/openShiftManagedClusters.json +++ /dev/null @@ -1,817 +0,0 @@ -{ - "swagger": "2.0", - "info": { - "title": "ContainerServiceClient", - "description": "The Container Service Client.", - "version": "2019-04-30" - }, - "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}/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 Managed Clusters": { - "$ref": "./examples/OpenShiftManagedClustersList.json" - } - } - } - }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/openShiftManagedClusters": { - "get": { - "tags": [ - "OpenShiftManagedClusters" - ], - "operationId": "OpenShiftManagedClusters_ListByResourceGroup", - "summary": "Lists OpenShift managed clusters in the specified subscription and resource group.", - "description": "Lists 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", - "minLength": 1, - "description": "The name of the resource group." - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OpenShiftManagedClusterListResult" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - }, - "x-ms-examples": { - "Get 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", - "minLength": 1, - "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", - "minLength": 1, - "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", - "minLength": 1, - "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", - "minLength": 1, - "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": "Details about the error." - } - }, - "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", - "readOnly": true, - "description": "DNS subdomain for OpenShift router." - }, - "fqdn": { - "type": "string", - "readOnly": true, - "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." - }, - "vnetId": { - "type": "string", - "description": "ID of the Vnet created for OSA cluster." - } - }, - "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", - "Standard_D8s_v3", - "Standard_D16s_v3", - "Standard_D32s_v3", - "Standard_D64s_v3", - "Standard_DS4_v2", - "Standard_DS5_v2", - "Standard_F8s_v2", - "Standard_F16s_v2", - "Standard_F32s_v2", - "Standard_F64s_v2", - "Standard_F72s_v2", - "Standard_F8s", - "Standard_F16s", - "Standard_E4s_v3", - "Standard_E8s_v3", - "Standard_E16s_v3", - "Standard_E20s_v3", - "Standard_E32s_v3", - "Standard_E64s_v3", - "Standard_GS2", - "Standard_GS3", - "Standard_GS4", - "Standard_GS5", - "Standard_DS12_v2", - "Standard_DS13_v2", - "Standard_DS14_v2", - "Standard_DS15_v2", - "Standard_L4s", - "Standard_L8s", - "Standard_L16s", - "Standard_L32s" - ] - }, - "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", - "description": "Number of masters (VMs) to host docker containers. The default value is 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", - "description": "Number of agents (VMs) to host docker containers." - }, - "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." - }, - "OpenShiftManagedClusterMonitorProfile":{ - "properties": { - "workspaceResourceID":{ - "type": "string", - "description": "Azure Resource Manager Resource ID for the Log Analytics workspace to integrate with." - } - }, - "description": "Defines the configuration for Log Analytics integration." - }, - "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." - }, - "clusterVersion": { - "readOnly": true, - "type": "string", - "description": "Version of OpenShift specified when creating the cluster." - }, - "publicHostname": { - "type": "string", - "readOnly": true, - "description": "Service generated FQDN for OpenShift API server." - }, - "fqdn": { - "type": "string", - "readOnly": true, - "description": "Service generated 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." - }, - "monitorProfile":{ - "$ref": "#/definitions/OpenShiftManagedClusterMonitorProfile", - "description": "Configures Log Analytics integration." - } - }, - "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." - }, - "customerAdminGroupId": { - "type": "string", - "description": "The groupId to be granted cluster admin role." - } - } - } - ], - "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." - }, - "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": { - "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" - } - } -} From d4b5c0f6e47f1343d10df01882c7eb1c37e3ef43 Mon Sep 17 00:00:00 2001 From: Jack Quincy Date: Wed, 18 Sep 2019 15:16:34 -0700 Subject: [PATCH 09/12] changing api version in the apiverion definition file to be the api version that is being added --- .../preview/2019-09-30/openShiftManagedClusters.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/openShiftManagedClusters.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/openShiftManagedClusters.json index 032f0e3db0a2..682c9b9976ad 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/openShiftManagedClusters.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/openShiftManagedClusters.json @@ -3,7 +3,7 @@ "info": { "title": "ContainerServiceClient", "description": "The Container Service Client.", - "version": "2019-04-30" + "version": "2019-09-30-preview" }, "host": "management.azure.com", "schemes": [ From 7293488dc4a4316c08908b8e7a6ff88118d91dda Mon Sep 17 00:00:00 2001 From: Jack Quincy Date: Thu, 19 Sep 2019 10:47:08 -0700 Subject: [PATCH 10/12] adding enabled flag --- .../2019-09-30/examples/OpenShiftManagedClustersGet.json | 3 ++- .../2019-09-30/examples/OpenShiftManagedClustersList.json | 1 + .../examples/OpenShiftManagedClustersListByResourceGroup.json | 1 + .../examples/OpenShiftManagedClustersUpdateTags.json | 1 + .../preview/2019-09-30/openShiftManagedClusters.json | 4 ++++ 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersGet.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersGet.json index f8d664e6d2ef..c67a630fed86 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersGet.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersGet.json @@ -69,7 +69,8 @@ ] }, "monitorProfile": { - "workspaceResourceID": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.OperationalInsights/workspaces/workspacename1" + "enabled": true, + "workspaceResourceID": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.OperationalInsights/workspaces/workspacename1" } } } diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersList.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersList.json index 86726bdb9d12..d14c7f622c3f 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersList.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersList.json @@ -69,6 +69,7 @@ ] }, "monitorProfile": { + "enabled": true, "workspaceResourceID": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.OperationalInsights/workspaces/workspacename1" } } diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersListByResourceGroup.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersListByResourceGroup.json index 0cb288484b7c..6194db0580d0 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersListByResourceGroup.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersListByResourceGroup.json @@ -69,6 +69,7 @@ ] }, "monitorProfile": { + "enabled": true, "workspaceResourceID": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.OperationalInsights/workspaces/workspacename1" } } diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersUpdateTags.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersUpdateTags.json index b6d484ed7a80..f2bf294aacbd 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersUpdateTags.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersUpdateTags.json @@ -74,6 +74,7 @@ ] }, "monitorProfile": { + "enabled": true, "workspaceResourceID": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.OperationalInsights/workspaces/workspacename1" } } diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/openShiftManagedClusters.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/openShiftManagedClusters.json index 682c9b9976ad..2963d2e6c482 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/openShiftManagedClusters.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/openShiftManagedClusters.json @@ -637,6 +637,10 @@ "workspaceResourceID":{ "type": "string", "description": "Azure Resource Manager Resource ID for the Log Analytics workspace to integrate with." + }, + "enabled":{ + "type": "boolean", + "description": "If the Log analytics integration should be turned on or off" } }, "description": "Defines the configuration for Log Analytics integration." From 6308fd287fe9db58a0a3f20bd2282ed7f88e1b23 Mon Sep 17 00:00:00 2001 From: Jack Quincy Date: Thu, 26 Sep 2019 11:02:34 -0700 Subject: [PATCH 11/12] update create_update example --- .../examples/OpenShiftManagedClustersCreate_Update.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersCreate_Update.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersCreate_Update.json index 621cae6b7c60..40603034764f 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersCreate_Update.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersCreate_Update.json @@ -60,6 +60,7 @@ ] }, "monitorProfile": { + "enabled": true, "workspaceResourceID": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.OperationalInsights/workspaces/workspacename1" } } @@ -129,6 +130,7 @@ ] }, "monitorProfile": { + "enabled": true, "workspaceResourceID": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.OperationalInsights/workspaces/workspacename1" } } @@ -196,6 +198,7 @@ ] }, "monitorProfile": { + "enabled": true, "workspaceResourceID": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.OperationalInsights/workspaces/workspacename1" } } From aa9913e0d2ece26504f653d3b30d22a4a35a0b38 Mon Sep 17 00:00:00 2001 From: Jack Quincy Date: Thu, 3 Oct 2019 14:04:47 -0700 Subject: [PATCH 12/12] fixing typo and indentation --- .../2019-09-30/examples/OpenShiftManagedClustersGet.json | 4 ++-- .../containerservice/resource-manager/readme.python.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersGet.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersGet.json index c67a630fed86..82292227d55d 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersGet.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2019-09-30/examples/OpenShiftManagedClustersGet.json @@ -69,8 +69,8 @@ ] }, "monitorProfile": { - "enabled": true, - "workspaceResourceID": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.OperationalInsights/workspaces/workspacename1" + "enabled": true, + "workspaceResourceID": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.OperationalInsights/workspaces/workspacename1" } } } diff --git a/specification/containerservice/resource-manager/readme.python.md b/specification/containerservice/resource-manager/readme.python.md index 77af14d2ecbf..5e21eda2ecea 100644 --- a/specification/containerservice/resource-manager/readme.python.md +++ b/specification/containerservice/resource-manager/readme.python.md @@ -130,7 +130,7 @@ python: ### Tag: package-2019-09-preview-only and python -These settings apply only when `--tag=package-2019-08-preview-only --python` is specified on the command line. +These settings apply only when `--tag=package-2019-09-preview-only --python` is specified on the command line. Please also specify `--python-sdks-folder=`. ``` yaml $(tag) == 'package-2019-09-preview-only' && $(python)