From 527659f3feee6aac4cc2bc707f8b5ca31d8ddc62 Mon Sep 17 00:00:00 2001 From: Jenny Lawrance Date: Wed, 12 May 2021 19:53:07 -0700 Subject: [PATCH 01/25] Adding kube-env PR --- .../stable/2021-01-01/KubeEnvironments.json | 694 ++++++++++++++++++ 1 file changed, 694 insertions(+) create mode 100644 specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json new file mode 100644 index 000000000000..efbba31f9f23 --- /dev/null +++ b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json @@ -0,0 +1,694 @@ +{ + "swagger": "2.0", + "info": { + "version": "2021-01-01", + "title": "KubeEnvironments API Client" + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "paths": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/kubeEnvironments": { + "get": { + "tags": [ + "KubeEnvironments" + ], + "summary": "Get all the Kubernetes Environments in a resource group.", + "description": "Description for Get all the Kubernetes Environments in a resource group.", + "operationId": "KubeEnvironments_ListByResourceGroup", + "parameters": [ + { + "$ref": "#/parameters/resourceGroupNameParameter" + }, + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/KubeEnvironmentCollection" + } + }, + "default": { + "description": "App Service error response.", + "schema": { + "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/kubeEnvironments/{name}": { + "get": { + "tags": [ + "KubeEnvironments" + ], + "summary": "Get the properties of a Kubernetes Environment.", + "description": "Description for Get the properties of a Kubernetes Environment.", + "operationId": "KubeEnvironments_Get", + "parameters": [ + { + "$ref": "#/parameters/resourceGroupNameParameter" + }, + { + "name": "name", + "in": "path", + "description": "Name of the Kubernetes Environment.", + "required": true, + "type": "string" + }, + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/KubeEnvironment" + } + }, + "default": { + "description": "App Service error response.", + "schema": { + "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse" + } + } + } + }, + "put": { + "tags": [ + "KubeEnvironments" + ], + "summary": "Create a Kubernetes Environment.", + "description": "Description for Create a Kubernetes Environment.", + "operationId": "KubeEnvironments_CreateOrUpdate", + "parameters": [ + { + "$ref": "#/parameters/resourceGroupNameParameter" + }, + { + "name": "name", + "in": "path", + "description": "Name of the Kubernetes Environment.", + "required": true, + "type": "string" + }, + { + "name": "kubeEnvironmentEnvelope", + "in": "body", + "description": "Configuration details of the Kubernetes Environment.", + "required": true, + "schema": { + "$ref": "#/definitions/KubeEnvironment" + } + }, + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/KubeEnvironment" + } + }, + "201": { + "description": "Created", + "schema": { + "$ref": "#/definitions/KubeEnvironment" + } + }, + "default": { + "description": "App Service error response.", + "schema": { + "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse" + } + } + }, + "x-ms-long-running-operation": true + }, + "delete": { + "tags": [ + "KubeEnvironments" + ], + "summary": "Delete a Kubernetes Environment.", + "description": "Description for Delete a Kubernetes Environment.", + "operationId": "KubeEnvironments_Delete", + "parameters": [ + { + "$ref": "#/parameters/resourceGroupNameParameter" + }, + { + "name": "name", + "in": "path", + "description": "Name of the Kubernetes Environment.", + "required": true, + "type": "string" + }, + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "202": { + "description": "Delete operation is in progress" + }, + "204": { + "description": "Kubernetes Environment does not exist" + }, + "default": { + "description": "App Service error response.", + "schema": { + "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse" + } + } + }, + "x-ms-long-running-operation": true + }, + "patch": { + "tags": [ + "KubeEnvironments" + ], + "summary": "Create a Kubernetes Environment.", + "description": "Description for Create a Kubernetes Environment.", + "operationId": "KubeEnvironments_Update", + "parameters": [ + { + "$ref": "#/parameters/resourceGroupNameParameter" + }, + { + "name": "name", + "in": "path", + "description": "Name of the Kubernetes Environment.", + "required": true, + "type": "string" + }, + { + "name": "kubeEnvironmentEnvelope", + "in": "body", + "description": "Configuration details of the Kubernetes Environment.", + "required": true, + "schema": { + "$ref": "#/definitions/KubeEnvironmentPatchResource" + } + }, + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/KubeEnvironment" + } + }, + "201": { + "description": "Created", + "schema": { + "$ref": "#/definitions/KubeEnvironment" + } + }, + "default": { + "description": "App Service error response.", + "schema": { + "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/kubeEnvironments/{name}/operations/{operationId}": { + "get": { + "tags": [ + "KubeEnvironments" + ], + "summary": "Get status of a Kubernetes Environment operation.", + "description": "Description for Get status of a Kubernetes Environment operation.", + "operationId": "KubeEnvironments_GetOperation", + "parameters": [ + { + "$ref": "#/parameters/resourceGroupNameParameter" + }, + { + "name": "name", + "in": "path", + "description": "Name of the Kubernetes Environment.", + "required": true, + "type": "string" + }, + { + "name": "operationId", + "in": "path", + "description": "ID of the operation.", + "required": true, + "type": "string" + }, + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "type": "object" + } + }, + "202": { + "description": "Asynchronous operation in progress", + "schema": { + "type": "object" + } + }, + "404": { + "description": "Not found." + }, + "default": { + "description": "App Service error response.", + "schema": { + "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse" + } + } + } + } + } + }, + "definitions": { + "AppLogsConfiguration": { + "type": "object", + "properties": { + "destination": { + "type": "string" + }, + "logAnalyticsConfiguration": { + "$ref": "#/definitions/LogAnalyticsConfiguration" + } + } + }, + "ArcConfiguration": { + "type": "object", + "properties": { + "artifactsStorageType": { + "enum": [ + "LocalNode", + "NetworkFileSystem" + ], + "type": "string", + "x-ms-enum": { + "name": "StorageType", + "modelAsString": false + }, + "x-ms-mutability": [ + "create", + "read" + ] + }, + "artifactStorageClassName": { + "type": "string", + "x-ms-mutability": [ + "create", + "read" + ] + }, + "artifactStorageMountPath": { + "type": "string", + "x-ms-mutability": [ + "create", + "read" + ] + }, + "artifactStorageNodeName": { + "type": "string", + "x-ms-mutability": [ + "create", + "read" + ] + }, + "artifactStorageAccessMode": { + "type": "string", + "x-ms-mutability": [ + "create", + "read" + ] + }, + "frontEndServiceConfiguration": { + "$ref": "#/definitions/FrontEndConfiguration" + }, + "kubeConfig": { + "type": "string", + "x-ms-mutability": [ + "create", + "update" + ], + "x-ms-secret": true + } + } + }, + "FrontEndConfiguration": { + "type": "object", + "properties": { + "kind": { + "enum": [ + "NodePort", + "LoadBalancer" + ], + "type": "string", + "x-ms-enum": { + "name": "FrontEndServiceType", + "modelAsString": false + } + } + } + }, + "KubeEnvironment": { + "description": "A Kubernetes cluster specialized for web workloads by Azure App Service", + "type": "object", + "allOf": [ + { + "$ref": "./CommonDefinitions.json#/definitions/Resource" + } + ], + "properties": { + "properties": { + "description": "KubeEnvironment resource specific properties", + "properties": { + "type": { + "description": "Type of the Kubernetes Environment.\nOnly Set for WorkerApps as Managed", + "type": "string", + "x-ms-mutability": [ + "create", + "read" + ] + }, + "extendedLocation": { + "$ref": "./CommonDefinitions.json#/definitions/ExtendedLocation", + "x-ms-mutability": [ + "create", + "read" + ] + }, + "provisioningState": { + "description": "Provisioning state of the Kubernetes Environment.", + "enum": [ + "Succeeded", + "Failed", + "Canceled", + "Waiting", + "InitializationInProgress", + "InfrastructureSetupInProgress", + "InfrastructureSetupComplete", + "ScheduledForDelete", + "UpgradeRequested", + "UpgradeFailed", + "AKSProvisionComplete" + ], + "type": "string", + "readOnly": true, + "x-ms-enum": { + "name": "KubeEnvironmentProvisioningState", + "modelAsString": false + } + }, + "deploymentErrors": { + "description": "Any errors that occurred during deployment or deployment validation", + "type": "string", + "readOnly": true + }, + "internalLoadBalancerEnabled": { + "description": "Only visible within Vnet/Subnet", + "type": "boolean", + "x-ms-mutability": [ + "create", + "read" + ] + }, + "defaultDomain": { + "description": "Default Domain Name for the cluster", + "type": "string", + "readOnly": true + }, + "staticIp": { + "description": "Static IP of the KubeEnvironment", + "type": "string", + "x-ms-mutability": [ + "create", + "read" + ] + }, + "arcConfiguration": { + "$ref": "#/definitions/ArcConfiguration", + "description": "Cluster configuration which determines the ARC cluster\ncomponents types. Eg: Choosing between BuildService kind,\nFrontEnd Service ArtifactsStorageType etc." + }, + "appLogsConfiguration": { + "$ref": "#/definitions/AppLogsConfiguration", + "description": "Cluster configuration which enables the log daemon to export\napp logs to a destination. Currently only \"log-analytics\" is\nsupported" + }, + "workerAppsConfiguration": { + "$ref": "#/definitions/WorkerAppsConfiguration", + "description": "Cluster configuration which enables users to create Worker Apps\nenabled dedicated Kube Environments" + }, + "aksResourceID": { + "type": "string", + "x-ms-mutability": [ + "create", + "read" + ] + } + }, + "x-ms-client-flatten": true + }, + "extendedLocation": { + "$ref": "./CommonDefinitions.json#/definitions/ExtendedLocation" + } + } + }, + "KubeEnvironmentCollection": { + "description": "Collection of Kubernetes Environments", + "required": [ + "value" + ], + "type": "object", + "properties": { + "value": { + "description": "Collection of resources.", + "type": "array", + "items": { + "$ref": "#/definitions/KubeEnvironment" + } + }, + "nextLink": { + "description": "Link to next page of resources.", + "type": "string", + "readOnly": true + } + } + }, + "KubeEnvironmentPatchResource": { + "description": "ARM resource for a KubeEnvironment when patching", + "type": "object", + "allOf": [ + { + "$ref": "./CommonDefinitions.json#/definitions/ProxyOnlyResource" + } + ], + "properties": { + "properties": { + "description": "KubeEnvironmentPatchResource resource specific properties", + "properties": { + "type": { + "description": "Type of the Kubernetes Environment.\nOnly Set for WorkerApps as Managed", + "type": "string", + "x-ms-mutability": [ + "create", + "read" + ] + }, + "extendedLocation": { + "$ref": "./CommonDefinitions.json#/definitions/ExtendedLocation", + "x-ms-mutability": [ + "create", + "read" + ] + }, + "provisioningState": { + "description": "Provisioning state of the Kubernetes Environment.", + "enum": [ + "Succeeded", + "Failed", + "Canceled", + "Waiting", + "InitializationInProgress", + "InfrastructureSetupInProgress", + "InfrastructureSetupComplete", + "ScheduledForDelete", + "UpgradeRequested", + "UpgradeFailed", + "AKSProvisionComplete" + ], + "type": "string", + "readOnly": true, + "x-ms-enum": { + "name": "KubeEnvironmentProvisioningState", + "modelAsString": false + } + }, + "deploymentErrors": { + "description": "Any errors that occurred during deployment or deployment validation", + "type": "string", + "readOnly": true + }, + "internalLoadBalancerEnabled": { + "description": "Only visible within Vnet/Subnet", + "type": "boolean", + "x-ms-mutability": [ + "create", + "read" + ] + }, + "defaultDomain": { + "description": "Default Domain Name for the cluster", + "type": "string", + "readOnly": true + }, + "staticIp": { + "description": "Static IP of the KubeEnvironment", + "type": "string", + "x-ms-mutability": [ + "create", + "read" + ] + }, + "arcConfiguration": { + "$ref": "#/definitions/ArcConfiguration", + "description": "Cluster configuration which determines the ARC cluster\ncomponents types. Eg: Choosing between BuildService kind,\nFrontEnd Service ArtifactsStorageType etc." + }, + "appLogsConfiguration": { + "$ref": "#/definitions/AppLogsConfiguration", + "description": "Cluster configuration which enables the log daemon to export\napp logs to a destination. Currently only \"log-analytics\" is\nsupported" + }, + "workerAppsConfiguration": { + "$ref": "#/definitions/WorkerAppsConfiguration", + "description": "Cluster configuration which enables users to create Worker Apps\nenabled dedicated Kube Environments" + }, + "aksResourceID": { + "type": "string", + "x-ms-mutability": [ + "create", + "read" + ] + } + }, + "x-ms-client-flatten": true + } + } + }, + "LogAnalyticsConfiguration": { + "type": "object", + "properties": { + "customerId": { + "type": "string" + }, + "sharedKey": { + "type": "string", + "x-ms-mutability": [ + "create", + "update" + ], + "x-ms-secret": true + } + } + }, + "WorkerAppsConfiguration": { + "description": "Configuration required deploy Kube Environment Dedicated\nto Worker Apps.\n \nCreate request is not accepted, if ArcConfiguration or AksResourceId is provided\nwith WorkerAppsConfiguration", + "type": "object", + "properties": { + "subnetResourceId": { + "description": "Service Principle Secret used to provision WorkerApps Kube Environment\nVnetResource", + "type": "string" + }, + "workerAppApiIP": { + "description": "Static IP Address used for Workerapps API Service", + "type": "string" + } + } + } + }, + "parameters": { + "subscriptionIdParameter": { + "name": "subscriptionId", + "in": "path", + "description": "Your Azure subscription ID. This is a GUID-formatted string (e.g. 00000000-0000-0000-0000-000000000000).", + "required": true, + "type": "string" + }, + "resourceGroupNameParameter": { + "name": "resourceGroupName", + "in": "path", + "description": "Name of the resource group to which the resource belongs.", + "required": true, + "type": "string", + "maxLength": 90, + "minLength": 1, + "pattern": "^[-\\w\\._\\(\\)]+[^\\.]$", + "x-ms-parameter-location": "method" + }, + "apiVersionParameter": { + "name": "api-version", + "in": "query", + "description": "API Version", + "required": true, + "type": "string" + } + }, + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "description": "Azure Active Directory OAuth2 Flow", + "flow": "implicit", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ] +} From 4eac3ccf894fd42f21e7674624663696046e3d3b Mon Sep 17 00:00:00 2001 From: Jenny Lawrance Date: Wed, 12 May 2021 20:02:33 -0700 Subject: [PATCH 02/25] Adding change in readme.md --- specification/web/resource-manager/readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/web/resource-manager/readme.md b/specification/web/resource-manager/readme.md index d4366d6ecc0a..a2426f35a2aa 100644 --- a/specification/web/resource-manager/readme.md +++ b/specification/web/resource-manager/readme.md @@ -81,6 +81,7 @@ input-file: - Microsoft.Web/stable/2021-01-01/ResourceProvider.json - Microsoft.Web/stable/2021-01-01/StaticSites.json - Microsoft.Web/stable/2021-01-01/WebApps.json + - Microsoft.Web/stable/2021-01-01/KubeEnvironments.json directive: # suppress each RPC 3016 error - where: $.definitions.FunctionSecrets.properties.trigger_url From e74b11cc23239815ee4529c796d5fa0724d992a9 Mon Sep 17 00:00:00 2001 From: Jenny Lawrance Date: Wed, 12 May 2021 20:55:13 -0700 Subject: [PATCH 03/25] Adding extended location to site and asps --- .../stable/2021-01-01/CommonDefinitions.json | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/CommonDefinitions.json b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/CommonDefinitions.json index e71a5ab26577..b19cb71a4470 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/CommonDefinitions.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/CommonDefinitions.json @@ -213,6 +213,10 @@ "default": false, "type": "boolean" }, + "elasticScaleEnabled": { + "description": "ServerFarm supports ElasticScale. Apps in this plan will scale as if the ServerFarm was ElasticPremium sku", + "type": "boolean" + }, "maximumElasticWorkerCount": { "format": "int32", "description": "Maximum number of total workers allowed for this ElasticScaleEnabled App Service Plan", @@ -305,6 +309,9 @@ }, "sku": { "$ref": "#/definitions/SkuDescription" + }, + "extendedLocation": { + "$ref": "#/definitions/ExtendedLocation" } } }, @@ -1120,6 +1127,18 @@ } } }, + "ExtendedLocation": { + "type": "object", + "properties": { + "customLocation": { + "type": "string", + "x-ms-mutability": [ + "create", + "read" + ] + } + } + }, "HandlerMapping": { "description": "The IIS handler mappings used to define which handler processes HTTP requests with certain extension. \nFor example, it is used to configure php-cgi.exe process to handle all HTTP requests with *.php extension.", "type": "object", @@ -2372,6 +2391,9 @@ }, "identity": { "$ref": "#/definitions/ManagedServiceIdentity" + }, + "extendedLocation": { + "$ref": "#/definitions/ExtendedLocation" } } }, From 6a64eefd737d48a866b5edf7cde642980d3808c0 Mon Sep 17 00:00:00 2001 From: Jenny Lawrance Date: Wed, 12 May 2021 21:00:16 -0700 Subject: [PATCH 04/25] Revert accidental change --- .../Microsoft.Web/stable/2021-01-01/CommonDefinitions.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/CommonDefinitions.json b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/CommonDefinitions.json index b19cb71a4470..52dfa3553543 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/CommonDefinitions.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/CommonDefinitions.json @@ -213,10 +213,6 @@ "default": false, "type": "boolean" }, - "elasticScaleEnabled": { - "description": "ServerFarm supports ElasticScale. Apps in this plan will scale as if the ServerFarm was ElasticPremium sku", - "type": "boolean" - }, "maximumElasticWorkerCount": { "format": "int32", "description": "Maximum number of total workers allowed for this ElasticScaleEnabled App Service Plan", From e5c46054b45048891f6f6e023d9a2cff18cd10f3 Mon Sep 17 00:00:00 2001 From: Jenny Lawrance Date: Wed, 12 May 2021 21:08:40 -0700 Subject: [PATCH 05/25] Fix spellcheck error --- .../stable/2021-01-01/KubeEnvironments.json | 87 +++++++++---------- 1 file changed, 41 insertions(+), 46 deletions(-) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json index efbba31f9f23..857cc08c1172 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json @@ -15,6 +15,41 @@ "application/json" ], "paths": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Web/kubeEnvironments": { + "get": { + "tags": [ + "KubeEnvironments" + ], + "summary": "Get all Kubernetes Environments for a subscription.", + "description": "Description for Get all Kubernetes Environments for a subscription.", + "operationId": "KubeEnvironments_ListBySubscription", + "parameters": [ + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/KubeEnvironmentCollection" + } + }, + "default": { + "description": "App Service error response.", + "schema": { + "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/kubeEnvironments": { "get": { "tags": [ @@ -98,8 +133,8 @@ "tags": [ "KubeEnvironments" ], - "summary": "Create a Kubernetes Environment.", - "description": "Description for Create a Kubernetes Environment.", + "summary": "Creates or updates a Kubernetes Environment.", + "description": "Description for Creates or updates a Kubernetes Environment.", "operationId": "KubeEnvironments_CreateOrUpdate", "parameters": [ { @@ -195,8 +230,8 @@ "tags": [ "KubeEnvironments" ], - "summary": "Create a Kubernetes Environment.", - "description": "Description for Create a Kubernetes Environment.", + "summary": "Creates or updates a Kubernetes Environment.", + "description": "Description for Creates or updates a Kubernetes Environment.", "operationId": "KubeEnvironments_Update", "parameters": [ { @@ -405,14 +440,6 @@ "properties": { "description": "KubeEnvironment resource specific properties", "properties": { - "type": { - "description": "Type of the Kubernetes Environment.\nOnly Set for WorkerApps as Managed", - "type": "string", - "x-ms-mutability": [ - "create", - "read" - ] - }, "extendedLocation": { "$ref": "./CommonDefinitions.json#/definitions/ExtendedLocation", "x-ms-mutability": [ @@ -432,8 +459,7 @@ "InfrastructureSetupComplete", "ScheduledForDelete", "UpgradeRequested", - "UpgradeFailed", - "AKSProvisionComplete" + "UpgradeFailed" ], "type": "string", "readOnly": true, @@ -476,10 +502,6 @@ "$ref": "#/definitions/AppLogsConfiguration", "description": "Cluster configuration which enables the log daemon to export\napp logs to a destination. Currently only \"log-analytics\" is\nsupported" }, - "workerAppsConfiguration": { - "$ref": "#/definitions/WorkerAppsConfiguration", - "description": "Cluster configuration which enables users to create Worker Apps\nenabled dedicated Kube Environments" - }, "aksResourceID": { "type": "string", "x-ms-mutability": [ @@ -528,14 +550,6 @@ "properties": { "description": "KubeEnvironmentPatchResource resource specific properties", "properties": { - "type": { - "description": "Type of the Kubernetes Environment.\nOnly Set for WorkerApps as Managed", - "type": "string", - "x-ms-mutability": [ - "create", - "read" - ] - }, "extendedLocation": { "$ref": "./CommonDefinitions.json#/definitions/ExtendedLocation", "x-ms-mutability": [ @@ -555,8 +569,7 @@ "InfrastructureSetupComplete", "ScheduledForDelete", "UpgradeRequested", - "UpgradeFailed", - "AKSProvisionComplete" + "UpgradeFailed" ], "type": "string", "readOnly": true, @@ -599,10 +612,6 @@ "$ref": "#/definitions/AppLogsConfiguration", "description": "Cluster configuration which enables the log daemon to export\napp logs to a destination. Currently only \"log-analytics\" is\nsupported" }, - "workerAppsConfiguration": { - "$ref": "#/definitions/WorkerAppsConfiguration", - "description": "Cluster configuration which enables users to create Worker Apps\nenabled dedicated Kube Environments" - }, "aksResourceID": { "type": "string", "x-ms-mutability": [ @@ -630,20 +639,6 @@ "x-ms-secret": true } } - }, - "WorkerAppsConfiguration": { - "description": "Configuration required deploy Kube Environment Dedicated\nto Worker Apps.\n \nCreate request is not accepted, if ArcConfiguration or AksResourceId is provided\nwith WorkerAppsConfiguration", - "type": "object", - "properties": { - "subnetResourceId": { - "description": "Service Principle Secret used to provision WorkerApps Kube Environment\nVnetResource", - "type": "string" - }, - "workerAppApiIP": { - "description": "Static IP Address used for Workerapps API Service", - "type": "string" - } - } } }, "parameters": { From 04d90e9225582a4385f3596a915bc70661fa6a35 Mon Sep 17 00:00:00 2001 From: Jenny Lawrance Date: Wed, 12 May 2021 21:30:12 -0700 Subject: [PATCH 06/25] Adding Example files for ListBySubscription --- .../stable/2021-01-01/KubeEnvironments.json | 5 ++ .../KubeEnvironments_ListBySubscription.json | 60 +++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_ListBySubscription.json diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json index 857cc08c1172..9950d8717bd2 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json @@ -47,6 +47,11 @@ }, "x-ms-pageable": { "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "List kube environments by subscription": { + "$ref": "./examples/KubeEnvironments_ListBySubscription.json" + } } } }, diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_ListBySubscription.json b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_ListBySubscription.json new file mode 100644 index 000000000000..c7be4ce70a0c --- /dev/null +++ b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_ListBySubscription.json @@ -0,0 +1,60 @@ +{ + "parameters": { + "subscriptionId": "/8efdecc5-919e-44eb-b179-915dca89ebf9", + "resourceGroupName": "Sample-WestUSResourceGroup", + "name": "SampleAse", + "api-version": "2021-01-01" + }, + "responses": { + "200": { + "body": { + "value":[ + { + "id":"/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/K4AppsProdRG/providers/Microsoft.Web/kubeEnvironments/jlaw-demo1", + "name":"jlaw-demo1", + "type":"Microsoft.Web/kubeEnvironments", + "location":"North Central US", + "tags":{ + + }, + "properties":{ + "type":null, + "extendedLocation":null, + "provisioningState":"Succeeded", + "deploymentErrors":null, + "internalLoadBalancerEnabled":false, + "defaultDomain":"jlaw-demo1.k4apps.io", + "staticIp":"20.42.33.145", + "arcConfiguration":null, + "appLogsConfiguration":null, + "workerAppsConfiguration":null, + "aksResourceID":"/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/K4AppsProdRG/providers/Microsoft.ContainerService/managedClusters/jlaw-demo1" + } + }, + { + "id":"/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/DemoRG/providers/Microsoft.Web/kubeEnvironments/demo1", + "name":"demo1", + "type":"Microsoft.Web/kubeEnvironments", + "location":"North Central US", + "tags":{ + + }, + "properties":{ + "type":null, + "extendedLocation":null, + "provisioningState":"Succeeded", + "deploymentErrors":null, + "internalLoadBalancerEnabled":false, + "defaultDomain":"demo1.k4apps.io", + "staticIp":"52.142.21.61", + "arcConfiguration":null, + "appLogsConfiguration":null, + "workerAppsConfiguration":null, + "aksResourceID":"/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/DemoRG/providers/Microsoft.ContainerService/managedClusters/demo1" + } + } + ] + } + } + } +} \ No newline at end of file From 1b9643477664880cc7b2ec6b7072a6a8c2797a3d Mon Sep 17 00:00:00 2001 From: Jenny Lawrance Date: Wed, 12 May 2021 21:36:09 -0700 Subject: [PATCH 07/25] Adding more examples --- .../stable/2021-01-01/KubeEnvironments.json | 5 ++ .../KubeEnvironments_ListByResourceGroup.json | 60 +++++++++++++++++++ .../KubeEnvironments_ListBySubscription.json | 2 +- 3 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_ListByResourceGroup.json diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json index 9950d8717bd2..12cc26c7a7d1 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json @@ -90,6 +90,11 @@ }, "x-ms-pageable": { "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "List kube environments by resource group": { + "$ref": "./examples/KubeEnvironments_ListByResourceGroup.json" + } } } }, diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_ListByResourceGroup.json b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_ListByResourceGroup.json new file mode 100644 index 000000000000..c20134cb20a1 --- /dev/null +++ b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_ListByResourceGroup.json @@ -0,0 +1,60 @@ +{ + "parameters": { + "subscriptionId": "8efdecc5-919e-44eb-b179-915dca89ebf9", + "resourceGroupName": "Sample-WestUSResourceGroup", + "name": "SampleAse", + "api-version": "2021-01-01" + }, + "responses": { + "200": { + "body": { + "value":[ + { + "id":"/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/K4AppsProdRG/providers/Microsoft.Web/kubeEnvironments/jlaw-demo1", + "name":"jlaw-demo1", + "type":"Microsoft.Web/kubeEnvironments", + "location":"North Central US", + "tags":{ + + }, + "properties":{ + "type":null, + "extendedLocation":null, + "provisioningState":"Succeeded", + "deploymentErrors":null, + "internalLoadBalancerEnabled":false, + "defaultDomain":"jlaw-demo1.k4apps.io", + "staticIp":"20.42.33.145", + "arcConfiguration":null, + "appLogsConfiguration":null, + "workerAppsConfiguration":null, + "aksResourceID":"/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/K4AppsProdRG/providers/Microsoft.ContainerService/managedClusters/jlaw-demo1" + } + }, + { + "id":"/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/DemoRG/providers/Microsoft.Web/kubeEnvironments/demo1", + "name":"demo1", + "type":"Microsoft.Web/kubeEnvironments", + "location":"North Central US", + "tags":{ + + }, + "properties":{ + "type":null, + "extendedLocation":null, + "provisioningState":"Succeeded", + "deploymentErrors":null, + "internalLoadBalancerEnabled":false, + "defaultDomain":"demo1.k4apps.io", + "staticIp":"52.142.21.61", + "arcConfiguration":null, + "appLogsConfiguration":null, + "workerAppsConfiguration":null, + "aksResourceID":"/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/DemoRG/providers/Microsoft.ContainerService/managedClusters/demo1" + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_ListBySubscription.json b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_ListBySubscription.json index c7be4ce70a0c..c20134cb20a1 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_ListBySubscription.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_ListBySubscription.json @@ -1,6 +1,6 @@ { "parameters": { - "subscriptionId": "/8efdecc5-919e-44eb-b179-915dca89ebf9", + "subscriptionId": "8efdecc5-919e-44eb-b179-915dca89ebf9", "resourceGroupName": "Sample-WestUSResourceGroup", "name": "SampleAse", "api-version": "2021-01-01" From fc717c7a73c1ca861d41a595e8085235abfea262 Mon Sep 17 00:00:00 2001 From: Jenny Lawrance Date: Wed, 12 May 2021 21:37:47 -0700 Subject: [PATCH 08/25] fix accidental property --- .../examples/KubeEnvironments_ListByResourceGroup.json | 1 - .../2021-01-01/examples/KubeEnvironments_ListBySubscription.json | 1 - 2 files changed, 2 deletions(-) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_ListByResourceGroup.json b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_ListByResourceGroup.json index c20134cb20a1..1dce46f90496 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_ListByResourceGroup.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_ListByResourceGroup.json @@ -49,7 +49,6 @@ "staticIp":"52.142.21.61", "arcConfiguration":null, "appLogsConfiguration":null, - "workerAppsConfiguration":null, "aksResourceID":"/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/DemoRG/providers/Microsoft.ContainerService/managedClusters/demo1" } } diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_ListBySubscription.json b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_ListBySubscription.json index c20134cb20a1..1dce46f90496 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_ListBySubscription.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_ListBySubscription.json @@ -49,7 +49,6 @@ "staticIp":"52.142.21.61", "arcConfiguration":null, "appLogsConfiguration":null, - "workerAppsConfiguration":null, "aksResourceID":"/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/DemoRG/providers/Microsoft.ContainerService/managedClusters/demo1" } } From 90c769e83158e73f532972d9dc04288b57e376b0 Mon Sep 17 00:00:00 2001 From: Jenny Lawrance Date: Wed, 12 May 2021 21:41:59 -0700 Subject: [PATCH 09/25] Prettier again for new files --- .../KubeEnvironments_ListByResourceGroup.json | 108 +++++++++--------- .../KubeEnvironments_ListBySubscription.json | 108 +++++++++--------- 2 files changed, 104 insertions(+), 112 deletions(-) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_ListByResourceGroup.json b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_ListByResourceGroup.json index 1dce46f90496..3e6f74437f6e 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_ListByResourceGroup.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_ListByResourceGroup.json @@ -1,59 +1,55 @@ { - "parameters": { - "subscriptionId": "8efdecc5-919e-44eb-b179-915dca89ebf9", - "resourceGroupName": "Sample-WestUSResourceGroup", - "name": "SampleAse", - "api-version": "2021-01-01" - }, - "responses": { - "200": { - "body": { - "value":[ - { - "id":"/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/K4AppsProdRG/providers/Microsoft.Web/kubeEnvironments/jlaw-demo1", - "name":"jlaw-demo1", - "type":"Microsoft.Web/kubeEnvironments", - "location":"North Central US", - "tags":{ - - }, - "properties":{ - "type":null, - "extendedLocation":null, - "provisioningState":"Succeeded", - "deploymentErrors":null, - "internalLoadBalancerEnabled":false, - "defaultDomain":"jlaw-demo1.k4apps.io", - "staticIp":"20.42.33.145", - "arcConfiguration":null, - "appLogsConfiguration":null, - "workerAppsConfiguration":null, - "aksResourceID":"/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/K4AppsProdRG/providers/Microsoft.ContainerService/managedClusters/jlaw-demo1" - } - }, - { - "id":"/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/DemoRG/providers/Microsoft.Web/kubeEnvironments/demo1", - "name":"demo1", - "type":"Microsoft.Web/kubeEnvironments", - "location":"North Central US", - "tags":{ - - }, - "properties":{ - "type":null, - "extendedLocation":null, - "provisioningState":"Succeeded", - "deploymentErrors":null, - "internalLoadBalancerEnabled":false, - "defaultDomain":"demo1.k4apps.io", - "staticIp":"52.142.21.61", - "arcConfiguration":null, - "appLogsConfiguration":null, - "aksResourceID":"/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/DemoRG/providers/Microsoft.ContainerService/managedClusters/demo1" - } - } - ] + "parameters": { + "subscriptionId": "8efdecc5-919e-44eb-b179-915dca89ebf9", + "resourceGroupName": "Sample-WestUSResourceGroup", + "name": "SampleAse", + "api-version": "2021-01-01" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/K4AppsProdRG/providers/Microsoft.Web/kubeEnvironments/jlaw-demo1", + "name": "jlaw-demo1", + "type": "Microsoft.Web/kubeEnvironments", + "location": "North Central US", + "tags": {}, + "properties": { + "type": null, + "extendedLocation": null, + "provisioningState": "Succeeded", + "deploymentErrors": null, + "internalLoadBalancerEnabled": false, + "defaultDomain": "jlaw-demo1.k4apps.io", + "staticIp": "20.42.33.145", + "arcConfiguration": null, + "appLogsConfiguration": null, + "workerAppsConfiguration": null, + "aksResourceID": "/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/K4AppsProdRG/providers/Microsoft.ContainerService/managedClusters/jlaw-demo1" } - } + }, + { + "id": "/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/DemoRG/providers/Microsoft.Web/kubeEnvironments/demo1", + "name": "demo1", + "type": "Microsoft.Web/kubeEnvironments", + "location": "North Central US", + "tags": {}, + "properties": { + "type": null, + "extendedLocation": null, + "provisioningState": "Succeeded", + "deploymentErrors": null, + "internalLoadBalancerEnabled": false, + "defaultDomain": "demo1.k4apps.io", + "staticIp": "52.142.21.61", + "arcConfiguration": null, + "appLogsConfiguration": null, + "aksResourceID": "/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/DemoRG/providers/Microsoft.ContainerService/managedClusters/demo1" + } + } + ] + } } -} \ No newline at end of file + } +} diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_ListBySubscription.json b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_ListBySubscription.json index 1dce46f90496..3e6f74437f6e 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_ListBySubscription.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_ListBySubscription.json @@ -1,59 +1,55 @@ { - "parameters": { - "subscriptionId": "8efdecc5-919e-44eb-b179-915dca89ebf9", - "resourceGroupName": "Sample-WestUSResourceGroup", - "name": "SampleAse", - "api-version": "2021-01-01" - }, - "responses": { - "200": { - "body": { - "value":[ - { - "id":"/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/K4AppsProdRG/providers/Microsoft.Web/kubeEnvironments/jlaw-demo1", - "name":"jlaw-demo1", - "type":"Microsoft.Web/kubeEnvironments", - "location":"North Central US", - "tags":{ - - }, - "properties":{ - "type":null, - "extendedLocation":null, - "provisioningState":"Succeeded", - "deploymentErrors":null, - "internalLoadBalancerEnabled":false, - "defaultDomain":"jlaw-demo1.k4apps.io", - "staticIp":"20.42.33.145", - "arcConfiguration":null, - "appLogsConfiguration":null, - "workerAppsConfiguration":null, - "aksResourceID":"/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/K4AppsProdRG/providers/Microsoft.ContainerService/managedClusters/jlaw-demo1" - } - }, - { - "id":"/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/DemoRG/providers/Microsoft.Web/kubeEnvironments/demo1", - "name":"demo1", - "type":"Microsoft.Web/kubeEnvironments", - "location":"North Central US", - "tags":{ - - }, - "properties":{ - "type":null, - "extendedLocation":null, - "provisioningState":"Succeeded", - "deploymentErrors":null, - "internalLoadBalancerEnabled":false, - "defaultDomain":"demo1.k4apps.io", - "staticIp":"52.142.21.61", - "arcConfiguration":null, - "appLogsConfiguration":null, - "aksResourceID":"/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/DemoRG/providers/Microsoft.ContainerService/managedClusters/demo1" - } - } - ] + "parameters": { + "subscriptionId": "8efdecc5-919e-44eb-b179-915dca89ebf9", + "resourceGroupName": "Sample-WestUSResourceGroup", + "name": "SampleAse", + "api-version": "2021-01-01" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/K4AppsProdRG/providers/Microsoft.Web/kubeEnvironments/jlaw-demo1", + "name": "jlaw-demo1", + "type": "Microsoft.Web/kubeEnvironments", + "location": "North Central US", + "tags": {}, + "properties": { + "type": null, + "extendedLocation": null, + "provisioningState": "Succeeded", + "deploymentErrors": null, + "internalLoadBalancerEnabled": false, + "defaultDomain": "jlaw-demo1.k4apps.io", + "staticIp": "20.42.33.145", + "arcConfiguration": null, + "appLogsConfiguration": null, + "workerAppsConfiguration": null, + "aksResourceID": "/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/K4AppsProdRG/providers/Microsoft.ContainerService/managedClusters/jlaw-demo1" } - } + }, + { + "id": "/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/DemoRG/providers/Microsoft.Web/kubeEnvironments/demo1", + "name": "demo1", + "type": "Microsoft.Web/kubeEnvironments", + "location": "North Central US", + "tags": {}, + "properties": { + "type": null, + "extendedLocation": null, + "provisioningState": "Succeeded", + "deploymentErrors": null, + "internalLoadBalancerEnabled": false, + "defaultDomain": "demo1.k4apps.io", + "staticIp": "52.142.21.61", + "arcConfiguration": null, + "appLogsConfiguration": null, + "aksResourceID": "/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/DemoRG/providers/Microsoft.ContainerService/managedClusters/demo1" + } + } + ] + } } -} \ No newline at end of file + } +} From 1d9b100d53ef2364f91420d7564a3f76953fb91e Mon Sep 17 00:00:00 2001 From: Jenny Lawrance Date: Wed, 12 May 2021 21:46:14 -0700 Subject: [PATCH 10/25] remove not used properties --- .../examples/KubeEnvironments_ListByResourceGroup.json | 3 --- .../examples/KubeEnvironments_ListBySubscription.json | 3 --- 2 files changed, 6 deletions(-) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_ListByResourceGroup.json b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_ListByResourceGroup.json index 3e6f74437f6e..a33046d7ebac 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_ListByResourceGroup.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_ListByResourceGroup.json @@ -16,7 +16,6 @@ "location": "North Central US", "tags": {}, "properties": { - "type": null, "extendedLocation": null, "provisioningState": "Succeeded", "deploymentErrors": null, @@ -25,7 +24,6 @@ "staticIp": "20.42.33.145", "arcConfiguration": null, "appLogsConfiguration": null, - "workerAppsConfiguration": null, "aksResourceID": "/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/K4AppsProdRG/providers/Microsoft.ContainerService/managedClusters/jlaw-demo1" } }, @@ -36,7 +34,6 @@ "location": "North Central US", "tags": {}, "properties": { - "type": null, "extendedLocation": null, "provisioningState": "Succeeded", "deploymentErrors": null, diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_ListBySubscription.json b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_ListBySubscription.json index 3e6f74437f6e..a33046d7ebac 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_ListBySubscription.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_ListBySubscription.json @@ -16,7 +16,6 @@ "location": "North Central US", "tags": {}, "properties": { - "type": null, "extendedLocation": null, "provisioningState": "Succeeded", "deploymentErrors": null, @@ -25,7 +24,6 @@ "staticIp": "20.42.33.145", "arcConfiguration": null, "appLogsConfiguration": null, - "workerAppsConfiguration": null, "aksResourceID": "/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/K4AppsProdRG/providers/Microsoft.ContainerService/managedClusters/jlaw-demo1" } }, @@ -36,7 +34,6 @@ "location": "North Central US", "tags": {}, "properties": { - "type": null, "extendedLocation": null, "provisioningState": "Succeeded", "deploymentErrors": null, From a815a1fb47a8cfe6c13ba212dfcfd850d92f1620 Mon Sep 17 00:00:00 2001 From: Jenny Lawrance Date: Wed, 12 May 2021 21:50:30 -0700 Subject: [PATCH 11/25] more examples --- .../examples/KubeEnvironments_Get.json | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_Get.json diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_Get.json b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_Get.json new file mode 100644 index 000000000000..3cfc00e28a71 --- /dev/null +++ b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_Get.json @@ -0,0 +1,32 @@ +{ + "parameters": { + "subscriptionId": "8efdecc5-919e-44eb-b179-915dca89ebf9", + "resourceGroupName": "K4AppsProdRG", + "name": "jlaw-demo1", + "api-version": "2021-01-01" + }, + "responses": { + "200": { + "body": { + "value": { + "id": "/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/K4AppsProdRG/providers/Microsoft.Web/kubeEnvironments/jlaw-demo1", + "name": "jlaw-demo1", + "type": "Microsoft.Web/kubeEnvironments", + "location": "North Central US", + "tags": {}, + "properties": { + "extendedLocation": null, + "provisioningState": "Succeeded", + "deploymentErrors": null, + "internalLoadBalancerEnabled": false, + "defaultDomain": "jlaw-demo1.k4apps.io", + "staticIp": "20.42.33.145", + "arcConfiguration": null, + "appLogsConfiguration": null, + "aksResourceID": "/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/K4AppsProdRG/providers/Microsoft.ContainerService/managedClusters/jlaw-demo1" + } + } + } + } + } +} From b540595f6ffebc6c01593df0fd2382f6641c9f02 Mon Sep 17 00:00:00 2001 From: Jenny Lawrance Date: Wed, 12 May 2021 21:53:45 -0700 Subject: [PATCH 12/25] Adding example for get --- .../Microsoft.Web/stable/2021-01-01/KubeEnvironments.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json index 12cc26c7a7d1..cb054cada0f7 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json @@ -137,6 +137,11 @@ "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse" } } + }, + "x-ms-examples": { + "Get kube environments by name": { + "$ref": "./examples/KubeEnvironments_Get.json" + } } }, "put": { From 462efc926aef50e2fe29e2119e848057f144eca8 Mon Sep 17 00:00:00 2001 From: Jenny Lawrance Date: Wed, 12 May 2021 22:11:55 -0700 Subject: [PATCH 13/25] More examples --- .../stable/2021-01-01/KubeEnvironments.json | 5 +++ .../examples/KubeEnvironments_Get.json | 33 +++++++++---------- .../KubeEnvironments_GetOperation.json | 18 ++++++++++ 3 files changed, 39 insertions(+), 17 deletions(-) create mode 100644 specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_GetOperation.json diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json index cb054cada0f7..53d8757b986d 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json @@ -352,6 +352,11 @@ "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse" } } + }, + "x-ms-examples": { + "Get kube operation by id": { + "$ref": "./examples/KubeEnvironments_GetOperation.json" + } } } } diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_Get.json b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_Get.json index 3cfc00e28a71..000f8d047b1a 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_Get.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_Get.json @@ -3,28 +3,27 @@ "subscriptionId": "8efdecc5-919e-44eb-b179-915dca89ebf9", "resourceGroupName": "K4AppsProdRG", "name": "jlaw-demo1", + "location": "North Central US", "api-version": "2021-01-01" }, "responses": { "200": { "body": { - "value": { - "id": "/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/K4AppsProdRG/providers/Microsoft.Web/kubeEnvironments/jlaw-demo1", - "name": "jlaw-demo1", - "type": "Microsoft.Web/kubeEnvironments", - "location": "North Central US", - "tags": {}, - "properties": { - "extendedLocation": null, - "provisioningState": "Succeeded", - "deploymentErrors": null, - "internalLoadBalancerEnabled": false, - "defaultDomain": "jlaw-demo1.k4apps.io", - "staticIp": "20.42.33.145", - "arcConfiguration": null, - "appLogsConfiguration": null, - "aksResourceID": "/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/K4AppsProdRG/providers/Microsoft.ContainerService/managedClusters/jlaw-demo1" - } + "id": "/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/K4AppsProdRG/providers/Microsoft.Web/kubeEnvironments/jlaw-demo1", + "name": "jlaw-demo1", + "type": "Microsoft.Web/kubeEnvironments", + "location": "North Central US", + "tags": {}, + "properties": { + "extendedLocation": null, + "provisioningState": "Succeeded", + "deploymentErrors": null, + "internalLoadBalancerEnabled": false, + "defaultDomain": "jlaw-demo1.k4apps.io", + "staticIp": "20.42.33.145", + "arcConfiguration": null, + "appLogsConfiguration": null, + "aksResourceID": "/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/K4AppsProdRG/providers/Microsoft.ContainerService/managedClusters/jlaw-demo1" } } } diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_GetOperation.json b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_GetOperation.json new file mode 100644 index 000000000000..0be5858312f0 --- /dev/null +++ b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_GetOperation.json @@ -0,0 +1,18 @@ +{ + "parameters": { + "subscriptionId": "8efdecc5-919e-44eb-b179-915dca89ebf9", + "resourceGroupName": "K4AppsProdRG", + "name": "jlaw-demo1", + "operationId": "8efdecc5-919e-44eb-b179-915dca89ebf9", + "api-version": "2021-01-01" + }, + "responses": { + "200": { + "headers": {}, + "body": { + "id": "8efdecc5-919e-44eb-b179-915dca89ebf", + "status": "Succeeded" + } + } + } +} From 8b6196bea0f7cc8f60499b7a6e45ecc0bcceb5e7 Mon Sep 17 00:00:00 2001 From: Jenny Lawrance Date: Wed, 12 May 2021 22:16:29 -0700 Subject: [PATCH 14/25] more examples --- .../stable/2021-01-01/KubeEnvironments.json | 5 +++++ .../2021-01-01/examples/KubeEnvironments_Delete.json | 12 ++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_Delete.json diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json index 53d8757b986d..28b636d89119 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json @@ -239,6 +239,11 @@ } } }, + "x-ms-examples": { + "Delete kube environment by name": { + "$ref": "./examples/KubeEnvironments_Delete.json" + } + }, "x-ms-long-running-operation": true }, "patch": { diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_Delete.json b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_Delete.json new file mode 100644 index 000000000000..6a375cd76b36 --- /dev/null +++ b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_Delete.json @@ -0,0 +1,12 @@ +{ + "parameters": { + "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "resourceGroupName": "testrg123", + "name": "testsf6141", + "api-version": "2021-01-01" + }, + "responses": { + "200": {}, + "204": {} + } +} From 4453056946a10b2276e63a2623a704f15f9fc562 Mon Sep 17 00:00:00 2001 From: Jenny Lawrance Date: Wed, 12 May 2021 22:21:15 -0700 Subject: [PATCH 15/25] fixes in examples --- .../stable/2021-01-01/examples/KubeEnvironments_Delete.json | 2 +- .../2021-01-01/examples/KubeEnvironments_GetOperation.json | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_Delete.json b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_Delete.json index 6a375cd76b36..08ce131c5916 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_Delete.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_Delete.json @@ -6,7 +6,7 @@ "api-version": "2021-01-01" }, "responses": { - "200": {}, + "202": {}, "204": {} } } diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_GetOperation.json b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_GetOperation.json index 0be5858312f0..6df28a2b5ab8 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_GetOperation.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_GetOperation.json @@ -13,6 +13,8 @@ "id": "8efdecc5-919e-44eb-b179-915dca89ebf", "status": "Succeeded" } - } + }, + "202": {}, + "204": {} } } From 52a070738567d05bd9dcb3f726e23de6992edaba Mon Sep 17 00:00:00 2001 From: Jenny Lawrance Date: Wed, 12 May 2021 22:23:04 -0700 Subject: [PATCH 16/25] Fix model validation --- .../Microsoft.Web/stable/2021-01-01/KubeEnvironments.json | 3 +++ .../stable/2021-01-01/examples/KubeEnvironments_Delete.json | 1 + 2 files changed, 4 insertions(+) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json index 28b636d89119..c9c8a7aec049 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json @@ -226,6 +226,9 @@ } ], "responses": { + "200": { + "description": "Delete operation completed" + }, "202": { "description": "Delete operation is in progress" }, diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_Delete.json b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_Delete.json index 08ce131c5916..257203d83ad7 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_Delete.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_Delete.json @@ -6,6 +6,7 @@ "api-version": "2021-01-01" }, "responses": { + "200": {}, "202": {}, "204": {} } From 05e3add425567d8f6d2af2de1ee9a9986f8f3335 Mon Sep 17 00:00:00 2001 From: Jenny Lawrance Date: Wed, 12 May 2021 22:25:40 -0700 Subject: [PATCH 17/25] Adding more fixes --- .../Microsoft.Web/stable/2021-01-01/KubeEnvironments.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json index c9c8a7aec049..83d94c85eabd 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json @@ -365,7 +365,8 @@ "Get kube operation by id": { "$ref": "./examples/KubeEnvironments_GetOperation.json" } - } + }, + "x-ms-long-running-operation": true } } }, From ee0ae1989a05a28b0604874fdbacafece5f6eee6 Mon Sep 17 00:00:00 2001 From: Jenny Lawrance Date: Wed, 12 May 2021 22:32:11 -0700 Subject: [PATCH 18/25] Adding fixes for model validation --- .../examples/KubeEnvironments_GetOperation.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_GetOperation.json b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_GetOperation.json index 6df28a2b5ab8..44805d9b00f2 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_GetOperation.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_GetOperation.json @@ -14,7 +14,11 @@ "status": "Succeeded" } }, - "202": {}, - "204": {} + "202": { + "headers": { + "azure-asyncoperation": "https://management.azure.com/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/kubeenvironments/westus2/operationResults/62e4d893-d233-4005-988e-a428d9f77076?api-version=2019-01-01" + } + }, + "404": {} } } From ec1081364ea3d5611262cce4177a8f44ac3d1095 Mon Sep 17 00:00:00 2001 From: Jenny Lawrance Date: Wed, 12 May 2021 22:57:35 -0700 Subject: [PATCH 19/25] Remove operation from swagger --- .../stable/2021-01-01/KubeEnvironments.json | 64 ------------------- .../KubeEnvironments_GetOperation.json | 24 ------- 2 files changed, 88 deletions(-) delete mode 100644 specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_GetOperation.json diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json index 83d94c85eabd..d88ec5de3f85 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json @@ -304,70 +304,6 @@ } } } - }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/kubeEnvironments/{name}/operations/{operationId}": { - "get": { - "tags": [ - "KubeEnvironments" - ], - "summary": "Get status of a Kubernetes Environment operation.", - "description": "Description for Get status of a Kubernetes Environment operation.", - "operationId": "KubeEnvironments_GetOperation", - "parameters": [ - { - "$ref": "#/parameters/resourceGroupNameParameter" - }, - { - "name": "name", - "in": "path", - "description": "Name of the Kubernetes Environment.", - "required": true, - "type": "string" - }, - { - "name": "operationId", - "in": "path", - "description": "ID of the operation.", - "required": true, - "type": "string" - }, - { - "$ref": "#/parameters/subscriptionIdParameter" - }, - { - "$ref": "#/parameters/apiVersionParameter" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "type": "object" - } - }, - "202": { - "description": "Asynchronous operation in progress", - "schema": { - "type": "object" - } - }, - "404": { - "description": "Not found." - }, - "default": { - "description": "App Service error response.", - "schema": { - "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse" - } - } - }, - "x-ms-examples": { - "Get kube operation by id": { - "$ref": "./examples/KubeEnvironments_GetOperation.json" - } - }, - "x-ms-long-running-operation": true - } } }, "definitions": { diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_GetOperation.json b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_GetOperation.json deleted file mode 100644 index 44805d9b00f2..000000000000 --- a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_GetOperation.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "parameters": { - "subscriptionId": "8efdecc5-919e-44eb-b179-915dca89ebf9", - "resourceGroupName": "K4AppsProdRG", - "name": "jlaw-demo1", - "operationId": "8efdecc5-919e-44eb-b179-915dca89ebf9", - "api-version": "2021-01-01" - }, - "responses": { - "200": { - "headers": {}, - "body": { - "id": "8efdecc5-919e-44eb-b179-915dca89ebf", - "status": "Succeeded" - } - }, - "202": { - "headers": { - "azure-asyncoperation": "https://management.azure.com/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.Web/kubeenvironments/westus2/operationResults/62e4d893-d233-4005-988e-a428d9f77076?api-version=2019-01-01" - } - }, - "404": {} - } -} From 52a1fad42808dbc5a5a775681669bcd2453743ea Mon Sep 17 00:00:00 2001 From: Jenny Lawrance Date: Thu, 13 May 2021 23:47:10 -0700 Subject: [PATCH 20/25] Adding more examples --- .../stable/2021-01-01/KubeEnvironments.json | 12 +++- .../KubeEnvironments_CreateOrUpdate.json | 61 +++++++++++++++++++ .../examples/KubeEnvironments_Get.json | 2 +- .../examples/KubeEnvironments_Update.json | 61 +++++++++++++++++++ 4 files changed, 134 insertions(+), 2 deletions(-) create mode 100644 specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_CreateOrUpdate.json create mode 100644 specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_Update.json diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json index d88ec5de3f85..befd5a804ba7 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/KubeEnvironments.json @@ -198,7 +198,12 @@ } } }, - "x-ms-long-running-operation": true + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Create kube environments": { + "$ref": "./examples/KubeEnvironments_CreateOrUpdate.json" + } + } }, "delete": { "tags": [ @@ -302,6 +307,11 @@ "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse" } } + }, + "x-ms-examples": { + "Update kube environments": { + "$ref": "./examples/KubeEnvironments_Update.json" + } } } } diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_CreateOrUpdate.json b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_CreateOrUpdate.json new file mode 100644 index 000000000000..6e8cb5090fd1 --- /dev/null +++ b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_CreateOrUpdate.json @@ -0,0 +1,61 @@ +{ + "parameters": { + "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "resourceGroupName": "examplerg", + "name": "testkubeenv", + "api-version": "2021-01-01", + "properties": { + "kubeEnvironmentEnvelope": { + "kind": "kubernetes", + "location": "East US", + "extendedLocation": { + "type": "customLocation", + "name": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.ExtendedLocation/customLocations/testcustomlocation" + }, + "staticIp": "1.2.3.4" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.Web/kubeEnvironments/testkubeenv", + "name": "testkubeenv", + "type": "Microsoft.Web/kubeEnvironments", + "location": "East US", + "tags": {}, + "properties": { + "extendedLocation": null, + "provisioningState": "Succeeded", + "deploymentErrors": null, + "internalLoadBalancerEnabled": false, + "defaultDomain": "testkubeenv.k4apps.io", + "staticIp": "1.2.3.4", + "arcConfiguration": null, + "appLogsConfiguration": null, + "aksResourceID": "test" + } + } + }, + "201": { + "body": { + "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.Web/kubeEnvironments/testkubeenv", + "name": "testkubeenv", + "type": "Microsoft.Web/kubeEnvironments", + "location": "East US", + "tags": {}, + "properties": { + "extendedLocation": null, + "provisioningState": "Provisioning", + "deploymentErrors": null, + "internalLoadBalancerEnabled": false, + "defaultDomain": "testkubeenv.k4apps.io", + "staticIp": "1.2.3.4", + "arcConfiguration": null, + "appLogsConfiguration": null, + "aksResourceID": "test" + } + } + } + } +} diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_Get.json b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_Get.json index 000f8d047b1a..a29998fbc2a2 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_Get.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_Get.json @@ -23,7 +23,7 @@ "staticIp": "20.42.33.145", "arcConfiguration": null, "appLogsConfiguration": null, - "aksResourceID": "/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/K4AppsProdRG/providers/Microsoft.ContainerService/managedClusters/jlaw-demo1" + "aksResourceID": "test" } } } diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_Update.json b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_Update.json new file mode 100644 index 000000000000..6e8cb5090fd1 --- /dev/null +++ b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_Update.json @@ -0,0 +1,61 @@ +{ + "parameters": { + "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "resourceGroupName": "examplerg", + "name": "testkubeenv", + "api-version": "2021-01-01", + "properties": { + "kubeEnvironmentEnvelope": { + "kind": "kubernetes", + "location": "East US", + "extendedLocation": { + "type": "customLocation", + "name": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.ExtendedLocation/customLocations/testcustomlocation" + }, + "staticIp": "1.2.3.4" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.Web/kubeEnvironments/testkubeenv", + "name": "testkubeenv", + "type": "Microsoft.Web/kubeEnvironments", + "location": "East US", + "tags": {}, + "properties": { + "extendedLocation": null, + "provisioningState": "Succeeded", + "deploymentErrors": null, + "internalLoadBalancerEnabled": false, + "defaultDomain": "testkubeenv.k4apps.io", + "staticIp": "1.2.3.4", + "arcConfiguration": null, + "appLogsConfiguration": null, + "aksResourceID": "test" + } + } + }, + "201": { + "body": { + "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.Web/kubeEnvironments/testkubeenv", + "name": "testkubeenv", + "type": "Microsoft.Web/kubeEnvironments", + "location": "East US", + "tags": {}, + "properties": { + "extendedLocation": null, + "provisioningState": "Provisioning", + "deploymentErrors": null, + "internalLoadBalancerEnabled": false, + "defaultDomain": "testkubeenv.k4apps.io", + "staticIp": "1.2.3.4", + "arcConfiguration": null, + "appLogsConfiguration": null, + "aksResourceID": "test" + } + } + } + } +} From 9d56c9340c331bfd23a3dd2ffe65a2d6103091e9 Mon Sep 17 00:00:00 2001 From: Jenny Lawrance Date: Thu, 13 May 2021 23:53:18 -0700 Subject: [PATCH 21/25] fixes for model validation --- .../KubeEnvironments_CreateOrUpdate.json | 20 +++++++++---------- .../examples/KubeEnvironments_Update.json | 20 +++++++++---------- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_CreateOrUpdate.json b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_CreateOrUpdate.json index 6e8cb5090fd1..025ebab1b594 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_CreateOrUpdate.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_CreateOrUpdate.json @@ -4,16 +4,14 @@ "resourceGroupName": "examplerg", "name": "testkubeenv", "api-version": "2021-01-01", - "properties": { - "kubeEnvironmentEnvelope": { - "kind": "kubernetes", - "location": "East US", - "extendedLocation": { - "type": "customLocation", - "name": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.ExtendedLocation/customLocations/testcustomlocation" - }, - "staticIp": "1.2.3.4" - } + "kubeEnvironmentEnvelope": { + "kind": "kubernetes", + "location": "East US", + "extendedLocation": { + "type": "customLocation", + "name": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.ExtendedLocation/customLocations/testcustomlocation" + }, + "staticIp": "1.2.3.4" } }, "responses": { @@ -46,7 +44,7 @@ "tags": {}, "properties": { "extendedLocation": null, - "provisioningState": "Provisioning", + "provisioningState": "InitializationInProgress", "deploymentErrors": null, "internalLoadBalancerEnabled": false, "defaultDomain": "testkubeenv.k4apps.io", diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_Update.json b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_Update.json index 6e8cb5090fd1..025ebab1b594 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_Update.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_Update.json @@ -4,16 +4,14 @@ "resourceGroupName": "examplerg", "name": "testkubeenv", "api-version": "2021-01-01", - "properties": { - "kubeEnvironmentEnvelope": { - "kind": "kubernetes", - "location": "East US", - "extendedLocation": { - "type": "customLocation", - "name": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.ExtendedLocation/customLocations/testcustomlocation" - }, - "staticIp": "1.2.3.4" - } + "kubeEnvironmentEnvelope": { + "kind": "kubernetes", + "location": "East US", + "extendedLocation": { + "type": "customLocation", + "name": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.ExtendedLocation/customLocations/testcustomlocation" + }, + "staticIp": "1.2.3.4" } }, "responses": { @@ -46,7 +44,7 @@ "tags": {}, "properties": { "extendedLocation": null, - "provisioningState": "Provisioning", + "provisioningState": "InitializationInProgress", "deploymentErrors": null, "internalLoadBalancerEnabled": false, "defaultDomain": "testkubeenv.k4apps.io", From 5a498c301fd9831cc2218bac697fb8d859fc8e9a Mon Sep 17 00:00:00 2001 From: Jenny Lawrance Date: Fri, 14 May 2021 00:04:44 -0700 Subject: [PATCH 22/25] Fix model validation --- .../KubeEnvironments_CreateOrUpdate.json | 16 +++++++++------- .../examples/KubeEnvironments_Update.json | 16 +++++++++------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_CreateOrUpdate.json b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_CreateOrUpdate.json index 025ebab1b594..c8acd24dbcd1 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_CreateOrUpdate.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_CreateOrUpdate.json @@ -5,13 +5,15 @@ "name": "testkubeenv", "api-version": "2021-01-01", "kubeEnvironmentEnvelope": { - "kind": "kubernetes", - "location": "East US", - "extendedLocation": { - "type": "customLocation", - "name": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.ExtendedLocation/customLocations/testcustomlocation" - }, - "staticIp": "1.2.3.4" + "properties": { + "kind": "kubernetes", + "location": "East US", + "extendedLocation": { + "type": "customLocation", + "name": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.ExtendedLocation/customLocations/testcustomlocation" + }, + "staticIp": "1.2.3.4" + } } }, "responses": { diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_Update.json b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_Update.json index 025ebab1b594..c8acd24dbcd1 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_Update.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_Update.json @@ -5,13 +5,15 @@ "name": "testkubeenv", "api-version": "2021-01-01", "kubeEnvironmentEnvelope": { - "kind": "kubernetes", - "location": "East US", - "extendedLocation": { - "type": "customLocation", - "name": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.ExtendedLocation/customLocations/testcustomlocation" - }, - "staticIp": "1.2.3.4" + "properties": { + "kind": "kubernetes", + "location": "East US", + "extendedLocation": { + "type": "customLocation", + "name": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.ExtendedLocation/customLocations/testcustomlocation" + }, + "staticIp": "1.2.3.4" + } } }, "responses": { From 1e3469b9c61adc7eadd8fc78827d87cf54930d11 Mon Sep 17 00:00:00 2001 From: Jenny Lawrance Date: Fri, 14 May 2021 00:44:55 -0700 Subject: [PATCH 23/25] testing new payload for create --- .../examples/KubeEnvironments_CreateOrUpdate.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_CreateOrUpdate.json b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_CreateOrUpdate.json index c8acd24dbcd1..7f92cc73ce3a 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_CreateOrUpdate.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_CreateOrUpdate.json @@ -4,13 +4,12 @@ "resourceGroupName": "examplerg", "name": "testkubeenv", "api-version": "2021-01-01", + "kind": "kubernetes", + "location": "East US", "kubeEnvironmentEnvelope": { "properties": { - "kind": "kubernetes", - "location": "East US", "extendedLocation": { - "type": "customLocation", - "name": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.ExtendedLocation/customLocations/testcustomlocation" + "customLocation": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.ExtendedLocation/customLocations/testcustomlocation" }, "staticIp": "1.2.3.4" } From 3472e53de28b869661920890f09780db65edff80 Mon Sep 17 00:00:00 2001 From: Jenny Lawrance Date: Fri, 14 May 2021 00:49:56 -0700 Subject: [PATCH 24/25] Testing new payload for update --- .../2021-01-01/examples/KubeEnvironments_Update.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_Update.json b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_Update.json index c8acd24dbcd1..7f92cc73ce3a 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_Update.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_Update.json @@ -4,13 +4,12 @@ "resourceGroupName": "examplerg", "name": "testkubeenv", "api-version": "2021-01-01", + "kind": "kubernetes", + "location": "East US", "kubeEnvironmentEnvelope": { "properties": { - "kind": "kubernetes", - "location": "East US", "extendedLocation": { - "type": "customLocation", - "name": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.ExtendedLocation/customLocations/testcustomlocation" + "customLocation": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.ExtendedLocation/customLocations/testcustomlocation" }, "staticIp": "1.2.3.4" } From bfc45842d4214721feb50fc4ea0cff972fa377ef Mon Sep 17 00:00:00 2001 From: Jenny Lawrance Date: Fri, 14 May 2021 01:02:08 -0700 Subject: [PATCH 25/25] Attempt #3 at fixing model validation --- .../2021-01-01/examples/KubeEnvironments_CreateOrUpdate.json | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_CreateOrUpdate.json b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_CreateOrUpdate.json index 7f92cc73ce3a..8118635fbb2b 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_CreateOrUpdate.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2021-01-01/examples/KubeEnvironments_CreateOrUpdate.json @@ -7,6 +7,7 @@ "kind": "kubernetes", "location": "East US", "kubeEnvironmentEnvelope": { + "location": "East US", "properties": { "extendedLocation": { "customLocation": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.ExtendedLocation/customLocations/testcustomlocation"