diff --git a/schemas/2019-02-01/Microsoft.ContainerService.json b/schemas/2019-02-01/Microsoft.ContainerService.json index 96c6ebb11c..3a46b4ce46 100644 --- a/schemas/2019-02-01/Microsoft.ContainerService.json +++ b/schemas/2019-02-01/Microsoft.ContainerService.json @@ -1055,7 +1055,7 @@ "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" } ], - "description": "(PREVIEW) Whether to enable Kubernetes Pod security policy." + "description": "(DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy." }, "enableRBAC": { "oneOf": [ diff --git a/schemas/2019-04-01/Microsoft.ContainerService.json b/schemas/2019-04-01/Microsoft.ContainerService.json index 0a80b3cdcd..348d1ea7bc 100644 --- a/schemas/2019-04-01/Microsoft.ContainerService.json +++ b/schemas/2019-04-01/Microsoft.ContainerService.json @@ -1112,7 +1112,7 @@ "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" } ], - "description": "(PREVIEW) Whether to enable Kubernetes Pod security policy." + "description": "(DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy." }, "enableRBAC": { "oneOf": [ diff --git a/schemas/2019-06-01/Microsoft.ContainerService.json b/schemas/2019-06-01/Microsoft.ContainerService.json index cd5f7c38d4..5de019b237 100644 --- a/schemas/2019-06-01/Microsoft.ContainerService.json +++ b/schemas/2019-06-01/Microsoft.ContainerService.json @@ -1210,7 +1210,7 @@ "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" } ], - "description": "(PREVIEW) Whether to enable Kubernetes Pod security policy." + "description": "(DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy." }, "enableRBAC": { "oneOf": [ diff --git a/schemas/2019-08-01/Microsoft.ContainerService.json b/schemas/2019-08-01/Microsoft.ContainerService.json index 4e35c08d4b..12c29b9b8a 100644 --- a/schemas/2019-08-01/Microsoft.ContainerService.json +++ b/schemas/2019-08-01/Microsoft.ContainerService.json @@ -1362,7 +1362,7 @@ "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" } ], - "description": "(PREVIEW) Whether to enable Kubernetes Pod security policy." + "description": "(DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy." }, "enableRBAC": { "oneOf": [ diff --git a/schemas/2019-09-30-preview/Microsoft.ContainerService.json b/schemas/2019-09-30-preview/Microsoft.ContainerService.json new file mode 100644 index 0000000000..f6fd4f596a --- /dev/null +++ b/schemas/2019-09-30-preview/Microsoft.ContainerService.json @@ -0,0 +1,516 @@ +{ + "id": "https://schema.management.azure.com/schemas/2019-09-30-preview/Microsoft.ContainerService.json#", + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "Microsoft.ContainerService", + "description": "Microsoft ContainerService Resource Types", + "resourceDefinitions": { + "openShiftManagedClusters": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2019-09-30-preview" + ] + }, + "location": { + "type": "string", + "description": "Resource location" + }, + "name": { + "type": "string", + "description": "The name of the OpenShift managed cluster resource." + }, + "plan": { + "oneOf": [ + { + "$ref": "#/definitions/PurchasePlan" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Used for establishing the purchase context of any 3rd Party artifact through MarketPlace." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/OpenShiftManagedClusterProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Properties of the OpenShift managed cluster." + }, + "tags": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Resource tags" + }, + "type": { + "type": "string", + "enum": [ + "Microsoft.ContainerService/openShiftManagedClusters" + ] + } + }, + "required": [ + "apiVersion", + "location", + "name", + "properties", + "type" + ], + "description": "Microsoft.ContainerService/openShiftManagedClusters" + } + }, + "definitions": { + "NetworkProfile": { + "type": "object", + "properties": { + "peerVnetId": { + "type": "string", + "description": "CIDR of the Vnet to peer." + }, + "vnetCidr": { + "type": "string", + "default": "10.0.0.0/8", + "description": "CIDR for the OpenShift Vnet." + }, + "vnetId": { + "type": "string", + "description": "ID of the Vnet created for OSA cluster." + } + }, + "description": "Represents the OpenShift networking configuration" + }, + "OpenShiftManagedClusterAADIdentityProvider": { + "type": "object", + "properties": { + "clientId": { + "type": "string", + "description": "The clientId password associated with the provider." + }, + "customerAdminGroupId": { + "type": "string", + "description": "The groupId to be granted cluster admin role." + }, + "kind": { + "type": "string", + "enum": [ + "AADIdentityProvider" + ] + }, + "secret": { + "type": "string", + "description": "The secret password associated with the provider." + }, + "tenantId": { + "type": "string", + "description": "The tenantId associated with the provider." + } + }, + "required": [ + "kind" + ], + "description": "Defines the Identity provider for MS AAD." + }, + "OpenShiftManagedClusterAgentPoolProfile": { + "type": "object", + "properties": { + "count": { + "oneOf": [ + { + "type": "integer" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Number of agents (VMs) to host docker containers." + }, + "name": { + "type": "string", + "description": "Unique name of the pool profile in the context of the subscription and resource group." + }, + "osType": { + "oneOf": [ + { + "type": "string", + "enum": [ + "Linux", + "Windows" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "OsType to be used to specify os type. Choose from Linux and Windows. Default to Linux." + }, + "role": { + "oneOf": [ + { + "type": "string", + "enum": [ + "compute", + "infra" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Define the role of the AgentPoolProfile." + }, + "subnetCidr": { + "type": "string", + "default": "10.0.0.0/24", + "description": "Subnet CIDR for the peering." + }, + "vmSize": { + "oneOf": [ + { + "type": "string", + "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" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Size of agent VMs." + } + }, + "required": [ + "count", + "name", + "vmSize" + ], + "description": "Defines the configuration of the OpenShift cluster VMs." + }, + "OpenShiftManagedClusterAuthProfile": { + "type": "object", + "properties": { + "identityProviders": { + "oneOf": [ + { + "type": "array", + "items": { + "$ref": "#/definitions/OpenShiftManagedClusterIdentityProvider" + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Type of authentication profile to use." + } + }, + "description": "Defines all possible authentication profiles for the OpenShift cluster." + }, + "OpenShiftManagedClusterBaseIdentityProvider": { + "type": "object", + "oneOf": [ + { + "$ref": "#/definitions/OpenShiftManagedClusterAADIdentityProvider" + } + ], + "properties": {}, + "description": "Structure for any Identity provider." + }, + "OpenShiftManagedClusterIdentityProvider": { + "type": "object", + "properties": { + "name": { + "type": "string", + "description": "Name of the provider." + }, + "provider": { + "oneOf": [ + { + "$ref": "#/definitions/OpenShiftManagedClusterBaseIdentityProvider" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Structure for any Identity provider." + } + }, + "description": "Defines the configuration of the identity providers to be used in the OpenShift cluster." + }, + "OpenShiftManagedClusterMasterPoolProfile": { + "type": "object", + "properties": { + "count": { + "oneOf": [ + { + "type": "integer" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Number of masters (VMs) to host docker containers. The default value is 3." + }, + "name": { + "type": "string", + "description": "Unique name of the master pool profile in the context of the subscription and resource group." + }, + "osType": { + "oneOf": [ + { + "type": "string", + "enum": [ + "Linux", + "Windows" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "OsType to be used to specify os type. Choose from Linux and Windows. Default to Linux." + }, + "subnetCidr": { + "type": "string", + "description": "Subnet CIDR for the peering." + }, + "vmSize": { + "oneOf": [ + { + "type": "string", + "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" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Size of agent VMs." + } + }, + "required": [ + "count", + "vmSize" + ], + "description": "OpenShiftManagedClusterMaterPoolProfile contains configuration for OpenShift master VMs." + }, + "OpenShiftManagedClusterMonitorProfile": { + "type": "object", + "properties": { + "enabled": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "If the Log analytics integration should be turned on or off" + }, + "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": { + "type": "object", + "properties": { + "agentPoolProfiles": { + "oneOf": [ + { + "type": "array", + "items": { + "$ref": "#/definitions/OpenShiftManagedClusterAgentPoolProfile" + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Configuration of OpenShift cluster VMs." + }, + "authProfile": { + "oneOf": [ + { + "$ref": "#/definitions/OpenShiftManagedClusterAuthProfile" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Defines all possible authentication profiles for the OpenShift cluster." + }, + "masterPoolProfile": { + "oneOf": [ + { + "$ref": "#/definitions/OpenShiftManagedClusterMasterPoolProfile" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "OpenShiftManagedClusterMaterPoolProfile contains configuration for OpenShift master VMs." + }, + "monitorProfile": { + "oneOf": [ + { + "$ref": "#/definitions/OpenShiftManagedClusterMonitorProfile" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Defines the configuration for Log Analytics integration." + }, + "networkProfile": { + "oneOf": [ + { + "$ref": "#/definitions/NetworkProfile" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Represents the OpenShift networking configuration" + }, + "openShiftVersion": { + "type": "string", + "description": "Version of OpenShift specified when creating the cluster." + }, + "routerProfiles": { + "oneOf": [ + { + "type": "array", + "items": { + "$ref": "#/definitions/OpenShiftRouterProfile" + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Configuration for OpenShift router(s)." + } + }, + "required": [ + "openShiftVersion" + ], + "description": "Properties of the OpenShift managed cluster." + }, + "OpenShiftRouterProfile": { + "type": "object", + "properties": { + "name": { + "type": "string", + "description": "Name of the router profile." + } + }, + "description": "Represents an OpenShift router" + }, + "PurchasePlan": { + "type": "object", + "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." + } + } +} \ No newline at end of file diff --git a/schemas/2019-10-01/Microsoft.ContainerService.json b/schemas/2019-10-01/Microsoft.ContainerService.json index 94973b51bd..0f29e89189 100644 --- a/schemas/2019-10-01/Microsoft.ContainerService.json +++ b/schemas/2019-10-01/Microsoft.ContainerService.json @@ -1362,7 +1362,7 @@ "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" } ], - "description": "(PREVIEW) Whether to enable Kubernetes Pod security policy." + "description": "(DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy." }, "enableRBAC": { "oneOf": [ diff --git a/schemas/2019-11-01/Microsoft.ContainerService.json b/schemas/2019-11-01/Microsoft.ContainerService.json index a73dba6b8f..d75d63e607 100644 --- a/schemas/2019-11-01/Microsoft.ContainerService.json +++ b/schemas/2019-11-01/Microsoft.ContainerService.json @@ -1482,7 +1482,7 @@ "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" } ], - "description": "(PREVIEW) Whether to enable Kubernetes Pod security policy." + "description": "(DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy." }, "enableRBAC": { "oneOf": [ diff --git a/schemas/2020-01-01/Microsoft.ContainerService.json b/schemas/2020-01-01/Microsoft.ContainerService.json index fd22fc381c..54616fd4cd 100644 --- a/schemas/2020-01-01/Microsoft.ContainerService.json +++ b/schemas/2020-01-01/Microsoft.ContainerService.json @@ -1486,7 +1486,7 @@ "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" } ], - "description": "(PREVIEW) Whether to enable Kubernetes Pod security policy." + "description": "(DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy." }, "enableRBAC": { "oneOf": [ diff --git a/schemas/2020-02-01/Microsoft.ContainerService.json b/schemas/2020-02-01/Microsoft.ContainerService.json index 573528b352..c6e5bd7336 100644 --- a/schemas/2020-02-01/Microsoft.ContainerService.json +++ b/schemas/2020-02-01/Microsoft.ContainerService.json @@ -1538,7 +1538,7 @@ "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" } ], - "description": "(PREVIEW) Whether to enable Kubernetes Pod security policy." + "description": "(DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy." }, "enableRBAC": { "oneOf": [ diff --git a/schemas/2020-03-01/Microsoft.ContainerService.json b/schemas/2020-03-01/Microsoft.ContainerService.json index 90d472911c..39cf5df7c9 100644 --- a/schemas/2020-03-01/Microsoft.ContainerService.json +++ b/schemas/2020-03-01/Microsoft.ContainerService.json @@ -1599,7 +1599,7 @@ "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" } ], - "description": "(PREVIEW) Whether to enable Kubernetes Pod security policy." + "description": "(DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy." }, "enableRBAC": { "oneOf": [ diff --git a/schemas/2020-04-01/Microsoft.ContainerService.json b/schemas/2020-04-01/Microsoft.ContainerService.json index afb439bdd0..970597841d 100644 --- a/schemas/2020-04-01/Microsoft.ContainerService.json +++ b/schemas/2020-04-01/Microsoft.ContainerService.json @@ -1637,7 +1637,7 @@ "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" } ], - "description": "(PREVIEW) Whether to enable Kubernetes Pod security policy." + "description": "(DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy." }, "enableRBAC": { "oneOf": [ diff --git a/schemas/2020-06-01/Microsoft.ContainerService.json b/schemas/2020-06-01/Microsoft.ContainerService.json index 4d49c97fc7..5e67abe7e6 100644 --- a/schemas/2020-06-01/Microsoft.ContainerService.json +++ b/schemas/2020-06-01/Microsoft.ContainerService.json @@ -1718,7 +1718,7 @@ "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" } ], - "description": "(PREVIEW) Whether to enable Kubernetes Pod security policy." + "description": "(DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy." }, "enableRBAC": { "oneOf": [ diff --git a/schemas/common/autogeneratedResources.json b/schemas/common/autogeneratedResources.json index a18ff59272..5bac9651db 100644 --- a/schemas/common/autogeneratedResources.json +++ b/schemas/common/autogeneratedResources.json @@ -1633,6 +1633,9 @@ { "$ref": "https://schema.management.azure.com/schemas/2019-08-01/Microsoft.ContainerService.json#/resourceDefinitions/managedClusters_agentPools" }, + { + "$ref": "https://schema.management.azure.com/schemas/2019-09-30-preview/Microsoft.ContainerService.json#/resourceDefinitions/openShiftManagedClusters" + }, { "$ref": "https://schema.management.azure.com/schemas/2019-10-01/Microsoft.ContainerService.json#/resourceDefinitions/managedClusters" },