From 5bc17a4d2c9779a3f3e999dcdb0ad965aefcfff4 Mon Sep 17 00:00:00 2001 From: sikasire Date: Tue, 19 Jan 2021 12:51:01 +0530 Subject: [PATCH 01/31] GA api version changes --- .../GA/2020-02-01/connectedClusters.json | 740 +++++++++++++++++ .../2021-02-01-preview/connectedClusters.json | 741 ++++++++++++++++++ 2 files changed, 1481 insertions(+) create mode 100644 specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/connectedClusters.json create mode 100644 specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/connectedClusters.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/connectedClusters.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/connectedClusters.json new file mode 100644 index 000000000000..fa9ef2cd5984 --- /dev/null +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/connectedClusters.json @@ -0,0 +1,740 @@ +{ + "swagger": "2.0", + "info": { + "title": "ConnectedKubernetesClient", + "version": "2020-02-01", + "description": "Azure Connected Cluster Resource Provider API for adopting any Kubernetes Cluster" + }, + "schemes": [ + "https" + ], + "host": "management.azure.com", + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ], + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow.", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "paths": { + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Kubernetes/connectedClusters/{clusterName}": { + "put": { + "summary": "Register a new Kubernetes cluster with Azure Resource Manager.", + "operationId": "ConnectedCluster_Create", + "description": "API to register a new Kubernetes cluster and create a tracked resource in Azure Resource Manager (ARM).", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "x-ms-examples": { + "CreateClusterExample": { + "$ref": "./examples/CreateClusterExample.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterNamePathParam" + }, + { + "in": "body", + "name": "ConnectedCluster", + "required": true, + "schema": { + "$ref": "#/definitions/ConnectedCluster" + }, + "description": "Parameters supplied to Create a Connected Cluster." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ConnectedCluster" + } + }, + "201": { + "description": "Resource creation request accepted", + "schema": { + "$ref": "#/definitions/ConnectedCluster" + } + }, + "default": { + "description": "Resource Provider error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" + } + }, + "patch": { + "summary": "Updates a connected cluster.", + "operationId": "ConnectedCluster_Update", + "description": "API to update certain properties of the connected cluster resource", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "x-ms-examples": { + "UpdateClusterExample": { + "$ref": "./examples/UpdateClusterExample.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterNamePathParam" + }, + { + "in": "body", + "name": "ConnectedClusterPatch", + "required": true, + "schema": { + "$ref": "#/definitions/ConnectedClusterPatch" + }, + "description": "Parameters supplied to update Connected Cluster." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ConnectedCluster" + } + }, + "default": { + "description": "Resource Provider error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + } + } + }, + "get": { + "summary": "Get the properties of the specified connected cluster.", + "operationId": "ConnectedCluster_Get", + "description": "Returns the properties of the specified connected cluster, including name, identity, properties, and additional cluster details.", + "produces": [ + "application/json" + ], + "x-ms-examples": { + "GetClusterExample": { + "$ref": "./examples/GetClusterExample.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterNamePathParam" + } + ], + "responses": { + "200": { + "description": "Resource retrieved successfully.", + "schema": { + "$ref": "#/definitions/ConnectedCluster" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + } + } + }, + "delete": { + "summary": "Delete a connected cluster.", + "operationId": "ConnectedCluster_Delete", + "description": "Delete a connected cluster, removing the tracked resource in Azure Resource Manager (ARM).", + "produces": [ + "application/json" + ], + "x-ms-examples": { + "DeleteClusterExample": { + "$ref": "./examples/DeleteClusterExample.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterNamePathParam" + } + ], + "responses": { + "200": { + "description": "OK" + }, + "202": { + "description": "Resource deletion is in progress" + }, + "204": { + "description": "The resource was not found but the request is well formed" + }, + "default": { + "description": "Resource Provider error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "location" + } + } + }, + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Kubernetes/connectedClusters/{clusterName}/listClusterUserCredentials": { + "post": { + "summary": "Gets cluster user credentials of a connected cluster", + "operationId": "ConnectedCluster_ListClusterUserCredentials", + "description": "Gets cluster user credentials of the connected cluster with a specified resource group and name.", + "produces": [ + "application/json" + ], + "x-ms-examples": { + "ListClusterUserCredentialsExample": { + "$ref": "./examples/ConnectedClustersListClusterCredentialsResult.json" + }, + "ListClusterUserCredentialsNonAadExample": { + "$ref": "./examples/ConnectedClustersListClusterCredentialsResultNonAad.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterNamePathParam" + }, + { + "$ref": "#/parameters/ClientProxy" + }, + { + "$ref": "#/parameters/isTokenAuth" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/CredentialResults" + } + }, + "default": { + "description": "Resource Provider error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Kubernetes/connectedClusters": { + "get": { + "summary": "Lists all connected clusters", + "operationId": "ConnectedCluster_ListByResourceGroup", + "description": "API to enumerate registered connected K8s clusters under a Resource Group", + "produces": [ + "application/json" + ], + "x-ms-examples": { + "GetClustersExample": { + "$ref": "./examples/GetClustersByResourceGroupExample.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ConnectedClusterList" + } + }, + "default": { + "description": "Resource Provider 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}/providers/Microsoft.Kubernetes/connectedClusters": { + "get": { + "summary": "Lists all connected clusters", + "operationId": "ConnectedCluster_ListBySubscription", + "description": "API to enumerate registered connected K8s clusters under a Subscription", + "produces": [ + "application/json" + ], + "x-ms-examples": { + "GetClustersExample": { + "$ref": "./examples/GetClustersBySubscriptionExample.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ConnectedClusterList" + } + }, + "default": { + "description": "Resource Provider error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/providers/Microsoft.Kubernetes/operations": { + "get": { + "description": "Lists all of the available API operations for Connected Cluster resource.", + "operationId": "Operations_Get", + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/OperationList" + } + }, + "default": { + "description": "Resource Provider error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "ListConnectedClusterOperationsExample": { + "$ref": "./examples/ListConnectedClusterOperationsExample.json" + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + } + }, + "definitions": { + "OperationList": { + "description": "The paginated list of connected cluster API operations.", + "properties": { + "value": { + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/Operation" + }, + "description": "The list of connected cluster API operations." + }, + "nextLink": { + "type": "string", + "description": "The link to fetch the next page of connected cluster API operations." + } + } + }, + "Operation": { + "type": "object", + "description": "The Connected cluster API operation", + "properties": { + "name": { + "readOnly": true, + "type": "string", + "description": "Operation name: {Microsoft.Kubernetes}/{resource}/{operation}" + }, + "display": { + "readOnly": true, + "description": "The object that represents the operation.", + "properties": { + "provider": { + "type": "string", + "description": "Service provider: Microsoft.connectedClusters" + }, + "resource": { + "type": "string", + "description": "Connected Cluster Resource on which the operation is performed" + }, + "operation": { + "type": "string", + "description": "Operation type: Read, write, delete, etc." + }, + "description": { + "type": "string", + "description": "Description of the operation." + } + } + } + } + }, + "ConnectedClusterList": { + "description": "The paginated list of connected Clusters", + "type": "object", + "properties": { + "value": { + "description": "The list of connected clusters", + "type": "array", + "items": { + "$ref": "#/definitions/ConnectedCluster" + } + }, + "nextLink": { + "description": "The link to fetch the next page of connected cluster", + "type": "string" + } + } + }, + "ConnectedCluster": { + "type": "object", + "required": [ + "properties", + "identity" + ], + "properties": { + "identity": { + "$ref": "#/definitions/ConnectedClusterIdentity", + "description": "The identity of the connected cluster." + }, + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/ConnectedClusterProperties", + "description": "Describes the connected cluster resource properties." + } + }, + "allOf": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/TrackedResource" + } + ], + "description": "Represents a connected cluster." + }, + "ConnectedClusterIdentity": { + "type": "object", + "required": [ + "type" + ], + "properties": { + "principalId": { + "readOnly": true, + "type": "string", + "description": "The principal id of connected cluster identity. This property will only be provided for a system assigned identity." + }, + "tenantId": { + "readOnly": true, + "type": "string", + "description": "The tenant id associated with the connected cluster. This property will only be provided for a system assigned identity." + }, + "type": { + "type": "string", + "description": "The type of identity used for the connected cluster. The type 'SystemAssigned, includes a system created identity. The type 'None' means no identity is assigned to the connected cluster.", + "enum": [ + "None", + "SystemAssigned" + ], + "x-ms-enum": { + "name": "ResourceIdentityType", + "modelAsString": false + } + } + }, + "description": "Identity for the connected cluster." + }, + "ConnectedClusterProperties": { + "type": "object", + "required": [ + "agentPublicKeyCertificate" + ], + "properties": { + "agentPublicKeyCertificate": { + "type": "string", + "description": "Base64 encoded public certificate used by the agent to do the initial handshake to the backend services in Azure." + }, + "kubernetesVersion": { + "readOnly": true, + "type": "string", + "description": "The Kubernetes version of the connected cluster resource" + }, + "totalNodeCount": { + "readOnly": true, + "type": "integer", + "description": "Number of nodes present in the connected cluster resource" + }, + "totalCoreCount": { + "readOnly": true, + "format": "int32", + "type": "integer", + "description": "Number of CPU cores present in the connected cluster resource" + }, + "agentVersion": { + "readOnly": true, + "type": "string", + "description": "Version of the agent running on the connected cluster resource" + }, + "provisioningState": { + "$ref": "#/definitions/ConnectedClusterProvisioningState", + "description": "Provisioning state of the connected cluster resource." + }, + "distribution": { + "type": "string", + "description": "The Kubernetes distribution running on this connected cluster." + }, + "infrastructure": { + "type": "string", + "description": "The infrastructure on which the Kubernetes cluster represented by this connected cluster is running on." + }, + "offering": { + "type": "string", + "readOnly": true, + "description": "Connected cluster offering" + }, + "managedIdentityCertificateExpirationTime": { + "type": "string", + "format": "date-time", + "readOnly": true, + "description": "Expiration time of the managed identity certificate" + }, + "lastConnectivityTime": { + "type": "string", + "readOnly": true, + "format": "date-time", + "description": "Time representing the last instance when heart beat was received from the cluster" + }, + "connectivityStatus": { + "type": "string", + "description": "Represents the connectivity status of the connected cluster.", + "enum": [ + "Connecting", + "Connected", + "Offline", + "Expired" + ], + "x-ms-enum": { + "name": "ConnectivityStatus", + "modelAsString": true + } + } + }, + "description": "Properties of the connected cluster." + }, + "CredentialResults": { + "properties": { + "hybridConnectionConfig": { + "$ref": "#/definitions/HybridConnectionConfig", + "description": "Contains the REP (rendezvous endpoint) and “Sender” access token.", + "readOnly": true + }, + "kubeconfigs": { + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/CredentialResult" + }, + "description": "Base64-encoded Kubernetes configuration file." + } + }, + "description": "The list of credential result response." + }, + "CredentialResult": { + "type": "object", + "properties": { + "name": { + "type": "string", + "readOnly": true, + "description": "The name of the credential." + }, + "value": { + "type": "string", + "format": "byte", + "readOnly": true, + "description": "Base64-encoded Kubernetes configuration file." + } + }, + "description": "The credential result response." + }, + "ConnectedClusterProvisioningState": { + "type": "string", + "description": "The current deployment state of connectedClusters.", + "enum": [ + "Succeeded", + "Failed", + "Canceled", + "Provisioning", + "Updating", + "Deleting", + "Accepted" + ], + "x-ms-enum": { + "name": "ProvisioningState", + "modelAsString": true + } + }, + "ConnectedClusterPatch": { + "type": "object", + "properties": { + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Resource tags." + }, + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/ConnectedClusterPatchProperties", + "description": "Describes the connected cluster resource properties that can be updated during PATCH operation." + } + }, + "description": "Object containing updates for patch operations." + }, + "ConnectedClusterPatchProperties": { + "type": "object", + "properties": { + }, + "description": "Properties which can be patched on the connected cluster resource." + }, + "HybridConnectionConfig": { + "description": "Contains the REP (rendezvous endpoint) and “Sender” access token.", + "properties": { + "expirationTime": { + "description": "Timestamp when this token will be expired.", + "type": "integer", + "readOnly": true, + "format": "int64" + }, + "hybridConnectionName": { + "description": "Name of the connection", + "type": "string", + "readOnly": true + }, + "relay": { + "description": "Name of the relay.", + "type": "string", + "readOnly": true + }, + "token": { + "description": "Sender access token", + "type": "string", + "readOnly": true + } + } + } + }, + "parameters": { + "ClusterNamePathParam": { + "name": "clusterName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the Kubernetes cluster on which get is called.", + "x-ms-parameter-location": "method" + }, + "ClientProxy": { + "name": "clientProxy", + "in": "query", + "required": false, + "type": "boolean", + "description": "Parameter to indicate whether the request is for client side proxy or not", + "x-ms-parameter-location": "method" + }, + "TokenAuth": { + "name": "isTokenAuth", + "in": "query", + "required": false, + "type": "boolean", + "description": "Parameter to indicate whether the it is token based authentication or AAD based authentication", + "x-ms-parameter-location": "method" + } + } + } + \ No newline at end of file diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/connectedClusters.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/connectedClusters.json new file mode 100644 index 000000000000..149e726929fb --- /dev/null +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/connectedClusters.json @@ -0,0 +1,741 @@ +{ + "swagger": "2.0", + "info": { + "title": "ConnectedKubernetesClient", + "version": "2020-02-01-preview", + "description": "Azure Connected Cluster Resource Provider API for adopting any Kubernetes Cluster" + }, + "schemes": [ + "https" + ], + "host": "management.azure.com", + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ], + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow.", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "paths": { + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Kubernetes/connectedClusters/{clusterName}": { + "put": { + "summary": "Register a new Kubernetes cluster with Azure Resource Manager.", + "operationId": "ConnectedCluster_Create", + "description": "API to register a new Kubernetes cluster and create a tracked resource in Azure Resource Manager (ARM).", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "x-ms-examples": { + "CreateClusterExample": { + "$ref": "./examples/CreateClusterExample.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterNamePathParam" + }, + { + "in": "body", + "name": "ConnectedCluster", + "required": true, + "schema": { + "$ref": "#/definitions/ConnectedCluster" + }, + "description": "Parameters supplied to Create a Connected Cluster." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ConnectedCluster" + } + }, + "201": { + "description": "Resource creation request accepted", + "schema": { + "$ref": "#/definitions/ConnectedCluster" + } + }, + "default": { + "description": "Resource Provider error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" + } + }, + "patch": { + "summary": "Updates a connected cluster.", + "operationId": "ConnectedCluster_Update", + "description": "API to update certain properties of the connected cluster resource", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "x-ms-examples": { + "UpdateClusterExample": { + "$ref": "./examples/UpdateClusterExample.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterNamePathParam" + }, + { + "in": "body", + "name": "ConnectedClusterPatch", + "required": true, + "schema": { + "$ref": "#/definitions/ConnectedClusterPatch" + }, + "description": "Parameters supplied to update Connected Cluster." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ConnectedCluster" + } + }, + "default": { + "description": "Resource Provider error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + } + } + }, + "get": { + "summary": "Get the properties of the specified connected cluster.", + "operationId": "ConnectedCluster_Get", + "description": "Returns the properties of the specified connected cluster, including name, identity, properties, and additional cluster details.", + "produces": [ + "application/json" + ], + "x-ms-examples": { + "GetClusterExample": { + "$ref": "./examples/GetClusterExample.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterNamePathParam" + } + ], + "responses": { + "200": { + "description": "Resource retrieved successfully.", + "schema": { + "$ref": "#/definitions/ConnectedCluster" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + } + } + }, + "delete": { + "summary": "Delete a connected cluster.", + "operationId": "ConnectedCluster_Delete", + "description": "Delete a connected cluster, removing the tracked resource in Azure Resource Manager (ARM).", + "produces": [ + "application/json" + ], + "x-ms-examples": { + "DeleteClusterExample": { + "$ref": "./examples/DeleteClusterExample.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterNamePathParam" + } + ], + "responses": { + "200": { + "description": "OK" + }, + "202": { + "description": "Resource deletion is in progress" + }, + "204": { + "description": "The resource was not found but the request is well formed" + }, + "default": { + "description": "Resource Provider error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "location" + } + } + }, + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Kubernetes/connectedClusters/{clusterName}/listClusterUserCredentials": { + "post": { + "summary": "Gets cluster user credentials of a connected cluster", + "operationId": "ConnectedCluster_ListClusterUserCredentials", + "description": "Gets cluster user credentials of the connected cluster with a specified resource group and name.", + "produces": [ + "application/json" + ], + "x-ms-examples": { + "ListClusterUserCredentialsExample": { + "$ref": "./examples/ConnectedClustersListClusterCredentialsResult.json" + }, + "ListClusterUserCredentialsNonAadExample": { + "$ref": "./examples/ConnectedClustersListClusterCredentialsResultNonAad.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterNamePathParam" + }, + { + "$ref": "#/parameters/ClientProxy" + }, + { + "$ref": "#/parameters/isTokenAuth" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/CredentialResults" + } + }, + "default": { + "description": "Resource Provider error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Kubernetes/connectedClusters": { + "get": { + "summary": "Lists all connected clusters", + "operationId": "ConnectedCluster_ListByResourceGroup", + "description": "API to enumerate registered connected K8s clusters under a Resource Group", + "produces": [ + "application/json" + ], + "x-ms-examples": { + "GetClustersExample": { + "$ref": "./examples/GetClustersByResourceGroupExample.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ConnectedClusterList" + } + }, + "default": { + "description": "Resource Provider 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}/providers/Microsoft.Kubernetes/connectedClusters": { + "get": { + "summary": "Lists all connected clusters", + "operationId": "ConnectedCluster_ListBySubscription", + "description": "API to enumerate registered connected K8s clusters under a Subscription", + "produces": [ + "application/json" + ], + "x-ms-examples": { + "GetClustersExample": { + "$ref": "./examples/GetClustersBySubscriptionExample.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ConnectedClusterList" + } + }, + "default": { + "description": "Resource Provider error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/providers/Microsoft.Kubernetes/operations": { + "get": { + "description": "Lists all of the available API operations for Connected Cluster resource.", + "operationId": "Operations_Get", + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/OperationList" + } + }, + "default": { + "description": "Resource Provider error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "ListConnectedClusterOperationsExample": { + "$ref": "./examples/ListConnectedClusterOperationsExample.json" + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + } + }, + "definitions": { + "OperationList": { + "description": "The paginated list of connected cluster API operations.", + "properties": { + "value": { + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/Operation" + }, + "description": "The list of connected cluster API operations." + }, + "nextLink": { + "type": "string", + "description": "The link to fetch the next page of connected cluster API operations." + } + } + }, + "Operation": { + "type": "object", + "description": "The Connected cluster API operation", + "properties": { + "name": { + "readOnly": true, + "type": "string", + "description": "Operation name: {Microsoft.Kubernetes}/{resource}/{operation}" + }, + "display": { + "readOnly": true, + "description": "The object that represents the operation.", + "properties": { + "provider": { + "type": "string", + "description": "Service provider: Microsoft.connectedClusters" + }, + "resource": { + "type": "string", + "description": "Connected Cluster Resource on which the operation is performed" + }, + "operation": { + "type": "string", + "description": "Operation type: Read, write, delete, etc." + }, + "description": { + "type": "string", + "description": "Description of the operation." + } + } + } + } + }, + "ConnectedClusterList": { + "description": "The paginated list of connected Clusters", + "type": "object", + "properties": { + "value": { + "description": "The list of connected clusters", + "type": "array", + "items": { + "$ref": "#/definitions/ConnectedCluster" + } + }, + "nextLink": { + "description": "The link to fetch the next page of connected cluster", + "type": "string" + } + } + }, + "ConnectedCluster": { + "type": "object", + "required": [ + "properties", + "identity" + ], + "properties": { + "identity": { + "$ref": "#/definitions/ConnectedClusterIdentity", + "description": "The identity of the connected cluster." + }, + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/ConnectedClusterProperties", + "description": "Describes the connected cluster resource properties." + } + }, + "allOf": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/TrackedResource" + } + ], + "description": "Represents a connected cluster." + }, + "ConnectedClusterIdentity": { + "type": "object", + "required": [ + "type" + ], + "properties": { + "principalId": { + "readOnly": true, + "type": "string", + "description": "The principal id of connected cluster identity. This property will only be provided for a system assigned identity." + }, + "tenantId": { + "readOnly": true, + "type": "string", + "description": "The tenant id associated with the connected cluster. This property will only be provided for a system assigned identity." + }, + "type": { + "type": "string", + "description": "The type of identity used for the connected cluster. The type 'SystemAssigned, includes a system created identity. The type 'None' means no identity is assigned to the connected cluster.", + "enum": [ + "None", + "SystemAssigned" + ], + "x-ms-enum": { + "name": "ResourceIdentityType", + "modelAsString": false + } + } + }, + "description": "Identity for the connected cluster." + }, + "ConnectedClusterProperties": { + "type": "object", + "required": [ + "agentPublicKeyCertificate" + ], + "properties": { + "agentPublicKeyCertificate": { + "type": "string", + "description": "Base64 encoded public certificate used by the agent to do the initial handshake to the backend services in Azure." + }, + "kubernetesVersion": { + "readOnly": true, + "type": "string", + "description": "The Kubernetes version of the connected cluster resource" + }, + "totalNodeCount": { + "readOnly": true, + "type": "integer", + "description": "Number of nodes present in the connected cluster resource" + }, + "totalCoreCount": { + "readOnly": true, + "format": "int32", + "type": "integer", + "description": "Number of CPU cores present in the connected cluster resource" + }, + "agentVersion": { + "readOnly": true, + "type": "string", + "description": "Version of the agent running on the connected cluster resource" + }, + "provisioningState": { + "$ref": "#/definitions/ConnectedClusterProvisioningState", + "description": "Provisioning state of the connected cluster resource." + }, + "distribution": { + "type": "string", + "description": "The Kubernetes distribution running on this connected cluster." + }, + "infrastructure": { + "type": "string", + "description": "The infrastructure on which the Kubernetes cluster represented by this connected cluster is running on." + }, + "offering": { + "type": "string", + "readOnly": true, + "description": "Connected cluster offering" + }, + "managedIdentityCertificateExpirationTime": { + "type": "string", + "format": "date-time", + "readOnly": true, + "description": "Expiration time of the managed identity certificate" + }, + "lastConnectivityTime": { + "type": "string", + "readOnly": true, + "format": "date-time", + "description": "Time representing the last instance when heart beat was received from the cluster" + }, + "connectivityStatus": { + "type": "string", + "description": "Represents the connectivity status of the connected cluster.", + "enum": [ + "Connecting", + "Connected", + "Offline", + "Expired" + ], + "x-ms-enum": { + "name": "ConnectivityStatus", + "modelAsString": true + } + } + }, + "description": "Properties of the connected cluster." + }, + "CredentialResults": { + "properties": { + "hybridConnectionConfig": { + "$ref": "#/definitions/HybridConnectionConfig", + "description": "Contains the REP (rendezvous endpoint) and “Sender” access token.", + "readOnly": true + }, + "kubeconfigs": { + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/CredentialResult" + }, + "description": "Base64-encoded Kubernetes configuration file." + } + }, + "description": "The list of credential result response." + }, + "CredentialResult": { + "type": "object", + "properties": { + "name": { + "type": "string", + "readOnly": true, + "description": "The name of the credential." + }, + "value": { + "type": "string", + "format": "byte", + "readOnly": true, + "description": "Base64-encoded Kubernetes configuration file." + } + }, + "description": "The credential result response." + }, + "ConnectedClusterProvisioningState": { + "type": "string", + "description": "The current deployment state of connectedClusters.", + "enum": [ + "Succeeded", + "Failed", + "Canceled", + "Provisioning", + "Updating", + "Deleting", + "Accepted" + ], + "x-ms-enum": { + "name": "ProvisioningState", + "modelAsString": true + } + }, + "ConnectedClusterPatch": { + "type": "object", + "properties": { + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Resource tags." + }, + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/ConnectedClusterPatchProperties", + "description": "Describes the connected cluster resource properties that can be updated during PATCH operation." + } + }, + "description": "Object containing updates for patch operations." + }, + "ConnectedClusterPatchProperties": { + "type": "object", + "properties": { + }, + "description": "Properties which can be patched on the connected cluster resource." + }, + "HybridConnectionConfig": { + "description": "Contains the REP (rendezvous endpoint) and “Sender” access token.", + "properties": { + "expirationTime": { + "description": "Timestamp when this token will be expired.", + "type": "integer", + "readOnly": true, + "format": "int64" + }, + "hybridConnectionName": { + "description": "Name of the connection", + "type": "string", + "readOnly": true + }, + "relay": { + "description": "Name of the relay.", + "type": "string", + "readOnly": true + }, + "token": { + "description": "Sender access token", + "type": "string", + "readOnly": true + } + } + } + }, + "parameters": { + "ClusterNamePathParam": { + "name": "clusterName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the Kubernetes cluster on which get is called.", + "x-ms-parameter-location": "method" + }, + "ClientProxy": { + "name": "clientProxy", + "in": "query", + "required": false, + "type": "boolean", + "description": "Parameter to indicate whether the request is for client side proxy or not", + "x-ms-parameter-location": "method" + }, + "TokenAuth": { + "name": "isTokenAuth", + "in": "query", + "required": false, + "type": "boolean", + "description": "Parameter to indicate whether the it is token based authentication or AAD based authentication", + "x-ms-parameter-location": "method" + } + } + } + + \ No newline at end of file From 9c8e72218f216d9ff26161dcfa64796ab4ac4426 Mon Sep 17 00:00:00 2001 From: sikasire Date: Tue, 19 Jan 2021 13:02:41 +0530 Subject: [PATCH 02/31] removing listcluster from GA --- .../GA/2020-02-01/connectedClusters.json | 52 ------------------- 1 file changed, 52 deletions(-) diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/connectedClusters.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/connectedClusters.json index fa9ef2cd5984..121b1f3e15cb 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/connectedClusters.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/connectedClusters.json @@ -235,58 +235,6 @@ } } }, - "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Kubernetes/connectedClusters/{clusterName}/listClusterUserCredentials": { - "post": { - "summary": "Gets cluster user credentials of a connected cluster", - "operationId": "ConnectedCluster_ListClusterUserCredentials", - "description": "Gets cluster user credentials of the connected cluster with a specified resource group and name.", - "produces": [ - "application/json" - ], - "x-ms-examples": { - "ListClusterUserCredentialsExample": { - "$ref": "./examples/ConnectedClustersListClusterCredentialsResult.json" - }, - "ListClusterUserCredentialsNonAadExample": { - "$ref": "./examples/ConnectedClustersListClusterCredentialsResultNonAad.json" - } - }, - "parameters": [ - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/ClusterNamePathParam" - }, - { - "$ref": "#/parameters/ClientProxy" - }, - { - "$ref": "#/parameters/isTokenAuth" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/CredentialResults" - } - }, - "default": { - "description": "Resource Provider error response describing why the operation failed.", - "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" - } - } - } - } - }, "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Kubernetes/connectedClusters": { "get": { "summary": "Lists all connected clusters", From 1d997b92cd56ca898785c739f0b9cda9448a3613 Mon Sep 17 00:00:00 2001 From: sikasire Date: Tue, 19 Jan 2021 13:15:06 +0530 Subject: [PATCH 03/31] Add example references --- ...dClustersListClusterCredentialsResult.json | 20 +++++++ ...ersListClusterCredentialsResultNonAad.json | 21 +++++++ .../GA/2020-02-01/CreateClusterExample.json | 57 +++++++++++++++++++ .../GA/2020-02-01/DeleteClusterExample.json | 13 +++++ .../GA/2020-02-01/GetClusterExample.json | 30 ++++++++++ .../GetClustersByResourceGroupExample.json | 52 +++++++++++++++++ .../GetClustersBySubscriptionExample.json | 51 +++++++++++++++++ ...ListConnectedClusterOperationsExample.json | 41 +++++++++++++ .../GA/2020-02-01/UpdateClusterExample.json | 37 ++++++++++++ ...dClustersListClusterCredentialsResult.json | 20 +++++++ ...ersListClusterCredentialsResultNonAad.json | 21 +++++++ .../CreateClusterExample.json | 57 +++++++++++++++++++ .../DeleteClusterExample.json | 13 +++++ .../2021-02-01-preview/GetClusterExample.json | 30 ++++++++++ .../GetClustersByResourceGroupExample.json | 52 +++++++++++++++++ .../GetClustersBySubscriptionExample.json | 51 +++++++++++++++++ ...ListConnectedClusterOperationsExample.json | 41 +++++++++++++ .../UpdateClusterExample.json | 37 ++++++++++++ 18 files changed, 644 insertions(+) create mode 100644 specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/ConnectedClustersListClusterCredentialsResult.json create mode 100644 specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/ConnectedClustersListClusterCredentialsResultNonAad.json create mode 100644 specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/CreateClusterExample.json create mode 100644 specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/DeleteClusterExample.json create mode 100644 specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/GetClusterExample.json create mode 100644 specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/GetClustersByResourceGroupExample.json create mode 100644 specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/GetClustersBySubscriptionExample.json create mode 100644 specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/ListConnectedClusterOperationsExample.json create mode 100644 specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/UpdateClusterExample.json create mode 100644 specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/ConnectedClustersListClusterCredentialsResult.json create mode 100644 specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/ConnectedClustersListClusterCredentialsResultNonAad.json create mode 100644 specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/CreateClusterExample.json create mode 100644 specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/DeleteClusterExample.json create mode 100644 specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/GetClusterExample.json create mode 100644 specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/GetClustersByResourceGroupExample.json create mode 100644 specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/GetClustersBySubscriptionExample.json create mode 100644 specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/ListConnectedClusterOperationsExample.json create mode 100644 specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/UpdateClusterExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/ConnectedClustersListClusterCredentialsResult.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/ConnectedClustersListClusterCredentialsResult.json new file mode 100644 index 000000000000..8fb9e1bf30b2 --- /dev/null +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/ConnectedClustersListClusterCredentialsResult.json @@ -0,0 +1,20 @@ +{ + "parameters": { + "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", + "resourceGroupName": "k8sc-rg", + "clusterName": "testCluster", + "api-version": "2020-02-01" + }, + "responses": { + "200": { + "body": { + "kubeconfigs": [ + { + "name": "credentialName1", + "value": "YXBpVmVyc2lvbjogdjENCmNsdXN0ZXJzOg0KLSBjbHVzdGVyOg0KICAgIGNlcnRpZmljYXRlLWF1dGhvcml0eS1kYXRhOiBMUzB0TFMxQ1JVZEpUaUJEUlZKVVNVWkpRMEZVUlMwdExTMHRDazFKU1VWNGVrTkRRWEVyWjBGM1NVSkJaMGxSVTJ0dVdsWnZaekp1VmpKVmNYZEtjblZYTTFCSGVrRk9RbWRyY1docmFVYzVkekJDUVZGelJrRkVRVTRLVFZGemQwTlJXVVJXVVZGRVJYZEthbGVsSlEwbHFRVTVDWjJ0eGFHdHBSemwzTUVKQlVVVkdRVUZQUTBGbk9FRk5TVWxEUTJkTFEwRm5SVUUwV1hCNUNsUmtUMVJSU1dNdmVsaERlR3hTZWtVMF" + } + ] + } + } + } +} diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/ConnectedClustersListClusterCredentialsResultNonAad.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/ConnectedClustersListClusterCredentialsResultNonAad.json new file mode 100644 index 000000000000..cfa0907d43f2 --- /dev/null +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/ConnectedClustersListClusterCredentialsResultNonAad.json @@ -0,0 +1,21 @@ +{ + "parameters": { + "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", + "resourceGroupName": "k8sc-rg", + "clusterName": "testCluster", + "api-version": "2020-02-01", + "isTokenAuth": true + }, + "responses": { + "200": { + "body": { + "kubeconfigs": [ + { + "name": "credentialName1", + "value": "YXBpVmVyc2lvbjogdjEKY2x1c3RlcnM6CiAgLSBjbHVzdGVyOgogICAgICBjZXJ0aWZpY2F0ZS1hdXRob3JpdHktZGF0YTogTFMwdExTMUNSVWRKVGlCRFJWSlVTVVpKUTBGVVJTMHRMUzB0Q2sxSlNVaDJWRU5EUW1GWFowRjNTVUpCWjBsVVlYZEJRVUV5VkhWQlRYaEJhVWx5UldsQlFVRkJRVUZFV2tSQlRrSm5hM0ZvYTJsSE9YY3dRa0ZSYzBaQlJFSlFUVkZ6ZDBOUldVUldVVkZIUlhkS1ZsVjZSV1ZOUW5kSFFURlZSVU5vVFZaVVYyeHFZMjA1ZW1JeVdqQkpSVTUyWTI1Q2RtTnRSakJoVnpsMVRWTkJkMGhuV1VSV1VWRkVSWGhrVG1GWFRubGlNMDUyV201UloxVnNUa0pKUmxKTlZYbENSRkZUUVhkTlZFRmxSbmN3ZVUxRVFUUk5hbU40VFdwTmVFNVVXbUZHZHpCNVRWUkJORTFxWTNoTmFrMTRUbFJhWVUxRFdYaEtSRUZwUW1kT1ZrSkJUVTFIZVc5MVlYcG9lbGt5T1hWaWJWWnFaRU0xTUZwWVRqQk1iVVkyWkZoS2JFeHRUblppVkVORFFWTkpkMFJSV1VwTGIxcEphSFpqVGtGUlJVSkNVVUZFWjJkRlVFRkVRME5CVVc5RFoyZEZRa0ZOU0VwVU0wZEtXbWhMTm5KaVVHSm9XRWN6V21SU05HVlhNSGhSVmxVclIwTjVXSEFyY0VwRFNtUjBhbGgyTjNwMFEzTnJRV0ZaZDJobmQyMHpOMGhFVkVWamNFVlFjR1p6TDJSSFdsQktiek5vU0ZOemVGaENUMUJXYUVsVVRHZFBSa1E0YW5BMVlWZG1kVXA0WWsxUFNqZ3dObWxST0VkT1NVdEZURGM1ZDFkMVNWcG5MemhCWTBZeVNEWnJTMDlWVVhJdmVFMWFjVWx1WW5sQk1XVmhPVW8xTmpKbVNVODRUbEp2YWxORVRFUlBWRzFyWTFaYVdHcHlTaTlsYW1wclVVMUhiV0YyT1hreE9EQjJUVkZ5TTBjM2FXZ3Jkell2VFZocGVWWkpLMGxhY3pSaGVXVTJhREo0VDA5VlNYQnRWVTQ0UlhVNWIwY3ZTSGRHV2swemJHWnBkR0ZQZUhsblEydHBNV2R0VFRsd09FcHhNMVIyVVRSbU9YSnBRVWRUVFhaWWVsSlpTa2hOU2toVVRtZFZhV1pZVjFWb1VFWTJWMkZGTWxwbFdVWkdOV1ozU0U5MlVYRnFSa2tyUlZWS1JscE1kekJEUVhkRlFVRmhUME5CTjJ0M1oyZFBNVTFKU1VKQmQxbExTM2RaUWtKQlNGZGxVVWxGUVdkVFFqbEJVMEk0VVVSMlFVaFZRVGxzZVZWTU9VWXpUVU5KVlZaQ1owbE5TbEpYYW5WT1RrVjRhM3AyT1RoTlRIbEJUSHBGTjNoYVQwMUJRVUZHTUV3dlFuTjNRVUZCUWtGTlFWSnFRa1ZCYVVJMFpWSlVTMHhZY1hsM09HazFMeTlyVmtaNWNrTlhZMFZtY0VaV2NGUlZSVFIzYlVNME1rZHhSMkpCU1dkTkswVllkRWhtV0Rrd05WVklZall3Y1hKUlEzUTRibkZhTkUxamRVUjNOMlJaZVhwdGJFc3pja05SUVdSblFtTXpSVTlUTDNWaGNsSlZVM2hZY0hKVlZuVlpVVTR2ZGxZcmEyWmpiMWhQVlhOc04yMDVjMk5QZVdkQlFVRllVWFk0UjNwd1FVRkJSVUYzUWtoTlJWVkRTVVZZYTFwcWMyOUNVamhWZEc5blQwbFhWeXQyVTFOQ2NWcEViRGxIVEVRME1uWXdNR0ZXTkRVMVF6RkJhVVZCZDI1aE4zaDVWRUZJUTBJemNqVTBSSG93WnpKMVJHWktNa2ROUVdod2RuRnJiSGN5YXpka1VrMVdZM2RLZDFsS1MzZFpRa0pCUjBOT2VGVkxRa0p2ZDBkRVFVdENaMmR5UW1kRlJrSlJZMFJCVkVGTFFtZG5ja0puUlVaQ1VXTkVRV3BCSzBKbmEzSkNaMFZGUVZsSk0wWlJZMFZOVkVGMlFtbGpja0puUlVWQldVa3pSbEZwU0RKdldqRm5LemRhUVZsTVNtaFNkVUowV2pWb2FHWlVjbGxKUm1Sb1dXRlBVVmxtUTIxR1FVTkJWMUZEUVZOVmQyZFpZMGREUTNOSFFWRlZSa0ozUlVKQ1NITjNaVlJDVkVKblozSkNaMFZHUWxGamQwRnZXa2hoU0ZJd1kwUnZka3d6WkROa2VUVjBZVmRPZVdJelRuWmFibEYxV1RJNWRFd3pRbkpoVXpsMFl6Sk9kbU51UVhaVVYyeHFZMjA1ZW1JeVdqQktWRWwzVld4T1FrcFVTWGRXUlhoVVNsUkpkMUV3Uld4TmFrRjNUVk0xYW1OdVVYZEpaMWxKUzNkWlFrSlJWVWhOUVVkSFJtMW9NR1JJUVRaTWVUbDJXVE5PZDB4dE1YcGlNazU2WTBNMWFtSXlNSGRJVVZsRVZsSXdUMEpDV1VWR1N6ZFZhQ3M1WkdnNUwxRjFZM0ZKTlVFNVJHc3djMlpzTTFsVFRVRnpSMEV4VldSRWQxRkZRWGRKUlhORVFrSkNaMDVXU0ZKRlJVOXFRVFJuYUhOeFRHMXpOR015VG5aaWJUVnNXVE5SZFdSSFZucGtRelZvWlc1V2VWcFROV3BpTWpKRFIxZHpOR015VG5aaWJUVnNXVE5SZFdSSFZucGtRelZvWlc1V2VWcFROV3BpTWpCM1oySkJSMEV4VldSSWQxTkNjVVJEUW5CVVEwSnZjVU5DYmpaRFFtNUpXazVoU0ZJd1kwUnZka3d5TVhwWk0wcHpURzB4Y0ZrelNuWmpNamx0WkVNMWFtSXlNSFpqUjNSd1RESXhlbGt5T1hsalF6bHFZMjEzZGxSWGJHcGpiVGw2WWpKYU1FcFVTWGRWYkU1Q1NsUkpkMVpGZUZSS1ZFbDNVVEJGYkUxcVFYZE5VelZxWTIxNVIxTXlhREJrU0VFMlRIazVhbU50ZDNWaVYyeHFZMjA1ZW1JeVdqQk1iVTUyWWxNNWQyRXlhM1ppV0U1cVlqTktkMHd5VG5saVF6bE9ZVmRPZVdJelRuWmFibEZzVFdwQ1UxVXdSV3hOYWtKVlZFWk5iRTFxUWtSUlUxVjVUVVJCZUV4dFRubGlSRUpZUW1kT1ZraFRRVVZWUkVKUFRVVkpSME5UYzBkQlVWRkNaMnBqY1VGVVFURk5SRTFIUTBOelIwRlJWVVpDZDBsQ1JtbGtiMlJJVW5kUGFUaDJaRE5rTTB4dE1YQlpNMHAyWXpJNWJXUkROV3BpTWpCMlkwZDBjRXd5TVhwWk1qbDVZME01YW1OSVRYZERRVmxIV2pSRlRVRlJTVUpOUWpoSFFURlZaRWwzVVZsTlFtRkJSa3hXTWtSRVFWSjZjMlZUVVdzeFRYZ3hkM041UzJ0Tk5rRjBhMDFDTUVkQk1WVmtTbEZSVjAxQ1VVZERRM05IUVZGVlJrSjNUVUpDWjJkeVFtZEZSa0pSWTBSQmFrRk9RbWRyY1docmFVYzVkekJDUVZGelJrRkJUME5CWjBWQlJWZHRUVmRzWjJ3NGQzSlRUWHBQTW1Ob1pVbHZhbkZRVjBNd2FVVlVkSGRZYVVreWRqVmtWVkV5ZG01eWMydFVZM1ZzV1ZJNFExSllRemxXY0hWTU5YZDJUbEJaWlVzNWFtRjRhRXhGZW14YUt6aENTaTlhSzA5Q1NsRlBiV0k0VDIxRkwzcEVha1o1WVU5WWIzUXZNMEl3ZG5CcE9FWk1NalZNUkhGbGVuZExSeXN5VHpSVVJWQkhha1pGTmxONVRqWmlVR2d5ZG1Vck4wSTJLemQwVWpWeWVEZEtlU3RVY2pGcE9XdDBkV1p6UVhGWk5HSmtaMmd4Y2xWTGFsSkZVemRLVjNWek9HZDNVWG80YmtkSGMzaEhXbVJuU25oYVpISlJjVlZJUzNFMFlWcDJVVEZtWmtrM1RUbHVXWGhOVFM5VFNURkRlbTkxWkd0NmFHVnFSRXgzYW5vdk5UZHRaR04xYVdZck56TkpUbUZDVG5KRFprRXljemM1T1hwV1lVeDNkbXBMTlhRcmEwOVNSelI0TkZoWVpTdFphelZhV2pWQlkyMUZVa05NWnpSTGJHVkpiRFJJY3pSeGRYSkxhbGMxTjI1SFRYTnhLMHBXVGpBd2FFWXhXR1pETkZCVlpYbFJObFJPTUcxNlVGRXhia2RaZENzcmJVSTFWV053TURkWVRuVnpWR1JoTW05SGF6SlNOak5PVWsxWWIzcHRTbkYxVnlzNGRFVlVMMUJLUzNGUGFrVlNRalJXZHpOQ1IwUnZWRTVYVTNwb1dIbDRTVlp0TVhOT1dUSkJUVlpYYUdOYVkzRXpPVWRYVUc5UVp6RXpSbW80VDFsc2NFRm1SR1o2YURGaWRYWkdVbVpwVFZVME1sbHROa3c1YlROVVMwUjRlVXdyTWxKVmVESlNNbUo1VUZWTVQyVXdSMnd4T1hKelUyWlpjeTlvYjNkb1dWSnNXWEp1T0dKYVJFTkhiRFUzTDFGTWVHcEJXWFJVVWtZdlZFaHZLM1JOYTJSVmFTOWhUV2xVU0hoMlltcGtZeTlsYWxocVVISjRTbUp5UzFCVU1tUkVXRVk0ZG5aRGQzZGFRazAwUjFGWlNGaDViRFV6VTB4cU1VdHJRMjlvVlZKTkwzcDBlVEZpVTJOWWRIcE5aMDFJVmpWUFRYVkthVVZYVVhKV1NpOUhWRzlNVGxsUVNHMWxORXROY21jOUNpMHRMUzB0UlU1RUlFTkZVbFJKUmtsRFFWUkZMUzB0TFMwPQogICAgICBzZXJ2ZXI6IGh0dHBzOi8vYTljNDMzYzMtNjhlMS00NTY2LWI2MzMtODM0NzUyOWYzNjIwLms4c2Nvbm5lY3QudGVzdC5henVyZS5jb20KICAgIG5hbWU6IGNsdXN0ZXIKY29udGV4dHM6CiAgLSBjb250ZXh0OgogICAgICBjbHVzdGVyOiBjbHVzdGVyCiAgICAgIHVzZXI6IGNsdXN0ZXJVc2VyX3Rlc3RfY2x1c3RlcgogICAgbmFtZTogY2x1c3RlcgpjdXJyZW50LWNvbnRleHQ6IGNsdXN0ZXIKa2luZDogQ29uZmlnCnByZWZlcmVuY2VzOiBudWxsCnVzZXJzOgogIC0gbmFtZTogY2x1c3RlclVzZXJfdGVzdF9jbHVzdGVyCiAgICB1c2VyOgogICAgICB0b2tlbjogMmM2NGZyMmQ2MWRhZmZkODY4NGJkYTc3M2Y2YTQ3OGUxZTU4NzlhZTE1ZmRkM2Q1NDU4NGNkNTM1MGM2YWUxMzlhMGI3OTk4YTc2ZjFhOTdlOGI3Y2EwNTJiYjIwZWY0ZjljZTAzN2Q5YTMyM2ZjMTYxZmI0MGI4OTVlOWIwZjM=" + } + ] + } + } + } +} diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/CreateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/CreateClusterExample.json new file mode 100644 index 000000000000..32dcda1ce9cf --- /dev/null +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/CreateClusterExample.json @@ -0,0 +1,57 @@ +{ + "parameters": { + "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", + "resourceGroupName": "k8sc-rg", + "clusterName": "testCluster", + "api-version": "2020-02-01", + "ConnectedCluster": { + "location": "East US", + "tags": {}, + "identity": { + "type": "SystemAssigned" + }, + "properties": { + "agentPublicKeyCertificate": "MIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO" + } + } + }, + "responses": { + "200": { + "body": { + "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "name": "connectedCluster1", + "type": "Microsoft.Kubernetes/connectedClusters", + "location": "East US", + "tags": {}, + "identity": { + "type": "SystemAssigned" + }, + "properties": { + "agentPublicKeyCertificate": "MIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", + "kubernetesVersion": "1.17.0", + "totalNodeCount": 2, + "agentVersion": "0.1.0" + } + } + }, + "201": { + "body": { + "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "name": "connectedCluster1", + "type": "Microsoft.Kubernetes/connectedClusters", + "location": "East US", + "tags": {}, + "identity": { + "type": "SystemAssigned" + }, + "properties": { + "agentPublicKeyCertificate": "MIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", + "kubernetesVersion": "1.17.0", + "totalNodeCount": 2, + "agentVersion": "0.1.0", + "provisioningState": "Accepted" + } + } + } + } +} diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/DeleteClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/DeleteClusterExample.json new file mode 100644 index 000000000000..20ead9ed0f85 --- /dev/null +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/DeleteClusterExample.json @@ -0,0 +1,13 @@ +{ + "parameters": { + "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", + "resourceGroupName": "k8sc-rg", + "clusterName": "testCluster", + "api-version": "2020-02-01" + }, + "responses": { + "200": {}, + "202": {}, + "204": {} + } +} diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/GetClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/GetClusterExample.json new file mode 100644 index 000000000000..4e09fd855852 --- /dev/null +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/GetClusterExample.json @@ -0,0 +1,30 @@ +{ + "parameters": { + "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", + "resourceGroupName": "k8sc-rg", + "clusterName": "testCluster", + "api-version": "2020-02-01" + }, + "responses": { + "200": { + "body": { + "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "name": "connectedCluster1", + "type": "Microsoft.Kubernetes/connectedClusters", + "location": "East US", + "tags": {}, + "identity": { + "principalId": "d8cd1fd9-154f-4da7-b348-595f283c13a3", + "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "type": "SystemAssigned" + }, + "properties": { + "agentPublicKeyCertificate": "MIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", + "kubernetesVersion": "1.17.0", + "totalNodeCount": 2, + "agentVersion": "0.1.0" + } + } + } + } +} diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/GetClustersByResourceGroupExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/GetClustersByResourceGroupExample.json new file mode 100644 index 000000000000..ac7a29c70f1e --- /dev/null +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/GetClustersByResourceGroupExample.json @@ -0,0 +1,52 @@ +{ + "parameters": { + "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", + "resourceGroupName": "k8sc-rg", + "api-version": "2020-02-01" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "72f988bf-86f1-41af-91ab-2d7cd011db48", + "name": "connectedCluster1", + "type": "Microsoft.Kubernetes/connectedClusters", + "location": "East US", + "tags": {}, + "identity": { + "principalId": "d8cd1fd9-154f-4da7-b348-595f283c13a3", + "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "type": "SystemAssigned" + }, + "properties": { + "agentPublicKeyCertificate": "MIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", + "kubernetesVersion": "1.17.0", + "totalNodeCount": 2, + "agentVersion": "0.1.0" + } + }, + { + "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "name": "connectedCluster1", + "type": "Microsoft.Kubernetes/connectedClusters", + "location": "East US", + "tags": {}, + "identity": { + "principalId": "d8cd1fd9-154f-4da7-b348-595f283c13a3", + "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "type": "SystemAssigned" + }, + "properties": { + "agentPublicKeyCertificate": "XIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", + "kubernetesVersion": "1.1", + "totalNodeCount": 2, + "agentVersion": "0.1.0" + } + } + ], + "nextLink": "https://serviceRoot/subscriptions/subId/resourcegroups/resourceGroupName/providers/Microsoft.Kubernetes/connectedClusters?api-version=2019-11-01-preview&$skiptoken=X'12345'" + } + } + } +} diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/GetClustersBySubscriptionExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/GetClustersBySubscriptionExample.json new file mode 100644 index 000000000000..944d5017b7ef --- /dev/null +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/GetClustersBySubscriptionExample.json @@ -0,0 +1,51 @@ +{ + "parameters": { + "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", + "api-version": "2020-02-01" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "name": "connectedCluster1", + "type": "Microsoft.Kubernetes/connectedClusters", + "location": "East US", + "tags": {}, + "identity": { + "principalId": "d8cd1fd9-154f-4da7-b348-595f283c13a3", + "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "type": "SystemAssigned" + }, + "properties": { + "agentPublicKeyCertificate": "MIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", + "kubernetesVersion": "1.17.0", + "totalNodeCount": 2, + "agentVersion": "0.1.0" + } + }, + { + "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "name": "connectedCluster2", + "type": "Microsoft.Kubernetes/connectedClusters", + "location": "East US", + "tags": {}, + "identity": { + "principalId": "d8cd1fd9-154f-4da7-b348-595f283c13a3", + "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "type": "SystemAssigned" + }, + "properties": { + "agentPublicKeyCertificate": "XIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", + "kubernetesVersion": "1.16.3", + "totalNodeCount": 4, + "agentVersion": "0.1.0" + } + } + ], + "nextLink": "https://serviceRoot/subscriptions/subId/resourcegroups/resourceGroupName/providers/Microsoft.Kubernetes/connectedClusters?api-version=2019-11-01-preview&$skiptoken=X'12345'" + } + } + } +} diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/ListConnectedClusterOperationsExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/ListConnectedClusterOperationsExample.json new file mode 100644 index 000000000000..be642775d19c --- /dev/null +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/ListConnectedClusterOperationsExample.json @@ -0,0 +1,41 @@ +{ + "parameters": { + "api-version": "2020-02-01" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "Microsoft.Kubernetes/connectedClusters/write", + "display": { + "provider": "Microsoft.connectedClusters", + "resource": "connectedClusters", + "operation": "Create ConnectedCluster", + "description": "Create any ConnectedCluster" + } + }, + { + "name": "Microsoft.Kubernetes/connectedClusters/read", + "display": { + "provider": "Microsoft.Kubernetes", + "resource": "connectedClusters", + "operation": "Get ConnectedCluster", + "description": "Get any ConnectedCluster" + } + }, + { + "name": "Microsoft.Kubernetes/connectedClusters/delete", + "display": { + "provider": "Microsoft.Kubernetes", + "resource": "connectedClusters", + "operation": "Delete ConnectedCluster", + "description": "Delete any ConnectedCluster" + } + } + ], + "nextLink": "https://serviceRoot/subscriptions/subId/resourcegroups/resourceGroupName/providers/Microsoft.Kubernetes/connectedClusters?api-version=2019-11-01-preview&$skiptoken=X'12345'" + } + } + } +} diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/UpdateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/UpdateClusterExample.json new file mode 100644 index 000000000000..076e66fc5a74 --- /dev/null +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/UpdateClusterExample.json @@ -0,0 +1,37 @@ +{ + "parameters": { + "api-version": "2020-02-01", + "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", + "resourceGroupName": "k8sc-rg", + "clusterName": "testCluster", + "ConnectedClusterPatch": { + "tags": { + "tag1": "value1", + "tag2": "value2" + }, + "properties": { + "agentPublicKeyCertificate": "MIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO" + } + } + }, + "responses": { + "200": { + "body": { + "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "name": "connectedCluster1", + "type": "Microsoft.Kubernetes/connectedClusters", + "location": "East US", + "tags": {}, + "identity": { + "type": "SystemAssigned" + }, + "properties": { + "agentPublicKeyCertificate": "MIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", + "kubernetesVersion": "1.17.0", + "totalNodeCount": 2, + "agentVersion": "0.1.0" + } + } + } + } +} diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/ConnectedClustersListClusterCredentialsResult.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/ConnectedClustersListClusterCredentialsResult.json new file mode 100644 index 000000000000..bff625574401 --- /dev/null +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/ConnectedClustersListClusterCredentialsResult.json @@ -0,0 +1,20 @@ +{ + "parameters": { + "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", + "resourceGroupName": "k8sc-rg", + "clusterName": "testCluster", + "api-version": "2020-02-01-preview" + }, + "responses": { + "200": { + "body": { + "kubeconfigs": [ + { + "name": "credentialName1", + "value": "YXBpVmVyc2lvbjogdjENCmNsdXN0ZXJzOg0KLSBjbHVzdGVyOg0KICAgIGNlcnRpZmljYXRlLWF1dGhvcml0eS1kYXRhOiBMUzB0TFMxQ1JVZEpUaUJEUlZKVVNVWkpRMEZVUlMwdExTMHRDazFKU1VWNGVrTkRRWEVyWjBGM1NVSkJaMGxSVTJ0dVdsWnZaekp1VmpKVmNYZEtjblZYTTFCSGVrRk9RbWRyY1docmFVYzVkekJDUVZGelJrRkVRVTRLVFZGemQwTlJXVVJXVVZGRVJYZEthbGVsSlEwbHFRVTVDWjJ0eGFHdHBSemwzTUVKQlVVVkdRVUZQUTBGbk9FRk5TVWxEUTJkTFEwRm5SVUUwV1hCNUNsUmtUMVJSU1dNdmVsaERlR3hTZWtVMF" + } + ] + } + } + } +} diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/ConnectedClustersListClusterCredentialsResultNonAad.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/ConnectedClustersListClusterCredentialsResultNonAad.json new file mode 100644 index 000000000000..ef8a8b90c445 --- /dev/null +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/ConnectedClustersListClusterCredentialsResultNonAad.json @@ -0,0 +1,21 @@ +{ + "parameters": { + "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", + "resourceGroupName": "k8sc-rg", + "clusterName": "testCluster", + "api-version": "2020-02-01-preview", + "isTokenAuth": true + }, + "responses": { + "200": { + "body": { + "kubeconfigs": [ + { + "name": "credentialName1", + "value": "YXBpVmVyc2lvbjogdjEKY2x1c3RlcnM6CiAgLSBjbHVzdGVyOgogICAgICBjZXJ0aWZpY2F0ZS1hdXRob3JpdHktZGF0YTogTFMwdExTMUNSVWRKVGlCRFJWSlVTVVpKUTBGVVJTMHRMUzB0Q2sxSlNVaDJWRU5EUW1GWFowRjNTVUpCWjBsVVlYZEJRVUV5VkhWQlRYaEJhVWx5UldsQlFVRkJRVUZFV2tSQlRrSm5hM0ZvYTJsSE9YY3dRa0ZSYzBaQlJFSlFUVkZ6ZDBOUldVUldVVkZIUlhkS1ZsVjZSV1ZOUW5kSFFURlZSVU5vVFZaVVYyeHFZMjA1ZW1JeVdqQkpSVTUyWTI1Q2RtTnRSakJoVnpsMVRWTkJkMGhuV1VSV1VWRkVSWGhrVG1GWFRubGlNMDUyV201UloxVnNUa0pKUmxKTlZYbENSRkZUUVhkTlZFRmxSbmN3ZVUxRVFUUk5hbU40VFdwTmVFNVVXbUZHZHpCNVRWUkJORTFxWTNoTmFrMTRUbFJhWVUxRFdYaEtSRUZwUW1kT1ZrSkJUVTFIZVc5MVlYcG9lbGt5T1hWaWJWWnFaRU0xTUZwWVRqQk1iVVkyWkZoS2JFeHRUblppVkVORFFWTkpkMFJSV1VwTGIxcEphSFpqVGtGUlJVSkNVVUZFWjJkRlVFRkVRME5CVVc5RFoyZEZRa0ZOU0VwVU0wZEtXbWhMTm5KaVVHSm9XRWN6V21SU05HVlhNSGhSVmxVclIwTjVXSEFyY0VwRFNtUjBhbGgyTjNwMFEzTnJRV0ZaZDJobmQyMHpOMGhFVkVWamNFVlFjR1p6TDJSSFdsQktiek5vU0ZOemVGaENUMUJXYUVsVVRHZFBSa1E0YW5BMVlWZG1kVXA0WWsxUFNqZ3dObWxST0VkT1NVdEZURGM1ZDFkMVNWcG5MemhCWTBZeVNEWnJTMDlWVVhJdmVFMWFjVWx1WW5sQk1XVmhPVW8xTmpKbVNVODRUbEp2YWxORVRFUlBWRzFyWTFaYVdHcHlTaTlsYW1wclVVMUhiV0YyT1hreE9EQjJUVkZ5TTBjM2FXZ3Jkell2VFZocGVWWkpLMGxhY3pSaGVXVTJhREo0VDA5VlNYQnRWVTQ0UlhVNWIwY3ZTSGRHV2swemJHWnBkR0ZQZUhsblEydHBNV2R0VFRsd09FcHhNMVIyVVRSbU9YSnBRVWRUVFhaWWVsSlpTa2hOU2toVVRtZFZhV1pZVjFWb1VFWTJWMkZGTWxwbFdVWkdOV1ozU0U5MlVYRnFSa2tyUlZWS1JscE1kekJEUVhkRlFVRmhUME5CTjJ0M1oyZFBNVTFKU1VKQmQxbExTM2RaUWtKQlNGZGxVVWxGUVdkVFFqbEJVMEk0VVVSMlFVaFZRVGxzZVZWTU9VWXpUVU5KVlZaQ1owbE5TbEpYYW5WT1RrVjRhM3AyT1RoTlRIbEJUSHBGTjNoYVQwMUJRVUZHTUV3dlFuTjNRVUZCUWtGTlFWSnFRa1ZCYVVJMFpWSlVTMHhZY1hsM09HazFMeTlyVmtaNWNrTlhZMFZtY0VaV2NGUlZSVFIzYlVNME1rZHhSMkpCU1dkTkswVllkRWhtV0Rrd05WVklZall3Y1hKUlEzUTRibkZhTkUxamRVUjNOMlJaZVhwdGJFc3pja05SUVdSblFtTXpSVTlUTDNWaGNsSlZVM2hZY0hKVlZuVlpVVTR2ZGxZcmEyWmpiMWhQVlhOc04yMDVjMk5QZVdkQlFVRllVWFk0UjNwd1FVRkJSVUYzUWtoTlJWVkRTVVZZYTFwcWMyOUNVamhWZEc5blQwbFhWeXQyVTFOQ2NWcEViRGxIVEVRME1uWXdNR0ZXTkRVMVF6RkJhVVZCZDI1aE4zaDVWRUZJUTBJemNqVTBSSG93WnpKMVJHWktNa2ROUVdod2RuRnJiSGN5YXpka1VrMVdZM2RLZDFsS1MzZFpRa0pCUjBOT2VGVkxRa0p2ZDBkRVFVdENaMmR5UW1kRlJrSlJZMFJCVkVGTFFtZG5ja0puUlVaQ1VXTkVRV3BCSzBKbmEzSkNaMFZGUVZsSk0wWlJZMFZOVkVGMlFtbGpja0puUlVWQldVa3pSbEZwU0RKdldqRm5LemRhUVZsTVNtaFNkVUowV2pWb2FHWlVjbGxKUm1Sb1dXRlBVVmxtUTIxR1FVTkJWMUZEUVZOVmQyZFpZMGREUTNOSFFWRlZSa0ozUlVKQ1NITjNaVlJDVkVKblozSkNaMFZHUWxGamQwRnZXa2hoU0ZJd1kwUnZka3d6WkROa2VUVjBZVmRPZVdJelRuWmFibEYxV1RJNWRFd3pRbkpoVXpsMFl6Sk9kbU51UVhaVVYyeHFZMjA1ZW1JeVdqQktWRWwzVld4T1FrcFVTWGRXUlhoVVNsUkpkMUV3Uld4TmFrRjNUVk0xYW1OdVVYZEpaMWxKUzNkWlFrSlJWVWhOUVVkSFJtMW9NR1JJUVRaTWVUbDJXVE5PZDB4dE1YcGlNazU2WTBNMWFtSXlNSGRJVVZsRVZsSXdUMEpDV1VWR1N6ZFZhQ3M1WkdnNUwxRjFZM0ZKTlVFNVJHc3djMlpzTTFsVFRVRnpSMEV4VldSRWQxRkZRWGRKUlhORVFrSkNaMDVXU0ZKRlJVOXFRVFJuYUhOeFRHMXpOR015VG5aaWJUVnNXVE5SZFdSSFZucGtRelZvWlc1V2VWcFROV3BpTWpKRFIxZHpOR015VG5aaWJUVnNXVE5SZFdSSFZucGtRelZvWlc1V2VWcFROV3BpTWpCM1oySkJSMEV4VldSSWQxTkNjVVJEUW5CVVEwSnZjVU5DYmpaRFFtNUpXazVoU0ZJd1kwUnZka3d5TVhwWk0wcHpURzB4Y0ZrelNuWmpNamx0WkVNMWFtSXlNSFpqUjNSd1RESXhlbGt5T1hsalF6bHFZMjEzZGxSWGJHcGpiVGw2WWpKYU1FcFVTWGRWYkU1Q1NsUkpkMVpGZUZSS1ZFbDNVVEJGYkUxcVFYZE5VelZxWTIxNVIxTXlhREJrU0VFMlRIazVhbU50ZDNWaVYyeHFZMjA1ZW1JeVdqQk1iVTUyWWxNNWQyRXlhM1ppV0U1cVlqTktkMHd5VG5saVF6bE9ZVmRPZVdJelRuWmFibEZzVFdwQ1UxVXdSV3hOYWtKVlZFWk5iRTFxUWtSUlUxVjVUVVJCZUV4dFRubGlSRUpZUW1kT1ZraFRRVVZWUkVKUFRVVkpSME5UYzBkQlVWRkNaMnBqY1VGVVFURk5SRTFIUTBOelIwRlJWVVpDZDBsQ1JtbGtiMlJJVW5kUGFUaDJaRE5rTTB4dE1YQlpNMHAyWXpJNWJXUkROV3BpTWpCMlkwZDBjRXd5TVhwWk1qbDVZME01YW1OSVRYZERRVmxIV2pSRlRVRlJTVUpOUWpoSFFURlZaRWwzVVZsTlFtRkJSa3hXTWtSRVFWSjZjMlZUVVdzeFRYZ3hkM041UzJ0Tk5rRjBhMDFDTUVkQk1WVmtTbEZSVjAxQ1VVZERRM05IUVZGVlJrSjNUVUpDWjJkeVFtZEZSa0pSWTBSQmFrRk9RbWRyY1docmFVYzVkekJDUVZGelJrRkJUME5CWjBWQlJWZHRUVmRzWjJ3NGQzSlRUWHBQTW1Ob1pVbHZhbkZRVjBNd2FVVlVkSGRZYVVreWRqVmtWVkV5ZG01eWMydFVZM1ZzV1ZJNFExSllRemxXY0hWTU5YZDJUbEJaWlVzNWFtRjRhRXhGZW14YUt6aENTaTlhSzA5Q1NsRlBiV0k0VDIxRkwzcEVha1o1WVU5WWIzUXZNMEl3ZG5CcE9FWk1NalZNUkhGbGVuZExSeXN5VHpSVVJWQkhha1pGTmxONVRqWmlVR2d5ZG1Vck4wSTJLemQwVWpWeWVEZEtlU3RVY2pGcE9XdDBkV1p6UVhGWk5HSmtaMmd4Y2xWTGFsSkZVemRLVjNWek9HZDNVWG80YmtkSGMzaEhXbVJuU25oYVpISlJjVlZJUzNFMFlWcDJVVEZtWmtrM1RUbHVXWGhOVFM5VFNURkRlbTkxWkd0NmFHVnFSRXgzYW5vdk5UZHRaR04xYVdZck56TkpUbUZDVG5KRFprRXljemM1T1hwV1lVeDNkbXBMTlhRcmEwOVNSelI0TkZoWVpTdFphelZhV2pWQlkyMUZVa05NWnpSTGJHVkpiRFJJY3pSeGRYSkxhbGMxTjI1SFRYTnhLMHBXVGpBd2FFWXhXR1pETkZCVlpYbFJObFJPTUcxNlVGRXhia2RaZENzcmJVSTFWV053TURkWVRuVnpWR1JoTW05SGF6SlNOak5PVWsxWWIzcHRTbkYxVnlzNGRFVlVMMUJLUzNGUGFrVlNRalJXZHpOQ1IwUnZWRTVYVTNwb1dIbDRTVlp0TVhOT1dUSkJUVlpYYUdOYVkzRXpPVWRYVUc5UVp6RXpSbW80VDFsc2NFRm1SR1o2YURGaWRYWkdVbVpwVFZVME1sbHROa3c1YlROVVMwUjRlVXdyTWxKVmVESlNNbUo1VUZWTVQyVXdSMnd4T1hKelUyWlpjeTlvYjNkb1dWSnNXWEp1T0dKYVJFTkhiRFUzTDFGTWVHcEJXWFJVVWtZdlZFaHZLM1JOYTJSVmFTOWhUV2xVU0hoMlltcGtZeTlsYWxocVVISjRTbUp5UzFCVU1tUkVXRVk0ZG5aRGQzZGFRazAwUjFGWlNGaDViRFV6VTB4cU1VdHJRMjlvVlZKTkwzcDBlVEZpVTJOWWRIcE5aMDFJVmpWUFRYVkthVVZYVVhKV1NpOUhWRzlNVGxsUVNHMWxORXROY21jOUNpMHRMUzB0UlU1RUlFTkZVbFJKUmtsRFFWUkZMUzB0TFMwPQogICAgICBzZXJ2ZXI6IGh0dHBzOi8vYTljNDMzYzMtNjhlMS00NTY2LWI2MzMtODM0NzUyOWYzNjIwLms4c2Nvbm5lY3QudGVzdC5henVyZS5jb20KICAgIG5hbWU6IGNsdXN0ZXIKY29udGV4dHM6CiAgLSBjb250ZXh0OgogICAgICBjbHVzdGVyOiBjbHVzdGVyCiAgICAgIHVzZXI6IGNsdXN0ZXJVc2VyX3Rlc3RfY2x1c3RlcgogICAgbmFtZTogY2x1c3RlcgpjdXJyZW50LWNvbnRleHQ6IGNsdXN0ZXIKa2luZDogQ29uZmlnCnByZWZlcmVuY2VzOiBudWxsCnVzZXJzOgogIC0gbmFtZTogY2x1c3RlclVzZXJfdGVzdF9jbHVzdGVyCiAgICB1c2VyOgogICAgICB0b2tlbjogMmM2NGZyMmQ2MWRhZmZkODY4NGJkYTc3M2Y2YTQ3OGUxZTU4NzlhZTE1ZmRkM2Q1NDU4NGNkNTM1MGM2YWUxMzlhMGI3OTk4YTc2ZjFhOTdlOGI3Y2EwNTJiYjIwZWY0ZjljZTAzN2Q5YTMyM2ZjMTYxZmI0MGI4OTVlOWIwZjM=" + } + ] + } + } + } +} diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/CreateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/CreateClusterExample.json new file mode 100644 index 000000000000..81d3e8533889 --- /dev/null +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/CreateClusterExample.json @@ -0,0 +1,57 @@ +{ + "parameters": { + "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", + "resourceGroupName": "k8sc-rg", + "clusterName": "testCluster", + "api-version": "2020-02-01-preview", + "ConnectedCluster": { + "location": "East US", + "tags": {}, + "identity": { + "type": "SystemAssigned" + }, + "properties": { + "agentPublicKeyCertificate": "MIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO" + } + } + }, + "responses": { + "200": { + "body": { + "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "name": "connectedCluster1", + "type": "Microsoft.Kubernetes/connectedClusters", + "location": "East US", + "tags": {}, + "identity": { + "type": "SystemAssigned" + }, + "properties": { + "agentPublicKeyCertificate": "MIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", + "kubernetesVersion": "1.17.0", + "totalNodeCount": 2, + "agentVersion": "0.1.0" + } + } + }, + "201": { + "body": { + "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "name": "connectedCluster1", + "type": "Microsoft.Kubernetes/connectedClusters", + "location": "East US", + "tags": {}, + "identity": { + "type": "SystemAssigned" + }, + "properties": { + "agentPublicKeyCertificate": "MIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", + "kubernetesVersion": "1.17.0", + "totalNodeCount": 2, + "agentVersion": "0.1.0", + "provisioningState": "Accepted" + } + } + } + } +} diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/DeleteClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/DeleteClusterExample.json new file mode 100644 index 000000000000..024e3e32e916 --- /dev/null +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/DeleteClusterExample.json @@ -0,0 +1,13 @@ +{ + "parameters": { + "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", + "resourceGroupName": "k8sc-rg", + "clusterName": "testCluster", + "api-version": "2020-02-01-preview" + }, + "responses": { + "200": {}, + "202": {}, + "204": {} + } +} diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/GetClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/GetClusterExample.json new file mode 100644 index 000000000000..79bdc677d9c8 --- /dev/null +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/GetClusterExample.json @@ -0,0 +1,30 @@ +{ + "parameters": { + "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", + "resourceGroupName": "k8sc-rg", + "clusterName": "testCluster", + "api-version": "2020-02-01-preview" + }, + "responses": { + "200": { + "body": { + "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "name": "connectedCluster1", + "type": "Microsoft.Kubernetes/connectedClusters", + "location": "East US", + "tags": {}, + "identity": { + "principalId": "d8cd1fd9-154f-4da7-b348-595f283c13a3", + "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "type": "SystemAssigned" + }, + "properties": { + "agentPublicKeyCertificate": "MIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", + "kubernetesVersion": "1.17.0", + "totalNodeCount": 2, + "agentVersion": "0.1.0" + } + } + } + } +} diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/GetClustersByResourceGroupExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/GetClustersByResourceGroupExample.json new file mode 100644 index 000000000000..b99d7c6a6f7f --- /dev/null +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/GetClustersByResourceGroupExample.json @@ -0,0 +1,52 @@ +{ + "parameters": { + "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", + "resourceGroupName": "k8sc-rg", + "api-version": "2020-02-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "72f988bf-86f1-41af-91ab-2d7cd011db48", + "name": "connectedCluster1", + "type": "Microsoft.Kubernetes/connectedClusters", + "location": "East US", + "tags": {}, + "identity": { + "principalId": "d8cd1fd9-154f-4da7-b348-595f283c13a3", + "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "type": "SystemAssigned" + }, + "properties": { + "agentPublicKeyCertificate": "MIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", + "kubernetesVersion": "1.17.0", + "totalNodeCount": 2, + "agentVersion": "0.1.0" + } + }, + { + "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "name": "connectedCluster1", + "type": "Microsoft.Kubernetes/connectedClusters", + "location": "East US", + "tags": {}, + "identity": { + "principalId": "d8cd1fd9-154f-4da7-b348-595f283c13a3", + "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "type": "SystemAssigned" + }, + "properties": { + "agentPublicKeyCertificate": "XIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", + "kubernetesVersion": "1.1", + "totalNodeCount": 2, + "agentVersion": "0.1.0" + } + } + ], + "nextLink": "https://serviceRoot/subscriptions/subId/resourcegroups/resourceGroupName/providers/Microsoft.Kubernetes/connectedClusters?api-version=2019-11-01-preview&$skiptoken=X'12345'" + } + } + } +} diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/GetClustersBySubscriptionExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/GetClustersBySubscriptionExample.json new file mode 100644 index 000000000000..e732acdbed07 --- /dev/null +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/GetClustersBySubscriptionExample.json @@ -0,0 +1,51 @@ +{ + "parameters": { + "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", + "api-version": "2020-02-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "name": "connectedCluster1", + "type": "Microsoft.Kubernetes/connectedClusters", + "location": "East US", + "tags": {}, + "identity": { + "principalId": "d8cd1fd9-154f-4da7-b348-595f283c13a3", + "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "type": "SystemAssigned" + }, + "properties": { + "agentPublicKeyCertificate": "MIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", + "kubernetesVersion": "1.17.0", + "totalNodeCount": 2, + "agentVersion": "0.1.0" + } + }, + { + "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "name": "connectedCluster2", + "type": "Microsoft.Kubernetes/connectedClusters", + "location": "East US", + "tags": {}, + "identity": { + "principalId": "d8cd1fd9-154f-4da7-b348-595f283c13a3", + "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "type": "SystemAssigned" + }, + "properties": { + "agentPublicKeyCertificate": "XIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", + "kubernetesVersion": "1.16.3", + "totalNodeCount": 4, + "agentVersion": "0.1.0" + } + } + ], + "nextLink": "https://serviceRoot/subscriptions/subId/resourcegroups/resourceGroupName/providers/Microsoft.Kubernetes/connectedClusters?api-version=2019-11-01-preview&$skiptoken=X'12345'" + } + } + } +} diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/ListConnectedClusterOperationsExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/ListConnectedClusterOperationsExample.json new file mode 100644 index 000000000000..5097bfc6d81d --- /dev/null +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/ListConnectedClusterOperationsExample.json @@ -0,0 +1,41 @@ +{ + "parameters": { + "api-version": "2020-02-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "Microsoft.Kubernetes/connectedClusters/write", + "display": { + "provider": "Microsoft.connectedClusters", + "resource": "connectedClusters", + "operation": "Create ConnectedCluster", + "description": "Create any ConnectedCluster" + } + }, + { + "name": "Microsoft.Kubernetes/connectedClusters/read", + "display": { + "provider": "Microsoft.Kubernetes", + "resource": "connectedClusters", + "operation": "Get ConnectedCluster", + "description": "Get any ConnectedCluster" + } + }, + { + "name": "Microsoft.Kubernetes/connectedClusters/delete", + "display": { + "provider": "Microsoft.Kubernetes", + "resource": "connectedClusters", + "operation": "Delete ConnectedCluster", + "description": "Delete any ConnectedCluster" + } + } + ], + "nextLink": "https://serviceRoot/subscriptions/subId/resourcegroups/resourceGroupName/providers/Microsoft.Kubernetes/connectedClusters?api-version=2019-11-01-preview&$skiptoken=X'12345'" + } + } + } +} diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/UpdateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/UpdateClusterExample.json new file mode 100644 index 000000000000..f0b3232b89f5 --- /dev/null +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/UpdateClusterExample.json @@ -0,0 +1,37 @@ +{ + "parameters": { + "api-version": "2020-02-01-preview", + "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", + "resourceGroupName": "k8sc-rg", + "clusterName": "testCluster", + "ConnectedClusterPatch": { + "tags": { + "tag1": "value1", + "tag2": "value2" + }, + "properties": { + "agentPublicKeyCertificate": "MIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO" + } + } + }, + "responses": { + "200": { + "body": { + "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "name": "connectedCluster1", + "type": "Microsoft.Kubernetes/connectedClusters", + "location": "East US", + "tags": {}, + "identity": { + "type": "SystemAssigned" + }, + "properties": { + "agentPublicKeyCertificate": "MIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", + "kubernetesVersion": "1.17.0", + "totalNodeCount": 2, + "agentVersion": "0.1.0" + } + } + } + } +} From d5c00f4662fb79fa6fff5fa793c1de0a0ed33d00 Mon Sep 17 00:00:00 2001 From: sikasire Date: Tue, 19 Jan 2021 13:39:56 +0530 Subject: [PATCH 04/31] prettier fix --- .../GA/2020-02-01/connectedClusters.json | 688 --------- ...dClustersListClusterCredentialsResult.json | 2 +- ...ersListClusterCredentialsResultNonAad.json | 2 +- .../CreateClusterExample.json | 2 +- .../DeleteClusterExample.json | 2 +- .../GetClusterExample.json | 2 +- .../GetClustersByResourceGroupExample.json | 2 +- .../GetClustersBySubscriptionExample.json | 2 +- ...ListConnectedClusterOperationsExample.json | 2 +- .../UpdateClusterExample.json | 2 +- .../GA/2021-02-01/connectedClusters.json | 686 +++++++++ ...dClustersListClusterCredentialsResult.json | 2 +- ...ersListClusterCredentialsResultNonAad.json | 2 +- .../CreateClusterExample.json | 2 +- .../DeleteClusterExample.json | 2 +- .../2021-02-01-preview/GetClusterExample.json | 2 +- .../GetClustersByResourceGroupExample.json | 2 +- .../GetClustersBySubscriptionExample.json | 2 +- ...ListConnectedClusterOperationsExample.json | 2 +- .../UpdateClusterExample.json | 2 +- .../2021-02-01-preview/connectedClusters.json | 1325 ++++++++--------- 21 files changed, 1365 insertions(+), 1370 deletions(-) delete mode 100644 specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/connectedClusters.json rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/{2020-02-01 => 2021-02-01}/ConnectedClustersListClusterCredentialsResult.json (95%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/{2020-02-01 => 2021-02-01}/ConnectedClustersListClusterCredentialsResultNonAad.json (99%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/{2020-02-01 => 2021-02-01}/CreateClusterExample.json (99%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/{2020-02-01 => 2021-02-01}/DeleteClusterExample.json (87%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/{2020-02-01 => 2021-02-01}/GetClusterExample.json (98%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/{2020-02-01 => 2021-02-01}/GetClustersByResourceGroupExample.json (99%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/{2020-02-01 => 2021-02-01}/GetClustersBySubscriptionExample.json (99%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/{2020-02-01 => 2021-02-01}/ListConnectedClusterOperationsExample.json (97%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/{2020-02-01 => 2021-02-01}/UpdateClusterExample.json (98%) create mode 100644 specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/connectedClusters.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/connectedClusters.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/connectedClusters.json deleted file mode 100644 index 121b1f3e15cb..000000000000 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/connectedClusters.json +++ /dev/null @@ -1,688 +0,0 @@ -{ - "swagger": "2.0", - "info": { - "title": "ConnectedKubernetesClient", - "version": "2020-02-01", - "description": "Azure Connected Cluster Resource Provider API for adopting any Kubernetes Cluster" - }, - "schemes": [ - "https" - ], - "host": "management.azure.com", - "security": [ - { - "azure_auth": [ - "user_impersonation" - ] - } - ], - "securityDefinitions": { - "azure_auth": { - "type": "oauth2", - "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", - "flow": "implicit", - "description": "Azure Active Directory OAuth2 Flow.", - "scopes": { - "user_impersonation": "impersonate your user account" - } - } - }, - "paths": { - "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Kubernetes/connectedClusters/{clusterName}": { - "put": { - "summary": "Register a new Kubernetes cluster with Azure Resource Manager.", - "operationId": "ConnectedCluster_Create", - "description": "API to register a new Kubernetes cluster and create a tracked resource in Azure Resource Manager (ARM).", - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "x-ms-examples": { - "CreateClusterExample": { - "$ref": "./examples/CreateClusterExample.json" - } - }, - "parameters": [ - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/ClusterNamePathParam" - }, - { - "in": "body", - "name": "ConnectedCluster", - "required": true, - "schema": { - "$ref": "#/definitions/ConnectedCluster" - }, - "description": "Parameters supplied to Create a Connected Cluster." - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/ConnectedCluster" - } - }, - "201": { - "description": "Resource creation request accepted", - "schema": { - "$ref": "#/definitions/ConnectedCluster" - } - }, - "default": { - "description": "Resource Provider error response describing why the operation failed.", - "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" - } - } - }, - "x-ms-long-running-operation": true, - "x-ms-long-running-operation-options": { - "final-state-via": "azure-async-operation" - } - }, - "patch": { - "summary": "Updates a connected cluster.", - "operationId": "ConnectedCluster_Update", - "description": "API to update certain properties of the connected cluster resource", - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "x-ms-examples": { - "UpdateClusterExample": { - "$ref": "./examples/UpdateClusterExample.json" - } - }, - "parameters": [ - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/ClusterNamePathParam" - }, - { - "in": "body", - "name": "ConnectedClusterPatch", - "required": true, - "schema": { - "$ref": "#/definitions/ConnectedClusterPatch" - }, - "description": "Parameters supplied to update Connected Cluster." - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/ConnectedCluster" - } - }, - "default": { - "description": "Resource Provider error response describing why the operation failed.", - "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" - } - } - } - }, - "get": { - "summary": "Get the properties of the specified connected cluster.", - "operationId": "ConnectedCluster_Get", - "description": "Returns the properties of the specified connected cluster, including name, identity, properties, and additional cluster details.", - "produces": [ - "application/json" - ], - "x-ms-examples": { - "GetClusterExample": { - "$ref": "./examples/GetClusterExample.json" - } - }, - "parameters": [ - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/ClusterNamePathParam" - } - ], - "responses": { - "200": { - "description": "Resource retrieved successfully.", - "schema": { - "$ref": "#/definitions/ConnectedCluster" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" - } - } - } - }, - "delete": { - "summary": "Delete a connected cluster.", - "operationId": "ConnectedCluster_Delete", - "description": "Delete a connected cluster, removing the tracked resource in Azure Resource Manager (ARM).", - "produces": [ - "application/json" - ], - "x-ms-examples": { - "DeleteClusterExample": { - "$ref": "./examples/DeleteClusterExample.json" - } - }, - "parameters": [ - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/ClusterNamePathParam" - } - ], - "responses": { - "200": { - "description": "OK" - }, - "202": { - "description": "Resource deletion is in progress" - }, - "204": { - "description": "The resource was not found but the request is well formed" - }, - "default": { - "description": "Resource Provider error response describing why the operation failed.", - "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" - } - } - }, - "x-ms-long-running-operation": true, - "x-ms-long-running-operation-options": { - "final-state-via": "location" - } - } - }, - "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Kubernetes/connectedClusters": { - "get": { - "summary": "Lists all connected clusters", - "operationId": "ConnectedCluster_ListByResourceGroup", - "description": "API to enumerate registered connected K8s clusters under a Resource Group", - "produces": [ - "application/json" - ], - "x-ms-examples": { - "GetClustersExample": { - "$ref": "./examples/GetClustersByResourceGroupExample.json" - } - }, - "parameters": [ - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/ConnectedClusterList" - } - }, - "default": { - "description": "Resource Provider 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}/providers/Microsoft.Kubernetes/connectedClusters": { - "get": { - "summary": "Lists all connected clusters", - "operationId": "ConnectedCluster_ListBySubscription", - "description": "API to enumerate registered connected K8s clusters under a Subscription", - "produces": [ - "application/json" - ], - "x-ms-examples": { - "GetClustersExample": { - "$ref": "./examples/GetClustersBySubscriptionExample.json" - } - }, - "parameters": [ - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/ConnectedClusterList" - } - }, - "default": { - "description": "Resource Provider error response describing why the operation failed.", - "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - } - } - }, - "/providers/Microsoft.Kubernetes/operations": { - "get": { - "description": "Lists all of the available API operations for Connected Cluster resource.", - "operationId": "Operations_Get", - "produces": [ - "application/json" - ], - "parameters": [ - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OperationList" - } - }, - "default": { - "description": "Resource Provider error response describing why the operation failed.", - "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" - } - } - }, - "x-ms-examples": { - "ListConnectedClusterOperationsExample": { - "$ref": "./examples/ListConnectedClusterOperationsExample.json" - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - } - } - } - }, - "definitions": { - "OperationList": { - "description": "The paginated list of connected cluster API operations.", - "properties": { - "value": { - "readOnly": true, - "type": "array", - "items": { - "$ref": "#/definitions/Operation" - }, - "description": "The list of connected cluster API operations." - }, - "nextLink": { - "type": "string", - "description": "The link to fetch the next page of connected cluster API operations." - } - } - }, - "Operation": { - "type": "object", - "description": "The Connected cluster API operation", - "properties": { - "name": { - "readOnly": true, - "type": "string", - "description": "Operation name: {Microsoft.Kubernetes}/{resource}/{operation}" - }, - "display": { - "readOnly": true, - "description": "The object that represents the operation.", - "properties": { - "provider": { - "type": "string", - "description": "Service provider: Microsoft.connectedClusters" - }, - "resource": { - "type": "string", - "description": "Connected Cluster Resource on which the operation is performed" - }, - "operation": { - "type": "string", - "description": "Operation type: Read, write, delete, etc." - }, - "description": { - "type": "string", - "description": "Description of the operation." - } - } - } - } - }, - "ConnectedClusterList": { - "description": "The paginated list of connected Clusters", - "type": "object", - "properties": { - "value": { - "description": "The list of connected clusters", - "type": "array", - "items": { - "$ref": "#/definitions/ConnectedCluster" - } - }, - "nextLink": { - "description": "The link to fetch the next page of connected cluster", - "type": "string" - } - } - }, - "ConnectedCluster": { - "type": "object", - "required": [ - "properties", - "identity" - ], - "properties": { - "identity": { - "$ref": "#/definitions/ConnectedClusterIdentity", - "description": "The identity of the connected cluster." - }, - "properties": { - "x-ms-client-flatten": true, - "$ref": "#/definitions/ConnectedClusterProperties", - "description": "Describes the connected cluster resource properties." - } - }, - "allOf": [ - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/TrackedResource" - } - ], - "description": "Represents a connected cluster." - }, - "ConnectedClusterIdentity": { - "type": "object", - "required": [ - "type" - ], - "properties": { - "principalId": { - "readOnly": true, - "type": "string", - "description": "The principal id of connected cluster identity. This property will only be provided for a system assigned identity." - }, - "tenantId": { - "readOnly": true, - "type": "string", - "description": "The tenant id associated with the connected cluster. This property will only be provided for a system assigned identity." - }, - "type": { - "type": "string", - "description": "The type of identity used for the connected cluster. The type 'SystemAssigned, includes a system created identity. The type 'None' means no identity is assigned to the connected cluster.", - "enum": [ - "None", - "SystemAssigned" - ], - "x-ms-enum": { - "name": "ResourceIdentityType", - "modelAsString": false - } - } - }, - "description": "Identity for the connected cluster." - }, - "ConnectedClusterProperties": { - "type": "object", - "required": [ - "agentPublicKeyCertificate" - ], - "properties": { - "agentPublicKeyCertificate": { - "type": "string", - "description": "Base64 encoded public certificate used by the agent to do the initial handshake to the backend services in Azure." - }, - "kubernetesVersion": { - "readOnly": true, - "type": "string", - "description": "The Kubernetes version of the connected cluster resource" - }, - "totalNodeCount": { - "readOnly": true, - "type": "integer", - "description": "Number of nodes present in the connected cluster resource" - }, - "totalCoreCount": { - "readOnly": true, - "format": "int32", - "type": "integer", - "description": "Number of CPU cores present in the connected cluster resource" - }, - "agentVersion": { - "readOnly": true, - "type": "string", - "description": "Version of the agent running on the connected cluster resource" - }, - "provisioningState": { - "$ref": "#/definitions/ConnectedClusterProvisioningState", - "description": "Provisioning state of the connected cluster resource." - }, - "distribution": { - "type": "string", - "description": "The Kubernetes distribution running on this connected cluster." - }, - "infrastructure": { - "type": "string", - "description": "The infrastructure on which the Kubernetes cluster represented by this connected cluster is running on." - }, - "offering": { - "type": "string", - "readOnly": true, - "description": "Connected cluster offering" - }, - "managedIdentityCertificateExpirationTime": { - "type": "string", - "format": "date-time", - "readOnly": true, - "description": "Expiration time of the managed identity certificate" - }, - "lastConnectivityTime": { - "type": "string", - "readOnly": true, - "format": "date-time", - "description": "Time representing the last instance when heart beat was received from the cluster" - }, - "connectivityStatus": { - "type": "string", - "description": "Represents the connectivity status of the connected cluster.", - "enum": [ - "Connecting", - "Connected", - "Offline", - "Expired" - ], - "x-ms-enum": { - "name": "ConnectivityStatus", - "modelAsString": true - } - } - }, - "description": "Properties of the connected cluster." - }, - "CredentialResults": { - "properties": { - "hybridConnectionConfig": { - "$ref": "#/definitions/HybridConnectionConfig", - "description": "Contains the REP (rendezvous endpoint) and “Sender” access token.", - "readOnly": true - }, - "kubeconfigs": { - "type": "array", - "readOnly": true, - "items": { - "$ref": "#/definitions/CredentialResult" - }, - "description": "Base64-encoded Kubernetes configuration file." - } - }, - "description": "The list of credential result response." - }, - "CredentialResult": { - "type": "object", - "properties": { - "name": { - "type": "string", - "readOnly": true, - "description": "The name of the credential." - }, - "value": { - "type": "string", - "format": "byte", - "readOnly": true, - "description": "Base64-encoded Kubernetes configuration file." - } - }, - "description": "The credential result response." - }, - "ConnectedClusterProvisioningState": { - "type": "string", - "description": "The current deployment state of connectedClusters.", - "enum": [ - "Succeeded", - "Failed", - "Canceled", - "Provisioning", - "Updating", - "Deleting", - "Accepted" - ], - "x-ms-enum": { - "name": "ProvisioningState", - "modelAsString": true - } - }, - "ConnectedClusterPatch": { - "type": "object", - "properties": { - "tags": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "Resource tags." - }, - "properties": { - "x-ms-client-flatten": true, - "$ref": "#/definitions/ConnectedClusterPatchProperties", - "description": "Describes the connected cluster resource properties that can be updated during PATCH operation." - } - }, - "description": "Object containing updates for patch operations." - }, - "ConnectedClusterPatchProperties": { - "type": "object", - "properties": { - }, - "description": "Properties which can be patched on the connected cluster resource." - }, - "HybridConnectionConfig": { - "description": "Contains the REP (rendezvous endpoint) and “Sender” access token.", - "properties": { - "expirationTime": { - "description": "Timestamp when this token will be expired.", - "type": "integer", - "readOnly": true, - "format": "int64" - }, - "hybridConnectionName": { - "description": "Name of the connection", - "type": "string", - "readOnly": true - }, - "relay": { - "description": "Name of the relay.", - "type": "string", - "readOnly": true - }, - "token": { - "description": "Sender access token", - "type": "string", - "readOnly": true - } - } - } - }, - "parameters": { - "ClusterNamePathParam": { - "name": "clusterName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the Kubernetes cluster on which get is called.", - "x-ms-parameter-location": "method" - }, - "ClientProxy": { - "name": "clientProxy", - "in": "query", - "required": false, - "type": "boolean", - "description": "Parameter to indicate whether the request is for client side proxy or not", - "x-ms-parameter-location": "method" - }, - "TokenAuth": { - "name": "isTokenAuth", - "in": "query", - "required": false, - "type": "boolean", - "description": "Parameter to indicate whether the it is token based authentication or AAD based authentication", - "x-ms-parameter-location": "method" - } - } - } - \ No newline at end of file diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/ConnectedClustersListClusterCredentialsResult.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/ConnectedClustersListClusterCredentialsResult.json similarity index 95% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/ConnectedClustersListClusterCredentialsResult.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/ConnectedClustersListClusterCredentialsResult.json index 8fb9e1bf30b2..e35f5414557c 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/ConnectedClustersListClusterCredentialsResult.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/ConnectedClustersListClusterCredentialsResult.json @@ -3,7 +3,7 @@ "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", "resourceGroupName": "k8sc-rg", "clusterName": "testCluster", - "api-version": "2020-02-01" + "api-version": "2021-02-01" }, "responses": { "200": { diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/ConnectedClustersListClusterCredentialsResultNonAad.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/ConnectedClustersListClusterCredentialsResultNonAad.json similarity index 99% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/ConnectedClustersListClusterCredentialsResultNonAad.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/ConnectedClustersListClusterCredentialsResultNonAad.json index cfa0907d43f2..817933360d8d 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/ConnectedClustersListClusterCredentialsResultNonAad.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/ConnectedClustersListClusterCredentialsResultNonAad.json @@ -3,7 +3,7 @@ "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", "resourceGroupName": "k8sc-rg", "clusterName": "testCluster", - "api-version": "2020-02-01", + "api-version": "2021-02-01", "isTokenAuth": true }, "responses": { diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/CreateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/CreateClusterExample.json similarity index 99% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/CreateClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/CreateClusterExample.json index 32dcda1ce9cf..4b6ad8332ad0 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/CreateClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/CreateClusterExample.json @@ -3,7 +3,7 @@ "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", "resourceGroupName": "k8sc-rg", "clusterName": "testCluster", - "api-version": "2020-02-01", + "api-version": "2021-02-01", "ConnectedCluster": { "location": "East US", "tags": {}, diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/DeleteClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/DeleteClusterExample.json similarity index 87% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/DeleteClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/DeleteClusterExample.json index 20ead9ed0f85..0baf0edc2373 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/DeleteClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/DeleteClusterExample.json @@ -3,7 +3,7 @@ "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", "resourceGroupName": "k8sc-rg", "clusterName": "testCluster", - "api-version": "2020-02-01" + "api-version": "2021-02-01" }, "responses": { "200": {}, diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/GetClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/GetClusterExample.json similarity index 98% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/GetClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/GetClusterExample.json index 4e09fd855852..c900421e78fb 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/GetClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/GetClusterExample.json @@ -3,7 +3,7 @@ "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", "resourceGroupName": "k8sc-rg", "clusterName": "testCluster", - "api-version": "2020-02-01" + "api-version": "2021-02-01" }, "responses": { "200": { diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/GetClustersByResourceGroupExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/GetClustersByResourceGroupExample.json similarity index 99% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/GetClustersByResourceGroupExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/GetClustersByResourceGroupExample.json index ac7a29c70f1e..d001cfd8392f 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/GetClustersByResourceGroupExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/GetClustersByResourceGroupExample.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", "resourceGroupName": "k8sc-rg", - "api-version": "2020-02-01" + "api-version": "2021-02-01" }, "responses": { "200": { diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/GetClustersBySubscriptionExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/GetClustersBySubscriptionExample.json similarity index 99% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/GetClustersBySubscriptionExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/GetClustersBySubscriptionExample.json index 944d5017b7ef..d99ba16c6b2a 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/GetClustersBySubscriptionExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/GetClustersBySubscriptionExample.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", - "api-version": "2020-02-01" + "api-version": "2021-02-01" }, "responses": { "200": { diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/ListConnectedClusterOperationsExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/ListConnectedClusterOperationsExample.json similarity index 97% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/ListConnectedClusterOperationsExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/ListConnectedClusterOperationsExample.json index be642775d19c..4ed850870388 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/ListConnectedClusterOperationsExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/ListConnectedClusterOperationsExample.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2020-02-01" + "api-version": "2021-02-01" }, "responses": { "200": { diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/UpdateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/UpdateClusterExample.json similarity index 98% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/UpdateClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/UpdateClusterExample.json index 076e66fc5a74..a147fbabcd0f 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2020-02-01/UpdateClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/UpdateClusterExample.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2020-02-01", + "api-version": "2021-02-01", "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", "resourceGroupName": "k8sc-rg", "clusterName": "testCluster", diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/connectedClusters.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/connectedClusters.json new file mode 100644 index 000000000000..f3e8ae0ced83 --- /dev/null +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/connectedClusters.json @@ -0,0 +1,686 @@ +{ + "swagger": "2.0", + "info": { + "title": "ConnectedKubernetesClient", + "version": "2020-02-01", + "description": "Azure Connected Cluster Resource Provider API for adopting any Kubernetes Cluster" + }, + "schemes": [ + "https" + ], + "host": "management.azure.com", + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ], + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow.", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "paths": { + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Kubernetes/connectedClusters/{clusterName}": { + "put": { + "summary": "Register a new Kubernetes cluster with Azure Resource Manager.", + "operationId": "ConnectedCluster_Create", + "description": "API to register a new Kubernetes cluster and create a tracked resource in Azure Resource Manager (ARM).", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "x-ms-examples": { + "CreateClusterExample": { + "$ref": "./examples/CreateClusterExample.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterNamePathParam" + }, + { + "in": "body", + "name": "ConnectedCluster", + "required": true, + "schema": { + "$ref": "#/definitions/ConnectedCluster" + }, + "description": "Parameters supplied to Create a Connected Cluster." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ConnectedCluster" + } + }, + "201": { + "description": "Resource creation request accepted", + "schema": { + "$ref": "#/definitions/ConnectedCluster" + } + }, + "default": { + "description": "Resource Provider error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" + } + }, + "patch": { + "summary": "Updates a connected cluster.", + "operationId": "ConnectedCluster_Update", + "description": "API to update certain properties of the connected cluster resource", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "x-ms-examples": { + "UpdateClusterExample": { + "$ref": "./examples/UpdateClusterExample.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterNamePathParam" + }, + { + "in": "body", + "name": "ConnectedClusterPatch", + "required": true, + "schema": { + "$ref": "#/definitions/ConnectedClusterPatch" + }, + "description": "Parameters supplied to update Connected Cluster." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ConnectedCluster" + } + }, + "default": { + "description": "Resource Provider error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + } + } + }, + "get": { + "summary": "Get the properties of the specified connected cluster.", + "operationId": "ConnectedCluster_Get", + "description": "Returns the properties of the specified connected cluster, including name, identity, properties, and additional cluster details.", + "produces": [ + "application/json" + ], + "x-ms-examples": { + "GetClusterExample": { + "$ref": "./examples/GetClusterExample.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterNamePathParam" + } + ], + "responses": { + "200": { + "description": "Resource retrieved successfully.", + "schema": { + "$ref": "#/definitions/ConnectedCluster" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + } + } + }, + "delete": { + "summary": "Delete a connected cluster.", + "operationId": "ConnectedCluster_Delete", + "description": "Delete a connected cluster, removing the tracked resource in Azure Resource Manager (ARM).", + "produces": [ + "application/json" + ], + "x-ms-examples": { + "DeleteClusterExample": { + "$ref": "./examples/DeleteClusterExample.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterNamePathParam" + } + ], + "responses": { + "200": { + "description": "OK" + }, + "202": { + "description": "Resource deletion is in progress" + }, + "204": { + "description": "The resource was not found but the request is well formed" + }, + "default": { + "description": "Resource Provider error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "location" + } + } + }, + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Kubernetes/connectedClusters": { + "get": { + "summary": "Lists all connected clusters", + "operationId": "ConnectedCluster_ListByResourceGroup", + "description": "API to enumerate registered connected K8s clusters under a Resource Group", + "produces": [ + "application/json" + ], + "x-ms-examples": { + "GetClustersExample": { + "$ref": "./examples/GetClustersByResourceGroupExample.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ConnectedClusterList" + } + }, + "default": { + "description": "Resource Provider 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}/providers/Microsoft.Kubernetes/connectedClusters": { + "get": { + "summary": "Lists all connected clusters", + "operationId": "ConnectedCluster_ListBySubscription", + "description": "API to enumerate registered connected K8s clusters under a Subscription", + "produces": [ + "application/json" + ], + "x-ms-examples": { + "GetClustersExample": { + "$ref": "./examples/GetClustersBySubscriptionExample.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ConnectedClusterList" + } + }, + "default": { + "description": "Resource Provider error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/providers/Microsoft.Kubernetes/operations": { + "get": { + "description": "Lists all of the available API operations for Connected Cluster resource.", + "operationId": "Operations_Get", + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/OperationList" + } + }, + "default": { + "description": "Resource Provider error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "ListConnectedClusterOperationsExample": { + "$ref": "./examples/ListConnectedClusterOperationsExample.json" + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + } + }, + "definitions": { + "OperationList": { + "description": "The paginated list of connected cluster API operations.", + "properties": { + "value": { + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/Operation" + }, + "description": "The list of connected cluster API operations." + }, + "nextLink": { + "type": "string", + "description": "The link to fetch the next page of connected cluster API operations." + } + } + }, + "Operation": { + "type": "object", + "description": "The Connected cluster API operation", + "properties": { + "name": { + "readOnly": true, + "type": "string", + "description": "Operation name: {Microsoft.Kubernetes}/{resource}/{operation}" + }, + "display": { + "readOnly": true, + "description": "The object that represents the operation.", + "properties": { + "provider": { + "type": "string", + "description": "Service provider: Microsoft.connectedClusters" + }, + "resource": { + "type": "string", + "description": "Connected Cluster Resource on which the operation is performed" + }, + "operation": { + "type": "string", + "description": "Operation type: Read, write, delete, etc." + }, + "description": { + "type": "string", + "description": "Description of the operation." + } + } + } + } + }, + "ConnectedClusterList": { + "description": "The paginated list of connected Clusters", + "type": "object", + "properties": { + "value": { + "description": "The list of connected clusters", + "type": "array", + "items": { + "$ref": "#/definitions/ConnectedCluster" + } + }, + "nextLink": { + "description": "The link to fetch the next page of connected cluster", + "type": "string" + } + } + }, + "ConnectedCluster": { + "type": "object", + "required": [ + "properties", + "identity" + ], + "properties": { + "identity": { + "$ref": "#/definitions/ConnectedClusterIdentity", + "description": "The identity of the connected cluster." + }, + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/ConnectedClusterProperties", + "description": "Describes the connected cluster resource properties." + } + }, + "allOf": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/TrackedResource" + } + ], + "description": "Represents a connected cluster." + }, + "ConnectedClusterIdentity": { + "type": "object", + "required": [ + "type" + ], + "properties": { + "principalId": { + "readOnly": true, + "type": "string", + "description": "The principal id of connected cluster identity. This property will only be provided for a system assigned identity." + }, + "tenantId": { + "readOnly": true, + "type": "string", + "description": "The tenant id associated with the connected cluster. This property will only be provided for a system assigned identity." + }, + "type": { + "type": "string", + "description": "The type of identity used for the connected cluster. The type 'SystemAssigned, includes a system created identity. The type 'None' means no identity is assigned to the connected cluster.", + "enum": [ + "None", + "SystemAssigned" + ], + "x-ms-enum": { + "name": "ResourceIdentityType", + "modelAsString": false + } + } + }, + "description": "Identity for the connected cluster." + }, + "ConnectedClusterProperties": { + "type": "object", + "required": [ + "agentPublicKeyCertificate" + ], + "properties": { + "agentPublicKeyCertificate": { + "type": "string", + "description": "Base64 encoded public certificate used by the agent to do the initial handshake to the backend services in Azure." + }, + "kubernetesVersion": { + "readOnly": true, + "type": "string", + "description": "The Kubernetes version of the connected cluster resource" + }, + "totalNodeCount": { + "readOnly": true, + "type": "integer", + "description": "Number of nodes present in the connected cluster resource" + }, + "totalCoreCount": { + "readOnly": true, + "format": "int32", + "type": "integer", + "description": "Number of CPU cores present in the connected cluster resource" + }, + "agentVersion": { + "readOnly": true, + "type": "string", + "description": "Version of the agent running on the connected cluster resource" + }, + "provisioningState": { + "$ref": "#/definitions/ConnectedClusterProvisioningState", + "description": "Provisioning state of the connected cluster resource." + }, + "distribution": { + "type": "string", + "description": "The Kubernetes distribution running on this connected cluster." + }, + "infrastructure": { + "type": "string", + "description": "The infrastructure on which the Kubernetes cluster represented by this connected cluster is running on." + }, + "offering": { + "type": "string", + "readOnly": true, + "description": "Connected cluster offering" + }, + "managedIdentityCertificateExpirationTime": { + "type": "string", + "format": "date-time", + "readOnly": true, + "description": "Expiration time of the managed identity certificate" + }, + "lastConnectivityTime": { + "type": "string", + "readOnly": true, + "format": "date-time", + "description": "Time representing the last instance when heart beat was received from the cluster" + }, + "connectivityStatus": { + "type": "string", + "description": "Represents the connectivity status of the connected cluster.", + "enum": [ + "Connecting", + "Connected", + "Offline", + "Expired" + ], + "x-ms-enum": { + "name": "ConnectivityStatus", + "modelAsString": true + } + } + }, + "description": "Properties of the connected cluster." + }, + "CredentialResults": { + "properties": { + "hybridConnectionConfig": { + "$ref": "#/definitions/HybridConnectionConfig", + "description": "Contains the REP (rendezvous endpoint) and “Sender” access token.", + "readOnly": true + }, + "kubeconfigs": { + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/CredentialResult" + }, + "description": "Base64-encoded Kubernetes configuration file." + } + }, + "description": "The list of credential result response." + }, + "CredentialResult": { + "type": "object", + "properties": { + "name": { + "type": "string", + "readOnly": true, + "description": "The name of the credential." + }, + "value": { + "type": "string", + "format": "byte", + "readOnly": true, + "description": "Base64-encoded Kubernetes configuration file." + } + }, + "description": "The credential result response." + }, + "ConnectedClusterProvisioningState": { + "type": "string", + "description": "The current deployment state of connectedClusters.", + "enum": [ + "Succeeded", + "Failed", + "Canceled", + "Provisioning", + "Updating", + "Deleting", + "Accepted" + ], + "x-ms-enum": { + "name": "ProvisioningState", + "modelAsString": true + } + }, + "ConnectedClusterPatch": { + "type": "object", + "properties": { + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Resource tags." + }, + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/ConnectedClusterPatchProperties", + "description": "Describes the connected cluster resource properties that can be updated during PATCH operation." + } + }, + "description": "Object containing updates for patch operations." + }, + "ConnectedClusterPatchProperties": { + "type": "object", + "properties": {}, + "description": "Properties which can be patched on the connected cluster resource." + }, + "HybridConnectionConfig": { + "description": "Contains the REP (rendezvous endpoint) and “Sender” access token.", + "properties": { + "expirationTime": { + "description": "Timestamp when this token will be expired.", + "type": "integer", + "readOnly": true, + "format": "int64" + }, + "hybridConnectionName": { + "description": "Name of the connection", + "type": "string", + "readOnly": true + }, + "relay": { + "description": "Name of the relay.", + "type": "string", + "readOnly": true + }, + "token": { + "description": "Sender access token", + "type": "string", + "readOnly": true + } + } + } + }, + "parameters": { + "ClusterNamePathParam": { + "name": "clusterName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the Kubernetes cluster on which get is called.", + "x-ms-parameter-location": "method" + }, + "ClientProxy": { + "name": "clientProxy", + "in": "query", + "required": false, + "type": "boolean", + "description": "Parameter to indicate whether the request is for client side proxy or not", + "x-ms-parameter-location": "method" + }, + "TokenAuth": { + "name": "isTokenAuth", + "in": "query", + "required": false, + "type": "boolean", + "description": "Parameter to indicate whether the it is token based authentication or AAD based authentication", + "x-ms-parameter-location": "method" + } + } +} diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/ConnectedClustersListClusterCredentialsResult.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/ConnectedClustersListClusterCredentialsResult.json index bff625574401..d1906a6dbf13 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/ConnectedClustersListClusterCredentialsResult.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/ConnectedClustersListClusterCredentialsResult.json @@ -3,7 +3,7 @@ "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", "resourceGroupName": "k8sc-rg", "clusterName": "testCluster", - "api-version": "2020-02-01-preview" + "api-version": "2021-02-01-preview" }, "responses": { "200": { diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/ConnectedClustersListClusterCredentialsResultNonAad.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/ConnectedClustersListClusterCredentialsResultNonAad.json index ef8a8b90c445..e429093476e9 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/ConnectedClustersListClusterCredentialsResultNonAad.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/ConnectedClustersListClusterCredentialsResultNonAad.json @@ -3,7 +3,7 @@ "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", "resourceGroupName": "k8sc-rg", "clusterName": "testCluster", - "api-version": "2020-02-01-preview", + "api-version": "2021-02-01-preview", "isTokenAuth": true }, "responses": { diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/CreateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/CreateClusterExample.json index 81d3e8533889..38ec5d00a3c4 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/CreateClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/CreateClusterExample.json @@ -3,7 +3,7 @@ "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", "resourceGroupName": "k8sc-rg", "clusterName": "testCluster", - "api-version": "2020-02-01-preview", + "api-version": "2021-02-01-preview", "ConnectedCluster": { "location": "East US", "tags": {}, diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/DeleteClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/DeleteClusterExample.json index 024e3e32e916..7d738bb0e807 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/DeleteClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/DeleteClusterExample.json @@ -3,7 +3,7 @@ "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", "resourceGroupName": "k8sc-rg", "clusterName": "testCluster", - "api-version": "2020-02-01-preview" + "api-version": "2021-02-01-preview" }, "responses": { "200": {}, diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/GetClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/GetClusterExample.json index 79bdc677d9c8..036cc1c71bda 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/GetClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/GetClusterExample.json @@ -3,7 +3,7 @@ "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", "resourceGroupName": "k8sc-rg", "clusterName": "testCluster", - "api-version": "2020-02-01-preview" + "api-version": "2021-02-01-preview" }, "responses": { "200": { diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/GetClustersByResourceGroupExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/GetClustersByResourceGroupExample.json index b99d7c6a6f7f..7cd673ebd044 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/GetClustersByResourceGroupExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/GetClustersByResourceGroupExample.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", "resourceGroupName": "k8sc-rg", - "api-version": "2020-02-01-preview" + "api-version": "2021-02-01-preview" }, "responses": { "200": { diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/GetClustersBySubscriptionExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/GetClustersBySubscriptionExample.json index e732acdbed07..ceccbcab724c 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/GetClustersBySubscriptionExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/GetClustersBySubscriptionExample.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", - "api-version": "2020-02-01-preview" + "api-version": "2021-02-01-preview" }, "responses": { "200": { diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/ListConnectedClusterOperationsExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/ListConnectedClusterOperationsExample.json index 5097bfc6d81d..cc87fb4cd882 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/ListConnectedClusterOperationsExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/ListConnectedClusterOperationsExample.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2020-02-01-preview" + "api-version": "2021-02-01-preview" }, "responses": { "200": { diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/UpdateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/UpdateClusterExample.json index f0b3232b89f5..f141ab1be019 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/UpdateClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/UpdateClusterExample.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2020-02-01-preview", + "api-version": "2021-02-01-preview", "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", "resourceGroupName": "k8sc-rg", "clusterName": "testCluster", diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/connectedClusters.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/connectedClusters.json index 149e726929fb..548b751a6884 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/connectedClusters.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/connectedClusters.json @@ -1,741 +1,738 @@ { - "swagger": "2.0", - "info": { - "title": "ConnectedKubernetesClient", - "version": "2020-02-01-preview", - "description": "Azure Connected Cluster Resource Provider API for adopting any Kubernetes Cluster" - }, - "schemes": [ - "https" - ], - "host": "management.azure.com", - "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" - } + "swagger": "2.0", + "info": { + "title": "ConnectedKubernetesClient", + "version": "2021-02-01-preview", + "description": "Azure Connected Cluster Resource Provider API for adopting any Kubernetes Cluster" + }, + "schemes": [ + "https" + ], + "host": "management.azure.com", + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ], + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow.", + "scopes": { + "user_impersonation": "impersonate your user account" } - }, - "paths": { - "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Kubernetes/connectedClusters/{clusterName}": { - "put": { - "summary": "Register a new Kubernetes cluster with Azure Resource Manager.", - "operationId": "ConnectedCluster_Create", - "description": "API to register a new Kubernetes cluster and create a tracked resource in Azure Resource Manager (ARM).", - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "x-ms-examples": { - "CreateClusterExample": { - "$ref": "./examples/CreateClusterExample.json" - } - }, - "parameters": [ - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/ClusterNamePathParam" - }, - { - "in": "body", - "name": "ConnectedCluster", - "required": true, - "schema": { - "$ref": "#/definitions/ConnectedCluster" - }, - "description": "Parameters supplied to Create a Connected Cluster." - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/ConnectedCluster" - } - }, - "201": { - "description": "Resource creation request accepted", - "schema": { - "$ref": "#/definitions/ConnectedCluster" - } - }, - "default": { - "description": "Resource Provider error response describing why the operation failed.", - "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" - } - } - }, - "x-ms-long-running-operation": true, - "x-ms-long-running-operation-options": { - "final-state-via": "azure-async-operation" + } + }, + "paths": { + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Kubernetes/connectedClusters/{clusterName}": { + "put": { + "summary": "Register a new Kubernetes cluster with Azure Resource Manager.", + "operationId": "ConnectedCluster_Create", + "description": "API to register a new Kubernetes cluster and create a tracked resource in Azure Resource Manager (ARM).", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "x-ms-examples": { + "CreateClusterExample": { + "$ref": "./examples/CreateClusterExample.json" } }, - "patch": { - "summary": "Updates a connected cluster.", - "operationId": "ConnectedCluster_Update", - "description": "API to update certain properties of the connected cluster resource", - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "x-ms-examples": { - "UpdateClusterExample": { - "$ref": "./examples/UpdateClusterExample.json" - } + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" }, - "parameters": [ - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/ClusterNamePathParam" - }, - { - "in": "body", - "name": "ConnectedClusterPatch", - "required": true, - "schema": { - "$ref": "#/definitions/ConnectedClusterPatch" - }, - "description": "Parameters supplied to update Connected Cluster." - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/ConnectedCluster" - } - }, - "default": { - "description": "Resource Provider error response describing why the operation failed.", - "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" - } - } - } - }, - "get": { - "summary": "Get the properties of the specified connected cluster.", - "operationId": "ConnectedCluster_Get", - "description": "Returns the properties of the specified connected cluster, including name, identity, properties, and additional cluster details.", - "produces": [ - "application/json" - ], - "x-ms-examples": { - "GetClusterExample": { - "$ref": "./examples/GetClusterExample.json" - } + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, - "parameters": [ - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/ClusterNamePathParam" - } - ], - "responses": { - "200": { - "description": "Resource retrieved successfully.", - "schema": { - "$ref": "#/definitions/ConnectedCluster" - } + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterNamePathParam" + }, + { + "in": "body", + "name": "ConnectedCluster", + "required": true, + "schema": { + "$ref": "#/definitions/ConnectedCluster" }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" - } - } + "description": "Parameters supplied to Create a Connected Cluster." } - }, - "delete": { - "summary": "Delete a connected cluster.", - "operationId": "ConnectedCluster_Delete", - "description": "Delete a connected cluster, removing the tracked resource in Azure Resource Manager (ARM).", - "produces": [ - "application/json" - ], - "x-ms-examples": { - "DeleteClusterExample": { - "$ref": "./examples/DeleteClusterExample.json" + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ConnectedCluster" } }, - "parameters": [ - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/ClusterNamePathParam" - } - ], - "responses": { - "200": { - "description": "OK" - }, - "202": { - "description": "Resource deletion is in progress" - }, - "204": { - "description": "The resource was not found but the request is well formed" - }, - "default": { - "description": "Resource Provider error response describing why the operation failed.", - "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" - } + "201": { + "description": "Resource creation request accepted", + "schema": { + "$ref": "#/definitions/ConnectedCluster" } }, - "x-ms-long-running-operation": true, - "x-ms-long-running-operation-options": { - "final-state-via": "location" + "default": { + "description": "Resource Provider error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } } + }, + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" } }, - "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Kubernetes/connectedClusters/{clusterName}/listClusterUserCredentials": { - "post": { - "summary": "Gets cluster user credentials of a connected cluster", - "operationId": "ConnectedCluster_ListClusterUserCredentials", - "description": "Gets cluster user credentials of the connected cluster with a specified resource group and name.", - "produces": [ - "application/json" - ], - "x-ms-examples": { - "ListClusterUserCredentialsExample": { - "$ref": "./examples/ConnectedClustersListClusterCredentialsResult.json" - }, - "ListClusterUserCredentialsNonAadExample": { - "$ref": "./examples/ConnectedClustersListClusterCredentialsResultNonAad.json" - } + "patch": { + "summary": "Updates a connected cluster.", + "operationId": "ConnectedCluster_Update", + "description": "API to update certain properties of the connected cluster resource", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "x-ms-examples": { + "UpdateClusterExample": { + "$ref": "./examples/UpdateClusterExample.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" }, - "parameters": [ - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/ClusterNamePathParam" - }, - { - "$ref": "#/parameters/ClientProxy" + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterNamePathParam" + }, + { + "in": "body", + "name": "ConnectedClusterPatch", + "required": true, + "schema": { + "$ref": "#/definitions/ConnectedClusterPatch" }, - { - "$ref": "#/parameters/isTokenAuth" + "description": "Parameters supplied to update Connected Cluster." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ConnectedCluster" } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/CredentialResults" - } - }, - "default": { - "description": "Resource Provider error response describing why the operation failed.", - "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" - } + }, + "default": { + "description": "Resource Provider error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } } }, - "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Kubernetes/connectedClusters": { - "get": { - "summary": "Lists all connected clusters", - "operationId": "ConnectedCluster_ListByResourceGroup", - "description": "API to enumerate registered connected K8s clusters under a Resource Group", - "produces": [ - "application/json" - ], - "x-ms-examples": { - "GetClustersExample": { - "$ref": "./examples/GetClustersByResourceGroupExample.json" - } + "get": { + "summary": "Get the properties of the specified connected cluster.", + "operationId": "ConnectedCluster_Get", + "description": "Returns the properties of the specified connected cluster, including name, identity, properties, and additional cluster details.", + "produces": [ + "application/json" + ], + "x-ms-examples": { + "GetClusterExample": { + "$ref": "./examples/GetClusterExample.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" }, - "parameters": [ - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/ConnectedClusterList" - } - }, - "default": { - "description": "Resource Provider error response describing why the operation failed.", - "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" - } - } + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, - "x-ms-pageable": { - "nextLinkName": "nextLink" + { + "$ref": "#/parameters/ClusterNamePathParam" } - } - }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Kubernetes/connectedClusters": { - "get": { - "summary": "Lists all connected clusters", - "operationId": "ConnectedCluster_ListBySubscription", - "description": "API to enumerate registered connected K8s clusters under a Subscription", - "produces": [ - "application/json" - ], - "x-ms-examples": { - "GetClustersExample": { - "$ref": "./examples/GetClustersBySubscriptionExample.json" + ], + "responses": { + "200": { + "description": "Resource retrieved successfully.", + "schema": { + "$ref": "#/definitions/ConnectedCluster" } }, - "parameters": [ - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/ConnectedClusterList" - } - }, - "default": { - "description": "Resource Provider error response describing why the operation failed.", - "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" - } + "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" } } }, - "/providers/Microsoft.Kubernetes/operations": { - "get": { - "description": "Lists all of the available API operations for Connected Cluster resource.", - "operationId": "Operations_Get", - "produces": [ - "application/json" - ], - "parameters": [ - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OperationList" - } - }, - "default": { - "description": "Resource Provider error response describing why the operation failed.", - "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" - } - } + "delete": { + "summary": "Delete a connected cluster.", + "operationId": "ConnectedCluster_Delete", + "description": "Delete a connected cluster, removing the tracked resource in Azure Resource Manager (ARM).", + "produces": [ + "application/json" + ], + "x-ms-examples": { + "DeleteClusterExample": { + "$ref": "./examples/DeleteClusterExample.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" }, - "x-ms-examples": { - "ListConnectedClusterOperationsExample": { - "$ref": "./examples/ListConnectedClusterOperationsExample.json" - } + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, - "x-ms-pageable": { - "nextLinkName": "nextLink" + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterNamePathParam" } + ], + "responses": { + "200": { + "description": "OK" + }, + "202": { + "description": "Resource deletion is in progress" + }, + "204": { + "description": "The resource was not found but the request is well formed" + }, + "default": { + "description": "Resource Provider error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "location" } } }, - "definitions": { - "OperationList": { - "description": "The paginated list of connected cluster API operations.", - "properties": { - "value": { - "readOnly": true, - "type": "array", - "items": { - "$ref": "#/definitions/Operation" - }, - "description": "The list of connected cluster API operations." + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Kubernetes/connectedClusters/{clusterName}/listClusterUserCredentials": { + "post": { + "summary": "Gets cluster user credentials of a connected cluster", + "operationId": "ConnectedCluster_ListClusterUserCredentials", + "description": "Gets cluster user credentials of the connected cluster with a specified resource group and name.", + "produces": [ + "application/json" + ], + "x-ms-examples": { + "ListClusterUserCredentialsExample": { + "$ref": "./examples/ConnectedClustersListClusterCredentialsResult.json" }, - "nextLink": { - "type": "string", - "description": "The link to fetch the next page of connected cluster API operations." + "ListClusterUserCredentialsNonAadExample": { + "$ref": "./examples/ConnectedClustersListClusterCredentialsResultNonAad.json" } - } - }, - "Operation": { - "type": "object", - "description": "The Connected cluster API operation", - "properties": { - "name": { - "readOnly": true, - "type": "string", - "description": "Operation name: {Microsoft.Kubernetes}/{resource}/{operation}" - }, - "display": { - "readOnly": true, - "description": "The object that represents the operation.", - "properties": { - "provider": { - "type": "string", - "description": "Service provider: Microsoft.connectedClusters" - }, - "resource": { - "type": "string", - "description": "Connected Cluster Resource on which the operation is performed" - }, - "operation": { - "type": "string", - "description": "Operation type: Read, write, delete, etc." - }, - "description": { - "type": "string", - "description": "Description of the operation." - } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterNamePathParam" + }, + { + "$ref": "#/parameters/ClientProxy" + }, + { + "$ref": "#/parameters/isTokenAuth" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/CredentialResults" + } + }, + "default": { + "description": "Resource Provider error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } } - }, - "ConnectedClusterList": { - "description": "The paginated list of connected Clusters", - "type": "object", - "properties": { - "value": { - "description": "The list of connected clusters", - "type": "array", - "items": { - "$ref": "#/definitions/ConnectedCluster" + } + }, + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Kubernetes/connectedClusters": { + "get": { + "summary": "Lists all connected clusters", + "operationId": "ConnectedCluster_ListByResourceGroup", + "description": "API to enumerate registered connected K8s clusters under a Resource Group", + "produces": [ + "application/json" + ], + "x-ms-examples": { + "GetClustersExample": { + "$ref": "./examples/GetClustersByResourceGroupExample.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ConnectedClusterList" } }, - "nextLink": { - "description": "The link to fetch the next page of connected cluster", - "type": "string" + "default": { + "description": "Resource Provider error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" } - }, - "ConnectedCluster": { - "type": "object", - "required": [ - "properties", - "identity" + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Kubernetes/connectedClusters": { + "get": { + "summary": "Lists all connected clusters", + "operationId": "ConnectedCluster_ListBySubscription", + "description": "API to enumerate registered connected K8s clusters under a Subscription", + "produces": [ + "application/json" ], - "properties": { - "identity": { - "$ref": "#/definitions/ConnectedClusterIdentity", - "description": "The identity of the connected cluster." - }, - "properties": { - "x-ms-client-flatten": true, - "$ref": "#/definitions/ConnectedClusterProperties", - "description": "Describes the connected cluster resource properties." + "x-ms-examples": { + "GetClustersExample": { + "$ref": "./examples/GetClustersBySubscriptionExample.json" } }, - "allOf": [ + "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/TrackedResource" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" } ], - "description": "Represents a connected cluster." - }, - "ConnectedClusterIdentity": { - "type": "object", - "required": [ - "type" - ], - "properties": { - "principalId": { - "readOnly": true, - "type": "string", - "description": "The principal id of connected cluster identity. This property will only be provided for a system assigned identity." - }, - "tenantId": { - "readOnly": true, - "type": "string", - "description": "The tenant id associated with the connected cluster. This property will only be provided for a system assigned identity." - }, - "type": { - "type": "string", - "description": "The type of identity used for the connected cluster. The type 'SystemAssigned, includes a system created identity. The type 'None' means no identity is assigned to the connected cluster.", - "enum": [ - "None", - "SystemAssigned" - ], - "x-ms-enum": { - "name": "ResourceIdentityType", - "modelAsString": false + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ConnectedClusterList" + } + }, + "default": { + "description": "Resource Provider error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, - "description": "Identity for the connected cluster." - }, - "ConnectedClusterProperties": { - "type": "object", - "required": [ - "agentPublicKeyCertificate" + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/providers/Microsoft.Kubernetes/operations": { + "get": { + "description": "Lists all of the available API operations for Connected Cluster resource.", + "operationId": "Operations_Get", + "produces": [ + "application/json" ], - "properties": { - "agentPublicKeyCertificate": { - "type": "string", - "description": "Base64 encoded public certificate used by the agent to do the initial handshake to the backend services in Azure." - }, - "kubernetesVersion": { - "readOnly": true, - "type": "string", - "description": "The Kubernetes version of the connected cluster resource" - }, - "totalNodeCount": { - "readOnly": true, - "type": "integer", - "description": "Number of nodes present in the connected cluster resource" - }, - "totalCoreCount": { - "readOnly": true, - "format": "int32", - "type": "integer", - "description": "Number of CPU cores present in the connected cluster resource" - }, - "agentVersion": { - "readOnly": true, - "type": "string", - "description": "Version of the agent running on the connected cluster resource" - }, - "provisioningState": { - "$ref": "#/definitions/ConnectedClusterProvisioningState", - "description": "Provisioning state of the connected cluster resource." - }, - "distribution": { - "type": "string", - "description": "The Kubernetes distribution running on this connected cluster." - }, - "infrastructure": { - "type": "string", - "description": "The infrastructure on which the Kubernetes cluster represented by this connected cluster is running on." - }, - "offering": { - "type": "string", - "readOnly": true, - "description": "Connected cluster offering" - }, - "managedIdentityCertificateExpirationTime": { - "type": "string", - "format": "date-time", - "readOnly": true, - "description": "Expiration time of the managed identity certificate" - }, - "lastConnectivityTime": { - "type": "string", - "readOnly": true, - "format": "date-time", - "description": "Time representing the last instance when heart beat was received from the cluster" - }, - "connectivityStatus": { - "type": "string", - "description": "Represents the connectivity status of the connected cluster.", - "enum": [ - "Connecting", - "Connected", - "Offline", - "Expired" - ], - "x-ms-enum": { - "name": "ConnectivityStatus", - "modelAsString": true + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/OperationList" + } + }, + "default": { + "description": "Resource Provider error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, - "description": "Properties of the connected cluster." - }, - "CredentialResults": { - "properties": { - "hybridConnectionConfig": { - "$ref": "#/definitions/HybridConnectionConfig", - "description": "Contains the REP (rendezvous endpoint) and “Sender” access token.", - "readOnly": true - }, - "kubeconfigs": { - "type": "array", - "readOnly": true, - "items": { - "$ref": "#/definitions/CredentialResult" - }, - "description": "Base64-encoded Kubernetes configuration file." + "x-ms-examples": { + "ListConnectedClusterOperationsExample": { + "$ref": "./examples/ListConnectedClusterOperationsExample.json" } }, - "description": "The list of credential result response." - }, - "CredentialResult": { - "type": "object", - "properties": { - "name": { - "type": "string", - "readOnly": true, - "description": "The name of the credential." - }, - "value": { - "type": "string", - "format": "byte", - "readOnly": true, - "description": "Base64-encoded Kubernetes configuration file." - } + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + } + }, + "definitions": { + "OperationList": { + "description": "The paginated list of connected cluster API operations.", + "properties": { + "value": { + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/Operation" + }, + "description": "The list of connected cluster API operations." }, - "description": "The credential result response." - }, - "ConnectedClusterProvisioningState": { - "type": "string", - "description": "The current deployment state of connectedClusters.", - "enum": [ - "Succeeded", - "Failed", - "Canceled", - "Provisioning", - "Updating", - "Deleting", - "Accepted" - ], - "x-ms-enum": { - "name": "ProvisioningState", - "modelAsString": true + "nextLink": { + "type": "string", + "description": "The link to fetch the next page of connected cluster API operations." } - }, - "ConnectedClusterPatch": { - "type": "object", - "properties": { - "tags": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "Resource tags." - }, + } + }, + "Operation": { + "type": "object", + "description": "The Connected cluster API operation", + "properties": { + "name": { + "readOnly": true, + "type": "string", + "description": "Operation name: {Microsoft.Kubernetes}/{resource}/{operation}" + }, + "display": { + "readOnly": true, + "description": "The object that represents the operation.", "properties": { - "x-ms-client-flatten": true, - "$ref": "#/definitions/ConnectedClusterPatchProperties", - "description": "Describes the connected cluster resource properties that can be updated during PATCH operation." + "provider": { + "type": "string", + "description": "Service provider: Microsoft.connectedClusters" + }, + "resource": { + "type": "string", + "description": "Connected Cluster Resource on which the operation is performed" + }, + "operation": { + "type": "string", + "description": "Operation type: Read, write, delete, etc." + }, + "description": { + "type": "string", + "description": "Description of the operation." + } + } + } + } + }, + "ConnectedClusterList": { + "description": "The paginated list of connected Clusters", + "type": "object", + "properties": { + "value": { + "description": "The list of connected clusters", + "type": "array", + "items": { + "$ref": "#/definitions/ConnectedCluster" } }, - "description": "Object containing updates for patch operations." - }, - "ConnectedClusterPatchProperties": { - "type": "object", + "nextLink": { + "description": "The link to fetch the next page of connected cluster", + "type": "string" + } + } + }, + "ConnectedCluster": { + "type": "object", + "required": [ + "properties", + "identity" + ], + "properties": { + "identity": { + "$ref": "#/definitions/ConnectedClusterIdentity", + "description": "The identity of the connected cluster." + }, "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/ConnectedClusterProperties", + "description": "Describes the connected cluster resource properties." + } + }, + "allOf": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/TrackedResource" + } + ], + "description": "Represents a connected cluster." + }, + "ConnectedClusterIdentity": { + "type": "object", + "required": [ + "type" + ], + "properties": { + "principalId": { + "readOnly": true, + "type": "string", + "description": "The principal id of connected cluster identity. This property will only be provided for a system assigned identity." + }, + "tenantId": { + "readOnly": true, + "type": "string", + "description": "The tenant id associated with the connected cluster. This property will only be provided for a system assigned identity." }, - "description": "Properties which can be patched on the connected cluster resource." + "type": { + "type": "string", + "description": "The type of identity used for the connected cluster. The type 'SystemAssigned, includes a system created identity. The type 'None' means no identity is assigned to the connected cluster.", + "enum": [ + "None", + "SystemAssigned" + ], + "x-ms-enum": { + "name": "ResourceIdentityType", + "modelAsString": false + } + } }, - "HybridConnectionConfig": { - "description": "Contains the REP (rendezvous endpoint) and “Sender” access token.", - "properties": { - "expirationTime": { - "description": "Timestamp when this token will be expired.", - "type": "integer", - "readOnly": true, - "format": "int64" - }, - "hybridConnectionName": { - "description": "Name of the connection", - "type": "string", - "readOnly": true - }, - "relay": { - "description": "Name of the relay.", - "type": "string", - "readOnly": true - }, - "token": { - "description": "Sender access token", - "type": "string", - "readOnly": true + "description": "Identity for the connected cluster." + }, + "ConnectedClusterProperties": { + "type": "object", + "required": [ + "agentPublicKeyCertificate" + ], + "properties": { + "agentPublicKeyCertificate": { + "type": "string", + "description": "Base64 encoded public certificate used by the agent to do the initial handshake to the backend services in Azure." + }, + "kubernetesVersion": { + "readOnly": true, + "type": "string", + "description": "The Kubernetes version of the connected cluster resource" + }, + "totalNodeCount": { + "readOnly": true, + "type": "integer", + "description": "Number of nodes present in the connected cluster resource" + }, + "totalCoreCount": { + "readOnly": true, + "format": "int32", + "type": "integer", + "description": "Number of CPU cores present in the connected cluster resource" + }, + "agentVersion": { + "readOnly": true, + "type": "string", + "description": "Version of the agent running on the connected cluster resource" + }, + "provisioningState": { + "$ref": "#/definitions/ConnectedClusterProvisioningState", + "description": "Provisioning state of the connected cluster resource." + }, + "distribution": { + "type": "string", + "description": "The Kubernetes distribution running on this connected cluster." + }, + "infrastructure": { + "type": "string", + "description": "The infrastructure on which the Kubernetes cluster represented by this connected cluster is running on." + }, + "offering": { + "type": "string", + "readOnly": true, + "description": "Connected cluster offering" + }, + "managedIdentityCertificateExpirationTime": { + "type": "string", + "format": "date-time", + "readOnly": true, + "description": "Expiration time of the managed identity certificate" + }, + "lastConnectivityTime": { + "type": "string", + "readOnly": true, + "format": "date-time", + "description": "Time representing the last instance when heart beat was received from the cluster" + }, + "connectivityStatus": { + "type": "string", + "description": "Represents the connectivity status of the connected cluster.", + "enum": [ + "Connecting", + "Connected", + "Offline", + "Expired" + ], + "x-ms-enum": { + "name": "ConnectivityStatus", + "modelAsString": true } } - } + }, + "description": "Properties of the connected cluster." }, - "parameters": { - "ClusterNamePathParam": { - "name": "clusterName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the Kubernetes cluster on which get is called.", - "x-ms-parameter-location": "method" + "CredentialResults": { + "properties": { + "hybridConnectionConfig": { + "$ref": "#/definitions/HybridConnectionConfig", + "description": "Contains the REP (rendezvous endpoint) and “Sender” access token.", + "readOnly": true + }, + "kubeconfigs": { + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/CredentialResult" + }, + "description": "Base64-encoded Kubernetes configuration file." + } }, - "ClientProxy": { - "name": "clientProxy", - "in": "query", - "required": false, - "type": "boolean", - "description": "Parameter to indicate whether the request is for client side proxy or not", - "x-ms-parameter-location": "method" + "description": "The list of credential result response." + }, + "CredentialResult": { + "type": "object", + "properties": { + "name": { + "type": "string", + "readOnly": true, + "description": "The name of the credential." + }, + "value": { + "type": "string", + "format": "byte", + "readOnly": true, + "description": "Base64-encoded Kubernetes configuration file." + } }, - "TokenAuth": { - "name": "isTokenAuth", - "in": "query", - "required": false, - "type": "boolean", - "description": "Parameter to indicate whether the it is token based authentication or AAD based authentication", - "x-ms-parameter-location": "method" + "description": "The credential result response." + }, + "ConnectedClusterProvisioningState": { + "type": "string", + "description": "The current deployment state of connectedClusters.", + "enum": [ + "Succeeded", + "Failed", + "Canceled", + "Provisioning", + "Updating", + "Deleting", + "Accepted" + ], + "x-ms-enum": { + "name": "ProvisioningState", + "modelAsString": true } + }, + "ConnectedClusterPatch": { + "type": "object", + "properties": { + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Resource tags." + }, + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/ConnectedClusterPatchProperties", + "description": "Describes the connected cluster resource properties that can be updated during PATCH operation." + } + }, + "description": "Object containing updates for patch operations." + }, + "ConnectedClusterPatchProperties": { + "type": "object", + "properties": {}, + "description": "Properties which can be patched on the connected cluster resource." + }, + "HybridConnectionConfig": { + "description": "Contains the REP (rendezvous endpoint) and “Sender” access token.", + "properties": { + "expirationTime": { + "description": "Timestamp when this token will be expired.", + "type": "integer", + "readOnly": true, + "format": "int64" + }, + "hybridConnectionName": { + "description": "Name of the connection", + "type": "string", + "readOnly": true + }, + "relay": { + "description": "Name of the relay.", + "type": "string", + "readOnly": true + }, + "token": { + "description": "Sender access token", + "type": "string", + "readOnly": true + } + } + } + }, + "parameters": { + "ClusterNamePathParam": { + "name": "clusterName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the Kubernetes cluster on which get is called.", + "x-ms-parameter-location": "method" + }, + "ClientProxy": { + "name": "clientProxy", + "in": "query", + "required": false, + "type": "boolean", + "description": "Parameter to indicate whether the request is for client side proxy or not", + "x-ms-parameter-location": "method" + }, + "TokenAuth": { + "name": "isTokenAuth", + "in": "query", + "required": false, + "type": "boolean", + "description": "Parameter to indicate whether the it is token based authentication or AAD based authentication", + "x-ms-parameter-location": "method" } } - - \ No newline at end of file +} From 97a80763ff183401c761e1ca94ecbd64d9117a21 Mon Sep 17 00:00:00 2001 From: sikasire Date: Tue, 19 Jan 2021 13:43:41 +0530 Subject: [PATCH 05/31] Adding to readme --- .../hybridkubernetes/resource-manager/readme.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/specification/hybridkubernetes/resource-manager/readme.md b/specification/hybridkubernetes/resource-manager/readme.md index f5fa2eeea680..52615dbf2f94 100644 --- a/specification/hybridkubernetes/resource-manager/readme.md +++ b/specification/hybridkubernetes/resource-manager/readme.md @@ -39,7 +39,22 @@ These settings apply only when `--tag=package-2020-01-01-preview` is specified o input-file: - Microsoft.Kubernetes/preview/2020-01-01-preview/connectedClusters.json ``` +### Tag: package-2021-02-01-preview +These settings apply only when `--tag=package-2021-02-01-preview` is specified on the command line. + +```yaml $(tag) == 'package-2021-02-01-preview' +input-file: +- Microsoft.Kubernetes/preview/2021-02-01-preview/connectedClusters.json +``` +### Tag: package-2021-02-01 + +These settings apply only when `--tag=package-2021-02-01` is specified on the command line. + +```yaml $(tag) == 'package-2021-02-01' +input-file: +- Microsoft.Kubernetes/GA/2021-02-01/connectedClusters.json +``` --- # Code Generation From b6ea82e333d5c66c2a6e530d81295ff99c1ad78c Mon Sep 17 00:00:00 2001 From: sikasire Date: Tue, 19 Jan 2021 14:09:07 +0530 Subject: [PATCH 06/31] adding examples --- .../ConnectedClustersListClusterCredentialsResult.json | 0 .../ConnectedClustersListClusterCredentialsResultNonAad.json | 0 .../GA/2021-02-01/{ => examples}/CreateClusterExample.json | 0 .../GA/2021-02-01/{ => examples}/DeleteClusterExample.json | 0 .../GA/2021-02-01/{ => examples}/GetClusterExample.json | 0 .../{ => examples}/GetClustersByResourceGroupExample.json | 0 .../{ => examples}/GetClustersBySubscriptionExample.json | 0 .../{ => examples}/ListConnectedClusterOperationsExample.json | 0 .../GA/2021-02-01/{ => examples}/UpdateClusterExample.json | 0 .../ConnectedClustersListClusterCredentialsResult.json | 0 .../ConnectedClustersListClusterCredentialsResultNonAad.json | 0 .../2021-02-01-preview/{ => examples}/CreateClusterExample.json | 0 .../2021-02-01-preview/{ => examples}/DeleteClusterExample.json | 0 .../2021-02-01-preview/{ => examples}/GetClusterExample.json | 0 .../{ => examples}/GetClustersByResourceGroupExample.json | 0 .../{ => examples}/GetClustersBySubscriptionExample.json | 0 .../{ => examples}/ListConnectedClusterOperationsExample.json | 0 .../2021-02-01-preview/{ => examples}/UpdateClusterExample.json | 0 18 files changed, 0 insertions(+), 0 deletions(-) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/{ => examples}/ConnectedClustersListClusterCredentialsResult.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/{ => examples}/ConnectedClustersListClusterCredentialsResultNonAad.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/{ => examples}/CreateClusterExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/{ => examples}/DeleteClusterExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/{ => examples}/GetClusterExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/{ => examples}/GetClustersByResourceGroupExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/{ => examples}/GetClustersBySubscriptionExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/{ => examples}/ListConnectedClusterOperationsExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/{ => examples}/UpdateClusterExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/{ => examples}/ConnectedClustersListClusterCredentialsResult.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/{ => examples}/ConnectedClustersListClusterCredentialsResultNonAad.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/{ => examples}/CreateClusterExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/{ => examples}/DeleteClusterExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/{ => examples}/GetClusterExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/{ => examples}/GetClustersByResourceGroupExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/{ => examples}/GetClustersBySubscriptionExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/{ => examples}/ListConnectedClusterOperationsExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/{ => examples}/UpdateClusterExample.json (100%) diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/ConnectedClustersListClusterCredentialsResult.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/ConnectedClustersListClusterCredentialsResult.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/ConnectedClustersListClusterCredentialsResult.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/ConnectedClustersListClusterCredentialsResult.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/ConnectedClustersListClusterCredentialsResultNonAad.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/ConnectedClustersListClusterCredentialsResultNonAad.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/ConnectedClustersListClusterCredentialsResultNonAad.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/ConnectedClustersListClusterCredentialsResultNonAad.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/CreateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/CreateClusterExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/CreateClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/CreateClusterExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/DeleteClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/DeleteClusterExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/DeleteClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/DeleteClusterExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/GetClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/GetClusterExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/GetClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/GetClusterExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/GetClustersByResourceGroupExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/GetClustersByResourceGroupExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/GetClustersByResourceGroupExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/GetClustersByResourceGroupExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/GetClustersBySubscriptionExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/GetClustersBySubscriptionExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/GetClustersBySubscriptionExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/GetClustersBySubscriptionExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/ListConnectedClusterOperationsExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/ListConnectedClusterOperationsExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/ListConnectedClusterOperationsExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/ListConnectedClusterOperationsExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/UpdateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/UpdateClusterExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/UpdateClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/UpdateClusterExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/ConnectedClustersListClusterCredentialsResult.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/ConnectedClustersListClusterCredentialsResult.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/ConnectedClustersListClusterCredentialsResult.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/ConnectedClustersListClusterCredentialsResult.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/ConnectedClustersListClusterCredentialsResultNonAad.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/ConnectedClustersListClusterCredentialsResultNonAad.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/ConnectedClustersListClusterCredentialsResultNonAad.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/ConnectedClustersListClusterCredentialsResultNonAad.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/CreateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/CreateClusterExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/CreateClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/CreateClusterExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/DeleteClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/DeleteClusterExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/DeleteClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/DeleteClusterExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/GetClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/GetClusterExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/GetClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/GetClusterExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/GetClustersByResourceGroupExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/GetClustersByResourceGroupExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/GetClustersByResourceGroupExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/GetClustersByResourceGroupExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/GetClustersBySubscriptionExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/GetClustersBySubscriptionExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/GetClustersBySubscriptionExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/GetClustersBySubscriptionExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/ListConnectedClusterOperationsExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/ListConnectedClusterOperationsExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/ListConnectedClusterOperationsExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/ListConnectedClusterOperationsExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/UpdateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/UpdateClusterExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/UpdateClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/UpdateClusterExample.json From 88e598801b481201b88cafa72f0a26ab8d81ccff Mon Sep 17 00:00:00 2001 From: sikasire Date: Tue, 19 Jan 2021 14:09:07 +0530 Subject: [PATCH 07/31] adding examples --- .../Microsoft.Kubernetes/GA/2021-02-01/connectedClusters.json | 2 +- .../ConnectedClustersListClusterCredentialsResult.json | 0 .../ConnectedClustersListClusterCredentialsResultNonAad.json | 0 .../GA/2021-02-01/{ => examples}/CreateClusterExample.json | 0 .../GA/2021-02-01/{ => examples}/DeleteClusterExample.json | 0 .../GA/2021-02-01/{ => examples}/GetClusterExample.json | 0 .../{ => examples}/GetClustersByResourceGroupExample.json | 0 .../{ => examples}/GetClustersBySubscriptionExample.json | 0 .../{ => examples}/ListConnectedClusterOperationsExample.json | 0 .../GA/2021-02-01/{ => examples}/UpdateClusterExample.json | 0 .../ConnectedClustersListClusterCredentialsResult.json | 0 .../ConnectedClustersListClusterCredentialsResultNonAad.json | 0 .../2021-02-01-preview/{ => examples}/CreateClusterExample.json | 0 .../2021-02-01-preview/{ => examples}/DeleteClusterExample.json | 0 .../2021-02-01-preview/{ => examples}/GetClusterExample.json | 0 .../{ => examples}/GetClustersByResourceGroupExample.json | 0 .../{ => examples}/GetClustersBySubscriptionExample.json | 0 .../{ => examples}/ListConnectedClusterOperationsExample.json | 0 .../2021-02-01-preview/{ => examples}/UpdateClusterExample.json | 0 19 files changed, 1 insertion(+), 1 deletion(-) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/{ => examples}/ConnectedClustersListClusterCredentialsResult.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/{ => examples}/ConnectedClustersListClusterCredentialsResultNonAad.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/{ => examples}/CreateClusterExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/{ => examples}/DeleteClusterExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/{ => examples}/GetClusterExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/{ => examples}/GetClustersByResourceGroupExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/{ => examples}/GetClustersBySubscriptionExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/{ => examples}/ListConnectedClusterOperationsExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/{ => examples}/UpdateClusterExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/{ => examples}/ConnectedClustersListClusterCredentialsResult.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/{ => examples}/ConnectedClustersListClusterCredentialsResultNonAad.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/{ => examples}/CreateClusterExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/{ => examples}/DeleteClusterExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/{ => examples}/GetClusterExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/{ => examples}/GetClustersByResourceGroupExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/{ => examples}/GetClustersBySubscriptionExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/{ => examples}/ListConnectedClusterOperationsExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/{ => examples}/UpdateClusterExample.json (100%) diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/connectedClusters.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/connectedClusters.json index f3e8ae0ced83..abdd253ccccc 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/connectedClusters.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/connectedClusters.json @@ -2,7 +2,7 @@ "swagger": "2.0", "info": { "title": "ConnectedKubernetesClient", - "version": "2020-02-01", + "version": "2021-02-01", "description": "Azure Connected Cluster Resource Provider API for adopting any Kubernetes Cluster" }, "schemes": [ diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/ConnectedClustersListClusterCredentialsResult.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/ConnectedClustersListClusterCredentialsResult.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/ConnectedClustersListClusterCredentialsResult.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/ConnectedClustersListClusterCredentialsResult.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/ConnectedClustersListClusterCredentialsResultNonAad.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/ConnectedClustersListClusterCredentialsResultNonAad.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/ConnectedClustersListClusterCredentialsResultNonAad.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/ConnectedClustersListClusterCredentialsResultNonAad.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/CreateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/CreateClusterExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/CreateClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/CreateClusterExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/DeleteClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/DeleteClusterExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/DeleteClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/DeleteClusterExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/GetClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/GetClusterExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/GetClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/GetClusterExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/GetClustersByResourceGroupExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/GetClustersByResourceGroupExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/GetClustersByResourceGroupExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/GetClustersByResourceGroupExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/GetClustersBySubscriptionExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/GetClustersBySubscriptionExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/GetClustersBySubscriptionExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/GetClustersBySubscriptionExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/ListConnectedClusterOperationsExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/ListConnectedClusterOperationsExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/ListConnectedClusterOperationsExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/ListConnectedClusterOperationsExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/UpdateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/UpdateClusterExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/UpdateClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/UpdateClusterExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/ConnectedClustersListClusterCredentialsResult.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/ConnectedClustersListClusterCredentialsResult.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/ConnectedClustersListClusterCredentialsResult.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/ConnectedClustersListClusterCredentialsResult.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/ConnectedClustersListClusterCredentialsResultNonAad.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/ConnectedClustersListClusterCredentialsResultNonAad.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/ConnectedClustersListClusterCredentialsResultNonAad.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/ConnectedClustersListClusterCredentialsResultNonAad.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/CreateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/CreateClusterExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/CreateClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/CreateClusterExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/DeleteClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/DeleteClusterExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/DeleteClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/DeleteClusterExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/GetClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/GetClusterExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/GetClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/GetClusterExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/GetClustersByResourceGroupExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/GetClustersByResourceGroupExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/GetClustersByResourceGroupExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/GetClustersByResourceGroupExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/GetClustersBySubscriptionExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/GetClustersBySubscriptionExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/GetClustersBySubscriptionExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/GetClustersBySubscriptionExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/ListConnectedClusterOperationsExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/ListConnectedClusterOperationsExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/ListConnectedClusterOperationsExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/ListConnectedClusterOperationsExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/UpdateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/UpdateClusterExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/UpdateClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/UpdateClusterExample.json From 84712dc0a4fee62676f5f669506af4b86af5f4a9 Mon Sep 17 00:00:00 2001 From: sikasire Date: Tue, 19 Jan 2021 20:20:31 +0530 Subject: [PATCH 08/31] removing listcluster dependent models from GA --- .../connectedClusters.json | 45 +------------------ .../examples/CreateClusterExample.json | 2 +- .../examples/DeleteClusterExample.json | 2 +- .../examples/GetClusterExample.json | 2 +- .../GetClustersByResourceGroupExample.json | 2 +- .../GetClustersBySubscriptionExample.json | 2 +- ...ListConnectedClusterOperationsExample.json | 2 +- .../examples/UpdateClusterExample.json | 2 +- .../connectedClusters.json | 4 +- ...dClustersListClusterCredentialsResult.json | 2 +- ...ersListClusterCredentialsResultNonAad.json | 0 .../examples/CreateClusterExample.json | 2 +- .../examples/DeleteClusterExample.json | 2 +- .../examples/GetClusterExample.json | 2 +- .../GetClustersByResourceGroupExample.json | 2 +- .../GetClustersBySubscriptionExample.json | 2 +- ...ListConnectedClusterOperationsExample.json | 2 +- .../examples/UpdateClusterExample.json | 2 +- .../resource-manager/readme.md | 12 ++--- 19 files changed, 24 insertions(+), 67 deletions(-) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/{2021-02-01 => 2021-03-01}/connectedClusters.json (93%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/{2021-02-01 => 2021-03-01}/examples/CreateClusterExample.json (99%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/{2021-02-01 => 2021-03-01}/examples/DeleteClusterExample.json (87%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/{2021-02-01 => 2021-03-01}/examples/GetClusterExample.json (98%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/{2021-02-01 => 2021-03-01}/examples/GetClustersByResourceGroupExample.json (99%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/{2021-02-01 => 2021-03-01}/examples/GetClustersBySubscriptionExample.json (99%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/{2021-02-01 => 2021-03-01}/examples/ListConnectedClusterOperationsExample.json (97%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/{2021-02-01 => 2021-03-01}/examples/UpdateClusterExample.json (98%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/{2021-02-01-preview => 2021-03-01-preview}/connectedClusters.json (99%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/{2021-02-01-preview => 2021-03-01-preview}/examples/ConnectedClustersListClusterCredentialsResult.json (94%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/{2021-02-01-preview => 2021-03-01-preview}/examples/ConnectedClustersListClusterCredentialsResultNonAad.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/{2021-02-01-preview => 2021-03-01-preview}/examples/CreateClusterExample.json (98%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/{2021-02-01-preview => 2021-03-01-preview}/examples/DeleteClusterExample.json (84%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/{2021-02-01-preview => 2021-03-01-preview}/examples/GetClusterExample.json (97%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/{2021-02-01-preview => 2021-03-01-preview}/examples/GetClustersByResourceGroupExample.json (98%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/{2021-02-01-preview => 2021-03-01-preview}/examples/GetClustersBySubscriptionExample.json (98%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/{2021-02-01-preview => 2021-03-01-preview}/examples/ListConnectedClusterOperationsExample.json (97%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/{2021-02-01-preview => 2021-03-01-preview}/examples/UpdateClusterExample.json (98%) diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/connectedClusters.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/connectedClusters.json similarity index 93% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/connectedClusters.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/connectedClusters.json index 6831fc75566b..4e0c4084172d 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/connectedClusters.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/connectedClusters.json @@ -2,7 +2,7 @@ "swagger": "2.0", "info": { "title": "ConnectedKubernetesClient", - "version": "2021-02-01", + "version": "2021-03-01", "description": "Azure Connected Cluster Resource Provider API for adopting any Kubernetes Cluster" }, "schemes": [ @@ -555,41 +555,6 @@ }, "description": "Properties of the connected cluster." }, - "CredentialResults": { - "properties": { - "hybridConnectionConfig": { - "$ref": "#/definitions/HybridConnectionConfig", - "description": "Contains the REP (rendezvous endpoint) and “Sender” access token.", - "readOnly": true - }, - "kubeconfigs": { - "type": "array", - "readOnly": true, - "items": { - "$ref": "#/definitions/CredentialResult" - }, - "description": "Base64-encoded Kubernetes configuration file." - } - }, - "description": "The list of credential result response." - }, - "CredentialResult": { - "type": "object", - "properties": { - "name": { - "type": "string", - "readOnly": true, - "description": "The name of the credential." - }, - "value": { - "type": "string", - "format": "byte", - "readOnly": true, - "description": "Base64-encoded Kubernetes configuration file." - } - }, - "description": "The credential result response." - }, "ConnectedClusterProvisioningState": { "type": "string", "description": "The current deployment state of connectedClusters.", @@ -665,14 +630,6 @@ "type": "string", "description": "The name of the Kubernetes cluster on which get is called.", "x-ms-parameter-location": "method" - }, - "ClientProxy": { - "name": "clientProxy", - "in": "query", - "required": false, - "type": "boolean", - "description": "Parameter to indicate whether the request is for client side proxy or not", - "x-ms-parameter-location": "method" } } } diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/CreateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/CreateClusterExample.json similarity index 99% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/CreateClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/CreateClusterExample.json index 4b6ad8332ad0..f610a13a6c22 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/CreateClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/CreateClusterExample.json @@ -3,7 +3,7 @@ "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", "resourceGroupName": "k8sc-rg", "clusterName": "testCluster", - "api-version": "2021-02-01", + "api-version": "2021-03-01", "ConnectedCluster": { "location": "East US", "tags": {}, diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/DeleteClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/DeleteClusterExample.json similarity index 87% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/DeleteClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/DeleteClusterExample.json index 0baf0edc2373..533e04114753 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/DeleteClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/DeleteClusterExample.json @@ -3,7 +3,7 @@ "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", "resourceGroupName": "k8sc-rg", "clusterName": "testCluster", - "api-version": "2021-02-01" + "api-version": "2021-03-01" }, "responses": { "200": {}, diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/GetClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/GetClusterExample.json similarity index 98% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/GetClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/GetClusterExample.json index c900421e78fb..70056cba82c5 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/GetClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/GetClusterExample.json @@ -3,7 +3,7 @@ "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", "resourceGroupName": "k8sc-rg", "clusterName": "testCluster", - "api-version": "2021-02-01" + "api-version": "2021-03-01" }, "responses": { "200": { diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/GetClustersByResourceGroupExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/GetClustersByResourceGroupExample.json similarity index 99% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/GetClustersByResourceGroupExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/GetClustersByResourceGroupExample.json index d001cfd8392f..ed09d63c03ed 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/GetClustersByResourceGroupExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/GetClustersByResourceGroupExample.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", "resourceGroupName": "k8sc-rg", - "api-version": "2021-02-01" + "api-version": "2021-03-01" }, "responses": { "200": { diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/GetClustersBySubscriptionExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/GetClustersBySubscriptionExample.json similarity index 99% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/GetClustersBySubscriptionExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/GetClustersBySubscriptionExample.json index d99ba16c6b2a..78e2cec96ec9 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/GetClustersBySubscriptionExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/GetClustersBySubscriptionExample.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", - "api-version": "2021-02-01" + "api-version": "2021-03-01" }, "responses": { "200": { diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/ListConnectedClusterOperationsExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/ListConnectedClusterOperationsExample.json similarity index 97% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/ListConnectedClusterOperationsExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/ListConnectedClusterOperationsExample.json index 4ed850870388..cc7d8fadcd35 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/ListConnectedClusterOperationsExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/ListConnectedClusterOperationsExample.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2021-02-01" + "api-version": "2021-03-01" }, "responses": { "200": { diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/UpdateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/UpdateClusterExample.json similarity index 98% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/UpdateClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/UpdateClusterExample.json index a147fbabcd0f..61a25d7a2ac2 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-02-01/examples/UpdateClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/UpdateClusterExample.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2021-02-01", + "api-version": "2021-03-01", "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", "resourceGroupName": "k8sc-rg", "clusterName": "testCluster", diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/connectedClusters.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/connectedClusters.json similarity index 99% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/connectedClusters.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/connectedClusters.json index 89440027ac4f..cc67f674679f 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/connectedClusters.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/connectedClusters.json @@ -2,7 +2,7 @@ "swagger": "2.0", "info": { "title": "ConnectedKubernetesClient", - "version": "2021-02-01-preview", + "version": "2021-03-01-preview", "description": "Azure Connected Cluster Resource Provider API for adopting any Kubernetes Cluster" }, "schemes": [ @@ -731,7 +731,7 @@ "in": "query", "required": false, "type": "boolean", - "description": "Parameter to indicate whether the it is token based authentication or AAD based authentication", + "description": "Parameter to indicate whether the request is token based authentication or AAD based authentication", "x-ms-parameter-location": "method" } } diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/ConnectedClustersListClusterCredentialsResult.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/ConnectedClustersListClusterCredentialsResult.json similarity index 94% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/ConnectedClustersListClusterCredentialsResult.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/ConnectedClustersListClusterCredentialsResult.json index d1906a6dbf13..9e6cf1dd9a46 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/ConnectedClustersListClusterCredentialsResult.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/ConnectedClustersListClusterCredentialsResult.json @@ -3,7 +3,7 @@ "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", "resourceGroupName": "k8sc-rg", "clusterName": "testCluster", - "api-version": "2021-02-01-preview" + "api-version": "2021-03-01-preview" }, "responses": { "200": { diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/ConnectedClustersListClusterCredentialsResultNonAad.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/ConnectedClustersListClusterCredentialsResultNonAad.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/ConnectedClustersListClusterCredentialsResultNonAad.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/ConnectedClustersListClusterCredentialsResultNonAad.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/CreateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/CreateClusterExample.json similarity index 98% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/CreateClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/CreateClusterExample.json index 38ec5d00a3c4..ccb3ecd27624 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/CreateClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/CreateClusterExample.json @@ -3,7 +3,7 @@ "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", "resourceGroupName": "k8sc-rg", "clusterName": "testCluster", - "api-version": "2021-02-01-preview", + "api-version": "2021-03-01-preview", "ConnectedCluster": { "location": "East US", "tags": {}, diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/DeleteClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/DeleteClusterExample.json similarity index 84% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/DeleteClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/DeleteClusterExample.json index 7d738bb0e807..e56093e285dc 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/DeleteClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/DeleteClusterExample.json @@ -3,7 +3,7 @@ "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", "resourceGroupName": "k8sc-rg", "clusterName": "testCluster", - "api-version": "2021-02-01-preview" + "api-version": "2021-03-01-preview" }, "responses": { "200": {}, diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/GetClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClusterExample.json similarity index 97% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/GetClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClusterExample.json index 036cc1c71bda..adf84ad22ec2 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/GetClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClusterExample.json @@ -3,7 +3,7 @@ "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", "resourceGroupName": "k8sc-rg", "clusterName": "testCluster", - "api-version": "2021-02-01-preview" + "api-version": "2021-03-01-preview" }, "responses": { "200": { diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/GetClustersByResourceGroupExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClustersByResourceGroupExample.json similarity index 98% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/GetClustersByResourceGroupExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClustersByResourceGroupExample.json index 7cd673ebd044..15f04639bda0 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/GetClustersByResourceGroupExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClustersByResourceGroupExample.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", "resourceGroupName": "k8sc-rg", - "api-version": "2021-02-01-preview" + "api-version": "2021-03-01-preview" }, "responses": { "200": { diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/GetClustersBySubscriptionExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClustersBySubscriptionExample.json similarity index 98% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/GetClustersBySubscriptionExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClustersBySubscriptionExample.json index ceccbcab724c..b813c89fb964 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/GetClustersBySubscriptionExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClustersBySubscriptionExample.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", - "api-version": "2021-02-01-preview" + "api-version": "2021-03-01-preview" }, "responses": { "200": { diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/ListConnectedClusterOperationsExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/ListConnectedClusterOperationsExample.json similarity index 97% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/ListConnectedClusterOperationsExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/ListConnectedClusterOperationsExample.json index cc87fb4cd882..6498993da804 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/ListConnectedClusterOperationsExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/ListConnectedClusterOperationsExample.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2021-02-01-preview" + "api-version": "2021-03-01-preview" }, "responses": { "200": { diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/UpdateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/UpdateClusterExample.json similarity index 98% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/UpdateClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/UpdateClusterExample.json index f141ab1be019..e5dd4166ef42 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-02-01-preview/examples/UpdateClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/UpdateClusterExample.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2021-02-01-preview", + "api-version": "2021-03-01-preview", "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", "resourceGroupName": "k8sc-rg", "clusterName": "testCluster", diff --git a/specification/hybridkubernetes/resource-manager/readme.md b/specification/hybridkubernetes/resource-manager/readme.md index 52615dbf2f94..1bda335b8ca8 100644 --- a/specification/hybridkubernetes/resource-manager/readme.md +++ b/specification/hybridkubernetes/resource-manager/readme.md @@ -41,19 +41,19 @@ input-file: ``` ### Tag: package-2021-02-01-preview -These settings apply only when `--tag=package-2021-02-01-preview` is specified on the command line. +These settings apply only when `--tag=package-2021-03-01-preview` is specified on the command line. -```yaml $(tag) == 'package-2021-02-01-preview' +```yaml $(tag) == 'package-2021-03-01-preview' input-file: -- Microsoft.Kubernetes/preview/2021-02-01-preview/connectedClusters.json +- Microsoft.Kubernetes/preview/2021-03-01-preview/connectedClusters.json ``` ### Tag: package-2021-02-01 -These settings apply only when `--tag=package-2021-02-01` is specified on the command line. +These settings apply only when `--tag=package-2021-03-01` is specified on the command line. -```yaml $(tag) == 'package-2021-02-01' +```yaml $(tag) == 'package-2021-03-01' input-file: -- Microsoft.Kubernetes/GA/2021-02-01/connectedClusters.json +- Microsoft.Kubernetes/GA/2021-03-01/connectedClusters.json ``` --- From 2c48ebecde021d4c339e36e087441c8784e901a0 Mon Sep 17 00:00:00 2001 From: sikasire Date: Wed, 20 Jan 2021 12:46:45 +0530 Subject: [PATCH 09/31] adding system data --- .../2021-03-01/connectedClusters.json | 63 +++++++++++++++++++ .../examples/CreateClusterExample.json | 0 .../examples/DeleteClusterExample.json | 0 .../examples/GetClusterExample.json | 0 .../GetClustersByResourceGroupExample.json | 0 .../GetClustersBySubscriptionExample.json | 0 ...ListConnectedClusterOperationsExample.json | 0 .../examples/UpdateClusterExample.json | 0 8 files changed, 63 insertions(+) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/{GA => }/2021-03-01/connectedClusters.json (91%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/{GA => }/2021-03-01/examples/CreateClusterExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/{GA => }/2021-03-01/examples/DeleteClusterExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/{GA => }/2021-03-01/examples/GetClusterExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/{GA => }/2021-03-01/examples/GetClustersByResourceGroupExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/{GA => }/2021-03-01/examples/GetClustersBySubscriptionExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/{GA => }/2021-03-01/examples/ListConnectedClusterOperationsExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/{GA => }/2021-03-01/examples/UpdateClusterExample.json (100%) diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/connectedClusters.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/connectedClusters.json similarity index 91% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/connectedClusters.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/connectedClusters.json index 4e0c4084172d..2edccf42404e 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/connectedClusters.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/connectedClusters.json @@ -438,6 +438,11 @@ "x-ms-client-flatten": true, "$ref": "#/definitions/ConnectedClusterProperties", "description": "Describes the connected cluster resource properties." + }, + "systemData": { + "$ref": "#/definitions/SystemData", + "readOnly": true, + "description": "Metadata pertaining to creation and last modification of the resource" } }, "allOf": [ @@ -551,6 +556,11 @@ "name": "ConnectivityStatus", "modelAsString": true } + }, + "systemData": { + "$ref": "#/definitions/SystemData", + "readOnly": "true", + "description": "Metadata pertaining to creation and last modification of the resource." } }, "description": "Properties of the connected cluster." @@ -620,6 +630,59 @@ "readOnly": true } } + }, + "SystemData": { + "description": "Metadata pertaining to creation and last modification of the resource.", + "type": "object", + "properties": { + "createdBy": { + "description": "The identity that created the resource.", + "type": "string" + }, + "createdByType": { + "description": "The type of identity that created the resource.", + "enum": [ + "User", + "Application", + "ManagedIdentity", + "Key" + ], + "type": "string", + "x-ms-enum": { + "name": "createdByType", + "modelAsString": true + } + }, + "createdAt": { + "format": "date-time", + "description": "The timestamp of resource creation (UTC).", + "type": "string" + }, + "lastModifiedBy": { + "description": "The identity that last modified the resource.", + "type": "string" + }, + "lastModifiedByType": { + "description": "The type of identity that last modified the resource.", + "enum": [ + "User", + "Application", + "ManagedIdentity", + "Key" + ], + "type": "string", + "x-ms-enum": { + "name": "lastModifiedByType", + "modelAsString": true + } + }, + "lastModifiedAt": { + "format": "date-time", + "description": "The timestamp of resource modification (UTC).", + "type": "string" + } + }, + "readOnly": true } }, "parameters": { diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/CreateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/CreateClusterExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/CreateClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/CreateClusterExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/DeleteClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/DeleteClusterExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/DeleteClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/DeleteClusterExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/GetClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClusterExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/GetClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClusterExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/GetClustersByResourceGroupExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClustersByResourceGroupExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/GetClustersByResourceGroupExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClustersByResourceGroupExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/GetClustersBySubscriptionExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClustersBySubscriptionExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/GetClustersBySubscriptionExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClustersBySubscriptionExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/ListConnectedClusterOperationsExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/ListConnectedClusterOperationsExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/ListConnectedClusterOperationsExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/ListConnectedClusterOperationsExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/UpdateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/UpdateClusterExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/UpdateClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/UpdateClusterExample.json From 3ef2bbc099a6e44cd9436f1892af77a63fdc0bc3 Mon Sep 17 00:00:00 2001 From: sikasire Date: Wed, 20 Jan 2021 12:46:45 +0530 Subject: [PATCH 10/31] adding system data --- .../2021-03-01/connectedClusters.json | 63 ++++++++++++++++++ .../examples/CreateClusterExample.json | 0 .../examples/DeleteClusterExample.json | 0 .../examples/GetClusterExample.json | 0 .../GetClustersByResourceGroupExample.json | 0 .../GetClustersBySubscriptionExample.json | 0 ...ListConnectedClusterOperationsExample.json | 0 .../examples/UpdateClusterExample.json | 0 .../2021-03-01-preview/connectedClusters.json | 64 +++++++++++++++++++ .../resource-manager/readme.md | 2 +- 10 files changed, 128 insertions(+), 1 deletion(-) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/{GA => }/2021-03-01/connectedClusters.json (91%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/{GA => }/2021-03-01/examples/CreateClusterExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/{GA => }/2021-03-01/examples/DeleteClusterExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/{GA => }/2021-03-01/examples/GetClusterExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/{GA => }/2021-03-01/examples/GetClustersByResourceGroupExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/{GA => }/2021-03-01/examples/GetClustersBySubscriptionExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/{GA => }/2021-03-01/examples/ListConnectedClusterOperationsExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/{GA => }/2021-03-01/examples/UpdateClusterExample.json (100%) diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/connectedClusters.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/connectedClusters.json similarity index 91% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/connectedClusters.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/connectedClusters.json index 4e0c4084172d..2edccf42404e 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/connectedClusters.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/connectedClusters.json @@ -438,6 +438,11 @@ "x-ms-client-flatten": true, "$ref": "#/definitions/ConnectedClusterProperties", "description": "Describes the connected cluster resource properties." + }, + "systemData": { + "$ref": "#/definitions/SystemData", + "readOnly": true, + "description": "Metadata pertaining to creation and last modification of the resource" } }, "allOf": [ @@ -551,6 +556,11 @@ "name": "ConnectivityStatus", "modelAsString": true } + }, + "systemData": { + "$ref": "#/definitions/SystemData", + "readOnly": "true", + "description": "Metadata pertaining to creation and last modification of the resource." } }, "description": "Properties of the connected cluster." @@ -620,6 +630,59 @@ "readOnly": true } } + }, + "SystemData": { + "description": "Metadata pertaining to creation and last modification of the resource.", + "type": "object", + "properties": { + "createdBy": { + "description": "The identity that created the resource.", + "type": "string" + }, + "createdByType": { + "description": "The type of identity that created the resource.", + "enum": [ + "User", + "Application", + "ManagedIdentity", + "Key" + ], + "type": "string", + "x-ms-enum": { + "name": "createdByType", + "modelAsString": true + } + }, + "createdAt": { + "format": "date-time", + "description": "The timestamp of resource creation (UTC).", + "type": "string" + }, + "lastModifiedBy": { + "description": "The identity that last modified the resource.", + "type": "string" + }, + "lastModifiedByType": { + "description": "The type of identity that last modified the resource.", + "enum": [ + "User", + "Application", + "ManagedIdentity", + "Key" + ], + "type": "string", + "x-ms-enum": { + "name": "lastModifiedByType", + "modelAsString": true + } + }, + "lastModifiedAt": { + "format": "date-time", + "description": "The timestamp of resource modification (UTC).", + "type": "string" + } + }, + "readOnly": true } }, "parameters": { diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/CreateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/CreateClusterExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/CreateClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/CreateClusterExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/DeleteClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/DeleteClusterExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/DeleteClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/DeleteClusterExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/GetClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClusterExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/GetClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClusterExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/GetClustersByResourceGroupExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClustersByResourceGroupExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/GetClustersByResourceGroupExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClustersByResourceGroupExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/GetClustersBySubscriptionExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClustersBySubscriptionExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/GetClustersBySubscriptionExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClustersBySubscriptionExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/ListConnectedClusterOperationsExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/ListConnectedClusterOperationsExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/ListConnectedClusterOperationsExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/ListConnectedClusterOperationsExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/UpdateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/UpdateClusterExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/GA/2021-03-01/examples/UpdateClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/UpdateClusterExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/connectedClusters.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/connectedClusters.json index cc67f674679f..91f640c8a0df 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/connectedClusters.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/connectedClusters.json @@ -490,6 +490,11 @@ "x-ms-client-flatten": true, "$ref": "#/definitions/ConnectedClusterProperties", "description": "Describes the connected cluster resource properties." + }, + "systemData": { + "$ref": "#/definitions/SystemData", + "readOnly": true, + "description": "Metadata pertaining to creation and last modification of the resource" } }, "allOf": [ @@ -537,6 +542,7 @@ ], "properties": { "agentPublicKeyCertificate": { + "readOnly": true, "type": "string", "description": "Base64 encoded public certificate used by the agent to do the initial handshake to the backend services in Azure." }, @@ -603,6 +609,11 @@ "name": "ConnectivityStatus", "modelAsString": true } + }, + "systemData": { + "$ref": "#/definitions/SystemData", + "readOnly": "true", + "description": "Metadata pertaining to creation and last modification of the resource." } }, "description": "Properties of the connected cluster." @@ -707,6 +718,59 @@ "readOnly": true } } + }, + "SystemData": { + "description": "Metadata pertaining to creation and last modification of the resource.", + "type": "object", + "properties": { + "createdBy": { + "description": "The identity that created the resource.", + "type": "string" + }, + "createdByType": { + "description": "The type of identity that created the resource.", + "enum": [ + "User", + "Application", + "ManagedIdentity", + "Key" + ], + "type": "string", + "x-ms-enum": { + "name": "createdByType", + "modelAsString": true + } + }, + "createdAt": { + "format": "date-time", + "description": "The timestamp of resource creation (UTC).", + "type": "string" + }, + "lastModifiedBy": { + "description": "The identity that last modified the resource.", + "type": "string" + }, + "lastModifiedByType": { + "description": "The type of identity that last modified the resource.", + "enum": [ + "User", + "Application", + "ManagedIdentity", + "Key" + ], + "type": "string", + "x-ms-enum": { + "name": "lastModifiedByType", + "modelAsString": true + } + }, + "lastModifiedAt": { + "format": "date-time", + "description": "The timestamp of resource modification (UTC).", + "type": "string" + } + }, + "readOnly": true } }, "parameters": { diff --git a/specification/hybridkubernetes/resource-manager/readme.md b/specification/hybridkubernetes/resource-manager/readme.md index 1bda335b8ca8..25a62f85e3cf 100644 --- a/specification/hybridkubernetes/resource-manager/readme.md +++ b/specification/hybridkubernetes/resource-manager/readme.md @@ -53,7 +53,7 @@ These settings apply only when `--tag=package-2021-03-01` is specified on the co ```yaml $(tag) == 'package-2021-03-01' input-file: -- Microsoft.Kubernetes/GA/2021-03-01/connectedClusters.json +- Microsoft.Kubernetes/2021-03-01/connectedClusters.json ``` --- From 5fe6e6df4fc928691efeab5be1941569781aa9aa Mon Sep 17 00:00:00 2001 From: sikasire Date: Wed, 20 Jan 2021 13:02:23 +0530 Subject: [PATCH 11/31] workaround for c# sdk bug --- .../hybridkubernetes/resource-manager/readme.csharp.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/specification/hybridkubernetes/resource-manager/readme.csharp.md b/specification/hybridkubernetes/resource-manager/readme.csharp.md index e09e4c73fa28..168034d3cd94 100644 --- a/specification/hybridkubernetes/resource-manager/readme.csharp.md +++ b/specification/hybridkubernetes/resource-manager/readme.csharp.md @@ -13,4 +13,13 @@ csharp: client-side-validation: false namespace: Microsoft.Kubernetes output-folder: $(csharp-sdks-folder)/Kubernetes/Management.Kubernetes/Generated + +directive: + - reason: Altering the incorrect null check for required fields in an optional body in listClusterUserCredentials + where: $ + transform: > + if( /AuthenticationDetails clientAuthenticationDetails/g.exec( $ ) ) { + $ = $.replace( /(if \(value == null\)[\s]+{[\s]+throw new ValidationException\(ValidationRules.CannotBeNull, "value"\);[\s]+}[\s]+)AuthenticationDetails/g, "AuthenticationDetails" ); + } + ``` From b5768aa31e581ab29f49ee6a6b0d77e925ee3fbe Mon Sep 17 00:00:00 2001 From: sikasire Date: Wed, 20 Jan 2021 13:02:23 +0530 Subject: [PATCH 12/31] workaround for c# sdk bug --- .../2021-03-01/connectedClusters.json | 54 +++++++++---------- .../resource-manager/readme.csharp.md | 9 ++++ 2 files changed, 36 insertions(+), 27 deletions(-) diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/connectedClusters.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/connectedClusters.json index 2edccf42404e..8e69a1d0c598 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/connectedClusters.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/connectedClusters.json @@ -46,13 +46,13 @@ }, "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/ClusterNamePathParam" @@ -83,7 +83,7 @@ "default": { "description": "Resource Provider error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -109,13 +109,13 @@ }, "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/ClusterNamePathParam" @@ -140,7 +140,7 @@ "default": { "description": "Resource Provider error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } } @@ -159,13 +159,13 @@ }, "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/ClusterNamePathParam" @@ -181,7 +181,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } } @@ -200,13 +200,13 @@ }, "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/ClusterNamePathParam" @@ -225,7 +225,7 @@ "default": { "description": "Resource Provider error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -250,13 +250,13 @@ }, "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" } ], "responses": { @@ -269,7 +269,7 @@ "default": { "description": "Resource Provider error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -293,10 +293,10 @@ }, "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" } ], "responses": { @@ -309,7 +309,7 @@ "default": { "description": "Resource Provider error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -327,7 +327,7 @@ ], "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" } ], "responses": { @@ -340,7 +340,7 @@ "default": { "description": "Resource Provider error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -447,7 +447,7 @@ }, "allOf": [ { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/TrackedResource" + "$ref": "../../../../common-types/resource-management/v2/types.json#/definitions/TrackedResource" } ], "description": "Represents a connected cluster." @@ -559,7 +559,7 @@ }, "systemData": { "$ref": "#/definitions/SystemData", - "readOnly": "true", + "readOnly": true, "description": "Metadata pertaining to creation and last modification of the resource." } }, diff --git a/specification/hybridkubernetes/resource-manager/readme.csharp.md b/specification/hybridkubernetes/resource-manager/readme.csharp.md index e09e4c73fa28..168034d3cd94 100644 --- a/specification/hybridkubernetes/resource-manager/readme.csharp.md +++ b/specification/hybridkubernetes/resource-manager/readme.csharp.md @@ -13,4 +13,13 @@ csharp: client-side-validation: false namespace: Microsoft.Kubernetes output-folder: $(csharp-sdks-folder)/Kubernetes/Management.Kubernetes/Generated + +directive: + - reason: Altering the incorrect null check for required fields in an optional body in listClusterUserCredentials + where: $ + transform: > + if( /AuthenticationDetails clientAuthenticationDetails/g.exec( $ ) ) { + $ = $.replace( /(if \(value == null\)[\s]+{[\s]+throw new ValidationException\(ValidationRules.CannotBeNull, "value"\);[\s]+}[\s]+)AuthenticationDetails/g, "AuthenticationDetails" ); + } + ``` From b6ae3e0d9a03038d2808d0bd7330588c1d0729c0 Mon Sep 17 00:00:00 2001 From: sikasire Date: Wed, 20 Jan 2021 15:15:25 +0530 Subject: [PATCH 13/31] Resolving PR comments --- .../2021-03-01/connectedClusters.json | 27 +------------------ .../examples/CreateClusterExample.json | 23 +++++++++++++--- .../examples/GetClusterExample.json | 13 +++++++-- .../GetClustersByResourceGroupExample.json | 26 +++++++++++++++--- .../GetClustersBySubscriptionExample.json | 26 +++++++++++++++--- .../examples/UpdateClusterExample.json | 13 +++++++-- .../examples/CreateClusterExample.json | 7 ++--- .../examples/GetClusterExample.json | 5 ++-- .../GetClustersByResourceGroupExample.json | 10 ++++--- .../GetClustersBySubscriptionExample.json | 10 ++++--- .../examples/UpdateClusterExample.json | 5 ++-- .../2021-03-01-preview/connectedClusters.json | 1 + .../examples/CreateClusterExample.json | 23 +++++++++++++--- .../examples/GetClusterExample.json | 13 +++++++-- .../GetClustersByResourceGroupExample.json | 26 +++++++++++++++--- .../GetClustersBySubscriptionExample.json | 26 +++++++++++++++--- .../examples/UpdateClusterExample.json | 13 +++++++-- 17 files changed, 196 insertions(+), 71 deletions(-) diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/connectedClusters.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/connectedClusters.json index 8e69a1d0c598..0702e0b75095 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/connectedClusters.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/connectedClusters.json @@ -545,6 +545,7 @@ }, "connectivityStatus": { "type": "string", + "readOnly": true, "description": "Represents the connectivity status of the connected cluster.", "enum": [ "Connecting", @@ -605,32 +606,6 @@ "properties": {}, "description": "Properties which can be patched on the connected cluster resource." }, - "HybridConnectionConfig": { - "description": "Contains the REP (rendezvous endpoint) and “Sender” access token.", - "properties": { - "expirationTime": { - "description": "Timestamp when this token will be expired.", - "type": "integer", - "readOnly": true, - "format": "int64" - }, - "hybridConnectionName": { - "description": "Name of the connection", - "type": "string", - "readOnly": true - }, - "relay": { - "description": "Name of the relay.", - "type": "string", - "readOnly": true - }, - "token": { - "description": "Sender access token", - "type": "string", - "readOnly": true - } - } - }, "SystemData": { "description": "Metadata pertaining to creation and last modification of the resource.", "type": "object", diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/CreateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/CreateClusterExample.json index f610a13a6c22..98375b4732f9 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/CreateClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/CreateClusterExample.json @@ -18,11 +18,19 @@ "responses": { "200": { "body": { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster1", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", "tags": {}, + "systemData": { + "createdBy": "sikasire@microsoft.com", + "createdByType": "User", + "createdAt": "2020-12-17T07:06:33.9173186Z", + "lastModifiedBy": "sikasire@microsoft.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-12-17T07:06:33.9173186Z" + }, "identity": { "type": "SystemAssigned" }, @@ -30,17 +38,26 @@ "agentPublicKeyCertificate": "MIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", "kubernetesVersion": "1.17.0", "totalNodeCount": 2, - "agentVersion": "0.1.0" + "agentVersion": "0.1.0", + "provisioningState": "Succeeded" } } }, "201": { "body": { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster1", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", "tags": {}, + "systemData": { + "createdBy": "sikasire@microsoft.com", + "createdByType": "User", + "createdAt": "2020-12-17T07:06:33.9173186Z", + "lastModifiedBy": "sikasire@microsoft.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-12-17T07:06:33.9173186Z" + }, "identity": { "type": "SystemAssigned" }, diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClusterExample.json index 70056cba82c5..fb6fda91a8ab 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClusterExample.json @@ -8,11 +8,19 @@ "responses": { "200": { "body": { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster1", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", "tags": {}, + "systemData": { + "createdBy": "sikasire@microsoft.com", + "createdByType": "User", + "createdAt": "2020-12-17T07:06:33.9173186Z", + "lastModifiedBy": "2d2a754c-cade-4935-83d4-ce413c5a3910", + "lastModifiedByType": "Application", + "lastModifiedAt": "2020-12-17T07:14:58.865041Z" + }, "identity": { "principalId": "d8cd1fd9-154f-4da7-b348-595f283c13a3", "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", @@ -22,7 +30,8 @@ "agentPublicKeyCertificate": "MIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", "kubernetesVersion": "1.17.0", "totalNodeCount": 2, - "agentVersion": "0.1.0" + "agentVersion": "0.1.0", + "provisioningState": "Succeeded" } } } diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClustersByResourceGroupExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClustersByResourceGroupExample.json index ed09d63c03ed..575cf80f361c 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClustersByResourceGroupExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClustersByResourceGroupExample.json @@ -9,11 +9,19 @@ "body": { "value": [ { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db48", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster1", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", "tags": {}, + "systemData": { + "createdBy": "sikasire@microsoft.com", + "createdByType": "User", + "createdAt": "2020-12-17T07:06:33.9173186Z", + "lastModifiedBy": "sikasire@microsoft.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-12-17T07:06:33.9173186Z" + }, "identity": { "principalId": "d8cd1fd9-154f-4da7-b348-595f283c13a3", "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", @@ -23,15 +31,24 @@ "agentPublicKeyCertificate": "MIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", "kubernetesVersion": "1.17.0", "totalNodeCount": 2, - "agentVersion": "0.1.0" + "agentVersion": "0.1.0", + "provisioningState": "Succeeded" } }, { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster1", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", "tags": {}, + "systemData": { + "createdBy": "sikasire@microsoft.com", + "createdByType": "User", + "createdAt": "2020-12-17T07:06:33.9173186Z", + "lastModifiedBy": "sikasire@microsoft.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-12-17T07:06:33.9173186Z" + }, "identity": { "principalId": "d8cd1fd9-154f-4da7-b348-595f283c13a3", "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", @@ -41,7 +58,8 @@ "agentPublicKeyCertificate": "XIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", "kubernetesVersion": "1.1", "totalNodeCount": 2, - "agentVersion": "0.1.0" + "agentVersion": "0.1.0", + "provisioningState": "Succeeded" } } ], diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClustersBySubscriptionExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClustersBySubscriptionExample.json index 78e2cec96ec9..bd3ea7caa9a2 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClustersBySubscriptionExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClustersBySubscriptionExample.json @@ -8,11 +8,19 @@ "body": { "value": [ { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster1", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", "tags": {}, + "systemData": { + "createdBy": "sikasire@microsoft.com", + "createdByType": "User", + "createdAt": "2020-12-17T07:06:33.9173186Z", + "lastModifiedBy": "sikasire@microsoft.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-12-17T07:06:33.9173186Z" + }, "identity": { "principalId": "d8cd1fd9-154f-4da7-b348-595f283c13a3", "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", @@ -22,15 +30,24 @@ "agentPublicKeyCertificate": "MIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", "kubernetesVersion": "1.17.0", "totalNodeCount": 2, - "agentVersion": "0.1.0" + "agentVersion": "0.1.0", + "provisioningState": "Succeeded" } }, { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster2", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", "tags": {}, + "systemData": { + "createdBy": "sikasire@microsoft.com", + "createdByType": "User", + "createdAt": "2020-12-17T07:06:33.9173186Z", + "lastModifiedBy": "sikasire@microsoft.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-12-17T07:06:33.9173186Z" + }, "identity": { "principalId": "d8cd1fd9-154f-4da7-b348-595f283c13a3", "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", @@ -40,7 +57,8 @@ "agentPublicKeyCertificate": "XIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", "kubernetesVersion": "1.16.3", "totalNodeCount": 4, - "agentVersion": "0.1.0" + "agentVersion": "0.1.0", + "provisioningState": "Succeeded" } } ], diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/UpdateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/UpdateClusterExample.json index 61a25d7a2ac2..2b4e8fd27065 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/UpdateClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/UpdateClusterExample.json @@ -17,11 +17,19 @@ "responses": { "200": { "body": { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster1", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", "tags": {}, + "systemData": { + "createdBy": "sikasire@microsoft.com", + "createdByType": "User", + "createdAt": "2020-12-17T07:06:33.9173186Z", + "lastModifiedBy": "2d2a754c-cade-4935-83d4-ce413c5a3910", + "lastModifiedByType": "Application", + "lastModifiedAt": "2020-12-17T07:14:58.865041Z" + }, "identity": { "type": "SystemAssigned" }, @@ -29,7 +37,8 @@ "agentPublicKeyCertificate": "MIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", "kubernetesVersion": "1.17.0", "totalNodeCount": 2, - "agentVersion": "0.1.0" + "agentVersion": "0.1.0", + "provisioningState": "Succeeded" } } } diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2020-01-01-preview/examples/CreateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2020-01-01-preview/examples/CreateClusterExample.json index 033ddcd945d1..6fe3a9418d8e 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2020-01-01-preview/examples/CreateClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2020-01-01-preview/examples/CreateClusterExample.json @@ -23,7 +23,7 @@ "responses": { "200": { "body": { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster1", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", @@ -40,13 +40,14 @@ }, "kubernetesVersion": "1.17.0", "totalNodeCount": 2, - "agentVersion": "0.1.0" + "agentVersion": "0.1.0", + "provisioningState": "Succeeded" } } }, "201": { "body": { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster1", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2020-01-01-preview/examples/GetClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2020-01-01-preview/examples/GetClusterExample.json index cde2327f4aee..462244567c57 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2020-01-01-preview/examples/GetClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2020-01-01-preview/examples/GetClusterExample.json @@ -8,7 +8,7 @@ "responses": { "200": { "body": { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster1", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", @@ -27,7 +27,8 @@ }, "kubernetesVersion": "1.17.0", "totalNodeCount": 2, - "agentVersion": "0.1.0" + "agentVersion": "0.1.0", + "provisioningState": "Succeeded" } } } diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2020-01-01-preview/examples/GetClustersByResourceGroupExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2020-01-01-preview/examples/GetClustersByResourceGroupExample.json index 4bfe14f142fa..caa5e501550d 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2020-01-01-preview/examples/GetClustersByResourceGroupExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2020-01-01-preview/examples/GetClustersByResourceGroupExample.json @@ -9,7 +9,7 @@ "body": { "value": [ { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db48", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster1", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", @@ -28,11 +28,12 @@ }, "kubernetesVersion": "1.17.0", "totalNodeCount": 2, - "agentVersion": "0.1.0" + "agentVersion": "0.1.0", + "provisioningState": "Succeeded" } }, { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster1", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", @@ -51,7 +52,8 @@ }, "kubernetesVersion": "1.1", "totalNodeCount": 2, - "agentVersion": "0.1.0" + "agentVersion": "0.1.0", + "provisioningState": "Succeeded" } } ], diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2020-01-01-preview/examples/GetClustersBySubscriptionExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2020-01-01-preview/examples/GetClustersBySubscriptionExample.json index a0128f14cc55..e2cdd2d7a3a1 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2020-01-01-preview/examples/GetClustersBySubscriptionExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2020-01-01-preview/examples/GetClustersBySubscriptionExample.json @@ -8,7 +8,7 @@ "body": { "value": [ { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster1", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", @@ -27,11 +27,12 @@ }, "kubernetesVersion": "1.17.0", "totalNodeCount": 2, - "agentVersion": "0.1.0" + "agentVersion": "0.1.0", + "provisioningState": "Succeeded" } }, { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster2", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", @@ -50,7 +51,8 @@ }, "kubernetesVersion": "1.16.3", "totalNodeCount": 4, - "agentVersion": "0.1.0" + "agentVersion": "0.1.0", + "provisioningState": "Succeeded" } } ], diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2020-01-01-preview/examples/UpdateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2020-01-01-preview/examples/UpdateClusterExample.json index 0dc7871fdba6..907e43e35c35 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2020-01-01-preview/examples/UpdateClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2020-01-01-preview/examples/UpdateClusterExample.json @@ -17,7 +17,7 @@ "responses": { "200": { "body": { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster1", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", @@ -34,7 +34,8 @@ }, "kubernetesVersion": "1.17.0", "totalNodeCount": 2, - "agentVersion": "0.1.0" + "agentVersion": "0.1.0", + "provisioningState": "Succeeded" } } } diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/connectedClusters.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/connectedClusters.json index 265293697319..32751bc2e9a7 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/connectedClusters.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/connectedClusters.json @@ -597,6 +597,7 @@ }, "connectivityStatus": { "type": "string", + "readOnly": true, "description": "Represents the connectivity status of the connected cluster.", "enum": [ "Connecting", diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/CreateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/CreateClusterExample.json index ccb3ecd27624..b6fcdf8c244a 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/CreateClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/CreateClusterExample.json @@ -18,11 +18,19 @@ "responses": { "200": { "body": { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster1", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", "tags": {}, + "systemData": { + "createdBy": "sikasire@microsoft.com", + "createdByType": "User", + "createdAt": "2020-12-17T07:06:33.9173186Z", + "lastModifiedBy": "sikasire@microsoft.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-12-17T07:06:33.9173186Z" + }, "identity": { "type": "SystemAssigned" }, @@ -30,17 +38,26 @@ "agentPublicKeyCertificate": "MIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", "kubernetesVersion": "1.17.0", "totalNodeCount": 2, - "agentVersion": "0.1.0" + "agentVersion": "0.1.0", + "provisioningState": "Succeeded" } } }, "201": { "body": { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster1", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", "tags": {}, + "systemData": { + "createdBy": "sikasire@microsoft.com", + "createdByType": "User", + "createdAt": "2020-12-17T07:06:33.9173186Z", + "lastModifiedBy": "sikasire@microsoft.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-12-17T07:06:33.9173186Z" + }, "identity": { "type": "SystemAssigned" }, diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClusterExample.json index adf84ad22ec2..3ab7b2e9d26b 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClusterExample.json @@ -8,11 +8,19 @@ "responses": { "200": { "body": { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster1", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", "tags": {}, + "systemData": { + "createdBy": "sikasire@microsoft.com", + "createdByType": "User", + "createdAt": "2020-12-17T07:06:33.9173186Z", + "lastModifiedBy": "2d2a754c-cade-4935-83d4-ce413c5a3910", + "lastModifiedByType": "Application", + "lastModifiedAt": "2020-12-17T07:14:58.865041Z" + }, "identity": { "principalId": "d8cd1fd9-154f-4da7-b348-595f283c13a3", "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", @@ -22,7 +30,8 @@ "agentPublicKeyCertificate": "MIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", "kubernetesVersion": "1.17.0", "totalNodeCount": 2, - "agentVersion": "0.1.0" + "agentVersion": "0.1.0", + "provisioningState": "Succeeded" } } } diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClustersByResourceGroupExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClustersByResourceGroupExample.json index 15f04639bda0..6fc7b73cc871 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClustersByResourceGroupExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClustersByResourceGroupExample.json @@ -9,11 +9,19 @@ "body": { "value": [ { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db48", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster1", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", "tags": {}, + "systemData": { + "createdBy": "sikasire@microsoft.com", + "createdByType": "User", + "createdAt": "2020-12-17T07:06:33.9173186Z", + "lastModifiedBy": "sikasire@microsoft.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-12-17T07:06:33.9173186Z" + }, "identity": { "principalId": "d8cd1fd9-154f-4da7-b348-595f283c13a3", "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", @@ -23,15 +31,24 @@ "agentPublicKeyCertificate": "MIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", "kubernetesVersion": "1.17.0", "totalNodeCount": 2, - "agentVersion": "0.1.0" + "agentVersion": "0.1.0", + "provisioningState": "Succeeded" } }, { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster1", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", "tags": {}, + "systemData": { + "createdBy": "sikasire@microsoft.com", + "createdByType": "User", + "createdAt": "2020-12-17T07:06:33.9173186Z", + "lastModifiedBy": "sikasire@microsoft.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-12-17T07:06:33.9173186Z" + }, "identity": { "principalId": "d8cd1fd9-154f-4da7-b348-595f283c13a3", "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", @@ -41,7 +58,8 @@ "agentPublicKeyCertificate": "XIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", "kubernetesVersion": "1.1", "totalNodeCount": 2, - "agentVersion": "0.1.0" + "agentVersion": "0.1.0", + "provisioningState": "Succeeded" } } ], diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClustersBySubscriptionExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClustersBySubscriptionExample.json index b813c89fb964..e58d91f89af8 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClustersBySubscriptionExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClustersBySubscriptionExample.json @@ -8,11 +8,19 @@ "body": { "value": [ { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster1", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", "tags": {}, + "systemData": { + "createdBy": "sikasire@microsoft.com", + "createdByType": "User", + "createdAt": "2020-12-17T07:06:33.9173186Z", + "lastModifiedBy": "sikasire@microsoft.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-12-17T07:06:33.9173186Z" + }, "identity": { "principalId": "d8cd1fd9-154f-4da7-b348-595f283c13a3", "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", @@ -22,15 +30,24 @@ "agentPublicKeyCertificate": "MIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", "kubernetesVersion": "1.17.0", "totalNodeCount": 2, - "agentVersion": "0.1.0" + "agentVersion": "0.1.0", + "provisioningState": "Succeeded" } }, { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster2", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", "tags": {}, + "systemData": { + "createdBy": "sikasire@microsoft.com", + "createdByType": "User", + "createdAt": "2020-12-17T07:06:33.9173186Z", + "lastModifiedBy": "sikasire@microsoft.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-12-17T07:06:33.9173186Z" + }, "identity": { "principalId": "d8cd1fd9-154f-4da7-b348-595f283c13a3", "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", @@ -40,7 +57,8 @@ "agentPublicKeyCertificate": "XIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", "kubernetesVersion": "1.16.3", "totalNodeCount": 4, - "agentVersion": "0.1.0" + "agentVersion": "0.1.0", + "provisioningState": "Succeeded" } } ], diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/UpdateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/UpdateClusterExample.json index e5dd4166ef42..8ccfa3bf35be 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/UpdateClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/UpdateClusterExample.json @@ -17,11 +17,19 @@ "responses": { "200": { "body": { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster1", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", "tags": {}, + "systemData": { + "createdBy": "sikasire@microsoft.com", + "createdByType": "User", + "createdAt": "2020-12-17T07:06:33.9173186Z", + "lastModifiedBy": "2d2a754c-cade-4935-83d4-ce413c5a3910", + "lastModifiedByType": "Application", + "lastModifiedAt": "2020-12-17T07:14:58.865041Z" + }, "identity": { "type": "SystemAssigned" }, @@ -29,7 +37,8 @@ "agentPublicKeyCertificate": "MIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", "kubernetesVersion": "1.17.0", "totalNodeCount": 2, - "agentVersion": "0.1.0" + "agentVersion": "0.1.0", + "provisioningState": "Succeeded" } } } From 630cb2a78c04ace53cc17a9fd6d3d4f50508856a Mon Sep 17 00:00:00 2001 From: sikasire Date: Wed, 20 Jan 2021 15:15:25 +0530 Subject: [PATCH 14/31] Resolving PR comments --- .../2021-03-01/connectedClusters.json | 27 +------------------ .../examples/CreateClusterExample.json | 23 +++++++++++++--- .../examples/GetClusterExample.json | 13 +++++++-- .../GetClustersByResourceGroupExample.json | 26 +++++++++++++++--- .../GetClustersBySubscriptionExample.json | 26 +++++++++++++++--- .../examples/UpdateClusterExample.json | 13 +++++++-- .../examples/CreateClusterExample.json | 7 ++--- .../examples/GetClusterExample.json | 5 ++-- .../GetClustersByResourceGroupExample.json | 10 ++++--- .../GetClustersBySubscriptionExample.json | 10 ++++--- .../examples/UpdateClusterExample.json | 5 ++-- .../2021-03-01-preview/connectedClusters.json | 1 + .../examples/CreateClusterExample.json | 23 +++++++++++++--- .../examples/GetClusterExample.json | 13 +++++++-- .../GetClustersByResourceGroupExample.json | 26 +++++++++++++++--- .../GetClustersBySubscriptionExample.json | 26 +++++++++++++++--- .../examples/UpdateClusterExample.json | 13 +++++++-- .../resource-manager/readme.md | 4 +-- 18 files changed, 198 insertions(+), 73 deletions(-) diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/connectedClusters.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/connectedClusters.json index 8e69a1d0c598..0702e0b75095 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/connectedClusters.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/connectedClusters.json @@ -545,6 +545,7 @@ }, "connectivityStatus": { "type": "string", + "readOnly": true, "description": "Represents the connectivity status of the connected cluster.", "enum": [ "Connecting", @@ -605,32 +606,6 @@ "properties": {}, "description": "Properties which can be patched on the connected cluster resource." }, - "HybridConnectionConfig": { - "description": "Contains the REP (rendezvous endpoint) and “Sender” access token.", - "properties": { - "expirationTime": { - "description": "Timestamp when this token will be expired.", - "type": "integer", - "readOnly": true, - "format": "int64" - }, - "hybridConnectionName": { - "description": "Name of the connection", - "type": "string", - "readOnly": true - }, - "relay": { - "description": "Name of the relay.", - "type": "string", - "readOnly": true - }, - "token": { - "description": "Sender access token", - "type": "string", - "readOnly": true - } - } - }, "SystemData": { "description": "Metadata pertaining to creation and last modification of the resource.", "type": "object", diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/CreateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/CreateClusterExample.json index f610a13a6c22..98375b4732f9 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/CreateClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/CreateClusterExample.json @@ -18,11 +18,19 @@ "responses": { "200": { "body": { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster1", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", "tags": {}, + "systemData": { + "createdBy": "sikasire@microsoft.com", + "createdByType": "User", + "createdAt": "2020-12-17T07:06:33.9173186Z", + "lastModifiedBy": "sikasire@microsoft.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-12-17T07:06:33.9173186Z" + }, "identity": { "type": "SystemAssigned" }, @@ -30,17 +38,26 @@ "agentPublicKeyCertificate": "MIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", "kubernetesVersion": "1.17.0", "totalNodeCount": 2, - "agentVersion": "0.1.0" + "agentVersion": "0.1.0", + "provisioningState": "Succeeded" } } }, "201": { "body": { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster1", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", "tags": {}, + "systemData": { + "createdBy": "sikasire@microsoft.com", + "createdByType": "User", + "createdAt": "2020-12-17T07:06:33.9173186Z", + "lastModifiedBy": "sikasire@microsoft.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-12-17T07:06:33.9173186Z" + }, "identity": { "type": "SystemAssigned" }, diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClusterExample.json index 70056cba82c5..fb6fda91a8ab 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClusterExample.json @@ -8,11 +8,19 @@ "responses": { "200": { "body": { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster1", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", "tags": {}, + "systemData": { + "createdBy": "sikasire@microsoft.com", + "createdByType": "User", + "createdAt": "2020-12-17T07:06:33.9173186Z", + "lastModifiedBy": "2d2a754c-cade-4935-83d4-ce413c5a3910", + "lastModifiedByType": "Application", + "lastModifiedAt": "2020-12-17T07:14:58.865041Z" + }, "identity": { "principalId": "d8cd1fd9-154f-4da7-b348-595f283c13a3", "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", @@ -22,7 +30,8 @@ "agentPublicKeyCertificate": "MIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", "kubernetesVersion": "1.17.0", "totalNodeCount": 2, - "agentVersion": "0.1.0" + "agentVersion": "0.1.0", + "provisioningState": "Succeeded" } } } diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClustersByResourceGroupExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClustersByResourceGroupExample.json index ed09d63c03ed..575cf80f361c 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClustersByResourceGroupExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClustersByResourceGroupExample.json @@ -9,11 +9,19 @@ "body": { "value": [ { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db48", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster1", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", "tags": {}, + "systemData": { + "createdBy": "sikasire@microsoft.com", + "createdByType": "User", + "createdAt": "2020-12-17T07:06:33.9173186Z", + "lastModifiedBy": "sikasire@microsoft.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-12-17T07:06:33.9173186Z" + }, "identity": { "principalId": "d8cd1fd9-154f-4da7-b348-595f283c13a3", "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", @@ -23,15 +31,24 @@ "agentPublicKeyCertificate": "MIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", "kubernetesVersion": "1.17.0", "totalNodeCount": 2, - "agentVersion": "0.1.0" + "agentVersion": "0.1.0", + "provisioningState": "Succeeded" } }, { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster1", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", "tags": {}, + "systemData": { + "createdBy": "sikasire@microsoft.com", + "createdByType": "User", + "createdAt": "2020-12-17T07:06:33.9173186Z", + "lastModifiedBy": "sikasire@microsoft.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-12-17T07:06:33.9173186Z" + }, "identity": { "principalId": "d8cd1fd9-154f-4da7-b348-595f283c13a3", "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", @@ -41,7 +58,8 @@ "agentPublicKeyCertificate": "XIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", "kubernetesVersion": "1.1", "totalNodeCount": 2, - "agentVersion": "0.1.0" + "agentVersion": "0.1.0", + "provisioningState": "Succeeded" } } ], diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClustersBySubscriptionExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClustersBySubscriptionExample.json index 78e2cec96ec9..bd3ea7caa9a2 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClustersBySubscriptionExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClustersBySubscriptionExample.json @@ -8,11 +8,19 @@ "body": { "value": [ { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster1", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", "tags": {}, + "systemData": { + "createdBy": "sikasire@microsoft.com", + "createdByType": "User", + "createdAt": "2020-12-17T07:06:33.9173186Z", + "lastModifiedBy": "sikasire@microsoft.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-12-17T07:06:33.9173186Z" + }, "identity": { "principalId": "d8cd1fd9-154f-4da7-b348-595f283c13a3", "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", @@ -22,15 +30,24 @@ "agentPublicKeyCertificate": "MIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", "kubernetesVersion": "1.17.0", "totalNodeCount": 2, - "agentVersion": "0.1.0" + "agentVersion": "0.1.0", + "provisioningState": "Succeeded" } }, { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster2", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", "tags": {}, + "systemData": { + "createdBy": "sikasire@microsoft.com", + "createdByType": "User", + "createdAt": "2020-12-17T07:06:33.9173186Z", + "lastModifiedBy": "sikasire@microsoft.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-12-17T07:06:33.9173186Z" + }, "identity": { "principalId": "d8cd1fd9-154f-4da7-b348-595f283c13a3", "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", @@ -40,7 +57,8 @@ "agentPublicKeyCertificate": "XIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", "kubernetesVersion": "1.16.3", "totalNodeCount": 4, - "agentVersion": "0.1.0" + "agentVersion": "0.1.0", + "provisioningState": "Succeeded" } } ], diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/UpdateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/UpdateClusterExample.json index 61a25d7a2ac2..2b4e8fd27065 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/UpdateClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/UpdateClusterExample.json @@ -17,11 +17,19 @@ "responses": { "200": { "body": { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster1", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", "tags": {}, + "systemData": { + "createdBy": "sikasire@microsoft.com", + "createdByType": "User", + "createdAt": "2020-12-17T07:06:33.9173186Z", + "lastModifiedBy": "2d2a754c-cade-4935-83d4-ce413c5a3910", + "lastModifiedByType": "Application", + "lastModifiedAt": "2020-12-17T07:14:58.865041Z" + }, "identity": { "type": "SystemAssigned" }, @@ -29,7 +37,8 @@ "agentPublicKeyCertificate": "MIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", "kubernetesVersion": "1.17.0", "totalNodeCount": 2, - "agentVersion": "0.1.0" + "agentVersion": "0.1.0", + "provisioningState": "Succeeded" } } } diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2020-01-01-preview/examples/CreateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2020-01-01-preview/examples/CreateClusterExample.json index 033ddcd945d1..6fe3a9418d8e 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2020-01-01-preview/examples/CreateClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2020-01-01-preview/examples/CreateClusterExample.json @@ -23,7 +23,7 @@ "responses": { "200": { "body": { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster1", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", @@ -40,13 +40,14 @@ }, "kubernetesVersion": "1.17.0", "totalNodeCount": 2, - "agentVersion": "0.1.0" + "agentVersion": "0.1.0", + "provisioningState": "Succeeded" } } }, "201": { "body": { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster1", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2020-01-01-preview/examples/GetClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2020-01-01-preview/examples/GetClusterExample.json index cde2327f4aee..462244567c57 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2020-01-01-preview/examples/GetClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2020-01-01-preview/examples/GetClusterExample.json @@ -8,7 +8,7 @@ "responses": { "200": { "body": { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster1", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", @@ -27,7 +27,8 @@ }, "kubernetesVersion": "1.17.0", "totalNodeCount": 2, - "agentVersion": "0.1.0" + "agentVersion": "0.1.0", + "provisioningState": "Succeeded" } } } diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2020-01-01-preview/examples/GetClustersByResourceGroupExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2020-01-01-preview/examples/GetClustersByResourceGroupExample.json index 4bfe14f142fa..caa5e501550d 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2020-01-01-preview/examples/GetClustersByResourceGroupExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2020-01-01-preview/examples/GetClustersByResourceGroupExample.json @@ -9,7 +9,7 @@ "body": { "value": [ { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db48", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster1", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", @@ -28,11 +28,12 @@ }, "kubernetesVersion": "1.17.0", "totalNodeCount": 2, - "agentVersion": "0.1.0" + "agentVersion": "0.1.0", + "provisioningState": "Succeeded" } }, { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster1", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", @@ -51,7 +52,8 @@ }, "kubernetesVersion": "1.1", "totalNodeCount": 2, - "agentVersion": "0.1.0" + "agentVersion": "0.1.0", + "provisioningState": "Succeeded" } } ], diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2020-01-01-preview/examples/GetClustersBySubscriptionExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2020-01-01-preview/examples/GetClustersBySubscriptionExample.json index a0128f14cc55..e2cdd2d7a3a1 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2020-01-01-preview/examples/GetClustersBySubscriptionExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2020-01-01-preview/examples/GetClustersBySubscriptionExample.json @@ -8,7 +8,7 @@ "body": { "value": [ { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster1", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", @@ -27,11 +27,12 @@ }, "kubernetesVersion": "1.17.0", "totalNodeCount": 2, - "agentVersion": "0.1.0" + "agentVersion": "0.1.0", + "provisioningState": "Succeeded" } }, { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster2", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", @@ -50,7 +51,8 @@ }, "kubernetesVersion": "1.16.3", "totalNodeCount": 4, - "agentVersion": "0.1.0" + "agentVersion": "0.1.0", + "provisioningState": "Succeeded" } } ], diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2020-01-01-preview/examples/UpdateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2020-01-01-preview/examples/UpdateClusterExample.json index 0dc7871fdba6..907e43e35c35 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2020-01-01-preview/examples/UpdateClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2020-01-01-preview/examples/UpdateClusterExample.json @@ -17,7 +17,7 @@ "responses": { "200": { "body": { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster1", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", @@ -34,7 +34,8 @@ }, "kubernetesVersion": "1.17.0", "totalNodeCount": 2, - "agentVersion": "0.1.0" + "agentVersion": "0.1.0", + "provisioningState": "Succeeded" } } } diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/connectedClusters.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/connectedClusters.json index 265293697319..32751bc2e9a7 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/connectedClusters.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/connectedClusters.json @@ -597,6 +597,7 @@ }, "connectivityStatus": { "type": "string", + "readOnly": true, "description": "Represents the connectivity status of the connected cluster.", "enum": [ "Connecting", diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/CreateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/CreateClusterExample.json index ccb3ecd27624..b6fcdf8c244a 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/CreateClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/CreateClusterExample.json @@ -18,11 +18,19 @@ "responses": { "200": { "body": { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster1", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", "tags": {}, + "systemData": { + "createdBy": "sikasire@microsoft.com", + "createdByType": "User", + "createdAt": "2020-12-17T07:06:33.9173186Z", + "lastModifiedBy": "sikasire@microsoft.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-12-17T07:06:33.9173186Z" + }, "identity": { "type": "SystemAssigned" }, @@ -30,17 +38,26 @@ "agentPublicKeyCertificate": "MIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", "kubernetesVersion": "1.17.0", "totalNodeCount": 2, - "agentVersion": "0.1.0" + "agentVersion": "0.1.0", + "provisioningState": "Succeeded" } } }, "201": { "body": { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster1", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", "tags": {}, + "systemData": { + "createdBy": "sikasire@microsoft.com", + "createdByType": "User", + "createdAt": "2020-12-17T07:06:33.9173186Z", + "lastModifiedBy": "sikasire@microsoft.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-12-17T07:06:33.9173186Z" + }, "identity": { "type": "SystemAssigned" }, diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClusterExample.json index adf84ad22ec2..3ab7b2e9d26b 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClusterExample.json @@ -8,11 +8,19 @@ "responses": { "200": { "body": { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster1", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", "tags": {}, + "systemData": { + "createdBy": "sikasire@microsoft.com", + "createdByType": "User", + "createdAt": "2020-12-17T07:06:33.9173186Z", + "lastModifiedBy": "2d2a754c-cade-4935-83d4-ce413c5a3910", + "lastModifiedByType": "Application", + "lastModifiedAt": "2020-12-17T07:14:58.865041Z" + }, "identity": { "principalId": "d8cd1fd9-154f-4da7-b348-595f283c13a3", "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", @@ -22,7 +30,8 @@ "agentPublicKeyCertificate": "MIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", "kubernetesVersion": "1.17.0", "totalNodeCount": 2, - "agentVersion": "0.1.0" + "agentVersion": "0.1.0", + "provisioningState": "Succeeded" } } } diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClustersByResourceGroupExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClustersByResourceGroupExample.json index 15f04639bda0..6fc7b73cc871 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClustersByResourceGroupExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClustersByResourceGroupExample.json @@ -9,11 +9,19 @@ "body": { "value": [ { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db48", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster1", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", "tags": {}, + "systemData": { + "createdBy": "sikasire@microsoft.com", + "createdByType": "User", + "createdAt": "2020-12-17T07:06:33.9173186Z", + "lastModifiedBy": "sikasire@microsoft.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-12-17T07:06:33.9173186Z" + }, "identity": { "principalId": "d8cd1fd9-154f-4da7-b348-595f283c13a3", "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", @@ -23,15 +31,24 @@ "agentPublicKeyCertificate": "MIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", "kubernetesVersion": "1.17.0", "totalNodeCount": 2, - "agentVersion": "0.1.0" + "agentVersion": "0.1.0", + "provisioningState": "Succeeded" } }, { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster1", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", "tags": {}, + "systemData": { + "createdBy": "sikasire@microsoft.com", + "createdByType": "User", + "createdAt": "2020-12-17T07:06:33.9173186Z", + "lastModifiedBy": "sikasire@microsoft.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-12-17T07:06:33.9173186Z" + }, "identity": { "principalId": "d8cd1fd9-154f-4da7-b348-595f283c13a3", "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", @@ -41,7 +58,8 @@ "agentPublicKeyCertificate": "XIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", "kubernetesVersion": "1.1", "totalNodeCount": 2, - "agentVersion": "0.1.0" + "agentVersion": "0.1.0", + "provisioningState": "Succeeded" } } ], diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClustersBySubscriptionExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClustersBySubscriptionExample.json index b813c89fb964..e58d91f89af8 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClustersBySubscriptionExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClustersBySubscriptionExample.json @@ -8,11 +8,19 @@ "body": { "value": [ { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster1", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", "tags": {}, + "systemData": { + "createdBy": "sikasire@microsoft.com", + "createdByType": "User", + "createdAt": "2020-12-17T07:06:33.9173186Z", + "lastModifiedBy": "sikasire@microsoft.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-12-17T07:06:33.9173186Z" + }, "identity": { "principalId": "d8cd1fd9-154f-4da7-b348-595f283c13a3", "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", @@ -22,15 +30,24 @@ "agentPublicKeyCertificate": "MIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", "kubernetesVersion": "1.17.0", "totalNodeCount": 2, - "agentVersion": "0.1.0" + "agentVersion": "0.1.0", + "provisioningState": "Succeeded" } }, { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster2", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", "tags": {}, + "systemData": { + "createdBy": "sikasire@microsoft.com", + "createdByType": "User", + "createdAt": "2020-12-17T07:06:33.9173186Z", + "lastModifiedBy": "sikasire@microsoft.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-12-17T07:06:33.9173186Z" + }, "identity": { "principalId": "d8cd1fd9-154f-4da7-b348-595f283c13a3", "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", @@ -40,7 +57,8 @@ "agentPublicKeyCertificate": "XIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", "kubernetesVersion": "1.16.3", "totalNodeCount": 4, - "agentVersion": "0.1.0" + "agentVersion": "0.1.0", + "provisioningState": "Succeeded" } } ], diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/UpdateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/UpdateClusterExample.json index e5dd4166ef42..8ccfa3bf35be 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/UpdateClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/UpdateClusterExample.json @@ -17,11 +17,19 @@ "responses": { "200": { "body": { - "id": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1", "name": "connectedCluster1", "type": "Microsoft.Kubernetes/connectedClusters", "location": "East US", "tags": {}, + "systemData": { + "createdBy": "sikasire@microsoft.com", + "createdByType": "User", + "createdAt": "2020-12-17T07:06:33.9173186Z", + "lastModifiedBy": "2d2a754c-cade-4935-83d4-ce413c5a3910", + "lastModifiedByType": "Application", + "lastModifiedAt": "2020-12-17T07:14:58.865041Z" + }, "identity": { "type": "SystemAssigned" }, @@ -29,7 +37,8 @@ "agentPublicKeyCertificate": "MIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO", "kubernetesVersion": "1.17.0", "totalNodeCount": 2, - "agentVersion": "0.1.0" + "agentVersion": "0.1.0", + "provisioningState": "Succeeded" } } } diff --git a/specification/hybridkubernetes/resource-manager/readme.md b/specification/hybridkubernetes/resource-manager/readme.md index 25a62f85e3cf..d87df28f440d 100644 --- a/specification/hybridkubernetes/resource-manager/readme.md +++ b/specification/hybridkubernetes/resource-manager/readme.md @@ -39,7 +39,7 @@ These settings apply only when `--tag=package-2020-01-01-preview` is specified o input-file: - Microsoft.Kubernetes/preview/2020-01-01-preview/connectedClusters.json ``` -### Tag: package-2021-02-01-preview +### Tag: package-2021-03-01-preview These settings apply only when `--tag=package-2021-03-01-preview` is specified on the command line. @@ -47,7 +47,7 @@ These settings apply only when `--tag=package-2021-03-01-preview` is specified o input-file: - Microsoft.Kubernetes/preview/2021-03-01-preview/connectedClusters.json ``` -### Tag: package-2021-02-01 +### Tag: package-2021-03-01 These settings apply only when `--tag=package-2021-03-01` is specified on the command line. From 28c416f432aefef2a978ee1cf34ce786c6d73925 Mon Sep 17 00:00:00 2001 From: sikasire Date: Wed, 20 Jan 2021 15:35:24 +0530 Subject: [PATCH 15/31] prettier fix --- .../2021-03-01/examples/CreateClusterExample.json | 4 ++-- .../2021-03-01/examples/GetClusterExample.json | 2 +- .../examples/GetClustersByResourceGroupExample.json | 4 ++-- .../2021-03-01/examples/GetClustersBySubscriptionExample.json | 4 ++-- .../2021-03-01/examples/UpdateClusterExample.json | 2 +- .../2021-03-01-preview/examples/CreateClusterExample.json | 4 ++-- .../2021-03-01-preview/examples/GetClusterExample.json | 2 +- .../examples/GetClustersByResourceGroupExample.json | 4 ++-- .../examples/GetClustersBySubscriptionExample.json | 4 ++-- .../2021-03-01-preview/examples/UpdateClusterExample.json | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/CreateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/CreateClusterExample.json index 98375b4732f9..31df3827d4bf 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/CreateClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/CreateClusterExample.json @@ -30,7 +30,7 @@ "lastModifiedBy": "sikasire@microsoft.com", "lastModifiedByType": "User", "lastModifiedAt": "2020-12-17T07:06:33.9173186Z" - }, + }, "identity": { "type": "SystemAssigned" }, @@ -57,7 +57,7 @@ "lastModifiedBy": "sikasire@microsoft.com", "lastModifiedByType": "User", "lastModifiedAt": "2020-12-17T07:06:33.9173186Z" - }, + }, "identity": { "type": "SystemAssigned" }, diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClusterExample.json index fb6fda91a8ab..73fa8d052c29 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClusterExample.json @@ -20,7 +20,7 @@ "lastModifiedBy": "2d2a754c-cade-4935-83d4-ce413c5a3910", "lastModifiedByType": "Application", "lastModifiedAt": "2020-12-17T07:14:58.865041Z" - }, + }, "identity": { "principalId": "d8cd1fd9-154f-4da7-b348-595f283c13a3", "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClustersByResourceGroupExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClustersByResourceGroupExample.json index 575cf80f361c..78398b4051e4 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClustersByResourceGroupExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClustersByResourceGroupExample.json @@ -21,7 +21,7 @@ "lastModifiedBy": "sikasire@microsoft.com", "lastModifiedByType": "User", "lastModifiedAt": "2020-12-17T07:06:33.9173186Z" - }, + }, "identity": { "principalId": "d8cd1fd9-154f-4da7-b348-595f283c13a3", "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", @@ -48,7 +48,7 @@ "lastModifiedBy": "sikasire@microsoft.com", "lastModifiedByType": "User", "lastModifiedAt": "2020-12-17T07:06:33.9173186Z" - }, + }, "identity": { "principalId": "d8cd1fd9-154f-4da7-b348-595f283c13a3", "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClustersBySubscriptionExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClustersBySubscriptionExample.json index bd3ea7caa9a2..4d46438a4b91 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClustersBySubscriptionExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClustersBySubscriptionExample.json @@ -20,7 +20,7 @@ "lastModifiedBy": "sikasire@microsoft.com", "lastModifiedByType": "User", "lastModifiedAt": "2020-12-17T07:06:33.9173186Z" - }, + }, "identity": { "principalId": "d8cd1fd9-154f-4da7-b348-595f283c13a3", "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", @@ -47,7 +47,7 @@ "lastModifiedBy": "sikasire@microsoft.com", "lastModifiedByType": "User", "lastModifiedAt": "2020-12-17T07:06:33.9173186Z" - }, + }, "identity": { "principalId": "d8cd1fd9-154f-4da7-b348-595f283c13a3", "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/UpdateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/UpdateClusterExample.json index 2b4e8fd27065..153e4044888c 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/UpdateClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/UpdateClusterExample.json @@ -29,7 +29,7 @@ "lastModifiedBy": "2d2a754c-cade-4935-83d4-ce413c5a3910", "lastModifiedByType": "Application", "lastModifiedAt": "2020-12-17T07:14:58.865041Z" - }, + }, "identity": { "type": "SystemAssigned" }, diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/CreateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/CreateClusterExample.json index b6fcdf8c244a..cea4277c9d2f 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/CreateClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/CreateClusterExample.json @@ -30,7 +30,7 @@ "lastModifiedBy": "sikasire@microsoft.com", "lastModifiedByType": "User", "lastModifiedAt": "2020-12-17T07:06:33.9173186Z" - }, + }, "identity": { "type": "SystemAssigned" }, @@ -57,7 +57,7 @@ "lastModifiedBy": "sikasire@microsoft.com", "lastModifiedByType": "User", "lastModifiedAt": "2020-12-17T07:06:33.9173186Z" - }, + }, "identity": { "type": "SystemAssigned" }, diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClusterExample.json index 3ab7b2e9d26b..1dfeab0a1a0e 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClusterExample.json @@ -20,7 +20,7 @@ "lastModifiedBy": "2d2a754c-cade-4935-83d4-ce413c5a3910", "lastModifiedByType": "Application", "lastModifiedAt": "2020-12-17T07:14:58.865041Z" - }, + }, "identity": { "principalId": "d8cd1fd9-154f-4da7-b348-595f283c13a3", "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClustersByResourceGroupExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClustersByResourceGroupExample.json index 6fc7b73cc871..52b874618cf0 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClustersByResourceGroupExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClustersByResourceGroupExample.json @@ -21,7 +21,7 @@ "lastModifiedBy": "sikasire@microsoft.com", "lastModifiedByType": "User", "lastModifiedAt": "2020-12-17T07:06:33.9173186Z" - }, + }, "identity": { "principalId": "d8cd1fd9-154f-4da7-b348-595f283c13a3", "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", @@ -48,7 +48,7 @@ "lastModifiedBy": "sikasire@microsoft.com", "lastModifiedByType": "User", "lastModifiedAt": "2020-12-17T07:06:33.9173186Z" - }, + }, "identity": { "principalId": "d8cd1fd9-154f-4da7-b348-595f283c13a3", "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClustersBySubscriptionExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClustersBySubscriptionExample.json index e58d91f89af8..02385d45a8ad 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClustersBySubscriptionExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClustersBySubscriptionExample.json @@ -20,7 +20,7 @@ "lastModifiedBy": "sikasire@microsoft.com", "lastModifiedByType": "User", "lastModifiedAt": "2020-12-17T07:06:33.9173186Z" - }, + }, "identity": { "principalId": "d8cd1fd9-154f-4da7-b348-595f283c13a3", "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", @@ -47,7 +47,7 @@ "lastModifiedBy": "sikasire@microsoft.com", "lastModifiedByType": "User", "lastModifiedAt": "2020-12-17T07:06:33.9173186Z" - }, + }, "identity": { "principalId": "d8cd1fd9-154f-4da7-b348-595f283c13a3", "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/UpdateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/UpdateClusterExample.json index 8ccfa3bf35be..f0c096067db7 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/UpdateClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/UpdateClusterExample.json @@ -29,7 +29,7 @@ "lastModifiedBy": "2d2a754c-cade-4935-83d4-ce413c5a3910", "lastModifiedByType": "Application", "lastModifiedAt": "2020-12-17T07:14:58.865041Z" - }, + }, "identity": { "type": "SystemAssigned" }, From 6b67f22b3c3bef2f6590db048f0b3cd423b225c6 Mon Sep 17 00:00:00 2001 From: sikasire Date: Mon, 25 Jan 2021 14:55:43 +0530 Subject: [PATCH 16/31] directory change --- .../{ => stable}/2021-03-01/connectedClusters.json | 0 .../{ => stable}/2021-03-01/examples/CreateClusterExample.json | 0 .../{ => stable}/2021-03-01/examples/DeleteClusterExample.json | 0 .../{ => stable}/2021-03-01/examples/GetClusterExample.json | 0 .../2021-03-01/examples/GetClustersByResourceGroupExample.json | 0 .../2021-03-01/examples/GetClustersBySubscriptionExample.json | 0 .../examples/ListConnectedClusterOperationsExample.json | 0 .../{ => stable}/2021-03-01/examples/UpdateClusterExample.json | 0 specification/hybridkubernetes/resource-manager/readme.md | 2 +- 9 files changed, 1 insertion(+), 1 deletion(-) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/{ => stable}/2021-03-01/connectedClusters.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/{ => stable}/2021-03-01/examples/CreateClusterExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/{ => stable}/2021-03-01/examples/DeleteClusterExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/{ => stable}/2021-03-01/examples/GetClusterExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/{ => stable}/2021-03-01/examples/GetClustersByResourceGroupExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/{ => stable}/2021-03-01/examples/GetClustersBySubscriptionExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/{ => stable}/2021-03-01/examples/ListConnectedClusterOperationsExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/{ => stable}/2021-03-01/examples/UpdateClusterExample.json (100%) diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/connectedClusters.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/stable/2021-03-01/connectedClusters.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/connectedClusters.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/stable/2021-03-01/connectedClusters.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/CreateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/stable/2021-03-01/examples/CreateClusterExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/CreateClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/stable/2021-03-01/examples/CreateClusterExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/DeleteClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/stable/2021-03-01/examples/DeleteClusterExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/DeleteClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/stable/2021-03-01/examples/DeleteClusterExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/stable/2021-03-01/examples/GetClusterExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/stable/2021-03-01/examples/GetClusterExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClustersByResourceGroupExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/stable/2021-03-01/examples/GetClustersByResourceGroupExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClustersByResourceGroupExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/stable/2021-03-01/examples/GetClustersByResourceGroupExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClustersBySubscriptionExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/stable/2021-03-01/examples/GetClustersBySubscriptionExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClustersBySubscriptionExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/stable/2021-03-01/examples/GetClustersBySubscriptionExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/ListConnectedClusterOperationsExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/stable/2021-03-01/examples/ListConnectedClusterOperationsExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/ListConnectedClusterOperationsExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/stable/2021-03-01/examples/ListConnectedClusterOperationsExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/UpdateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/stable/2021-03-01/examples/UpdateClusterExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/UpdateClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/stable/2021-03-01/examples/UpdateClusterExample.json diff --git a/specification/hybridkubernetes/resource-manager/readme.md b/specification/hybridkubernetes/resource-manager/readme.md index d87df28f440d..36fe1ca42069 100644 --- a/specification/hybridkubernetes/resource-manager/readme.md +++ b/specification/hybridkubernetes/resource-manager/readme.md @@ -53,7 +53,7 @@ These settings apply only when `--tag=package-2021-03-01` is specified on the co ```yaml $(tag) == 'package-2021-03-01' input-file: -- Microsoft.Kubernetes/2021-03-01/connectedClusters.json +- Microsoft.Kubernetes/stable/2021-03-01/connectedClusters.json ``` --- From 0857e282c75f67cdf409c0c58d2e477c3610452d Mon Sep 17 00:00:00 2001 From: sikasire Date: Mon, 25 Jan 2021 14:55:43 +0530 Subject: [PATCH 17/31] directory change --- .../2021-03-01/connectedClusters.json | 52 +++++++++---------- .../examples/CreateClusterExample.json | 0 .../examples/DeleteClusterExample.json | 0 .../examples/GetClusterExample.json | 0 .../GetClustersByResourceGroupExample.json | 0 .../GetClustersBySubscriptionExample.json | 0 ...ListConnectedClusterOperationsExample.json | 0 .../examples/UpdateClusterExample.json | 0 .../resource-manager/readme.md | 2 +- 9 files changed, 27 insertions(+), 27 deletions(-) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/{ => stable}/2021-03-01/connectedClusters.json (86%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/{ => stable}/2021-03-01/examples/CreateClusterExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/{ => stable}/2021-03-01/examples/DeleteClusterExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/{ => stable}/2021-03-01/examples/GetClusterExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/{ => stable}/2021-03-01/examples/GetClustersByResourceGroupExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/{ => stable}/2021-03-01/examples/GetClustersBySubscriptionExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/{ => stable}/2021-03-01/examples/ListConnectedClusterOperationsExample.json (100%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/{ => stable}/2021-03-01/examples/UpdateClusterExample.json (100%) diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/connectedClusters.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/stable/2021-03-01/connectedClusters.json similarity index 86% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/connectedClusters.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/stable/2021-03-01/connectedClusters.json index 0702e0b75095..17092b517369 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/connectedClusters.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/stable/2021-03-01/connectedClusters.json @@ -46,13 +46,13 @@ }, "parameters": [ { - "$ref": "../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/ClusterNamePathParam" @@ -83,7 +83,7 @@ "default": { "description": "Resource Provider error response describing why the operation failed.", "schema": { - "$ref": "../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -109,13 +109,13 @@ }, "parameters": [ { - "$ref": "../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/ClusterNamePathParam" @@ -140,7 +140,7 @@ "default": { "description": "Resource Provider error response describing why the operation failed.", "schema": { - "$ref": "../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } } @@ -159,13 +159,13 @@ }, "parameters": [ { - "$ref": "../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/ClusterNamePathParam" @@ -181,7 +181,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } } @@ -200,13 +200,13 @@ }, "parameters": [ { - "$ref": "../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/ClusterNamePathParam" @@ -225,7 +225,7 @@ "default": { "description": "Resource Provider error response describing why the operation failed.", "schema": { - "$ref": "../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -250,13 +250,13 @@ }, "parameters": [ { - "$ref": "../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" } ], "responses": { @@ -269,7 +269,7 @@ "default": { "description": "Resource Provider error response describing why the operation failed.", "schema": { - "$ref": "../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -293,10 +293,10 @@ }, "parameters": [ { - "$ref": "../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" } ], "responses": { @@ -309,7 +309,7 @@ "default": { "description": "Resource Provider error response describing why the operation failed.", "schema": { - "$ref": "../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -327,7 +327,7 @@ ], "parameters": [ { - "$ref": "../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" } ], "responses": { @@ -340,7 +340,7 @@ "default": { "description": "Resource Provider error response describing why the operation failed.", "schema": { - "$ref": "../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -447,7 +447,7 @@ }, "allOf": [ { - "$ref": "../../../../common-types/resource-management/v2/types.json#/definitions/TrackedResource" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/TrackedResource" } ], "description": "Represents a connected cluster." diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/CreateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/stable/2021-03-01/examples/CreateClusterExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/CreateClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/stable/2021-03-01/examples/CreateClusterExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/DeleteClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/stable/2021-03-01/examples/DeleteClusterExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/DeleteClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/stable/2021-03-01/examples/DeleteClusterExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/stable/2021-03-01/examples/GetClusterExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/stable/2021-03-01/examples/GetClusterExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClustersByResourceGroupExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/stable/2021-03-01/examples/GetClustersByResourceGroupExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClustersByResourceGroupExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/stable/2021-03-01/examples/GetClustersByResourceGroupExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClustersBySubscriptionExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/stable/2021-03-01/examples/GetClustersBySubscriptionExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/GetClustersBySubscriptionExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/stable/2021-03-01/examples/GetClustersBySubscriptionExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/ListConnectedClusterOperationsExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/stable/2021-03-01/examples/ListConnectedClusterOperationsExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/ListConnectedClusterOperationsExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/stable/2021-03-01/examples/ListConnectedClusterOperationsExample.json diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/UpdateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/stable/2021-03-01/examples/UpdateClusterExample.json similarity index 100% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/2021-03-01/examples/UpdateClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/stable/2021-03-01/examples/UpdateClusterExample.json diff --git a/specification/hybridkubernetes/resource-manager/readme.md b/specification/hybridkubernetes/resource-manager/readme.md index d87df28f440d..36fe1ca42069 100644 --- a/specification/hybridkubernetes/resource-manager/readme.md +++ b/specification/hybridkubernetes/resource-manager/readme.md @@ -53,7 +53,7 @@ These settings apply only when `--tag=package-2021-03-01` is specified on the co ```yaml $(tag) == 'package-2021-03-01' input-file: -- Microsoft.Kubernetes/2021-03-01/connectedClusters.json +- Microsoft.Kubernetes/stable/2021-03-01/connectedClusters.json ``` --- From eaf12636c958876df61dc65f4d66fdde3cf01782 Mon Sep 17 00:00:00 2001 From: sikasire Date: Tue, 26 Jan 2021 00:51:55 +0530 Subject: [PATCH 18/31] addressing ARM requested changes --- .../preview/2021-03-01-preview/connectedClusters.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/connectedClusters.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/connectedClusters.json index 32751bc2e9a7..92815c771c2a 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/connectedClusters.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/connectedClusters.json @@ -609,11 +609,6 @@ "name": "ConnectivityStatus", "modelAsString": true } - }, - "systemData": { - "$ref": "#/definitions/SystemData", - "readOnly": true, - "description": "Metadata pertaining to creation and last modification of the resource." } }, "description": "Properties of the connected cluster." From fcb3a5ba6b563f9223ecd57e80c3dca331deeec1 Mon Sep 17 00:00:00 2001 From: sikasire Date: Tue, 26 Jan 2021 00:51:55 +0530 Subject: [PATCH 19/31] addressing ARM requested changes --- .../preview/2021-03-01-preview/connectedClusters.json | 5 ----- .../stable/2021-03-01/connectedClusters.json | 5 ----- 2 files changed, 10 deletions(-) diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/connectedClusters.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/connectedClusters.json index 32751bc2e9a7..92815c771c2a 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/connectedClusters.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/connectedClusters.json @@ -609,11 +609,6 @@ "name": "ConnectivityStatus", "modelAsString": true } - }, - "systemData": { - "$ref": "#/definitions/SystemData", - "readOnly": true, - "description": "Metadata pertaining to creation and last modification of the resource." } }, "description": "Properties of the connected cluster." diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/stable/2021-03-01/connectedClusters.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/stable/2021-03-01/connectedClusters.json index 17092b517369..e93e50320915 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/stable/2021-03-01/connectedClusters.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/stable/2021-03-01/connectedClusters.json @@ -557,11 +557,6 @@ "name": "ConnectivityStatus", "modelAsString": true } - }, - "systemData": { - "$ref": "#/definitions/SystemData", - "readOnly": true, - "description": "Metadata pertaining to creation and last modification of the resource." } }, "description": "Properties of the connected cluster." From 49e77050e875ae1fe99bbdade5cbb7abf630d1af Mon Sep 17 00:00:00 2001 From: sikasire Date: Wed, 27 Jan 2021 14:43:17 +0530 Subject: [PATCH 20/31] Moving client proxy and tokenauth to body --- .../connectedClusters.json | 48 ++++++++++++------- ...dClustersListClusterCredentialsResult.json | 2 +- ...ersListClusterCredentialsResultNonAad.json | 2 +- .../examples/CreateClusterExample.json | 2 +- .../examples/DeleteClusterExample.json | 2 +- .../examples/GetClusterExample.json | 2 +- .../GetClustersByResourceGroupExample.json | 2 +- .../GetClustersBySubscriptionExample.json | 2 +- ...ListConnectedClusterOperationsExample.json | 2 +- .../examples/UpdateClusterExample.json | 2 +- .../resource-manager/readme.md | 8 ++-- 11 files changed, 43 insertions(+), 31 deletions(-) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/{2021-03-01-preview => 2021-04-01-preview}/connectedClusters.json (96%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/{2021-03-01-preview => 2021-04-01-preview}/examples/ConnectedClustersListClusterCredentialsResult.json (94%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/{2021-03-01-preview => 2021-04-01-preview}/examples/ConnectedClustersListClusterCredentialsResultNonAad.json (99%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/{2021-03-01-preview => 2021-04-01-preview}/examples/CreateClusterExample.json (99%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/{2021-03-01-preview => 2021-04-01-preview}/examples/DeleteClusterExample.json (84%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/{2021-03-01-preview => 2021-04-01-preview}/examples/GetClusterExample.json (98%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/{2021-03-01-preview => 2021-04-01-preview}/examples/GetClustersByResourceGroupExample.json (99%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/{2021-03-01-preview => 2021-04-01-preview}/examples/GetClustersBySubscriptionExample.json (99%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/{2021-03-01-preview => 2021-04-01-preview}/examples/ListConnectedClusterOperationsExample.json (97%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/{2021-03-01-preview => 2021-04-01-preview}/examples/UpdateClusterExample.json (98%) diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/connectedClusters.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json similarity index 96% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/connectedClusters.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json index 92815c771c2a..ebb99186d1a4 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/connectedClusters.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json @@ -265,10 +265,23 @@ "$ref": "#/parameters/ClusterNamePathParam" }, { - "$ref": "#/parameters/ClientProxy" + "in": "body", + "required": true, + "name": "ClientAuthenticationMethod", + "schema": { + "$ref": "#/definitions/AuthenticationMethod" + }, + "description": "Authentication method used by the user to fetch credentials for accessing the cluster." }, { - "$ref": "#/parameters/TokenAuth" + "in": "body", + "required": true, + "type": "boolean", + "name": "ClientProxy", + "schema":{ + "$ref": "#/definitions/ClientProxy" + }, + "description": "Boolean value to indicate whether the request is for client side proxy or not" } ], "responses": { @@ -766,6 +779,21 @@ } }, "readOnly": true + }, + "AuthenticationMethod": { + "description": "Authentication method used by the user to fetch credentials for accessing the cluster.", + "enum": [ + "AAD", + "Token" + ], + "x-ms-enum": { + "name": "AuthenticationMethod", + "modelAsString": true + } + }, + "ClientProxy": { + "description": "Boolean value to indicate whether the request is for client side proxy or not", + "type": "boolean" } }, "parameters": { @@ -776,22 +804,6 @@ "type": "string", "description": "The name of the Kubernetes cluster on which get is called.", "x-ms-parameter-location": "method" - }, - "ClientProxy": { - "name": "clientProxy", - "in": "query", - "required": false, - "type": "boolean", - "description": "Parameter to indicate whether the request is for client side proxy or not", - "x-ms-parameter-location": "method" - }, - "TokenAuth": { - "name": "isTokenAuth", - "in": "query", - "required": false, - "type": "boolean", - "description": "Parameter to indicate whether the request is token based authentication or AAD based authentication", - "x-ms-parameter-location": "method" } } } diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/ConnectedClustersListClusterCredentialsResult.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/ConnectedClustersListClusterCredentialsResult.json similarity index 94% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/ConnectedClustersListClusterCredentialsResult.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/ConnectedClustersListClusterCredentialsResult.json index 9e6cf1dd9a46..1759a62c4623 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/ConnectedClustersListClusterCredentialsResult.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/ConnectedClustersListClusterCredentialsResult.json @@ -3,7 +3,7 @@ "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", "resourceGroupName": "k8sc-rg", "clusterName": "testCluster", - "api-version": "2021-03-01-preview" + "api-version": "2021-04-01-preview" }, "responses": { "200": { diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/ConnectedClustersListClusterCredentialsResultNonAad.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/ConnectedClustersListClusterCredentialsResultNonAad.json similarity index 99% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/ConnectedClustersListClusterCredentialsResultNonAad.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/ConnectedClustersListClusterCredentialsResultNonAad.json index e429093476e9..70c5774da1e4 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/ConnectedClustersListClusterCredentialsResultNonAad.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/ConnectedClustersListClusterCredentialsResultNonAad.json @@ -3,7 +3,7 @@ "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", "resourceGroupName": "k8sc-rg", "clusterName": "testCluster", - "api-version": "2021-02-01-preview", + "api-version": "2021-04-01-preview", "isTokenAuth": true }, "responses": { diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/CreateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/CreateClusterExample.json similarity index 99% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/CreateClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/CreateClusterExample.json index cea4277c9d2f..f694867f464b 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/CreateClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/CreateClusterExample.json @@ -3,7 +3,7 @@ "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", "resourceGroupName": "k8sc-rg", "clusterName": "testCluster", - "api-version": "2021-03-01-preview", + "api-version": "2021-04-01-preview", "ConnectedCluster": { "location": "East US", "tags": {}, diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/DeleteClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/DeleteClusterExample.json similarity index 84% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/DeleteClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/DeleteClusterExample.json index e56093e285dc..c5398ba02b69 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/DeleteClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/DeleteClusterExample.json @@ -3,7 +3,7 @@ "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", "resourceGroupName": "k8sc-rg", "clusterName": "testCluster", - "api-version": "2021-03-01-preview" + "api-version": "2021-04-01-preview" }, "responses": { "200": {}, diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/GetClusterExample.json similarity index 98% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/GetClusterExample.json index 1dfeab0a1a0e..5e8b730833e2 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/GetClusterExample.json @@ -3,7 +3,7 @@ "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", "resourceGroupName": "k8sc-rg", "clusterName": "testCluster", - "api-version": "2021-03-01-preview" + "api-version": "2021-04-01-preview" }, "responses": { "200": { diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClustersByResourceGroupExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/GetClustersByResourceGroupExample.json similarity index 99% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClustersByResourceGroupExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/GetClustersByResourceGroupExample.json index 52b874618cf0..e1586d2c1d31 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClustersByResourceGroupExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/GetClustersByResourceGroupExample.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", "resourceGroupName": "k8sc-rg", - "api-version": "2021-03-01-preview" + "api-version": "2021-04-01-preview" }, "responses": { "200": { diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClustersBySubscriptionExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/GetClustersBySubscriptionExample.json similarity index 99% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClustersBySubscriptionExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/GetClustersBySubscriptionExample.json index 02385d45a8ad..8f6147f750e0 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClustersBySubscriptionExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/GetClustersBySubscriptionExample.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", - "api-version": "2021-03-01-preview" + "api-version": "2021-04-01-preview" }, "responses": { "200": { diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/ListConnectedClusterOperationsExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/ListConnectedClusterOperationsExample.json similarity index 97% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/ListConnectedClusterOperationsExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/ListConnectedClusterOperationsExample.json index 6498993da804..3813b3a708a4 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/ListConnectedClusterOperationsExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/ListConnectedClusterOperationsExample.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2021-03-01-preview" + "api-version": "2021-04-01-preview" }, "responses": { "200": { diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/UpdateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/UpdateClusterExample.json similarity index 98% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/UpdateClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/UpdateClusterExample.json index f0c096067db7..f404817f2c74 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/UpdateClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/UpdateClusterExample.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2021-03-01-preview", + "api-version": "2021-04-01-preview", "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", "resourceGroupName": "k8sc-rg", "clusterName": "testCluster", diff --git a/specification/hybridkubernetes/resource-manager/readme.md b/specification/hybridkubernetes/resource-manager/readme.md index 36fe1ca42069..fee29bb571d2 100644 --- a/specification/hybridkubernetes/resource-manager/readme.md +++ b/specification/hybridkubernetes/resource-manager/readme.md @@ -39,13 +39,13 @@ These settings apply only when `--tag=package-2020-01-01-preview` is specified o input-file: - Microsoft.Kubernetes/preview/2020-01-01-preview/connectedClusters.json ``` -### Tag: package-2021-03-01-preview +### Tag: package-2021-04-01-preview -These settings apply only when `--tag=package-2021-03-01-preview` is specified on the command line. +These settings apply only when `--tag=package-2021-04-01-preview` is specified on the command line. -```yaml $(tag) == 'package-2021-03-01-preview' +```yaml $(tag) == 'package-2021-04-01-preview' input-file: -- Microsoft.Kubernetes/preview/2021-03-01-preview/connectedClusters.json +- Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json ``` ### Tag: package-2021-03-01 From d5c00628b5128782dc8a996fe8713507802fcf00 Mon Sep 17 00:00:00 2001 From: sikasire Date: Wed, 27 Jan 2021 14:43:17 +0530 Subject: [PATCH 21/31] Moving client proxy and tokenauth to body --- .../connectedClusters.json | 50 ++++++++++++------- ...dClustersListClusterCredentialsResult.json | 2 +- ...ersListClusterCredentialsResultNonAad.json | 2 +- .../examples/CreateClusterExample.json | 2 +- .../examples/DeleteClusterExample.json | 2 +- .../examples/GetClusterExample.json | 2 +- .../GetClustersByResourceGroupExample.json | 2 +- .../GetClustersBySubscriptionExample.json | 2 +- ...ListConnectedClusterOperationsExample.json | 2 +- .../examples/UpdateClusterExample.json | 2 +- .../resource-manager/readme.md | 8 +-- 11 files changed, 44 insertions(+), 32 deletions(-) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/{2021-03-01-preview => 2021-04-01-preview}/connectedClusters.json (95%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/{2021-03-01-preview => 2021-04-01-preview}/examples/ConnectedClustersListClusterCredentialsResult.json (94%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/{2021-03-01-preview => 2021-04-01-preview}/examples/ConnectedClustersListClusterCredentialsResultNonAad.json (99%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/{2021-03-01-preview => 2021-04-01-preview}/examples/CreateClusterExample.json (99%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/{2021-03-01-preview => 2021-04-01-preview}/examples/DeleteClusterExample.json (84%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/{2021-03-01-preview => 2021-04-01-preview}/examples/GetClusterExample.json (98%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/{2021-03-01-preview => 2021-04-01-preview}/examples/GetClustersByResourceGroupExample.json (99%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/{2021-03-01-preview => 2021-04-01-preview}/examples/GetClustersBySubscriptionExample.json (99%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/{2021-03-01-preview => 2021-04-01-preview}/examples/ListConnectedClusterOperationsExample.json (97%) rename specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/{2021-03-01-preview => 2021-04-01-preview}/examples/UpdateClusterExample.json (98%) diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/connectedClusters.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json similarity index 95% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/connectedClusters.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json index 92815c771c2a..418b6074315b 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/connectedClusters.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json @@ -2,7 +2,7 @@ "swagger": "2.0", "info": { "title": "ConnectedKubernetesClient", - "version": "2021-03-01-preview", + "version": "2021-04-01-preview", "description": "Azure Connected Cluster Resource Provider API for adopting any Kubernetes Cluster" }, "schemes": [ @@ -265,10 +265,23 @@ "$ref": "#/parameters/ClusterNamePathParam" }, { - "$ref": "#/parameters/ClientProxy" + "in": "body", + "required": true, + "name": "ClientAuthenticationMethod", + "schema": { + "$ref": "#/definitions/AuthenticationMethod" + }, + "description": "Authentication method used by the user to fetch credentials for accessing the cluster." }, { - "$ref": "#/parameters/TokenAuth" + "in": "body", + "required": true, + "type": "boolean", + "name": "ClientProxy", + "schema":{ + "$ref": "#/definitions/ClientProxy" + }, + "description": "Boolean value to indicate whether the request is for client side proxy or not" } ], "responses": { @@ -766,6 +779,21 @@ } }, "readOnly": true + }, + "AuthenticationMethod": { + "description": "Authentication method used by the user to fetch credentials for accessing the cluster.", + "enum": [ + "AAD", + "Token" + ], + "x-ms-enum": { + "name": "AuthenticationMethod", + "modelAsString": true + } + }, + "ClientProxy": { + "description": "Boolean value to indicate whether the request is for client side proxy or not", + "type": "boolean" } }, "parameters": { @@ -776,22 +804,6 @@ "type": "string", "description": "The name of the Kubernetes cluster on which get is called.", "x-ms-parameter-location": "method" - }, - "ClientProxy": { - "name": "clientProxy", - "in": "query", - "required": false, - "type": "boolean", - "description": "Parameter to indicate whether the request is for client side proxy or not", - "x-ms-parameter-location": "method" - }, - "TokenAuth": { - "name": "isTokenAuth", - "in": "query", - "required": false, - "type": "boolean", - "description": "Parameter to indicate whether the request is token based authentication or AAD based authentication", - "x-ms-parameter-location": "method" } } } diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/ConnectedClustersListClusterCredentialsResult.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/ConnectedClustersListClusterCredentialsResult.json similarity index 94% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/ConnectedClustersListClusterCredentialsResult.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/ConnectedClustersListClusterCredentialsResult.json index 9e6cf1dd9a46..1759a62c4623 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/ConnectedClustersListClusterCredentialsResult.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/ConnectedClustersListClusterCredentialsResult.json @@ -3,7 +3,7 @@ "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", "resourceGroupName": "k8sc-rg", "clusterName": "testCluster", - "api-version": "2021-03-01-preview" + "api-version": "2021-04-01-preview" }, "responses": { "200": { diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/ConnectedClustersListClusterCredentialsResultNonAad.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/ConnectedClustersListClusterCredentialsResultNonAad.json similarity index 99% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/ConnectedClustersListClusterCredentialsResultNonAad.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/ConnectedClustersListClusterCredentialsResultNonAad.json index e429093476e9..70c5774da1e4 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/ConnectedClustersListClusterCredentialsResultNonAad.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/ConnectedClustersListClusterCredentialsResultNonAad.json @@ -3,7 +3,7 @@ "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", "resourceGroupName": "k8sc-rg", "clusterName": "testCluster", - "api-version": "2021-02-01-preview", + "api-version": "2021-04-01-preview", "isTokenAuth": true }, "responses": { diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/CreateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/CreateClusterExample.json similarity index 99% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/CreateClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/CreateClusterExample.json index cea4277c9d2f..f694867f464b 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/CreateClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/CreateClusterExample.json @@ -3,7 +3,7 @@ "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", "resourceGroupName": "k8sc-rg", "clusterName": "testCluster", - "api-version": "2021-03-01-preview", + "api-version": "2021-04-01-preview", "ConnectedCluster": { "location": "East US", "tags": {}, diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/DeleteClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/DeleteClusterExample.json similarity index 84% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/DeleteClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/DeleteClusterExample.json index e56093e285dc..c5398ba02b69 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/DeleteClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/DeleteClusterExample.json @@ -3,7 +3,7 @@ "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", "resourceGroupName": "k8sc-rg", "clusterName": "testCluster", - "api-version": "2021-03-01-preview" + "api-version": "2021-04-01-preview" }, "responses": { "200": {}, diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/GetClusterExample.json similarity index 98% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/GetClusterExample.json index 1dfeab0a1a0e..5e8b730833e2 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/GetClusterExample.json @@ -3,7 +3,7 @@ "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", "resourceGroupName": "k8sc-rg", "clusterName": "testCluster", - "api-version": "2021-03-01-preview" + "api-version": "2021-04-01-preview" }, "responses": { "200": { diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClustersByResourceGroupExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/GetClustersByResourceGroupExample.json similarity index 99% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClustersByResourceGroupExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/GetClustersByResourceGroupExample.json index 52b874618cf0..e1586d2c1d31 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClustersByResourceGroupExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/GetClustersByResourceGroupExample.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", "resourceGroupName": "k8sc-rg", - "api-version": "2021-03-01-preview" + "api-version": "2021-04-01-preview" }, "responses": { "200": { diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClustersBySubscriptionExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/GetClustersBySubscriptionExample.json similarity index 99% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClustersBySubscriptionExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/GetClustersBySubscriptionExample.json index 02385d45a8ad..8f6147f750e0 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/GetClustersBySubscriptionExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/GetClustersBySubscriptionExample.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", - "api-version": "2021-03-01-preview" + "api-version": "2021-04-01-preview" }, "responses": { "200": { diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/ListConnectedClusterOperationsExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/ListConnectedClusterOperationsExample.json similarity index 97% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/ListConnectedClusterOperationsExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/ListConnectedClusterOperationsExample.json index 6498993da804..3813b3a708a4 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/ListConnectedClusterOperationsExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/ListConnectedClusterOperationsExample.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2021-03-01-preview" + "api-version": "2021-04-01-preview" }, "responses": { "200": { diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/UpdateClusterExample.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/UpdateClusterExample.json similarity index 98% rename from specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/UpdateClusterExample.json rename to specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/UpdateClusterExample.json index f0c096067db7..f404817f2c74 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-03-01-preview/examples/UpdateClusterExample.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/UpdateClusterExample.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2021-03-01-preview", + "api-version": "2021-04-01-preview", "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", "resourceGroupName": "k8sc-rg", "clusterName": "testCluster", diff --git a/specification/hybridkubernetes/resource-manager/readme.md b/specification/hybridkubernetes/resource-manager/readme.md index 36fe1ca42069..fee29bb571d2 100644 --- a/specification/hybridkubernetes/resource-manager/readme.md +++ b/specification/hybridkubernetes/resource-manager/readme.md @@ -39,13 +39,13 @@ These settings apply only when `--tag=package-2020-01-01-preview` is specified o input-file: - Microsoft.Kubernetes/preview/2020-01-01-preview/connectedClusters.json ``` -### Tag: package-2021-03-01-preview +### Tag: package-2021-04-01-preview -These settings apply only when `--tag=package-2021-03-01-preview` is specified on the command line. +These settings apply only when `--tag=package-2021-04-01-preview` is specified on the command line. -```yaml $(tag) == 'package-2021-03-01-preview' +```yaml $(tag) == 'package-2021-04-01-preview' input-file: -- Microsoft.Kubernetes/preview/2021-03-01-preview/connectedClusters.json +- Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json ``` ### Tag: package-2021-03-01 From a84ba9a0266cecc7e986e26f8570d1a5f9eb226c Mon Sep 17 00:00:00 2001 From: sikasire Date: Wed, 27 Jan 2021 14:52:25 +0530 Subject: [PATCH 22/31] prettier check --- .../preview/2021-04-01-preview/connectedClusters.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json index 418b6074315b..0a6023a3de41 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json @@ -278,7 +278,7 @@ "required": true, "type": "boolean", "name": "ClientProxy", - "schema":{ + "schema": { "$ref": "#/definitions/ClientProxy" }, "description": "Boolean value to indicate whether the request is for client side proxy or not" @@ -783,8 +783,8 @@ "AuthenticationMethod": { "description": "Authentication method used by the user to fetch credentials for accessing the cluster.", "enum": [ - "AAD", - "Token" + "AAD", + "Token" ], "x-ms-enum": { "name": "AuthenticationMethod", From c2160692575e5a8cc281baa4cb34a28f91061c9b Mon Sep 17 00:00:00 2001 From: sikasire Date: Wed, 27 Jan 2021 14:52:25 +0530 Subject: [PATCH 23/31] prettier check --- .../preview/2021-04-01-preview/connectedClusters.json | 7 +++---- .../ConnectedClustersListClusterCredentialsResult.json | 4 +++- ...onnectedClustersListClusterCredentialsResultNonAad.json | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json index 418b6074315b..83138ab264e7 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json @@ -276,9 +276,8 @@ { "in": "body", "required": true, - "type": "boolean", "name": "ClientProxy", - "schema":{ + "schema": { "$ref": "#/definitions/ClientProxy" }, "description": "Boolean value to indicate whether the request is for client side proxy or not" @@ -783,8 +782,8 @@ "AuthenticationMethod": { "description": "Authentication method used by the user to fetch credentials for accessing the cluster.", "enum": [ - "AAD", - "Token" + "AAD", + "Token" ], "x-ms-enum": { "name": "AuthenticationMethod", diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/ConnectedClustersListClusterCredentialsResult.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/ConnectedClustersListClusterCredentialsResult.json index 1759a62c4623..f92035432236 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/ConnectedClustersListClusterCredentialsResult.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/ConnectedClustersListClusterCredentialsResult.json @@ -3,7 +3,9 @@ "subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5", "resourceGroupName": "k8sc-rg", "clusterName": "testCluster", - "api-version": "2021-04-01-preview" + "api-version": "2021-04-01-preview", + "ClientProxy": true, + "AuthenticationMethod": "AAD" }, "responses": { "200": { diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/ConnectedClustersListClusterCredentialsResultNonAad.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/ConnectedClustersListClusterCredentialsResultNonAad.json index 70c5774da1e4..db77aa98e5e1 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/ConnectedClustersListClusterCredentialsResultNonAad.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/ConnectedClustersListClusterCredentialsResultNonAad.json @@ -4,7 +4,8 @@ "resourceGroupName": "k8sc-rg", "clusterName": "testCluster", "api-version": "2021-04-01-preview", - "isTokenAuth": true + "ClientProxy": true, + "AuthenticationMethod": "Token" }, "responses": { "200": { From 4ba9a86e1c31ef2383ca7ac14df9c953fa89df3d Mon Sep 17 00:00:00 2001 From: sikasire Date: Wed, 27 Jan 2021 15:51:05 +0530 Subject: [PATCH 24/31] body fix --- .../2021-04-01-preview/connectedClusters.json | 77 ++++++++++++------- 1 file changed, 50 insertions(+), 27 deletions(-) diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json index 0aa9045b4c0d..f0d8aff62829 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json @@ -265,10 +265,12 @@ "$ref": "#/parameters/ClusterNamePathParam" }, { - "$ref": "#/parameters/ClientProxy" + "$ref": "#/parameters/ClientProxy", + "required": true }, { - "$ref": "#/parameters/TokenAuth" + "$ref": "#/parameters/TokenAuth", + "required": true } ], "responses": { @@ -766,32 +768,53 @@ } }, "readOnly": true - } - }, - "parameters": { - "ClusterNamePathParam": { - "name": "clusterName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the Kubernetes cluster on which get is called.", - "x-ms-parameter-location": "method" - }, - "ClientProxy": { - "name": "clientProxy", - "in": "body", - "required": true, - "type": "boolean", - "description": "Parameter to indicate whether the request is for client side proxy or not", - "x-ms-parameter-location": "method" }, - "TokenAuth": { - "name": "isTokenAuth", - "in": "body", - "required": true, - "type": "boolean", - "description": "Parameter to indicate whether the request is token based authentication or AAD based authentication", - "x-ms-parameter-location": "method" + "AuthenticationMethod": { + "description": "Authentication method used by the user to fetch credentials for accessing the cluster.", + "enum": [ + "AAD", + "Token" + ], + "x-ms-enum": { + "name": "AuthenticationMethod", + "modelAsString": true } + }, + "ClientProxy": { + "description": "Boolean value to indicate whether the request is for client side proxy or not", + "type": "boolean" } +}, +"parameters": { +"ClusterNamePathParam": { + "name": "clusterName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the Kubernetes cluster on which get is called.", + "x-ms-parameter-location": "method" +}, +"ClientProxy": { + "name": "clientProxy", + "in": "body", + "required": true, + "type": "boolean", + "schema": { + "$ref": "#/definitions/ClientProxy" + }, + "description": "Parameter to indicate whether the request is for client side proxy or not", + "x-ms-parameter-location": "method" +}, +"AuthMethod": { + "name": "authMethod", + "in": "body", + "required": true, + "type": "boolean", + "schema": { + "$ref": "#/definitions/AuthenticationMethod" + }, + "description": "Parameter to indicate whether the request is token based authentication or AAD based authentication", + "x-ms-parameter-location": "method" +} } +} \ No newline at end of file From b97a156d91eb165fe926133b588c928b75d63ace Mon Sep 17 00:00:00 2001 From: sikasire Date: Wed, 27 Jan 2021 15:51:05 +0530 Subject: [PATCH 25/31] body fix --- .../2021-04-01-preview/connectedClusters.json | 33 ++++++++++++++++--- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json index 0aa9045b4c0d..14b328213708 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json @@ -2,7 +2,7 @@ "swagger": "2.0", "info": { "title": "ConnectedKubernetesClient", - "version": "2021-03-01-preview", + "version": "2021-04-01-preview", "description": "Azure Connected Cluster Resource Provider API for adopting any Kubernetes Cluster" }, "schemes": [ @@ -265,10 +265,12 @@ "$ref": "#/parameters/ClusterNamePathParam" }, { - "$ref": "#/parameters/ClientProxy" + "$ref": "#/parameters/ClientProxy", + "required": true }, { - "$ref": "#/parameters/TokenAuth" + "$ref": "#/parameters/TokenAuth", + "required": true } ], "responses": { @@ -766,6 +768,21 @@ } }, "readOnly": true + }, + "AuthenticationMethod": { + "description": "Authentication method used by the user to fetch credentials for accessing the cluster.", + "enum": [ + "AAD", + "Token" + ], + "x-ms-enum": { + "name": "AuthenticationMethod", + "modelAsString": true + } + }, + "ClientProxy": { + "description": "Boolean value to indicate whether the request is for client side proxy or not", + "type": "boolean" } }, "parameters": { @@ -782,14 +799,20 @@ "in": "body", "required": true, "type": "boolean", + "schema": { + "$ref": "#/definitions/ClientProxy" + }, "description": "Parameter to indicate whether the request is for client side proxy or not", "x-ms-parameter-location": "method" }, - "TokenAuth": { - "name": "isTokenAuth", + "AuthMethod": { + "name": "authMethod", "in": "body", "required": true, "type": "boolean", + "schema": { + "$ref": "#/definitions/AuthenticationMethod" + }, "description": "Parameter to indicate whether the request is token based authentication or AAD based authentication", "x-ms-parameter-location": "method" } From 567add92bc60625f97aa03e997e580a6025cf607 Mon Sep 17 00:00:00 2001 From: sikasire Date: Wed, 27 Jan 2021 17:58:50 +0530 Subject: [PATCH 26/31] fix --- .../2021-04-01-preview/connectedClusters.json | 63 ++++++------------- 1 file changed, 20 insertions(+), 43 deletions(-) diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json index 0fae1240c7a8..d0b8e3dea1ae 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json @@ -265,12 +265,26 @@ "$ref": "#/parameters/ClusterNamePathParam" }, { - "$ref": "#/parameters/ClientProxy", - "required": true - }, - { - "$ref": "#/parameters/AuthMethod", - "required": true + "in": "body", + "required": true, + "properties": { + "authenticationMethod": { + "type": "string", + "description": "The mode of client authentication.", + "enum": [ + "Token", + "AAD" + ], + "x-ms-enum": { + "name": "AuthenticationMethod", + "modelAsString": true + } + }, + "clientProxy": { + "type": "boolean", + "description": "Boolean value to indicate whether the request is for client side proxy or not" + } + } } ], "responses": { @@ -768,21 +782,6 @@ } }, "readOnly": true - }, - "AuthenticationMethod": { - "description": "Authentication method used by the user to fetch credentials for accessing the cluster.", - "enum": [ - "AAD", - "Token" - ], - "x-ms-enum": { - "name": "AuthenticationMethod", - "modelAsString": true - } - }, - "ClientProxy": { - "description": "Boolean value to indicate whether the request is for client side proxy or not", - "type": "boolean" } }, "parameters": { @@ -793,28 +792,6 @@ "type": "string", "description": "The name of the Kubernetes cluster on which get is called.", "x-ms-parameter-location": "method" - }, - "ClientProxy": { - "name": "clientProxy", - "in": "path", - "required": true, - "type": "boolean", - "schema": { - "$ref": "#/definitions/ClientProxy" - }, - "description": "Parameter to indicate whether the request is for client side proxy or not", - "x-ms-parameter-location": "method" - }, - "AuthMethod": { - "name": "authMethod", - "in": "path", - "required": true, - "type": "boolean", - "schema": { - "$ref": "#/definitions/AuthenticationMethod" - }, - "description": "Parameter to indicate whether the request is token based authentication or AAD based authentication", - "x-ms-parameter-location": "method" } } } From b181315cef85852856d43d9b5456b3f7e55a5ea9 Mon Sep 17 00:00:00 2001 From: sikasire Date: Wed, 27 Jan 2021 17:58:50 +0530 Subject: [PATCH 27/31] fix --- .../2021-04-01-preview/connectedClusters.json | 64 +++++++------------ 1 file changed, 23 insertions(+), 41 deletions(-) diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json index 0fae1240c7a8..075677c9094d 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json @@ -265,12 +265,13 @@ "$ref": "#/parameters/ClusterNamePathParam" }, { - "$ref": "#/parameters/ClientProxy", - "required": true - }, - { - "$ref": "#/parameters/AuthMethod", - "required": true + "in": "body", + "required": true, + "name": "Properties", + "schema": { + "$ref": "#/definitions/Properties" + }, + "description": "properties" } ], "responses": { @@ -769,20 +770,23 @@ }, "readOnly": true }, - "AuthenticationMethod": { - "description": "Authentication method used by the user to fetch credentials for accessing the cluster.", - "enum": [ - "AAD", - "Token" - ], - "x-ms-enum": { - "name": "AuthenticationMethod", - "modelAsString": true + "Properties": { + "authenticationMethod": { + "type": "string", + "description": "The mode of client authentication.", + "enum": [ + "Token", + "AAD" + ], + "x-ms-enum": { + "name": "AuthenticationMethod", + "modelAsString": true + } + }, + "clientProxy": { + "type": "boolean", + "description": "Boolean value to indicate whether the request is for client side proxy or not" } - }, - "ClientProxy": { - "description": "Boolean value to indicate whether the request is for client side proxy or not", - "type": "boolean" } }, "parameters": { @@ -793,28 +797,6 @@ "type": "string", "description": "The name of the Kubernetes cluster on which get is called.", "x-ms-parameter-location": "method" - }, - "ClientProxy": { - "name": "clientProxy", - "in": "path", - "required": true, - "type": "boolean", - "schema": { - "$ref": "#/definitions/ClientProxy" - }, - "description": "Parameter to indicate whether the request is for client side proxy or not", - "x-ms-parameter-location": "method" - }, - "AuthMethod": { - "name": "authMethod", - "in": "path", - "required": true, - "type": "boolean", - "schema": { - "$ref": "#/definitions/AuthenticationMethod" - }, - "description": "Parameter to indicate whether the request is token based authentication or AAD based authentication", - "x-ms-parameter-location": "method" } } } From d86c4f24e13ad1459ade249b3072b85008de85ec Mon Sep 17 00:00:00 2001 From: sikasire Date: Wed, 27 Jan 2021 19:02:37 +0530 Subject: [PATCH 28/31] NIT --- .../preview/2021-04-01-preview/connectedClusters.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json index 442d8de5b981..a45d4ba5468a 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json @@ -271,7 +271,7 @@ "schema": { "$ref": "#/definitions/ListClusterUserCredentialsProperties" }, - "description": "ListClusterUserCredetials properties" + "description": "ListClusterUserCredentials properties" } ], "responses": { From 120fb4051cb0c99cf02cb15a058c6c3baa3c2fba Mon Sep 17 00:00:00 2001 From: sikasire Date: Wed, 27 Jan 2021 21:04:27 +0530 Subject: [PATCH 29/31] nit fix --- .../preview/2021-04-01-preview/connectedClusters.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json index a45d4ba5468a..7d2e30cb80aa 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json @@ -267,7 +267,7 @@ { "in": "body", "required": true, - "name": "ListClusterUserCredentialsProperties", + "name": "Properties", "schema": { "$ref": "#/definitions/ListClusterUserCredentialsProperties" }, @@ -772,6 +772,10 @@ }, "ListClusterUserCredentialsProperties": { "type": "object", + "required": [ + "authenticationMethod", + "clientProxy" + ], "properties": { "authenticationMethod": { "type": "string", From 07c295de7c531f8721c0727e432d08f5bbbff3f0 Mon Sep 17 00:00:00 2001 From: sikasire Date: Wed, 27 Jan 2021 21:17:48 +0530 Subject: [PATCH 30/31] examples fix --- .../examples/ConnectedClustersListClusterCredentialsResult.json | 2 +- .../ConnectedClustersListClusterCredentialsResultNonAad.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/ConnectedClustersListClusterCredentialsResult.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/ConnectedClustersListClusterCredentialsResult.json index 091b1d69bb61..5ee18472fa52 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/ConnectedClustersListClusterCredentialsResult.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/ConnectedClustersListClusterCredentialsResult.json @@ -4,7 +4,7 @@ "resourceGroupName": "k8sc-rg", "clusterName": "testCluster", "api-version": "2021-04-01-preview", - "ListClusterUserCredentialsProperties": { + "Properties": { "authenticationMethod": "AAD", "clientProxy": true } diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/ConnectedClustersListClusterCredentialsResultNonAad.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/ConnectedClustersListClusterCredentialsResultNonAad.json index 8dd83747ebcb..f6c70aa321b3 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/ConnectedClustersListClusterCredentialsResultNonAad.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/examples/ConnectedClustersListClusterCredentialsResultNonAad.json @@ -4,7 +4,7 @@ "resourceGroupName": "k8sc-rg", "clusterName": "testCluster", "api-version": "2021-04-01-preview", - "ListClusterUserCredentialsProperties": { + "Properties": { "authenticationMethod": "Token", "clientProxy": true } From 2ae9ed2adca38733d3d18c064ba36177a626e229 Mon Sep 17 00:00:00 2001 From: sikasire Date: Wed, 27 Jan 2021 23:27:34 +0530 Subject: [PATCH 31/31] setting default identity to systemassigned --- .../preview/2021-04-01-preview/connectedClusters.json | 1 + .../stable/2021-03-01/connectedClusters.json | 1 + 2 files changed, 2 insertions(+) diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json index 7d2e30cb80aa..44d0e93d9196 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2021-04-01-preview/connectedClusters.json @@ -526,6 +526,7 @@ "type": { "type": "string", "description": "The type of identity used for the connected cluster. The type 'SystemAssigned, includes a system created identity. The type 'None' means no identity is assigned to the connected cluster.", + "default": "SystemAssigned", "enum": [ "None", "SystemAssigned" diff --git a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/stable/2021-03-01/connectedClusters.json b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/stable/2021-03-01/connectedClusters.json index e93e50320915..2c88d6d237c1 100644 --- a/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/stable/2021-03-01/connectedClusters.json +++ b/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/stable/2021-03-01/connectedClusters.json @@ -471,6 +471,7 @@ "type": { "type": "string", "description": "The type of identity used for the connected cluster. The type 'SystemAssigned, includes a system created identity. The type 'None' means no identity is assigned to the connected cluster.", + "default": "SystemAssigned", "enum": [ "None", "SystemAssigned"