diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/CreateExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/CreateExtension.json index d733d4f5c5b2..187e24209ce0 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/CreateExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/CreateExtension.json @@ -5,7 +5,7 @@ "clusterRp": "Microsoft.Kubernetes", "clusterResourceName": "connectedClusters", "extensionName": "ClusterMonitor", - "api-version": "2022-01-15-preview", + "api-version": "2021-09-01", "clusterName": "clusterName1", "extension": { "properties": { @@ -31,8 +31,7 @@ "201": { "headers": { "Operation-Location": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/extensions/ClusterMonitor/operations/{operationId}", - "x-ms-async-operation-timeout": "PT48H", - "Azure-AsyncOperation": "http://management.azure.com/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Kubernetes/ConnectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/extensions/ClusterMonitor/operations/operationId?api-version=2022-01-15-preview" + "x-ms-async-operation-timeout": "PT48H" }, "description": "Details of the Kubernetes Extension's current status.", "body": { diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/CreateSourceControlConfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/CreateSourceControlConfiguration.json index f1253d452db6..bbf4913a0657 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/CreateSourceControlConfiguration.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/CreateSourceControlConfiguration.json @@ -5,7 +5,7 @@ "clusterRp": "Microsoft.Kubernetes", "clusterResourceName": "connectedClusters", "sourceControlConfigurationName": "SRS_GitHubConfig", - "api-version": "2022-01-15-preview", + "api-version": "2021-03-01", "clusterName": "clusterName1", "sourceControlConfiguration": { "properties": { diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/DeleteExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/DeleteExtension.json index 17f04fc9d72d..09d346f3d552 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/DeleteExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/DeleteExtension.json @@ -5,7 +5,7 @@ "clusterRp": "Microsoft.Kubernetes", "clusterResourceName": "connectedClusters", "extensionName": "ClusterMonitor", - "api-version": "2022-01-15-preview", + "api-version": "2021-09-01", "clusterName": "clusterName1" }, "responses": { diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/DeleteSourceControlConfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/DeleteSourceControlConfiguration.json index 804da18db1a8..1ac9224560ec 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/DeleteSourceControlConfiguration.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/DeleteSourceControlConfiguration.json @@ -5,7 +5,7 @@ "clusterRp": "Microsoft.Kubernetes", "clusterResourceName": "connectedClusters", "sourceControlConfigurationName": "SRS_GitHubConfig", - "api-version": "2022-01-15-preview", + "api-version": "2021-03-01", "clusterName": "clusterName1" }, "responses": { diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/GetExtensionAsyncOperationStatus.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/GetAsyncOperationStatus.json similarity index 94% rename from specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/GetExtensionAsyncOperationStatus.json rename to specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/GetAsyncOperationStatus.json index 0619f4f63a6b..9b778cac2bec 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/GetExtensionAsyncOperationStatus.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/GetAsyncOperationStatus.json @@ -5,7 +5,7 @@ "clusterRp": "Microsoft.Kubernetes", "clusterResourceName": "connectedClusters", "extensionName": "ClusterMonitor", - "api-version": "2022-01-15-preview", + "api-version": "2021-09-01", "clusterName": "clusterName1", "operationId": "99999999-9999-9999-9999-999999999999" }, diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/GetExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/GetExtension.json index ad7314f6b48a..2e563cd992e1 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/GetExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/GetExtension.json @@ -5,7 +5,7 @@ "clusterRp": "Microsoft.Kubernetes", "clusterResourceName": "connectedClusters", "extensionName": "ClusterMonitor", - "api-version": "2022-01-15-preview", + "api-version": "2021-09-01", "clusterName": "clusterName1" }, "responses": { diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/GetSourceControlConfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/GetSourceControlConfiguration.json index a2286de1b8ba..4eff9a901fe3 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/GetSourceControlConfiguration.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/GetSourceControlConfiguration.json @@ -5,7 +5,7 @@ "clusterRp": "Microsoft.Kubernetes", "clusterResourceName": "connectedClusters", "sourceControlConfigurationName": "SRS_GitHubConfig", - "api-version": "2022-01-15-preview", + "api-version": "2021-03-01", "clusterName": "clusterName1" }, "responses": { diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/ListAsyncOperationStatus.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/ListAsyncOperationStatus.json index 65fcf17feb52..bdad45aea1ac 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/ListAsyncOperationStatus.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/ListAsyncOperationStatus.json @@ -4,7 +4,7 @@ "resourceGroupName": "rg1", "clusterRp": "Microsoft.Kubernetes", "clusterResourceName": "connectedClusters", - "api-version": "2022-01-15-preview", + "api-version": "2021-09-01", "clusterName": "clusterName1" }, "responses": { diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/ListExtensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/ListExtensions.json index 2f1625a3fd2b..bf276ad0aaa0 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/ListExtensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/ListExtensions.json @@ -4,7 +4,7 @@ "resourceGroupName": "rg1", "clusterRp": "Microsoft.Kubernetes", "clusterResourceName": "connectedClusters", - "api-version": "2022-01-15-preview", + "api-version": "2021-09-01", "clusterName": "clusterName1" }, "responses": { diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/ListSourceControlConfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/ListSourceControlConfiguration.json index 0bcb4f7a0f0e..99d40f22c865 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/ListSourceControlConfiguration.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/ListSourceControlConfiguration.json @@ -4,7 +4,7 @@ "resourceGroupName": "rg1", "clusterRp": "Microsoft.Kubernetes", "clusterResourceName": "connectedClusters", - "api-version": "2022-01-15-preview", + "api-version": "2021-03-01", "clusterName": "clusterName1" }, "responses": { diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/PatchExtension.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/PatchExtension.json index 450f1a3aae6b..d8f9f78cec93 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/PatchExtension.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/examples/PatchExtension.json @@ -5,7 +5,7 @@ "clusterRp": "Microsoft.Kubernetes", "clusterResourceName": "connectedClusters", "extensionName": "ClusterMonitor", - "api-version": "2022-01-15-preview", + "api-version": "2021-09-01", "clusterName": "clusterName1", "patchExtension": { "properties": { @@ -24,9 +24,8 @@ "responses": { "202": { "headers": { - "Operation-Location": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/extensions/ClusterMonitor/operations/operationId", - "x-ms-async-operation-timeout": "PT48H", - "Azure-AsyncOperation": "http://management.azure.com/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Kubernetes/ConnectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/extensions/ClusterMonitor/operations/operationId?api-version=2022-01-15-preview" + "Operation-Location": "/subscriptions/subId1/resourceGroups/rg1/providers/Microsoft.Kubernetes/connectedClusters/clusterName1/providers/Microsoft.KubernetesConfiguration/extensions/ClusterMonitor/operations/{operationId}", + "x-ms-async-operation-timeout": "PT48H" }, "description": "Extension properties and details of the Patch operation, including AsyncOperation url.", "body": { @@ -48,6 +47,16 @@ "statuses": [] } } + }, + "409": { + "headers": {}, + "description": "Conflict failure, as another Patch operation is in progress", + "body": { + "error": { + "code": "PatchConflict", + "message": "The PATCH method cannot be completed due to a conflict. (ProvisioningState of extension: Updating). Please wait for a few minutes for the ProvisioningState to change to Succeeded, Failed or Canceled and retry again. If the problem persists, please contact Microsoft support." + } + } } } } diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/extensions.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/extensions.json index 71bbbdbeef7d..9e48920b8bb0 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/extensions.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/extensions.json @@ -1,7 +1,7 @@ { "swagger": "2.0", "info": { - "version": "2022-01-15-preview", + "version": "2021-09-01", "title": "ExtensionsClient", "description": "Use these APIs to create extension resources through ARM, for Kubernetes Clusters." }, @@ -55,13 +55,13 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "../../common/2022-01-15-preview/parameters.json#/parameters/ClusterRpParameter" + "$ref": "#/parameters/ClusterRpParameter" }, { - "$ref": "../../common/2022-01-15-preview/parameters.json#/parameters/ClusterResourceNameParameter" + "$ref": "#/parameters/ClusterResourceNameParameter" }, { - "$ref": "../../common/2022-01-15-preview/parameters.json#/parameters/ClusterNameParameter" + "$ref": "#/parameters/ClusterNameParameter" }, { "$ref": "#/parameters/ExtensionNameParameter" @@ -124,13 +124,13 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "../../common/2022-01-15-preview/parameters.json#/parameters/ClusterRpParameter" + "$ref": "#/parameters/ClusterRpParameter" }, { - "$ref": "../../common/2022-01-15-preview/parameters.json#/parameters/ClusterResourceNameParameter" + "$ref": "#/parameters/ClusterResourceNameParameter" }, { - "$ref": "../../common/2022-01-15-preview/parameters.json#/parameters/ClusterNameParameter" + "$ref": "#/parameters/ClusterNameParameter" }, { "$ref": "#/parameters/ExtensionNameParameter" @@ -174,13 +174,13 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "../../common/2022-01-15-preview/parameters.json#/parameters/ClusterRpParameter" + "$ref": "#/parameters/ClusterRpParameter" }, { - "$ref": "../../common/2022-01-15-preview/parameters.json#/parameters/ClusterResourceNameParameter" + "$ref": "#/parameters/ClusterResourceNameParameter" }, { - "$ref": "../../common/2022-01-15-preview/parameters.json#/parameters/ClusterNameParameter" + "$ref": "#/parameters/ClusterNameParameter" }, { "$ref": "#/parameters/ExtensionNameParameter" @@ -237,13 +237,13 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "../../common/2022-01-15-preview/parameters.json#/parameters/ClusterRpParameter" + "$ref": "#/parameters/ClusterRpParameter" }, { - "$ref": "../../common/2022-01-15-preview/parameters.json#/parameters/ClusterResourceNameParameter" + "$ref": "#/parameters/ClusterResourceNameParameter" }, { - "$ref": "../../common/2022-01-15-preview/parameters.json#/parameters/ClusterNameParameter" + "$ref": "#/parameters/ClusterNameParameter" }, { "$ref": "#/parameters/ExtensionNameParameter" @@ -268,6 +268,13 @@ "$ref": "#/definitions/Extension" } }, + "409": { + "description": "Conflict", + "x-ms-error-response": true, + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + }, "default": { "description": "Error response describing why the operation failed.", "schema": { @@ -302,13 +309,13 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "../../common/2022-01-15-preview/parameters.json#/parameters/ClusterRpParameter" + "$ref": "#/parameters/ClusterRpParameter" }, { - "$ref": "../../common/2022-01-15-preview/parameters.json#/parameters/ClusterResourceNameParameter" + "$ref": "#/parameters/ClusterResourceNameParameter" }, { - "$ref": "../../common/2022-01-15-preview/parameters.json#/parameters/ClusterNameParameter" + "$ref": "#/parameters/ClusterNameParameter" }, { "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" @@ -333,16 +340,67 @@ } } }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRp}/{clusterResourceName}/{clusterName}/providers/Microsoft.KubernetesConfiguration/operations": { + "get": { + "tags": [ + "Operations in a Cluster" + ], + "operationId": "OperationStatus_List", + "description": "List Async Operations, currently in progress, in a cluster", + "x-ms-examples": { + "AsyncOperationStatus List": { + "$ref": "./examples/ListAsyncOperationStatus.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterRpParameter" + }, + { + "$ref": "#/parameters/ClusterResourceNameParameter" + }, + { + "$ref": "#/parameters/ClusterNameParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Operations in a cluster", + "schema": { + "$ref": "#/definitions/OperationStatusList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRp}/{clusterResourceName}/{clusterName}/providers/Microsoft.KubernetesConfiguration/extensions/{extensionName}/operations/{operationId}": { "get": { "tags": [ - "Extension Operation Status" + "Operation Status" ], "operationId": "OperationStatus_Get", "description": "Get Async Operation status", "x-ms-examples": { - "ExtensionAsyncOperationStatus Get": { - "$ref": "./examples/GetExtensionAsyncOperationStatus.json" + "AsyncOperationStatus Get": { + "$ref": "./examples/GetAsyncOperationStatus.json" } }, "parameters": [ @@ -353,13 +411,13 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "../../common/2022-01-15-preview/parameters.json#/parameters/ClusterRpParameter" + "$ref": "#/parameters/ClusterRpParameter" }, { - "$ref": "../../common/2022-01-15-preview/parameters.json#/parameters/ClusterResourceNameParameter" + "$ref": "#/parameters/ClusterResourceNameParameter" }, { - "$ref": "../../common/2022-01-15-preview/parameters.json#/parameters/ClusterNameParameter" + "$ref": "#/parameters/ClusterNameParameter" }, { "$ref": "#/parameters/ExtensionNameParameter" @@ -377,9 +435,42 @@ ], "responses": { "200": { - "description": "Extension Operation Status", + "description": "Operation Status", + "schema": { + "$ref": "#/definitions/OperationStatusResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + } + } + } + }, + "/providers/Microsoft.KubernetesConfiguration/operations": { + "get": { + "tags": [ + "Operations" + ], + "operationId": "Operations_List", + "x-ms-examples": { + "BatchAccountDelete": { + "$ref": "./examples/OperationsList.json" + } + }, + "description": "List all the available operations the KubernetesConfiguration resource provider supports, in this api-version.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK response definition.", "schema": { - "$ref": "../../common/2022-01-15-preview/definitions.json#/definitions/OperationStatusResult" + "$ref": "#/definitions/ResourceProviderOperationList" } }, "default": { @@ -388,6 +479,9 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" } } } @@ -395,6 +489,7 @@ "definitions": { "ScopeCluster": { "description": "Specifies that the scope of the extension is Cluster", + "x-nullable": true, "type": "object", "properties": { "releaseNamespace": { @@ -405,6 +500,7 @@ }, "ScopeNamespace": { "description": "Specifies that the scope of the extension is Namespace", + "x-nullable": true, "type": "object", "properties": { "targetNamespace": { @@ -418,19 +514,30 @@ "type": "object", "properties": { "cluster": { - "type": "object", - "x-nullable": true, - "description": "Specifies that the scope of the extension is Cluster", "$ref": "#/definitions/ScopeCluster" }, "namespace": { - "type": "object", - "x-nullable": true, - "description": "Specifies that the scope of the extension is Namespace", "$ref": "#/definitions/ScopeNamespace" } } }, + "provisioningState": { + "type": "string", + "readOnly": true, + "description": "The provisioning state of the extension resource.", + "enum": [ + "Succeeded", + "Failed", + "Canceled", + "Creating", + "Updating", + "Deleting" + ], + "x-ms-enum": { + "name": "ProvisioningState", + "modelAsString": true + } + }, "ExtensionStatus": { "description": "Status from the extension.", "type": "object", @@ -517,10 +624,7 @@ } }, "provisioningState": { - "description": "Status of installation of this extension.", - "type": "string", - "readOnly": true, - "$ref": "../../common/2022-01-15-preview/definitions.json#/definitions/ProvisioningStateDefinition" + "$ref": "#/definitions/provisioningState" }, "statuses": { "description": "Status from this extension.", @@ -531,9 +635,6 @@ } }, "errorInfo": { - "description": "Error information from the Agent - e.g. errors during installation.", - "type": "object", - "readOnly": true, "x-nullable": true, "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorDetail" }, @@ -617,6 +718,121 @@ } } }, + "ResourceProviderOperation": { + "description": "Supported operation of this resource provider.", + "type": "object", + "readOnly": true, + "properties": { + "name": { + "description": "Operation name, in format of {provider}/{resource}/{operation}", + "type": "string" + }, + "display": { + "description": "Display metadata associated with the operation.", + "type": "object", + "properties": { + "provider": { + "description": "Resource provider: Microsoft KubernetesConfiguration.", + "type": "string" + }, + "resource": { + "description": "Resource on which the operation is performed.", + "type": "string" + }, + "operation": { + "description": "Type of operation: get, read, delete, etc.", + "type": "string" + }, + "description": { + "description": "Description of this operation.", + "type": "string" + } + } + }, + "isDataAction": { + "description": "The flag that indicates whether the operation applies to data plane.", + "type": "boolean", + "readOnly": true + }, + "origin": { + "description": "Origin of the operation", + "type": "string", + "readOnly": true + } + } + }, + "ResourceProviderOperationList": { + "description": "Result of the request to list operations.", + "type": "object", + "readOnly": true, + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/ResourceProviderOperation" + }, + "description": "List of operations supported by this resource provider." + }, + "nextLink": { + "type": "string", + "readOnly": true, + "description": "URL to the next set of results, if any." + } + } + }, + "OperationStatusResult": { + "description": "The current status of an async operation.", + "type": "object", + "required": [ + "status" + ], + "properties": { + "id": { + "description": "Fully qualified ID for the async operation.", + "type": "string" + }, + "name": { + "description": "Name of the async operation.", + "type": "string" + }, + "status": { + "description": "Operation status.", + "type": "string" + }, + "properties": { + "description": "Additional information, if available.", + "type": "object", + "x-nullable": true, + "x-ms-client-flatten": true, + "additionalProperties": { + "type": "string" + } + }, + "error": { + "x-nullable": true, + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorDetail" + } + } + }, + "OperationStatusList": { + "description": "The async operations in progress, in the cluster.", + "type": "object", + "properties": { + "value": { + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/OperationStatusResult" + }, + "description": "List of async operations in progress, in the cluster." + }, + "nextLink": { + "type": "string", + "readOnly": true, + "description": "URL to get the next set of Operation Result objects, if any." + } + } + }, "patchExtension": { "description": "The Extension Patch Request object.", "type": "object", @@ -670,6 +886,38 @@ "required": true, "type": "string", "x-ms-parameter-location": "method" + }, + "ClusterRpParameter": { + "name": "clusterRp", + "in": "path", + "required": true, + "type": "string", + "enum": [ + "Microsoft.ContainerService", + "Microsoft.Kubernetes" + ], + "description": "The Kubernetes cluster RP - either Microsoft.ContainerService (for AKS clusters) or Microsoft.Kubernetes (for OnPrem K8S clusters).", + "x-ms-parameter-location": "method" + }, + "ClusterResourceNameParameter": { + "name": "clusterResourceName", + "in": "path", + "required": true, + "type": "string", + "enum": [ + "managedClusters", + "connectedClusters" + ], + "description": "The Kubernetes cluster resource name - either managedClusters (for AKS clusters) or connectedClusters (for OnPrem K8S clusters).", + "x-ms-parameter-location": "method" + }, + "ClusterNameParameter": { + "name": "clusterName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the kubernetes cluster.", + "x-ms-parameter-location": "method" } } } diff --git a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/kubernetesconfiguration.json b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/kubernetesconfiguration.json index 7d597dddb3eb..77b40eba2add 100644 --- a/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/kubernetesconfiguration.json +++ b/specification/kubernetesconfiguration/resource-manager/Microsoft.KubernetesConfiguration/preview/2022-01-15-preview/kubernetesconfiguration.json @@ -1,7 +1,7 @@ { "swagger": "2.0", "info": { - "version": "2022-01-15-preview", + "version": "2021-03-01", "title": "SourceControlConfigurationClient", "description": "Use these APIs to create Source Control Configuration resources through ARM, for Kubernetes Clusters." }, @@ -48,19 +48,19 @@ }, "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + "$ref": "#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "#/parameters/ResourceGroupNameParameter" }, { - "$ref": "../../common/2022-01-15-preview/parameters.json#/parameters/ClusterRpParameter" + "$ref": "#/parameters/ClusterRpParameter" }, { - "$ref": "../../common/2022-01-15-preview/parameters.json#/parameters/ClusterResourceNameParameter" + "$ref": "#/parameters/ClusterResourceNameParameter" }, { - "$ref": "../../common/2022-01-15-preview/parameters.json#/parameters/ClusterNameParameter" + "$ref": "#/parameters/ClusterNameParameter" }, { "$ref": "#/parameters/SourceControlConfigurationNameParameter" @@ -79,7 +79,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/ErrorResponse" } } } @@ -97,19 +97,19 @@ }, "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + "$ref": "#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "#/parameters/ResourceGroupNameParameter" }, { - "$ref": "../../common/2022-01-15-preview/parameters.json#/parameters/ClusterRpParameter" + "$ref": "#/parameters/ClusterRpParameter" }, { - "$ref": "../../common/2022-01-15-preview/parameters.json#/parameters/ClusterResourceNameParameter" + "$ref": "#/parameters/ClusterResourceNameParameter" }, { - "$ref": "../../common/2022-01-15-preview/parameters.json#/parameters/ClusterNameParameter" + "$ref": "#/parameters/ClusterNameParameter" }, { "$ref": "#/parameters/SourceControlConfigurationNameParameter" @@ -143,7 +143,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/ErrorResponse" } } } @@ -161,19 +161,19 @@ }, "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + "$ref": "#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "#/parameters/ResourceGroupNameParameter" }, { - "$ref": "../../common/2022-01-15-preview/parameters.json#/parameters/ClusterRpParameter" + "$ref": "#/parameters/ClusterRpParameter" }, { - "$ref": "../../common/2022-01-15-preview/parameters.json#/parameters/ClusterResourceNameParameter" + "$ref": "#/parameters/ClusterResourceNameParameter" }, { - "$ref": "../../common/2022-01-15-preview/parameters.json#/parameters/ClusterNameParameter" + "$ref": "#/parameters/ClusterNameParameter" }, { "$ref": "#/parameters/SourceControlConfigurationNameParameter" @@ -192,7 +192,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/ErrorResponse" } } }, @@ -213,19 +213,19 @@ }, "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + "$ref": "#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "#/parameters/ResourceGroupNameParameter" }, { - "$ref": "../../common/2022-01-15-preview/parameters.json#/parameters/ClusterRpParameter" + "$ref": "#/parameters/ClusterRpParameter" }, { - "$ref": "../../common/2022-01-15-preview/parameters.json#/parameters/ClusterResourceNameParameter" + "$ref": "#/parameters/ClusterResourceNameParameter" }, { - "$ref": "../../common/2022-01-15-preview/parameters.json#/parameters/ClusterNameParameter" + "$ref": "#/parameters/ClusterNameParameter" }, { "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" @@ -241,7 +241,43 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/providers/Microsoft.KubernetesConfiguration/operations": { + "get": { + "tags": [ + "Operations" + ], + "operationId": "Operations_List", + "x-ms-examples": { + "BatchAccountDelete": { + "$ref": "./examples/OperationsList.json" + } + }, + "description": "List all the available operations the KubernetesConfiguration resource provider supports.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK response definition.", + "schema": { + "$ref": "#/definitions/ResourceProviderOperationList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" } } }, @@ -252,6 +288,44 @@ } }, "definitions": { + "Result": { + "description": "Sample result definition", + "properties": { + "sampleProperty": { + "type": "string", + "description": "Sample property of type string" + } + } + }, + "ErrorResponse": { + "description": "Error response.", + "properties": { + "error": { + "description": "Error definition.", + "$ref": "#/definitions/ErrorDefinition" + } + } + }, + "ErrorDefinition": { + "description": "Error definition.", + "readOnly": true, + "required": [ + "message", + "code" + ], + "properties": { + "code": { + "description": "Service specific error code which serves as the substatus for the HTTP error code.", + "type": "string", + "minimum": 100, + "maximum": 600 + }, + "message": { + "description": "Description of the error.", + "type": "string" + } + } + }, "ComplianceStatus": { "description": "Compliance Status details", "type": "object", @@ -321,7 +395,6 @@ }, "ConfigurationProtectedSettings": { "description": "Name-value pairs of protected configuration settings for the configuration", - "type": "object", "additionalProperties": { "type": "string" } @@ -352,7 +425,6 @@ }, "SourceControlConfiguration": { "description": "The SourceControl Configuration object returned in Get & Put response.", - "type": "object", "properties": { "properties": { "type": "object", @@ -444,7 +516,6 @@ }, "SourceControlConfigurationList": { "description": "Result of the request to list Source Control Configurations. It contains a list of SourceControlConfiguration objects and a URL link to get the next set of results.", - "type": "object", "properties": { "value": { "type": "array", @@ -460,9 +531,110 @@ "description": "URL to get the next set of configuration objects, if any." } } + }, + "ResourceProviderOperation": { + "description": "Supported operation of this resource provider.", + "readOnly": true, + "properties": { + "name": { + "description": "Operation name, in format of {provider}/{resource}/{operation}", + "type": "string" + }, + "display": { + "description": "Display metadata associated with the operation.", + "properties": { + "provider": { + "description": "Resource provider: Microsoft KubernetesConfiguration.", + "type": "string" + }, + "resource": { + "description": "Resource on which the operation is performed.", + "type": "string" + }, + "operation": { + "description": "Type of operation: get, read, delete, etc.", + "type": "string" + }, + "description": { + "description": "Description of this operation.", + "type": "string" + } + } + }, + "isDataAction": { + "description": "The flag that indicates whether the operation applies to data plane.", + "type": "boolean", + "readOnly": true + } + } + }, + "ResourceProviderOperationList": { + "description": "Result of the request to list operations.", + "readOnly": true, + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/ResourceProviderOperation" + }, + "description": "List of operations supported by this resource provider." + }, + "nextLink": { + "type": "string", + "readOnly": true, + "description": "URL to the next set of results, if any." + } + } } }, "parameters": { + "SubscriptionIdParameter": { + "name": "subscriptionId", + "in": "path", + "required": true, + "type": "string", + "description": "The Azure subscription ID. This is a GUID-formatted string (e.g. 00000000-0000-0000-0000-000000000000)" + }, + "ResourceGroupNameParameter": { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group.", + "x-ms-parameter-location": "method" + }, + "ClusterRpParameter": { + "name": "clusterRp", + "in": "path", + "required": true, + "type": "string", + "enum": [ + "Microsoft.ContainerService", + "Microsoft.Kubernetes" + ], + "description": "The Kubernetes cluster RP - either Microsoft.ContainerService (for AKS clusters) or Microsoft.Kubernetes (for OnPrem K8S clusters).", + "x-ms-parameter-location": "method" + }, + "ClusterResourceNameParameter": { + "name": "clusterResourceName", + "in": "path", + "required": true, + "type": "string", + "enum": [ + "managedClusters", + "connectedClusters" + ], + "description": "The Kubernetes cluster resource name - either managedClusters (for AKS clusters) or connectedClusters (for OnPrem K8S clusters).", + "x-ms-parameter-location": "method" + }, + "ClusterNameParameter": { + "name": "clusterName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the kubernetes cluster.", + "x-ms-parameter-location": "method" + }, "SourceControlConfigurationNameParameter": { "name": "sourceControlConfigurationName", "in": "path",