From 52b67daa5052bb51d4da00a9353f00902e4569f7 Mon Sep 17 00:00:00 2001 From: zman-ms Date: Tue, 26 Sep 2023 14:14:22 -0700 Subject: [PATCH 01/16] rebase --- .../examples/FleetMembers_Create.json | 4 ++ .../examples/FleetMembers_Delete.json | 4 ++ .../examples/FleetMembers_Get.json | 4 ++ .../examples/FleetMembers_ListByFleet.json | 4 ++ .../examples/FleetMembers_Update.json | 4 ++ .../examples/Fleets_CreateOrUpdate.json | 16 +++++++ .../examples/Fleets_Delete.json | 4 ++ .../examples/Fleets_Get.json | 8 ++++ .../examples/Fleets_ListByResourceGroup.json | 8 ++++ .../examples/Fleets_ListBySub.json | 8 ++++ .../Fleets_ListCredentialsResult.json | 4 ++ .../examples/Fleets_PatchTags.json | 8 ++++ .../examples/Operations_List.json | 4 ++ .../examples/UpdateRuns_CreateOrUpdate.json | 13 ++++++ .../examples/UpdateRuns_Delete.json | 4 ++ .../examples/UpdateRuns_Get.json | 4 ++ .../examples/UpdateRuns_ListByFleet.json | 4 ++ .../examples/UpdateRuns_Start.json | 4 ++ .../examples/UpdateRuns_Stop.json | 4 ++ .../preview/2023-08-15-preview/fleets.json | 42 +++++++++++++++++++ 20 files changed, 155 insertions(+) diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Create.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Create.json index 4c13eff90052..e107e38d2f93 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Create.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Create.json @@ -2,7 +2,11 @@ "operationId": "FleetMembers_Create", "title": "Creates a FleetMember resource with a long running operation.", "parameters": { +<<<<<<< HEAD "api-version": "2023-08-15-preview", +======= + "api-version": "2023-06-15-preview", +>>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) "subscriptionId": "subid1", "resourceGroupName": "rg1", "fleetName": "fleet1", diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Delete.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Delete.json index 329442e4975e..369ce858efe4 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Delete.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Delete.json @@ -2,7 +2,11 @@ "operationId": "FleetMembers_Delete", "title": "Deletes a FleetMember resource asynchronously with a long running operation.", "parameters": { +<<<<<<< HEAD "api-version": "2023-08-15-preview", +======= + "api-version": "2023-06-15-preview", +>>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) "subscriptionId": "subid1", "resourceGroupName": "rg1", "fleetName": "fleet1", diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Get.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Get.json index 066e27aa6bdf..ed020c4803b4 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Get.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Get.json @@ -2,7 +2,11 @@ "operationId": "FleetMembers_Get", "title": "Gets a FleetMember resource.", "parameters": { +<<<<<<< HEAD "api-version": "2023-08-15-preview", +======= + "api-version": "2023-06-15-preview", +>>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) "subscriptionId": "subid1", "resourceGroupName": "rg1", "fleetName": "fleet1", diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_ListByFleet.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_ListByFleet.json index d94d94675ce8..2fcb69338809 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_ListByFleet.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_ListByFleet.json @@ -2,7 +2,11 @@ "operationId": "FleetMembers_ListByFleet", "title": "Lists the members of a Fleet.", "parameters": { +<<<<<<< HEAD "api-version": "2023-08-15-preview", +======= + "api-version": "2023-06-15-preview", +>>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) "subscriptionId": "subid1", "resourceGroupName": "rg1", "fleetName": "fleet1" diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Update.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Update.json index dc4f64f91383..c163b1985509 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Update.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Update.json @@ -2,7 +2,11 @@ "operationId": "FleetMembers_Update", "title": "Updates a FleetMember resource synchronously.", "parameters": { +<<<<<<< HEAD "api-version": "2023-08-15-preview", +======= + "api-version": "2023-06-15-preview", +>>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) "subscriptionId": "subid1", "resourceGroupName": "rg1", "fleetName": "fleet1", diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_CreateOrUpdate.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_CreateOrUpdate.json index 48c12421b097..2c8a17ca5e3d 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_CreateOrUpdate.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_CreateOrUpdate.json @@ -2,7 +2,11 @@ "operationId": "Fleets_CreateOrUpdate", "title": "Creates a Fleet resource with a long running operation.", "parameters": { +<<<<<<< HEAD "api-version": "2023-08-15-preview", +======= + "api-version": "2023-06-15-preview", +>>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) "subscriptionId": "subid1", "resourceGroupName": "rg1", "fleetName": "fleet1", @@ -14,10 +18,14 @@ "location": "East US", "properties": { "hubProfile": { +<<<<<<< HEAD "dnsPrefix": "dnsprefix1", "agentProfile": { "vmSize": "Standard_DS1" } +======= + "dnsPrefix": "dnsprefix1" +>>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) } } } @@ -51,11 +59,15 @@ "hubProfile": { "dnsPrefix": "dnsprefix1", "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", +<<<<<<< HEAD "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", "agentProfile": { "vmSize": "Standard_DS1" } +======= + "kubernetesVersion": "1.22.4" +>>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) }, "provisioningState": "Updating" } @@ -89,11 +101,15 @@ "hubProfile": { "dnsPrefix": "dnsprefix1", "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", +<<<<<<< HEAD "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", "agentProfile": { "vmSize": "Standard_DS1" } +======= + "kubernetesVersion": "1.22.4" +>>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) }, "provisioningState": "Creating" } diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_Delete.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_Delete.json index 79b64cae3917..f279a0a1e9b7 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_Delete.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_Delete.json @@ -2,7 +2,11 @@ "operationId": "Fleets_Delete", "title": "Deletes a Fleet resource asynchronously with a long running operation.", "parameters": { +<<<<<<< HEAD "api-version": "2023-08-15-preview", +======= + "api-version": "2023-06-15-preview", +>>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) "subscriptionId": "subid1", "resourceGroupName": "rg1", "fleetName": "fleet1" diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_Get.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_Get.json index 76846af0ee11..004f80745dde 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_Get.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_Get.json @@ -2,7 +2,11 @@ "operationId": "Fleets_Get", "title": "Gets a Fleet resource.", "parameters": { +<<<<<<< HEAD "api-version": "2023-08-15-preview", +======= + "api-version": "2023-06-15-preview", +>>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) "subscriptionId": "subid1", "resourceGroupName": "rg1", "fleetName": "fleet1" @@ -34,11 +38,15 @@ "hubProfile": { "dnsPrefix": "dnsprefix1", "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", +<<<<<<< HEAD "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", "agentProfile": { "vmSize": "Standard_DS1" } +======= + "kubernetesVersion": "1.22.4" +>>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) }, "provisioningState": "Succeeded" } diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListByResourceGroup.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListByResourceGroup.json index dccf77273622..d4fbdfb4652b 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListByResourceGroup.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListByResourceGroup.json @@ -2,7 +2,11 @@ "operationId": "Fleets_ListByResourceGroup", "title": "Lists the Fleet resources in a resource group.", "parameters": { +<<<<<<< HEAD "api-version": "2023-08-15-preview", +======= + "api-version": "2023-06-15-preview", +>>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) "subscriptionId": "subid1", "resourceGroupName": "rg1" }, @@ -32,11 +36,15 @@ "hubProfile": { "dnsPrefix": "dnsprefix1", "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", +<<<<<<< HEAD "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", "agentProfile": { "vmSize": "Standard_DS1" } +======= + "kubernetesVersion": "1.22.4" +>>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) }, "provisioningState": "Succeeded" } diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListBySub.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListBySub.json index 7dcee17d809b..cb6c442a2d5e 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListBySub.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListBySub.json @@ -2,7 +2,11 @@ "operationId": "Fleets_ListBySubscription", "title": "Lists the Fleet resources in a subscription.", "parameters": { +<<<<<<< HEAD "api-version": "2023-08-15-preview", +======= + "api-version": "2023-06-15-preview", +>>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) "subscriptionId": "subid1" }, "responses": { @@ -31,11 +35,15 @@ "hubProfile": { "dnsPrefix": "dnsprefix1", "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", +<<<<<<< HEAD "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", "agentProfile": { "vmSize": "Standard_DS1" } +======= + "kubernetesVersion": "1.22.4" +>>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) }, "provisioningState": "Succeeded" } diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListCredentialsResult.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListCredentialsResult.json index 292774324fb6..66714ea3cb58 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListCredentialsResult.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListCredentialsResult.json @@ -2,7 +2,11 @@ "operationId": "Fleets_ListCredentials", "title": "Lists the user credentials of a Fleet.", "parameters": { +<<<<<<< HEAD "api-version": "2023-08-15-preview", +======= + "api-version": "2023-06-15-preview", +>>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) "subscriptionId": "subid1", "resourceGroupName": "rg1", "fleetName": "fleet" diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_PatchTags.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_PatchTags.json index 52f18e156b32..40828ac38695 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_PatchTags.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_PatchTags.json @@ -2,7 +2,11 @@ "operationId": "Fleets_Update", "title": "Update a Fleet.", "parameters": { +<<<<<<< HEAD "api-version": "2023-08-15-preview", +======= + "api-version": "2023-06-15-preview", +>>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) "subscriptionId": "subid1", "resourceGroupName": "rg1", "fleetName": "fleet1", @@ -41,11 +45,15 @@ "hubProfile": { "dnsPrefix": "dnsprefix1", "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", +<<<<<<< HEAD "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", "agentProfile": { "vmSize": "Standard_DS1" } +======= + "kubernetesVersion": "1.22.4" +>>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) }, "provisioningState": "Succeeded" } diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Operations_List.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Operations_List.json index cdc0a85b3463..a624acc5c1f6 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Operations_List.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Operations_List.json @@ -2,7 +2,11 @@ "operationId": "Operations_List", "title": "List the operations for the provider.", "parameters": { +<<<<<<< HEAD "api-version": "2023-08-15-preview" +======= + "api-version": "2023-06-15-preview" +>>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) }, "responses": { "200": { diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_CreateOrUpdate.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_CreateOrUpdate.json index ee9175813aa3..f3714b38390b 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_CreateOrUpdate.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_CreateOrUpdate.json @@ -2,14 +2,21 @@ "operationId": "UpdateRuns_CreateOrUpdate", "title": "Create an UpdateRun.", "parameters": { +<<<<<<< HEAD "api-version": "2023-08-15-preview", +======= + "api-version": "2023-06-15-preview", +>>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "rg1", "fleetName": "fleet1", "updateRunName": "run1", "resource": { "properties": { +<<<<<<< HEAD "updateStrategyId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ContainerService/fleets/myFleet/updateStrategies/strategy1", +======= +>>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) "strategy": { "stages": [ { @@ -51,7 +58,10 @@ }, "properties": { "provisioningState": "Succeeded", +<<<<<<< HEAD "updateStrategyId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ContainerService/fleets/myFleet/updateStrategies/strategy1", +======= +>>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) "strategy": { "stages": [ { @@ -129,7 +139,10 @@ }, "properties": { "provisioningState": "Succeeded", +<<<<<<< HEAD "updateStrategyId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ContainerService/fleets/myFleet/updateStrategies/strategy1", +======= +>>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) "strategy": { "stages": [ { diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Delete.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Delete.json index fc0c94e82b0c..41eaf0e7b5fc 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Delete.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Delete.json @@ -2,7 +2,11 @@ "operationId": "UpdateRuns_Delete", "title": "Delete an updateRun resource.", "parameters": { +<<<<<<< HEAD "api-version": "2023-08-15-preview", +======= + "api-version": "2023-06-15-preview", +>>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) "subscriptionId": "subid1", "resourceGroupName": "rg1", "fleetName": "fleet1", diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Get.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Get.json index b4d32c98f967..5a9481602858 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Get.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Get.json @@ -2,7 +2,11 @@ "operationId": "UpdateRuns_Get", "title": "Gets an UpdateRun resource.", "parameters": { +<<<<<<< HEAD "api-version": "2023-08-15-preview", +======= + "api-version": "2023-06-15-preview", +>>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "rg1", "fleetName": "fleet1", diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_ListByFleet.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_ListByFleet.json index 9668c951be8a..8dd22cd0e258 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_ListByFleet.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_ListByFleet.json @@ -2,7 +2,11 @@ "operationId": "UpdateRuns_ListByFleet", "title": "Lists the UpdateRun resources by fleet.", "parameters": { +<<<<<<< HEAD "api-version": "2023-08-15-preview", +======= + "api-version": "2023-06-15-preview", +>>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "rg1", "fleetName": "fleet1" diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Start.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Start.json index f83c6af39a06..9b83980b0a09 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Start.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Start.json @@ -2,7 +2,11 @@ "operationId": "UpdateRuns_Start", "title": "Starts an UpdateRun.", "parameters": { +<<<<<<< HEAD "api-version": "2023-08-15-preview", +======= + "api-version": "2023-06-15-preview", +>>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "rg1", "fleetName": "fleet1", diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Stop.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Stop.json index cbc0667f9d15..ef24a4bd3b43 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Stop.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Stop.json @@ -2,7 +2,11 @@ "operationId": "UpdateRuns_Stop", "title": "Stops an UpdateRun.", "parameters": { +<<<<<<< HEAD "api-version": "2023-08-15-preview", +======= + "api-version": "2023-06-15-preview", +>>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "rg1", "fleetName": "fleet1", diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/fleets.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/fleets.json index c43c26eeec96..30f8e5b9321e 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/fleets.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/fleets.json @@ -50,9 +50,12 @@ }, { "name": "UpdateRuns" +<<<<<<< HEAD }, { "name": "FleetUpdateStrategies" +======= +>>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) } ], "paths": { @@ -1362,6 +1365,7 @@ }, "x-ms-long-running-operation": true } +<<<<<<< HEAD }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/fleets/{fleetName}/updateStrategies": { "get": { @@ -1655,6 +1659,8 @@ }, "x-ms-long-running-operation": true } +======= +>>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) } }, "definitions": { @@ -1699,6 +1705,7 @@ "read", "create" ] +<<<<<<< HEAD }, "vmSize": { "type": "string", @@ -1707,6 +1714,8 @@ "read", "create" ] +======= +>>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) } } }, @@ -1825,11 +1834,14 @@ "type": "string", "description": "The Kubernetes version of the Fleet hub.", "readOnly": true +<<<<<<< HEAD }, "portalFqdn": { "type": "string", "description": "The Azure Portal FQDN of the Fleet hub.", "readOnly": true +======= +>>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) } } }, @@ -2080,6 +2092,7 @@ ] } }, +<<<<<<< HEAD "FleetUpdateStrategy": { "type": "object", "description": "Defines a multi-stage process to perform update operations across members of a Fleet.", @@ -2191,6 +2204,8 @@ ] } }, +======= +>>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) "KubernetesVersion": { "type": "string" }, @@ -2374,7 +2389,11 @@ "properties": { "name": { "type": "string", +<<<<<<< HEAD "description": "Name of the group.\nIt must match a group name of an existing fleet member. ", +======= + "description": "The name of the Fleet member group to update. \nIt should match the name of an existing FleetMember group.\nA group can only appear once across all UpdateStages in the UpdateRun.", +>>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) "minLength": 1, "maxLength": 50, "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" @@ -2413,7 +2432,11 @@ }, "UpdateRun": { "type": "object", +<<<<<<< HEAD "description": "A multi-stage process to perform update operations across members of a Fleet.", +======= + "description": "An UpdateRun is a multi-stage process to perform update operations across members of a Fleet.", +>>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) "properties": { "properties": { "$ref": "#/definitions/UpdateRunProperties", @@ -2466,10 +2489,13 @@ "description": "The provisioning state of the UpdateRun resource.", "readOnly": true }, +<<<<<<< HEAD "updateStrategyId": { "$ref": "#/definitions/FleetUpdateStrategyResourceId", "description": "The resource id of the FleetUpdateStrategy resource to reference.\n\nWhen creating a new run, there are three ways to define a strategy for the run:\n1. Define a new strategy in place: Set the \"strategy\" field.\n2. Use an existing strategy: Set the \"updateStrategyId\" field. (since 2023-08-15-preview)\n3. Use the default strategy to update all the members one by one: Leave both \"updateStrategyId\" and \"strategy\" unset. (since 2023-08-15-preview)\n\nSetting both \"updateStrategyId\" and \"strategy\" is invalid.\n\nUpdateRuns created by \"updateStrategyId\" snapshot the referenced UpdateStrategy at the time of creation and store it in the \"strategy\" field. \nSubsequent changes to the referenced FleetUpdateStrategy resource do not propagate. \nUpdateRunStrategy changes can be made directly on the \"strategy\" field before launching the UpdateRun." }, +======= +>>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) "strategy": { "$ref": "#/definitions/UpdateRunStrategy", "description": "The strategy defines the order in which the clusters will be updated. \nIf not set, all members will be updated sequentially. The UpdateRun status will show a single UpdateStage and a single UpdateGroup targeting all members.\nThe strategy of the UpdateRun can be modified until the run is started." @@ -2547,11 +2573,19 @@ }, "UpdateRunStrategy": { "type": "object", +<<<<<<< HEAD "description": "Defines the update sequence of the clusters via stages and groups.\n\nStages within a run are executed sequentially one after another.\nGroups within a stage are executed in parallel.\nMember clusters within a group are updated sequentially one after another.\n\nA valid strategy contains no duplicate groups within or across stages.", "properties": { "stages": { "type": "array", "description": "The list of stages that compose this update run. Min size: 1.", +======= + "description": "The UpdateRunStrategy configures the sequence of Stages and Groups in which the clusters will be updated.", + "properties": { + "stages": { + "type": "array", + "description": "The list of stages that compose this update run.", +>>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) "items": { "$ref": "#/definitions/UpdateStage" }, @@ -2566,7 +2600,11 @@ }, "UpdateStage": { "type": "object", +<<<<<<< HEAD "description": "Defines a stage which contains the groups to update and the steps to take (e.g., wait for a time period) before starting the next stage.", +======= + "description": "Contains the groups to be updated by an UpdateRun.\nUpdate order:\n- Sequential between stages: Stages run sequentially. The previous stage must complete before the next one starts.\n- Parallel within a stage: Groups within a stage run in parallel.\n- Sequential within a group: Clusters within a group are updated sequentially.", +>>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) "properties": { "name": { "type": "string", @@ -2577,7 +2615,11 @@ }, "groups": { "type": "array", +<<<<<<< HEAD "description": "Defines the groups to be executed in parallel in this stage. Duplicate groups are not allowed. Min size: 1.", +======= + "description": "A list of group names that compose the stage.\nThe groups will be updated in parallel. Each group name can only appear once in the UpdateRun.", +>>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) "items": { "$ref": "#/definitions/UpdateGroup" }, From fe122caf0c4683bf063a03959966e7b4cf236a17 Mon Sep 17 00:00:00 2001 From: zman-ms Date: Tue, 26 Sep 2023 14:14:45 -0700 Subject: [PATCH 02/16] rebase --- .../Microsoft.ContainerService/fleet/readme.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/readme.md b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/readme.md index bb0e0b0a1386..ed47d976589d 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/readme.md +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/readme.md @@ -27,6 +27,7 @@ These are the global settings for the ContainerServices API. ``` yaml openapi-type: arm +<<<<<<< HEAD tag: package-2023-08-preview ``` @@ -36,6 +37,17 @@ tag: package-2023-08-preview These settings apply only when `--tag=package-2023-08-preview` is specified on the command line. ``` yaml $(tag) == 'package-2023-08-preview' +======= +tag: package-preview-2023-08 +``` + + +### Tag: package-preview-2023-08 + +These settings apply only when `--tag=package-preview-2023-08` is specified on the command line. + +```yaml $(tag) == 'package-preview-2023-08' +>>>>>>> afeb018213 (Updates readme) input-file: - preview/2023-08-15-preview/fleets.json ``` From 45c2c4721472639714008ade58bd14a4e970af7d Mon Sep 17 00:00:00 2001 From: zman-ms Date: Tue, 26 Sep 2023 14:15:26 -0700 Subject: [PATCH 03/16] rebase --- .../2023-08-15-preview/examples/FleetMembers_Create.json | 4 ++++ .../2023-08-15-preview/examples/FleetMembers_Delete.json | 4 ++++ .../preview/2023-08-15-preview/examples/FleetMembers_Get.json | 4 ++++ .../2023-08-15-preview/examples/FleetMembers_ListByFleet.json | 4 ++++ .../2023-08-15-preview/examples/FleetMembers_Update.json | 4 ++++ .../2023-08-15-preview/examples/Fleets_CreateOrUpdate.json | 4 ++++ .../preview/2023-08-15-preview/examples/Fleets_Delete.json | 4 ++++ .../fleet/preview/2023-08-15-preview/examples/Fleets_Get.json | 4 ++++ .../examples/Fleets_ListByResourceGroup.json | 4 ++++ .../preview/2023-08-15-preview/examples/Fleets_ListBySub.json | 4 ++++ .../examples/Fleets_ListCredentialsResult.json | 4 ++++ .../preview/2023-08-15-preview/examples/Fleets_PatchTags.json | 4 ++++ .../preview/2023-08-15-preview/examples/Operations_List.json | 4 ++++ .../examples/UpdateRuns_CreateOrUpdate.json | 4 ++++ .../2023-08-15-preview/examples/UpdateRuns_Delete.json | 4 ++++ .../preview/2023-08-15-preview/examples/UpdateRuns_Get.json | 4 ++++ .../2023-08-15-preview/examples/UpdateRuns_ListByFleet.json | 4 ++++ .../preview/2023-08-15-preview/examples/UpdateRuns_Start.json | 4 ++++ .../preview/2023-08-15-preview/examples/UpdateRuns_Stop.json | 4 ++++ 19 files changed, 76 insertions(+) diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Create.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Create.json index e107e38d2f93..650b8ad75758 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Create.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Create.json @@ -2,11 +2,15 @@ "operationId": "FleetMembers_Create", "title": "Creates a FleetMember resource with a long running operation.", "parameters": { +<<<<<<< HEAD <<<<<<< HEAD "api-version": "2023-08-15-preview", ======= "api-version": "2023-06-15-preview", >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) +======= + "api-version": "2023-08-15-preview", +>>>>>>> 149b98b920 (Updates API version in new specs and examples) "subscriptionId": "subid1", "resourceGroupName": "rg1", "fleetName": "fleet1", diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Delete.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Delete.json index 369ce858efe4..70a114fe67b9 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Delete.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Delete.json @@ -2,11 +2,15 @@ "operationId": "FleetMembers_Delete", "title": "Deletes a FleetMember resource asynchronously with a long running operation.", "parameters": { +<<<<<<< HEAD <<<<<<< HEAD "api-version": "2023-08-15-preview", ======= "api-version": "2023-06-15-preview", >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) +======= + "api-version": "2023-08-15-preview", +>>>>>>> 149b98b920 (Updates API version in new specs and examples) "subscriptionId": "subid1", "resourceGroupName": "rg1", "fleetName": "fleet1", diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Get.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Get.json index ed020c4803b4..2b68c28c4274 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Get.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Get.json @@ -2,11 +2,15 @@ "operationId": "FleetMembers_Get", "title": "Gets a FleetMember resource.", "parameters": { +<<<<<<< HEAD <<<<<<< HEAD "api-version": "2023-08-15-preview", ======= "api-version": "2023-06-15-preview", >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) +======= + "api-version": "2023-08-15-preview", +>>>>>>> 149b98b920 (Updates API version in new specs and examples) "subscriptionId": "subid1", "resourceGroupName": "rg1", "fleetName": "fleet1", diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_ListByFleet.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_ListByFleet.json index 2fcb69338809..7dac8ef72be7 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_ListByFleet.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_ListByFleet.json @@ -2,11 +2,15 @@ "operationId": "FleetMembers_ListByFleet", "title": "Lists the members of a Fleet.", "parameters": { +<<<<<<< HEAD <<<<<<< HEAD "api-version": "2023-08-15-preview", ======= "api-version": "2023-06-15-preview", >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) +======= + "api-version": "2023-08-15-preview", +>>>>>>> 149b98b920 (Updates API version in new specs and examples) "subscriptionId": "subid1", "resourceGroupName": "rg1", "fleetName": "fleet1" diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Update.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Update.json index c163b1985509..9f48dfb7e7f1 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Update.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Update.json @@ -2,11 +2,15 @@ "operationId": "FleetMembers_Update", "title": "Updates a FleetMember resource synchronously.", "parameters": { +<<<<<<< HEAD <<<<<<< HEAD "api-version": "2023-08-15-preview", ======= "api-version": "2023-06-15-preview", >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) +======= + "api-version": "2023-08-15-preview", +>>>>>>> 149b98b920 (Updates API version in new specs and examples) "subscriptionId": "subid1", "resourceGroupName": "rg1", "fleetName": "fleet1", diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_CreateOrUpdate.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_CreateOrUpdate.json index 2c8a17ca5e3d..2a3b26a1415f 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_CreateOrUpdate.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_CreateOrUpdate.json @@ -2,11 +2,15 @@ "operationId": "Fleets_CreateOrUpdate", "title": "Creates a Fleet resource with a long running operation.", "parameters": { +<<<<<<< HEAD <<<<<<< HEAD "api-version": "2023-08-15-preview", ======= "api-version": "2023-06-15-preview", >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) +======= + "api-version": "2023-08-15-preview", +>>>>>>> 149b98b920 (Updates API version in new specs and examples) "subscriptionId": "subid1", "resourceGroupName": "rg1", "fleetName": "fleet1", diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_Delete.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_Delete.json index f279a0a1e9b7..feef16ca1c71 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_Delete.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_Delete.json @@ -2,11 +2,15 @@ "operationId": "Fleets_Delete", "title": "Deletes a Fleet resource asynchronously with a long running operation.", "parameters": { +<<<<<<< HEAD <<<<<<< HEAD "api-version": "2023-08-15-preview", ======= "api-version": "2023-06-15-preview", >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) +======= + "api-version": "2023-08-15-preview", +>>>>>>> 149b98b920 (Updates API version in new specs and examples) "subscriptionId": "subid1", "resourceGroupName": "rg1", "fleetName": "fleet1" diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_Get.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_Get.json index 004f80745dde..e3935ac7f28f 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_Get.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_Get.json @@ -2,11 +2,15 @@ "operationId": "Fleets_Get", "title": "Gets a Fleet resource.", "parameters": { +<<<<<<< HEAD <<<<<<< HEAD "api-version": "2023-08-15-preview", ======= "api-version": "2023-06-15-preview", >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) +======= + "api-version": "2023-08-15-preview", +>>>>>>> 149b98b920 (Updates API version in new specs and examples) "subscriptionId": "subid1", "resourceGroupName": "rg1", "fleetName": "fleet1" diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListByResourceGroup.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListByResourceGroup.json index d4fbdfb4652b..c92c61ec70fc 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListByResourceGroup.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListByResourceGroup.json @@ -2,11 +2,15 @@ "operationId": "Fleets_ListByResourceGroup", "title": "Lists the Fleet resources in a resource group.", "parameters": { +<<<<<<< HEAD <<<<<<< HEAD "api-version": "2023-08-15-preview", ======= "api-version": "2023-06-15-preview", >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) +======= + "api-version": "2023-08-15-preview", +>>>>>>> 149b98b920 (Updates API version in new specs and examples) "subscriptionId": "subid1", "resourceGroupName": "rg1" }, diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListBySub.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListBySub.json index cb6c442a2d5e..8452b61430f2 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListBySub.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListBySub.json @@ -2,11 +2,15 @@ "operationId": "Fleets_ListBySubscription", "title": "Lists the Fleet resources in a subscription.", "parameters": { +<<<<<<< HEAD <<<<<<< HEAD "api-version": "2023-08-15-preview", ======= "api-version": "2023-06-15-preview", >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) +======= + "api-version": "2023-08-15-preview", +>>>>>>> 149b98b920 (Updates API version in new specs and examples) "subscriptionId": "subid1" }, "responses": { diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListCredentialsResult.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListCredentialsResult.json index 66714ea3cb58..a352c5ce4a67 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListCredentialsResult.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListCredentialsResult.json @@ -2,11 +2,15 @@ "operationId": "Fleets_ListCredentials", "title": "Lists the user credentials of a Fleet.", "parameters": { +<<<<<<< HEAD <<<<<<< HEAD "api-version": "2023-08-15-preview", ======= "api-version": "2023-06-15-preview", >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) +======= + "api-version": "2023-08-15-preview", +>>>>>>> 149b98b920 (Updates API version in new specs and examples) "subscriptionId": "subid1", "resourceGroupName": "rg1", "fleetName": "fleet" diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_PatchTags.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_PatchTags.json index 40828ac38695..e09174e7b835 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_PatchTags.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_PatchTags.json @@ -2,11 +2,15 @@ "operationId": "Fleets_Update", "title": "Update a Fleet.", "parameters": { +<<<<<<< HEAD <<<<<<< HEAD "api-version": "2023-08-15-preview", ======= "api-version": "2023-06-15-preview", >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) +======= + "api-version": "2023-08-15-preview", +>>>>>>> 149b98b920 (Updates API version in new specs and examples) "subscriptionId": "subid1", "resourceGroupName": "rg1", "fleetName": "fleet1", diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Operations_List.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Operations_List.json index a624acc5c1f6..7eaf68d47935 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Operations_List.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Operations_List.json @@ -2,11 +2,15 @@ "operationId": "Operations_List", "title": "List the operations for the provider.", "parameters": { +<<<<<<< HEAD <<<<<<< HEAD "api-version": "2023-08-15-preview" ======= "api-version": "2023-06-15-preview" >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) +======= + "api-version": "2023-08-15-preview" +>>>>>>> 149b98b920 (Updates API version in new specs and examples) }, "responses": { "200": { diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_CreateOrUpdate.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_CreateOrUpdate.json index f3714b38390b..cc62b236e093 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_CreateOrUpdate.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_CreateOrUpdate.json @@ -2,11 +2,15 @@ "operationId": "UpdateRuns_CreateOrUpdate", "title": "Create an UpdateRun.", "parameters": { +<<<<<<< HEAD <<<<<<< HEAD "api-version": "2023-08-15-preview", ======= "api-version": "2023-06-15-preview", >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) +======= + "api-version": "2023-08-15-preview", +>>>>>>> 149b98b920 (Updates API version in new specs and examples) "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "rg1", "fleetName": "fleet1", diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Delete.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Delete.json index 41eaf0e7b5fc..934a15346fd5 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Delete.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Delete.json @@ -2,11 +2,15 @@ "operationId": "UpdateRuns_Delete", "title": "Delete an updateRun resource.", "parameters": { +<<<<<<< HEAD <<<<<<< HEAD "api-version": "2023-08-15-preview", ======= "api-version": "2023-06-15-preview", >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) +======= + "api-version": "2023-08-15-preview", +>>>>>>> 149b98b920 (Updates API version in new specs and examples) "subscriptionId": "subid1", "resourceGroupName": "rg1", "fleetName": "fleet1", diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Get.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Get.json index 5a9481602858..95170f543a66 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Get.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Get.json @@ -2,11 +2,15 @@ "operationId": "UpdateRuns_Get", "title": "Gets an UpdateRun resource.", "parameters": { +<<<<<<< HEAD <<<<<<< HEAD "api-version": "2023-08-15-preview", ======= "api-version": "2023-06-15-preview", >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) +======= + "api-version": "2023-08-15-preview", +>>>>>>> 149b98b920 (Updates API version in new specs and examples) "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "rg1", "fleetName": "fleet1", diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_ListByFleet.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_ListByFleet.json index 8dd22cd0e258..bdbcba09a324 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_ListByFleet.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_ListByFleet.json @@ -2,11 +2,15 @@ "operationId": "UpdateRuns_ListByFleet", "title": "Lists the UpdateRun resources by fleet.", "parameters": { +<<<<<<< HEAD <<<<<<< HEAD "api-version": "2023-08-15-preview", ======= "api-version": "2023-06-15-preview", >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) +======= + "api-version": "2023-08-15-preview", +>>>>>>> 149b98b920 (Updates API version in new specs and examples) "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "rg1", "fleetName": "fleet1" diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Start.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Start.json index 9b83980b0a09..41f08435d74e 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Start.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Start.json @@ -2,11 +2,15 @@ "operationId": "UpdateRuns_Start", "title": "Starts an UpdateRun.", "parameters": { +<<<<<<< HEAD <<<<<<< HEAD "api-version": "2023-08-15-preview", ======= "api-version": "2023-06-15-preview", >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) +======= + "api-version": "2023-08-15-preview", +>>>>>>> 149b98b920 (Updates API version in new specs and examples) "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "rg1", "fleetName": "fleet1", diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Stop.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Stop.json index ef24a4bd3b43..d9bfc0641615 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Stop.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Stop.json @@ -2,11 +2,15 @@ "operationId": "UpdateRuns_Stop", "title": "Stops an UpdateRun.", "parameters": { +<<<<<<< HEAD <<<<<<< HEAD "api-version": "2023-08-15-preview", ======= "api-version": "2023-06-15-preview", >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) +======= + "api-version": "2023-08-15-preview", +>>>>>>> 149b98b920 (Updates API version in new specs and examples) "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "rg1", "fleetName": "fleet1", From e4c75fe6dd12b2de6e9e63fd6090a02639cf6c00 Mon Sep 17 00:00:00 2001 From: zman-ms Date: Tue, 26 Sep 2023 14:16:24 -0700 Subject: [PATCH 04/16] rebase --- .../Fleets_CreateOrUpdate.json | 17 ++----- .../2023-08-15-preview/Fleets_Get.json | 6 +-- .../Fleets_ListByResourceGroup.json | 6 +-- .../2023-08-15-preview/Fleets_ListBySub.json | 6 +-- .../2023-08-15-preview/Fleets_PatchTags.json | 6 +-- .../examples/UpdateRuns_CreateOrUpdate.json | 12 +++++ .../preview/2023-08-15-preview/fleets.json | 48 +++++++++++++++++++ .../fleet/readme.md | 12 ----- 8 files changed, 67 insertions(+), 46 deletions(-) diff --git a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_CreateOrUpdate.json b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_CreateOrUpdate.json index 48c12421b097..8af8f2ab7785 100644 --- a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_CreateOrUpdate.json +++ b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_CreateOrUpdate.json @@ -14,10 +14,7 @@ "location": "East US", "properties": { "hubProfile": { - "dnsPrefix": "dnsprefix1", - "agentProfile": { - "vmSize": "Standard_DS1" - } + "dnsPrefix": "dnsprefix1" } } } @@ -51,11 +48,7 @@ "hubProfile": { "dnsPrefix": "dnsprefix1", "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", - "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", - "kubernetesVersion": "1.22.4", - "agentProfile": { - "vmSize": "Standard_DS1" - } + "kubernetesVersion": "1.22.4" }, "provisioningState": "Updating" } @@ -89,11 +82,7 @@ "hubProfile": { "dnsPrefix": "dnsprefix1", "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", - "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", - "kubernetesVersion": "1.22.4", - "agentProfile": { - "vmSize": "Standard_DS1" - } + "kubernetesVersion": "1.22.4" }, "provisioningState": "Creating" } diff --git a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_Get.json b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_Get.json index 76846af0ee11..0e3c3312b54d 100644 --- a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_Get.json +++ b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_Get.json @@ -34,11 +34,7 @@ "hubProfile": { "dnsPrefix": "dnsprefix1", "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", - "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", - "kubernetesVersion": "1.22.4", - "agentProfile": { - "vmSize": "Standard_DS1" - } + "kubernetesVersion": "1.22.4" }, "provisioningState": "Succeeded" } diff --git a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_ListByResourceGroup.json b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_ListByResourceGroup.json index dccf77273622..ace6f2c9acc2 100644 --- a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_ListByResourceGroup.json +++ b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_ListByResourceGroup.json @@ -32,11 +32,7 @@ "hubProfile": { "dnsPrefix": "dnsprefix1", "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", - "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", - "kubernetesVersion": "1.22.4", - "agentProfile": { - "vmSize": "Standard_DS1" - } + "kubernetesVersion": "1.22.4" }, "provisioningState": "Succeeded" } diff --git a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_ListBySub.json b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_ListBySub.json index 7dcee17d809b..b18f015c5b70 100644 --- a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_ListBySub.json +++ b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_ListBySub.json @@ -31,11 +31,7 @@ "hubProfile": { "dnsPrefix": "dnsprefix1", "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", - "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", - "kubernetesVersion": "1.22.4", - "agentProfile": { - "vmSize": "Standard_DS1" - } + "kubernetesVersion": "1.22.4" }, "provisioningState": "Succeeded" } diff --git a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_PatchTags.json b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_PatchTags.json index 52f18e156b32..d5b620026d57 100644 --- a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_PatchTags.json +++ b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_PatchTags.json @@ -41,11 +41,7 @@ "hubProfile": { "dnsPrefix": "dnsprefix1", "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", - "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", - "kubernetesVersion": "1.22.4", - "agentProfile": { - "vmSize": "Standard_DS1" - } + "kubernetesVersion": "1.22.4" }, "provisioningState": "Succeeded" } diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_CreateOrUpdate.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_CreateOrUpdate.json index cc62b236e093..111ea1ced067 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_CreateOrUpdate.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_CreateOrUpdate.json @@ -17,10 +17,14 @@ "updateRunName": "run1", "resource": { "properties": { +<<<<<<< HEAD <<<<<<< HEAD "updateStrategyId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ContainerService/fleets/myFleet/updateStrategies/strategy1", ======= >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) +======= + "updateStrategyId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ContainerService/fleets/myFleet/updateStrategies/strategy1", +>>>>>>> 69af7c5c07 ([Fleet][Dev] Strategy resource API (#25582)) "strategy": { "stages": [ { @@ -62,10 +66,14 @@ }, "properties": { "provisioningState": "Succeeded", +<<<<<<< HEAD <<<<<<< HEAD "updateStrategyId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ContainerService/fleets/myFleet/updateStrategies/strategy1", ======= >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) +======= + "updateStrategyId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ContainerService/fleets/myFleet/updateStrategies/strategy1", +>>>>>>> 69af7c5c07 ([Fleet][Dev] Strategy resource API (#25582)) "strategy": { "stages": [ { @@ -143,10 +151,14 @@ }, "properties": { "provisioningState": "Succeeded", +<<<<<<< HEAD <<<<<<< HEAD "updateStrategyId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ContainerService/fleets/myFleet/updateStrategies/strategy1", ======= >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) +======= + "updateStrategyId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ContainerService/fleets/myFleet/updateStrategies/strategy1", +>>>>>>> 69af7c5c07 ([Fleet][Dev] Strategy resource API (#25582)) "strategy": { "stages": [ { diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/fleets.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/fleets.json index 30f8e5b9321e..d4cace6462b2 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/fleets.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/fleets.json @@ -50,12 +50,18 @@ }, { "name": "UpdateRuns" +<<<<<<< HEAD <<<<<<< HEAD }, { "name": "FleetUpdateStrategies" ======= >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) +======= + }, + { + "name": "FleetUpdateStrategies" +>>>>>>> 69af7c5c07 ([Fleet][Dev] Strategy resource API (#25582)) } ], "paths": { @@ -1366,6 +1372,9 @@ "x-ms-long-running-operation": true } <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 69af7c5c07 ([Fleet][Dev] Strategy resource API (#25582)) }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/fleets/{fleetName}/updateStrategies": { "get": { @@ -1659,8 +1668,11 @@ }, "x-ms-long-running-operation": true } +<<<<<<< HEAD ======= >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) +======= +>>>>>>> 69af7c5c07 ([Fleet][Dev] Strategy resource API (#25582)) } }, "definitions": { @@ -2093,6 +2105,9 @@ } }, <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 69af7c5c07 ([Fleet][Dev] Strategy resource API (#25582)) "FleetUpdateStrategy": { "type": "object", "description": "Defines a multi-stage process to perform update operations across members of a Fleet.", @@ -2204,8 +2219,11 @@ ] } }, +<<<<<<< HEAD ======= >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) +======= +>>>>>>> 69af7c5c07 ([Fleet][Dev] Strategy resource API (#25582)) "KubernetesVersion": { "type": "string" }, @@ -2389,11 +2407,15 @@ "properties": { "name": { "type": "string", +<<<<<<< HEAD <<<<<<< HEAD "description": "Name of the group.\nIt must match a group name of an existing fleet member. ", ======= "description": "The name of the Fleet member group to update. \nIt should match the name of an existing FleetMember group.\nA group can only appear once across all UpdateStages in the UpdateRun.", >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) +======= + "description": "Name of the group.\nIt must match a group name of an existing fleet member. ", +>>>>>>> 69af7c5c07 ([Fleet][Dev] Strategy resource API (#25582)) "minLength": 1, "maxLength": 50, "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" @@ -2432,11 +2454,15 @@ }, "UpdateRun": { "type": "object", +<<<<<<< HEAD <<<<<<< HEAD "description": "A multi-stage process to perform update operations across members of a Fleet.", ======= "description": "An UpdateRun is a multi-stage process to perform update operations across members of a Fleet.", >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) +======= + "description": "A multi-stage process to perform update operations across members of a Fleet.", +>>>>>>> 69af7c5c07 ([Fleet][Dev] Strategy resource API (#25582)) "properties": { "properties": { "$ref": "#/definitions/UpdateRunProperties", @@ -2490,12 +2516,18 @@ "readOnly": true }, <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 69af7c5c07 ([Fleet][Dev] Strategy resource API (#25582)) "updateStrategyId": { "$ref": "#/definitions/FleetUpdateStrategyResourceId", "description": "The resource id of the FleetUpdateStrategy resource to reference.\n\nWhen creating a new run, there are three ways to define a strategy for the run:\n1. Define a new strategy in place: Set the \"strategy\" field.\n2. Use an existing strategy: Set the \"updateStrategyId\" field. (since 2023-08-15-preview)\n3. Use the default strategy to update all the members one by one: Leave both \"updateStrategyId\" and \"strategy\" unset. (since 2023-08-15-preview)\n\nSetting both \"updateStrategyId\" and \"strategy\" is invalid.\n\nUpdateRuns created by \"updateStrategyId\" snapshot the referenced UpdateStrategy at the time of creation and store it in the \"strategy\" field. \nSubsequent changes to the referenced FleetUpdateStrategy resource do not propagate. \nUpdateRunStrategy changes can be made directly on the \"strategy\" field before launching the UpdateRun." }, +<<<<<<< HEAD ======= >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) +======= +>>>>>>> 69af7c5c07 ([Fleet][Dev] Strategy resource API (#25582)) "strategy": { "$ref": "#/definitions/UpdateRunStrategy", "description": "The strategy defines the order in which the clusters will be updated. \nIf not set, all members will be updated sequentially. The UpdateRun status will show a single UpdateStage and a single UpdateGroup targeting all members.\nThe strategy of the UpdateRun can be modified until the run is started." @@ -2573,6 +2605,7 @@ }, "UpdateRunStrategy": { "type": "object", +<<<<<<< HEAD <<<<<<< HEAD "description": "Defines the update sequence of the clusters via stages and groups.\n\nStages within a run are executed sequentially one after another.\nGroups within a stage are executed in parallel.\nMember clusters within a group are updated sequentially one after another.\n\nA valid strategy contains no duplicate groups within or across stages.", "properties": { @@ -2586,6 +2619,13 @@ "type": "array", "description": "The list of stages that compose this update run.", >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) +======= + "description": "Defines the update sequence of the clusters via stages and groups.\n\nStages within a run are executed sequentially one after another.\nGroups within a stage are executed in parallel.\nMember clusters within a group are updated sequentially one after another.\n\nA valid strategy contains no duplicate groups within or across stages.", + "properties": { + "stages": { + "type": "array", + "description": "The list of stages that compose this update run. Min size: 1.", +>>>>>>> 69af7c5c07 ([Fleet][Dev] Strategy resource API (#25582)) "items": { "$ref": "#/definitions/UpdateStage" }, @@ -2600,11 +2640,15 @@ }, "UpdateStage": { "type": "object", +<<<<<<< HEAD <<<<<<< HEAD "description": "Defines a stage which contains the groups to update and the steps to take (e.g., wait for a time period) before starting the next stage.", ======= "description": "Contains the groups to be updated by an UpdateRun.\nUpdate order:\n- Sequential between stages: Stages run sequentially. The previous stage must complete before the next one starts.\n- Parallel within a stage: Groups within a stage run in parallel.\n- Sequential within a group: Clusters within a group are updated sequentially.", >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) +======= + "description": "Defines a stage which contains the groups to update and the steps to take (e.g., wait for a time period) before starting the next stage.", +>>>>>>> 69af7c5c07 ([Fleet][Dev] Strategy resource API (#25582)) "properties": { "name": { "type": "string", @@ -2615,11 +2659,15 @@ }, "groups": { "type": "array", +<<<<<<< HEAD <<<<<<< HEAD "description": "Defines the groups to be executed in parallel in this stage. Duplicate groups are not allowed. Min size: 1.", ======= "description": "A list of group names that compose the stage.\nThe groups will be updated in parallel. Each group name can only appear once in the UpdateRun.", >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) +======= + "description": "Defines the groups to be executed in parallel in this stage. Duplicate groups are not allowed. Min size: 1.", +>>>>>>> 69af7c5c07 ([Fleet][Dev] Strategy resource API (#25582)) "items": { "$ref": "#/definitions/UpdateGroup" }, diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/readme.md b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/readme.md index ed47d976589d..f57c06cace6c 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/readme.md +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/readme.md @@ -27,17 +27,6 @@ These are the global settings for the ContainerServices API. ``` yaml openapi-type: arm -<<<<<<< HEAD -tag: package-2023-08-preview -``` - - -### Tag: package-2023-08-preview - -These settings apply only when `--tag=package-2023-08-preview` is specified on the command line. - -``` yaml $(tag) == 'package-2023-08-preview' -======= tag: package-preview-2023-08 ``` @@ -47,7 +36,6 @@ tag: package-preview-2023-08 These settings apply only when `--tag=package-preview-2023-08` is specified on the command line. ```yaml $(tag) == 'package-preview-2023-08' ->>>>>>> afeb018213 (Updates readme) input-file: - preview/2023-08-15-preview/fleets.json ``` From f729746490fe9b4fc50dd7250db97d62906a2540 Mon Sep 17 00:00:00 2001 From: zman-ms Date: Tue, 26 Sep 2023 14:18:14 -0700 Subject: [PATCH 05/16] rebase --- .../2023-08-15-preview/Fleets_CreateOrUpdate.json | 9 ++++++--- .../examples/2023-08-15-preview/Fleets_Get.json | 3 ++- .../Fleets_ListByResourceGroup.json | 3 ++- .../2023-08-15-preview/Fleets_ListBySub.json | 3 ++- .../2023-08-15-preview/Fleets_PatchTags.json | 3 ++- .../containerservice/Fleet.Management/fleet.tsp | 5 +++++ .../examples/Fleets_CreateOrUpdate.json | 15 +++++++++++++++ .../2023-08-15-preview/examples/Fleets_Get.json | 5 +++++ .../examples/Fleets_ListByResourceGroup.json | 5 +++++ .../examples/Fleets_ListBySub.json | 5 +++++ .../examples/Fleets_PatchTags.json | 5 +++++ .../fleet/preview/2023-08-15-preview/fleets.json | 11 +++++++++++ 12 files changed, 65 insertions(+), 7 deletions(-) diff --git a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_CreateOrUpdate.json b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_CreateOrUpdate.json index 8af8f2ab7785..e634ed32908a 100644 --- a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_CreateOrUpdate.json +++ b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_CreateOrUpdate.json @@ -14,7 +14,8 @@ "location": "East US", "properties": { "hubProfile": { - "dnsPrefix": "dnsprefix1" + "dnsPrefix": "dnsprefix1", + "vmSize": "Standard_DS1" } } } @@ -48,7 +49,8 @@ "hubProfile": { "dnsPrefix": "dnsprefix1", "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", - "kubernetesVersion": "1.22.4" + "kubernetesVersion": "1.22.4", + "vmSize": "Standard_DS1" }, "provisioningState": "Updating" } @@ -82,7 +84,8 @@ "hubProfile": { "dnsPrefix": "dnsprefix1", "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", - "kubernetesVersion": "1.22.4" + "kubernetesVersion": "1.22.4", + "vmSize": "Standard_DS1" }, "provisioningState": "Creating" } diff --git a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_Get.json b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_Get.json index 0e3c3312b54d..2c6b93ec93fd 100644 --- a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_Get.json +++ b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_Get.json @@ -34,7 +34,8 @@ "hubProfile": { "dnsPrefix": "dnsprefix1", "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", - "kubernetesVersion": "1.22.4" + "kubernetesVersion": "1.22.4", + "vmSize": "Standard_DS1" }, "provisioningState": "Succeeded" } diff --git a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_ListByResourceGroup.json b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_ListByResourceGroup.json index ace6f2c9acc2..c534f41c857a 100644 --- a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_ListByResourceGroup.json +++ b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_ListByResourceGroup.json @@ -32,7 +32,8 @@ "hubProfile": { "dnsPrefix": "dnsprefix1", "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", - "kubernetesVersion": "1.22.4" + "kubernetesVersion": "1.22.4", + "vmSize": "Standard_DS1" }, "provisioningState": "Succeeded" } diff --git a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_ListBySub.json b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_ListBySub.json index b18f015c5b70..862de7b34230 100644 --- a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_ListBySub.json +++ b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_ListBySub.json @@ -31,7 +31,8 @@ "hubProfile": { "dnsPrefix": "dnsprefix1", "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", - "kubernetesVersion": "1.22.4" + "kubernetesVersion": "1.22.4", + "vmSize": "Standard_DS1" }, "provisioningState": "Succeeded" } diff --git a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_PatchTags.json b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_PatchTags.json index d5b620026d57..09f21298a086 100644 --- a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_PatchTags.json +++ b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_PatchTags.json @@ -41,7 +41,8 @@ "hubProfile": { "dnsPrefix": "dnsprefix1", "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", - "kubernetesVersion": "1.22.4" + "kubernetesVersion": "1.22.4", + "vmSize": "Standard_DS1" }, "provisioningState": "Succeeded" } diff --git a/specification/containerservice/Fleet.Management/fleet.tsp b/specification/containerservice/Fleet.Management/fleet.tsp index 0205267721d1..9a5747002ed9 100644 --- a/specification/containerservice/Fleet.Management/fleet.tsp +++ b/specification/containerservice/Fleet.Management/fleet.tsp @@ -83,6 +83,11 @@ model FleetHubProfile { @visibility("read") @doc("The Azure Portal FQDN of the Fleet hub.") portalFqdn?: string; + + @added(Versions.v2023_08_15_preview) + @doc("The virtual machine size of the Fleet hub.") + @visibility("read", "create") + vmSize?: string; } scalar SubnetResourceId diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_CreateOrUpdate.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_CreateOrUpdate.json index 2a3b26a1415f..aec1f62e8df4 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_CreateOrUpdate.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_CreateOrUpdate.json @@ -22,6 +22,7 @@ "location": "East US", "properties": { "hubProfile": { +<<<<<<< HEAD <<<<<<< HEAD "dnsPrefix": "dnsprefix1", "agentProfile": { @@ -30,6 +31,10 @@ ======= "dnsPrefix": "dnsprefix1" >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) +======= + "dnsPrefix": "dnsprefix1", + "vmSize": "Standard_DS1" +>>>>>>> 092b424f5c ([Fleet] Add VMSize to hub profile (#25709)) } } } @@ -63,6 +68,7 @@ "hubProfile": { "dnsPrefix": "dnsprefix1", "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", +<<<<<<< HEAD <<<<<<< HEAD "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", @@ -72,6 +78,10 @@ ======= "kubernetesVersion": "1.22.4" >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) +======= + "kubernetesVersion": "1.22.4", + "vmSize": "Standard_DS1" +>>>>>>> 092b424f5c ([Fleet] Add VMSize to hub profile (#25709)) }, "provisioningState": "Updating" } @@ -105,6 +115,7 @@ "hubProfile": { "dnsPrefix": "dnsprefix1", "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", +<<<<<<< HEAD <<<<<<< HEAD "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", @@ -114,6 +125,10 @@ ======= "kubernetesVersion": "1.22.4" >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) +======= + "kubernetesVersion": "1.22.4", + "vmSize": "Standard_DS1" +>>>>>>> 092b424f5c ([Fleet] Add VMSize to hub profile (#25709)) }, "provisioningState": "Creating" } diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_Get.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_Get.json index e3935ac7f28f..9e2e1ec8bd24 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_Get.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_Get.json @@ -42,6 +42,7 @@ "hubProfile": { "dnsPrefix": "dnsprefix1", "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", +<<<<<<< HEAD <<<<<<< HEAD "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", @@ -51,6 +52,10 @@ ======= "kubernetesVersion": "1.22.4" >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) +======= + "kubernetesVersion": "1.22.4", + "vmSize": "Standard_DS1" +>>>>>>> 092b424f5c ([Fleet] Add VMSize to hub profile (#25709)) }, "provisioningState": "Succeeded" } diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListByResourceGroup.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListByResourceGroup.json index c92c61ec70fc..5e32e96b84c4 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListByResourceGroup.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListByResourceGroup.json @@ -40,6 +40,7 @@ "hubProfile": { "dnsPrefix": "dnsprefix1", "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", +<<<<<<< HEAD <<<<<<< HEAD "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", @@ -49,6 +50,10 @@ ======= "kubernetesVersion": "1.22.4" >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) +======= + "kubernetesVersion": "1.22.4", + "vmSize": "Standard_DS1" +>>>>>>> 092b424f5c ([Fleet] Add VMSize to hub profile (#25709)) }, "provisioningState": "Succeeded" } diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListBySub.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListBySub.json index 8452b61430f2..3d17b8910598 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListBySub.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListBySub.json @@ -39,6 +39,7 @@ "hubProfile": { "dnsPrefix": "dnsprefix1", "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", +<<<<<<< HEAD <<<<<<< HEAD "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", @@ -48,6 +49,10 @@ ======= "kubernetesVersion": "1.22.4" >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) +======= + "kubernetesVersion": "1.22.4", + "vmSize": "Standard_DS1" +>>>>>>> 092b424f5c ([Fleet] Add VMSize to hub profile (#25709)) }, "provisioningState": "Succeeded" } diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_PatchTags.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_PatchTags.json index e09174e7b835..b5948bdc4cf6 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_PatchTags.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_PatchTags.json @@ -49,6 +49,7 @@ "hubProfile": { "dnsPrefix": "dnsprefix1", "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", +<<<<<<< HEAD <<<<<<< HEAD "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", @@ -58,6 +59,10 @@ ======= "kubernetesVersion": "1.22.4" >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) +======= + "kubernetesVersion": "1.22.4", + "vmSize": "Standard_DS1" +>>>>>>> 092b424f5c ([Fleet] Add VMSize to hub profile (#25709)) }, "provisioningState": "Succeeded" } diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/fleets.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/fleets.json index d4cace6462b2..246296df2a35 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/fleets.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/fleets.json @@ -1846,6 +1846,7 @@ "type": "string", "description": "The Kubernetes version of the Fleet hub.", "readOnly": true +<<<<<<< HEAD <<<<<<< HEAD }, "portalFqdn": { @@ -1854,6 +1855,16 @@ "readOnly": true ======= >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) +======= + }, + "vmSize": { + "type": "string", + "description": "The virtual machine size of the Fleet hub.", + "x-ms-mutability": [ + "read", + "create" + ] +>>>>>>> 092b424f5c ([Fleet] Add VMSize to hub profile (#25709)) } } }, From 537985a2bd6b353782fd2683278505900618421f Mon Sep 17 00:00:00 2001 From: zman-ms Date: Tue, 26 Sep 2023 14:19:28 -0700 Subject: [PATCH 06/16] rebase --- .../2023-08-15-preview/Fleets_CreateOrUpdate.json | 2 ++ .../examples/2023-08-15-preview/Fleets_Get.json | 1 + .../2023-08-15-preview/Fleets_ListByResourceGroup.json | 1 + .../examples/2023-08-15-preview/Fleets_ListBySub.json | 1 + .../examples/2023-08-15-preview/Fleets_PatchTags.json | 1 + .../examples/Fleets_CreateOrUpdate.json | 8 ++++++++ .../preview/2023-08-15-preview/examples/Fleets_Get.json | 4 ++++ .../examples/Fleets_ListByResourceGroup.json | 4 ++++ .../2023-08-15-preview/examples/Fleets_ListBySub.json | 4 ++++ .../2023-08-15-preview/examples/Fleets_PatchTags.json | 4 ++++ .../fleet/preview/2023-08-15-preview/fleets.json | 5 +++++ 11 files changed, 35 insertions(+) diff --git a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_CreateOrUpdate.json b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_CreateOrUpdate.json index e634ed32908a..28b4d865f226 100644 --- a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_CreateOrUpdate.json +++ b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_CreateOrUpdate.json @@ -49,6 +49,7 @@ "hubProfile": { "dnsPrefix": "dnsprefix1", "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", + "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", "vmSize": "Standard_DS1" }, @@ -84,6 +85,7 @@ "hubProfile": { "dnsPrefix": "dnsprefix1", "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", + "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", "vmSize": "Standard_DS1" }, diff --git a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_Get.json b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_Get.json index 2c6b93ec93fd..228597be55a6 100644 --- a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_Get.json +++ b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_Get.json @@ -34,6 +34,7 @@ "hubProfile": { "dnsPrefix": "dnsprefix1", "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", + "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", "vmSize": "Standard_DS1" }, diff --git a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_ListByResourceGroup.json b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_ListByResourceGroup.json index c534f41c857a..e4e37d610f02 100644 --- a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_ListByResourceGroup.json +++ b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_ListByResourceGroup.json @@ -32,6 +32,7 @@ "hubProfile": { "dnsPrefix": "dnsprefix1", "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", + "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", "vmSize": "Standard_DS1" }, diff --git a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_ListBySub.json b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_ListBySub.json index 862de7b34230..757e3e45cd7b 100644 --- a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_ListBySub.json +++ b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_ListBySub.json @@ -31,6 +31,7 @@ "hubProfile": { "dnsPrefix": "dnsprefix1", "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", + "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", "vmSize": "Standard_DS1" }, diff --git a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_PatchTags.json b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_PatchTags.json index 09f21298a086..ed64c9677ebb 100644 --- a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_PatchTags.json +++ b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_PatchTags.json @@ -41,6 +41,7 @@ "hubProfile": { "dnsPrefix": "dnsprefix1", "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", + "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", "vmSize": "Standard_DS1" }, diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_CreateOrUpdate.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_CreateOrUpdate.json index aec1f62e8df4..58b98e73dfd5 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_CreateOrUpdate.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_CreateOrUpdate.json @@ -69,6 +69,7 @@ "dnsPrefix": "dnsprefix1", "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", @@ -79,6 +80,9 @@ "kubernetesVersion": "1.22.4" >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) ======= +======= + "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", +>>>>>>> 19e857e8a6 (Add portal FQDN to fleet hub profile (#25766)) "kubernetesVersion": "1.22.4", "vmSize": "Standard_DS1" >>>>>>> 092b424f5c ([Fleet] Add VMSize to hub profile (#25709)) @@ -116,6 +120,7 @@ "dnsPrefix": "dnsprefix1", "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", @@ -126,6 +131,9 @@ "kubernetesVersion": "1.22.4" >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) ======= +======= + "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", +>>>>>>> 19e857e8a6 (Add portal FQDN to fleet hub profile (#25766)) "kubernetesVersion": "1.22.4", "vmSize": "Standard_DS1" >>>>>>> 092b424f5c ([Fleet] Add VMSize to hub profile (#25709)) diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_Get.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_Get.json index 9e2e1ec8bd24..eeb7c0135c84 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_Get.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_Get.json @@ -43,6 +43,7 @@ "dnsPrefix": "dnsprefix1", "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", @@ -53,6 +54,9 @@ "kubernetesVersion": "1.22.4" >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) ======= +======= + "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", +>>>>>>> 19e857e8a6 (Add portal FQDN to fleet hub profile (#25766)) "kubernetesVersion": "1.22.4", "vmSize": "Standard_DS1" >>>>>>> 092b424f5c ([Fleet] Add VMSize to hub profile (#25709)) diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListByResourceGroup.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListByResourceGroup.json index 5e32e96b84c4..0933c9672b8d 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListByResourceGroup.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListByResourceGroup.json @@ -41,6 +41,7 @@ "dnsPrefix": "dnsprefix1", "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", @@ -51,6 +52,9 @@ "kubernetesVersion": "1.22.4" >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) ======= +======= + "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", +>>>>>>> 19e857e8a6 (Add portal FQDN to fleet hub profile (#25766)) "kubernetesVersion": "1.22.4", "vmSize": "Standard_DS1" >>>>>>> 092b424f5c ([Fleet] Add VMSize to hub profile (#25709)) diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListBySub.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListBySub.json index 3d17b8910598..bbd32bd72445 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListBySub.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListBySub.json @@ -40,6 +40,7 @@ "dnsPrefix": "dnsprefix1", "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", @@ -50,6 +51,9 @@ "kubernetesVersion": "1.22.4" >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) ======= +======= + "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", +>>>>>>> 19e857e8a6 (Add portal FQDN to fleet hub profile (#25766)) "kubernetesVersion": "1.22.4", "vmSize": "Standard_DS1" >>>>>>> 092b424f5c ([Fleet] Add VMSize to hub profile (#25709)) diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_PatchTags.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_PatchTags.json index b5948bdc4cf6..430b77afde73 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_PatchTags.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_PatchTags.json @@ -50,6 +50,7 @@ "dnsPrefix": "dnsprefix1", "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", @@ -60,6 +61,9 @@ "kubernetesVersion": "1.22.4" >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) ======= +======= + "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", +>>>>>>> 19e857e8a6 (Add portal FQDN to fleet hub profile (#25766)) "kubernetesVersion": "1.22.4", "vmSize": "Standard_DS1" >>>>>>> 092b424f5c ([Fleet] Add VMSize to hub profile (#25709)) diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/fleets.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/fleets.json index 246296df2a35..46d740d14e3d 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/fleets.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/fleets.json @@ -1857,6 +1857,11 @@ >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) ======= }, + "portalFqdn": { + "type": "string", + "description": "The Azure Portal FQDN of the Fleet hub.", + "readOnly": true + }, "vmSize": { "type": "string", "description": "The virtual machine size of the Fleet hub.", From 1bd6a612babdf1d28133744d4aae474d7ea2f7df Mon Sep 17 00:00:00 2001 From: zman-ms Date: Tue, 26 Sep 2023 14:21:12 -0700 Subject: [PATCH 07/16] rebase --- .../2023-08-15-preview/Fleets_CreateOrUpdate.json | 12 +++++++++--- .../examples/2023-08-15-preview/Fleets_Get.json | 4 +++- .../Fleets_ListByResourceGroup.json | 4 +++- .../2023-08-15-preview/Fleets_ListBySub.json | 4 +++- .../2023-08-15-preview/Fleets_PatchTags.json | 4 +++- .../containerservice/Fleet.Management/fleet.tsp | 5 ----- .../examples/Fleets_CreateOrUpdate.json | 12 ++++++++++++ .../2023-08-15-preview/examples/Fleets_Get.json | 3 +++ .../examples/Fleets_ListByResourceGroup.json | 3 +++ .../examples/Fleets_ListBySub.json | 3 +++ .../examples/Fleets_PatchTags.json | 3 +++ .../fleet/preview/2023-08-15-preview/fleets.json | 9 +++++++++ 12 files changed, 54 insertions(+), 12 deletions(-) diff --git a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_CreateOrUpdate.json b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_CreateOrUpdate.json index 28b4d865f226..48c12421b097 100644 --- a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_CreateOrUpdate.json +++ b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_CreateOrUpdate.json @@ -15,7 +15,9 @@ "properties": { "hubProfile": { "dnsPrefix": "dnsprefix1", - "vmSize": "Standard_DS1" + "agentProfile": { + "vmSize": "Standard_DS1" + } } } } @@ -51,7 +53,9 @@ "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", - "vmSize": "Standard_DS1" + "agentProfile": { + "vmSize": "Standard_DS1" + } }, "provisioningState": "Updating" } @@ -87,7 +91,9 @@ "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", - "vmSize": "Standard_DS1" + "agentProfile": { + "vmSize": "Standard_DS1" + } }, "provisioningState": "Creating" } diff --git a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_Get.json b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_Get.json index 228597be55a6..76846af0ee11 100644 --- a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_Get.json +++ b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_Get.json @@ -36,7 +36,9 @@ "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", - "vmSize": "Standard_DS1" + "agentProfile": { + "vmSize": "Standard_DS1" + } }, "provisioningState": "Succeeded" } diff --git a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_ListByResourceGroup.json b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_ListByResourceGroup.json index e4e37d610f02..dccf77273622 100644 --- a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_ListByResourceGroup.json +++ b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_ListByResourceGroup.json @@ -34,7 +34,9 @@ "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", - "vmSize": "Standard_DS1" + "agentProfile": { + "vmSize": "Standard_DS1" + } }, "provisioningState": "Succeeded" } diff --git a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_ListBySub.json b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_ListBySub.json index 757e3e45cd7b..7dcee17d809b 100644 --- a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_ListBySub.json +++ b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_ListBySub.json @@ -33,7 +33,9 @@ "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", - "vmSize": "Standard_DS1" + "agentProfile": { + "vmSize": "Standard_DS1" + } }, "provisioningState": "Succeeded" } diff --git a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_PatchTags.json b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_PatchTags.json index ed64c9677ebb..52f18e156b32 100644 --- a/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_PatchTags.json +++ b/specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_PatchTags.json @@ -43,7 +43,9 @@ "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", - "vmSize": "Standard_DS1" + "agentProfile": { + "vmSize": "Standard_DS1" + } }, "provisioningState": "Succeeded" } diff --git a/specification/containerservice/Fleet.Management/fleet.tsp b/specification/containerservice/Fleet.Management/fleet.tsp index 9a5747002ed9..0205267721d1 100644 --- a/specification/containerservice/Fleet.Management/fleet.tsp +++ b/specification/containerservice/Fleet.Management/fleet.tsp @@ -83,11 +83,6 @@ model FleetHubProfile { @visibility("read") @doc("The Azure Portal FQDN of the Fleet hub.") portalFqdn?: string; - - @added(Versions.v2023_08_15_preview) - @doc("The virtual machine size of the Fleet hub.") - @visibility("read", "create") - vmSize?: string; } scalar SubnetResourceId diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_CreateOrUpdate.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_CreateOrUpdate.json index 58b98e73dfd5..2b2ddd1bf2f9 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_CreateOrUpdate.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_CreateOrUpdate.json @@ -33,8 +33,14 @@ >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) ======= "dnsPrefix": "dnsprefix1", +<<<<<<< HEAD "vmSize": "Standard_DS1" >>>>>>> 092b424f5c ([Fleet] Add VMSize to hub profile (#25709)) +======= + "agentProfile": { + "vmSize": "Standard_DS1" + } +>>>>>>> d158b9b8b6 ([Fleet] Move VMSize into AgentProfile (#25805)) } } } @@ -76,6 +82,7 @@ "agentProfile": { "vmSize": "Standard_DS1" } +<<<<<<< HEAD ======= "kubernetesVersion": "1.22.4" >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) @@ -86,6 +93,8 @@ "kubernetesVersion": "1.22.4", "vmSize": "Standard_DS1" >>>>>>> 092b424f5c ([Fleet] Add VMSize to hub profile (#25709)) +======= +>>>>>>> d158b9b8b6 ([Fleet] Move VMSize into AgentProfile (#25805)) }, "provisioningState": "Updating" } @@ -127,6 +136,7 @@ "agentProfile": { "vmSize": "Standard_DS1" } +<<<<<<< HEAD ======= "kubernetesVersion": "1.22.4" >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) @@ -137,6 +147,8 @@ "kubernetesVersion": "1.22.4", "vmSize": "Standard_DS1" >>>>>>> 092b424f5c ([Fleet] Add VMSize to hub profile (#25709)) +======= +>>>>>>> d158b9b8b6 ([Fleet] Move VMSize into AgentProfile (#25805)) }, "provisioningState": "Creating" } diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_Get.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_Get.json index eeb7c0135c84..7998c56a15ee 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_Get.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_Get.json @@ -50,6 +50,7 @@ "agentProfile": { "vmSize": "Standard_DS1" } +<<<<<<< HEAD ======= "kubernetesVersion": "1.22.4" >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) @@ -60,6 +61,8 @@ "kubernetesVersion": "1.22.4", "vmSize": "Standard_DS1" >>>>>>> 092b424f5c ([Fleet] Add VMSize to hub profile (#25709)) +======= +>>>>>>> d158b9b8b6 ([Fleet] Move VMSize into AgentProfile (#25805)) }, "provisioningState": "Succeeded" } diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListByResourceGroup.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListByResourceGroup.json index 0933c9672b8d..76b95ac38c6f 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListByResourceGroup.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListByResourceGroup.json @@ -48,6 +48,7 @@ "agentProfile": { "vmSize": "Standard_DS1" } +<<<<<<< HEAD ======= "kubernetesVersion": "1.22.4" >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) @@ -58,6 +59,8 @@ "kubernetesVersion": "1.22.4", "vmSize": "Standard_DS1" >>>>>>> 092b424f5c ([Fleet] Add VMSize to hub profile (#25709)) +======= +>>>>>>> d158b9b8b6 ([Fleet] Move VMSize into AgentProfile (#25805)) }, "provisioningState": "Succeeded" } diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListBySub.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListBySub.json index bbd32bd72445..c92f83231372 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListBySub.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListBySub.json @@ -47,6 +47,7 @@ "agentProfile": { "vmSize": "Standard_DS1" } +<<<<<<< HEAD ======= "kubernetesVersion": "1.22.4" >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) @@ -57,6 +58,8 @@ "kubernetesVersion": "1.22.4", "vmSize": "Standard_DS1" >>>>>>> 092b424f5c ([Fleet] Add VMSize to hub profile (#25709)) +======= +>>>>>>> d158b9b8b6 ([Fleet] Move VMSize into AgentProfile (#25805)) }, "provisioningState": "Succeeded" } diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_PatchTags.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_PatchTags.json index 430b77afde73..fea3dc17e45a 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_PatchTags.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_PatchTags.json @@ -57,6 +57,7 @@ "agentProfile": { "vmSize": "Standard_DS1" } +<<<<<<< HEAD ======= "kubernetesVersion": "1.22.4" >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) @@ -67,6 +68,8 @@ "kubernetesVersion": "1.22.4", "vmSize": "Standard_DS1" >>>>>>> 092b424f5c ([Fleet] Add VMSize to hub profile (#25709)) +======= +>>>>>>> d158b9b8b6 ([Fleet] Move VMSize into AgentProfile (#25805)) }, "provisioningState": "Succeeded" } diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/fleets.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/fleets.json index 46d740d14e3d..328ba47278d6 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/fleets.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/fleets.json @@ -1718,6 +1718,9 @@ "create" ] <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> d158b9b8b6 ([Fleet] Move VMSize into AgentProfile (#25805)) }, "vmSize": { "type": "string", @@ -1726,8 +1729,11 @@ "read", "create" ] +<<<<<<< HEAD ======= >>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) +======= +>>>>>>> d158b9b8b6 ([Fleet] Move VMSize into AgentProfile (#25805)) } } }, @@ -1861,6 +1867,7 @@ "type": "string", "description": "The Azure Portal FQDN of the Fleet hub.", "readOnly": true +<<<<<<< HEAD }, "vmSize": { "type": "string", @@ -1870,6 +1877,8 @@ "create" ] >>>>>>> 092b424f5c ([Fleet] Add VMSize to hub profile (#25709)) +======= +>>>>>>> d158b9b8b6 ([Fleet] Move VMSize into AgentProfile (#25805)) } } }, From 730113c3ae95d087d301af497ec4e2aac6344d54 Mon Sep 17 00:00:00 2001 From: zman-ms <99997769+zman-ms@users.noreply.github.com> Date: Sun, 17 Sep 2023 16:32:30 -0700 Subject: [PATCH 08/16] [Fleet] Fix readme.md for 0815 (#25822) * fix readme * format --- .../Microsoft.ContainerService/fleet/readme.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/readme.md b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/readme.md index f57c06cace6c..bb0e0b0a1386 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/readme.md +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/readme.md @@ -27,15 +27,15 @@ These are the global settings for the ContainerServices API. ``` yaml openapi-type: arm -tag: package-preview-2023-08 +tag: package-2023-08-preview ``` -### Tag: package-preview-2023-08 +### Tag: package-2023-08-preview -These settings apply only when `--tag=package-preview-2023-08` is specified on the command line. +These settings apply only when `--tag=package-2023-08-preview` is specified on the command line. -```yaml $(tag) == 'package-preview-2023-08' +``` yaml $(tag) == 'package-2023-08-preview' input-file: - preview/2023-08-15-preview/fleets.json ``` From 822eda8423b342f14a51c1c06363b56113feecb5 Mon Sep 17 00:00:00 2001 From: zman-ms Date: Tue, 12 Sep 2023 15:46:50 -0700 Subject: [PATCH 09/16] remove hub profile --- specification/containerservice/Fleet.Management/main.tsp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/specification/containerservice/Fleet.Management/main.tsp b/specification/containerservice/Fleet.Management/main.tsp index 3e89b70a13bf..0e1e988ef746 100644 --- a/specification/containerservice/Fleet.Management/main.tsp +++ b/specification/containerservice/Fleet.Management/main.tsp @@ -41,4 +41,9 @@ enum Versions { @useDependency(Azure.Core.Versions.v1_0_Preview_2) @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) v2023_08_15_preview: "2023-08-15-preview", + + @doc("Azure Kubernetes Fleet Manager api version 2023-10-15.") + @useDependency(Azure.Core.Versions.v1_0_Preview_2) + @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) + v2023_10_15: "2023-10-15", } From 3ccea42c14ba5b7924a50450da1fb29536cf0785 Mon Sep 17 00:00:00 2001 From: zman-ms Date: Tue, 12 Sep 2023 15:47:06 -0700 Subject: [PATCH 10/16] examples --- .../2023-10-15/FleetMembers_Create.json | 68 + .../2023-10-15/FleetMembers_Delete.json | 21 + .../examples/2023-10-15/FleetMembers_Get.json | 36 + .../2023-10-15/FleetMembers_ListByFleet.json | 37 + .../2023-10-15/FleetMembers_Update.json | 48 + .../2023-10-15/Fleets_CreateOrUpdate.json | 78 + .../examples/2023-10-15/Fleets_Delete.json | 20 + .../examples/2023-10-15/Fleets_Get.json | 39 + .../Fleets_ListByResourceGroup.json | 40 + .../examples/2023-10-15/Fleets_ListBySub.json | 39 + .../Fleets_ListCredentialsResult.json | 22 + .../examples/2023-10-15/Fleets_PatchTags.json | 52 + .../examples/2023-10-15/Operations_List.json | 25 + .../2023-10-15/UpdateRuns_CreateOrUpdate.json | 196 ++ .../2023-10-15/UpdateRuns_Delete.json | 21 + .../examples/2023-10-15/UpdateRuns_Get.json | 90 + .../2023-10-15/UpdateRuns_ListByFleet.json | 94 + .../examples/2023-10-15/UpdateRuns_Start.json | 99 + .../examples/2023-10-15/UpdateRuns_Stop.json | 99 + .../UpdateStrategies_CreateOrUpdate.json | 94 + .../2023-10-15/UpdateStrategies_Delete.json | 21 + .../2023-10-15/UpdateStrategies_Get.json | 45 + .../UpdateStrategies_ListByFleet.json | 49 + .../examples/FleetMembers_Create.json | 68 + .../examples/FleetMembers_Delete.json | 21 + .../2023-10-15/examples/FleetMembers_Get.json | 36 + .../examples/FleetMembers_ListByFleet.json | 37 + .../examples/FleetMembers_Update.json | 48 + .../examples/Fleets_CreateOrUpdate.json | 78 + .../2023-10-15/examples/Fleets_Delete.json | 20 + .../2023-10-15/examples/Fleets_Get.json | 39 + .../examples/Fleets_ListByResourceGroup.json | 40 + .../2023-10-15/examples/Fleets_ListBySub.json | 39 + .../Fleets_ListCredentialsResult.json | 22 + .../2023-10-15/examples/Fleets_PatchTags.json | 52 + .../2023-10-15/examples/Operations_List.json | 25 + .../examples/UpdateRuns_CreateOrUpdate.json | 196 ++ .../examples/UpdateRuns_Delete.json | 21 + .../2023-10-15/examples/UpdateRuns_Get.json | 90 + .../examples/UpdateRuns_ListByFleet.json | 94 + .../2023-10-15/examples/UpdateRuns_Start.json | 99 + .../2023-10-15/examples/UpdateRuns_Stop.json | 99 + .../UpdateStrategies_CreateOrUpdate.json | 94 + .../examples/UpdateStrategies_Delete.json | 21 + .../examples/UpdateStrategies_Get.json | 45 + .../UpdateStrategies_ListByFleet.json | 49 + .../fleet/stable/2023-10-15/fleets.json | 2726 +++++++++++++++++ 47 files changed, 5392 insertions(+) create mode 100644 specification/containerservice/Fleet.Management/examples/2023-10-15/FleetMembers_Create.json create mode 100644 specification/containerservice/Fleet.Management/examples/2023-10-15/FleetMembers_Delete.json create mode 100644 specification/containerservice/Fleet.Management/examples/2023-10-15/FleetMembers_Get.json create mode 100644 specification/containerservice/Fleet.Management/examples/2023-10-15/FleetMembers_ListByFleet.json create mode 100644 specification/containerservice/Fleet.Management/examples/2023-10-15/FleetMembers_Update.json create mode 100644 specification/containerservice/Fleet.Management/examples/2023-10-15/Fleets_CreateOrUpdate.json create mode 100644 specification/containerservice/Fleet.Management/examples/2023-10-15/Fleets_Delete.json create mode 100644 specification/containerservice/Fleet.Management/examples/2023-10-15/Fleets_Get.json create mode 100644 specification/containerservice/Fleet.Management/examples/2023-10-15/Fleets_ListByResourceGroup.json create mode 100644 specification/containerservice/Fleet.Management/examples/2023-10-15/Fleets_ListBySub.json create mode 100644 specification/containerservice/Fleet.Management/examples/2023-10-15/Fleets_ListCredentialsResult.json create mode 100644 specification/containerservice/Fleet.Management/examples/2023-10-15/Fleets_PatchTags.json create mode 100644 specification/containerservice/Fleet.Management/examples/2023-10-15/Operations_List.json create mode 100644 specification/containerservice/Fleet.Management/examples/2023-10-15/UpdateRuns_CreateOrUpdate.json create mode 100644 specification/containerservice/Fleet.Management/examples/2023-10-15/UpdateRuns_Delete.json create mode 100644 specification/containerservice/Fleet.Management/examples/2023-10-15/UpdateRuns_Get.json create mode 100644 specification/containerservice/Fleet.Management/examples/2023-10-15/UpdateRuns_ListByFleet.json create mode 100644 specification/containerservice/Fleet.Management/examples/2023-10-15/UpdateRuns_Start.json create mode 100644 specification/containerservice/Fleet.Management/examples/2023-10-15/UpdateRuns_Stop.json create mode 100644 specification/containerservice/Fleet.Management/examples/2023-10-15/UpdateStrategies_CreateOrUpdate.json create mode 100644 specification/containerservice/Fleet.Management/examples/2023-10-15/UpdateStrategies_Delete.json create mode 100644 specification/containerservice/Fleet.Management/examples/2023-10-15/UpdateStrategies_Get.json create mode 100644 specification/containerservice/Fleet.Management/examples/2023-10-15/UpdateStrategies_ListByFleet.json create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/FleetMembers_Create.json create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/FleetMembers_Delete.json create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/FleetMembers_Get.json create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/FleetMembers_ListByFleet.json create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/FleetMembers_Update.json create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/Fleets_CreateOrUpdate.json create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/Fleets_Delete.json create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/Fleets_Get.json create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/Fleets_ListByResourceGroup.json create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/Fleets_ListBySub.json create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/Fleets_ListCredentialsResult.json create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/Fleets_PatchTags.json create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/Operations_List.json create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/UpdateRuns_CreateOrUpdate.json create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/UpdateRuns_Delete.json create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/UpdateRuns_Get.json create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/UpdateRuns_ListByFleet.json create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/UpdateRuns_Start.json create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/UpdateRuns_Stop.json create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/UpdateStrategies_CreateOrUpdate.json create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/UpdateStrategies_Delete.json create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/UpdateStrategies_Get.json create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/UpdateStrategies_ListByFleet.json create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/fleets.json diff --git a/specification/containerservice/Fleet.Management/examples/2023-10-15/FleetMembers_Create.json b/specification/containerservice/Fleet.Management/examples/2023-10-15/FleetMembers_Create.json new file mode 100644 index 000000000000..b9677730252a --- /dev/null +++ b/specification/containerservice/Fleet.Management/examples/2023-10-15/FleetMembers_Create.json @@ -0,0 +1,68 @@ +{ + "operationId": "FleetMembers_Create", + "title": "Creates a FleetMember resource with a long running operation.", + "parameters": { + "api-version": "2023-10-15", + "subscriptionId": "subid1", + "resourceGroupName": "rg1", + "fleetName": "fleet1", + "fleetMemberName": "member-1", + "resource": { + "properties": { + "clusterResourceId": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/cluster-1" + } + } + }, + "responses": { + "201": { + "headers": { + "ETag": "23ujdflewrj3=", + "Location": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operations/00000000-0000-0000-0000-000000000000?api-version=2022-02-01", + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operationResults/00000000-0000-0000-0000-000000000000?api-version=2022-02-01" + }, + "body": { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/fleets/fleet-1/members/member-1", + "name": "member-1", + "type": "Microsoft.ContainerService/fleets/members", + "systemData": { + "createdBy": "someUser", + "createdByType": "User", + "createdAt": "2022-03-23T05:40:40.657Z", + "lastModifiedBy": "someOtherUser", + "lastModifiedByType": "User", + "lastModifiedAt": "2022-03-23T05:40:40.657Z" + }, + "eTag": "23ujdflewrj3=", + "properties": { + "clusterResourceId": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/cluster-1", + "provisioningState": "Succeeded" + } + } + }, + "200": { + "headers": { + "ETag": "23ujdflewrj3=", + "Location": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operations/00000000-0000-0000-0000-000000000000?api-version=2022-02-01", + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operationResults/00000000-0000-0000-0000-000000000000?api-version=2022-02-01" + }, + "body": { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/fleets/fleet-1/members/member-1", + "name": "member-1", + "type": "Microsoft.ContainerService/fleets/members", + "systemData": { + "createdBy": "someUser", + "createdByType": "User", + "createdAt": "2022-03-23T05:40:40.657Z", + "lastModifiedBy": "someOtherUser", + "lastModifiedByType": "User", + "lastModifiedAt": "2022-03-23T05:40:40.657Z" + }, + "eTag": "23ujdflewrj3=", + "properties": { + "clusterResourceId": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/cluster-1", + "provisioningState": "Succeeded" + } + } + } + } +} diff --git a/specification/containerservice/Fleet.Management/examples/2023-10-15/FleetMembers_Delete.json b/specification/containerservice/Fleet.Management/examples/2023-10-15/FleetMembers_Delete.json new file mode 100644 index 000000000000..3ee851eb4979 --- /dev/null +++ b/specification/containerservice/Fleet.Management/examples/2023-10-15/FleetMembers_Delete.json @@ -0,0 +1,21 @@ +{ + "operationId": "FleetMembers_Delete", + "title": "Deletes a FleetMember resource asynchronously with a long running operation.", + "parameters": { + "api-version": "2023-10-15", + "subscriptionId": "subid1", + "resourceGroupName": "rg1", + "fleetName": "fleet1", + "fleetMemberName": "member-1" + }, + "responses": { + "202": { + "headers": { + "Location": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operations/00000000-0000-0000-0000-000000000000?api-version=2022-02-01", + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operationResults/00000000-0000-0000-0000-000000000000?api-version=2022-02-01" + } + }, + "200": {}, + "204": {} + } +} diff --git a/specification/containerservice/Fleet.Management/examples/2023-10-15/FleetMembers_Get.json b/specification/containerservice/Fleet.Management/examples/2023-10-15/FleetMembers_Get.json new file mode 100644 index 000000000000..066e27aa6bdf --- /dev/null +++ b/specification/containerservice/Fleet.Management/examples/2023-10-15/FleetMembers_Get.json @@ -0,0 +1,36 @@ +{ + "operationId": "FleetMembers_Get", + "title": "Gets a FleetMember resource.", + "parameters": { + "api-version": "2023-08-15-preview", + "subscriptionId": "subid1", + "resourceGroupName": "rg1", + "fleetName": "fleet1", + "fleetMemberName": "member-1" + }, + "responses": { + "200": { + "headers": { + "ETag": "kd30rkdfo49=" + }, + "body": { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/fleets/fleet-1/members/member-1", + "name": "member-1", + "type": "Microsoft.ContainerService/fleets/members", + "systemData": { + "createdBy": "someUser", + "createdByType": "User", + "createdAt": "2022-03-23T05:40:40.657Z", + "lastModifiedBy": "someOtherUser", + "lastModifiedByType": "User", + "lastModifiedAt": "2022-03-23T05:40:40.657Z" + }, + "eTag": "kd30rkdfo49=", + "properties": { + "clusterResourceId": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/cluster-1", + "provisioningState": "Succeeded" + } + } + } + } +} diff --git a/specification/containerservice/Fleet.Management/examples/2023-10-15/FleetMembers_ListByFleet.json b/specification/containerservice/Fleet.Management/examples/2023-10-15/FleetMembers_ListByFleet.json new file mode 100644 index 000000000000..d94d94675ce8 --- /dev/null +++ b/specification/containerservice/Fleet.Management/examples/2023-10-15/FleetMembers_ListByFleet.json @@ -0,0 +1,37 @@ +{ + "operationId": "FleetMembers_ListByFleet", + "title": "Lists the members of a Fleet.", + "parameters": { + "api-version": "2023-08-15-preview", + "subscriptionId": "subid1", + "resourceGroupName": "rg1", + "fleetName": "fleet1" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/fleets/fleet-1/members/member-1", + "name": "member-1", + "type": "Microsoft.ContainerService/fleets/members", + "systemData": { + "createdBy": "someUser", + "createdByType": "User", + "createdAt": "2022-03-23T05:40:40.657Z", + "lastModifiedBy": "someOtherUser", + "lastModifiedByType": "User", + "lastModifiedAt": "2022-03-23T05:40:40.657Z" + }, + "eTag": "kd30rkdfo49=", + "properties": { + "clusterResourceId": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/cluster-1", + "provisioningState": "Succeeded" + } + } + ], + "nextLink": null + } + } + } +} diff --git a/specification/containerservice/Fleet.Management/examples/2023-10-15/FleetMembers_Update.json b/specification/containerservice/Fleet.Management/examples/2023-10-15/FleetMembers_Update.json new file mode 100644 index 000000000000..2f1132980dd4 --- /dev/null +++ b/specification/containerservice/Fleet.Management/examples/2023-10-15/FleetMembers_Update.json @@ -0,0 +1,48 @@ +{ + "operationId": "FleetMembers_Update", + "title": "Updates a FleetMember resource synchronously.", + "parameters": { + "api-version": "2023-10-15", + "subscriptionId": "subid1", + "resourceGroupName": "rg1", + "fleetName": "fleet1", + "fleetMemberName": "member-1", + "properties": { + "properties": { + "group": "staging" + } + } + }, + "responses": { + "200": { + "headers": { + "ETag": "23ujdflewrj3=" + }, + "body": { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/fleets/fleet-1/members/member-1", + "name": "member-1", + "type": "Microsoft.ContainerService/fleets/members", + "systemData": { + "createdBy": "someUser", + "createdByType": "User", + "createdAt": "2022-03-23T05:40:40.657Z", + "lastModifiedBy": "someOtherUser", + "lastModifiedByType": "User", + "lastModifiedAt": "2022-03-23T05:40:40.657Z" + }, + "eTag": "23ujdflewrj3=", + "properties": { + "clusterResourceId": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/cluster-1", + "group": "staging", + "provisioningState": "Succeeded" + } + } + }, + "202": { + "headers": { + "Retry-After": "20", + "Location": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operations/00000000-0000-0000-0000-000000000000?api-version=2022-02-01" + } + } + } +} diff --git a/specification/containerservice/Fleet.Management/examples/2023-10-15/Fleets_CreateOrUpdate.json b/specification/containerservice/Fleet.Management/examples/2023-10-15/Fleets_CreateOrUpdate.json new file mode 100644 index 000000000000..8f0f82231fa4 --- /dev/null +++ b/specification/containerservice/Fleet.Management/examples/2023-10-15/Fleets_CreateOrUpdate.json @@ -0,0 +1,78 @@ +{ + "operationId": "Fleets_CreateOrUpdate", + "title": "Creates a Fleet resource with a long running operation.", + "parameters": { + "api-version": "2023-10-15", + "subscriptionId": "subid1", + "resourceGroupName": "rg1", + "fleetName": "fleet1", + "resource": { + "tags": { + "tier": "production", + "archv2": "" + }, + "location": "East US", + "properties": {} + } + }, + "responses": { + "200": { + "headers": { + "ETag": "23ujdflewrj3=", + "Location": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operations/00000000-0000-0000-0000-000000000000?api-version=2022-02-01", + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operationResults/00000000-0000-0000-0000-000000000000?api-version=2022-02-01" + }, + "body": { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/fleets/fleet-1", + "name": "fleet-1", + "type": "Microsoft.ContainerService/fleets", + "systemData": { + "createdBy": "someUser", + "createdByType": "User", + "createdAt": "2022-03-23T05:40:40.657Z", + "lastModifiedBy": "someOtherUser", + "lastModifiedByType": "User", + "lastModifiedAt": "2022-03-23T05:40:40.657Z" + }, + "tags": { + "tier": "production", + "archv2": "" + }, + "location": "East US", + "eTag": "23ujdflewrj3=", + "properties": { + "provisioningState": "Updating" + } + } + }, + "201": { + "headers": { + "ETag": "23ujdflewrj3=", + "Location": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operations/00000000-0000-0000-0000-000000000000?api-version=2022-02-01", + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operationResults/00000000-0000-0000-0000-000000000000?api-version=2022-02-01" + }, + "body": { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/fleets/fleet1", + "name": "fleet1", + "type": "Microsoft.ContainerService/fleets", + "systemData": { + "createdBy": "someUser", + "createdByType": "User", + "createdAt": "2022-03-23T05:40:40.657Z", + "lastModifiedBy": "someOtherUser", + "lastModifiedByType": "User", + "lastModifiedAt": "2022-03-23T05:40:40.657Z" + }, + "tags": { + "tier": "production", + "archv2": "" + }, + "location": "East US", + "eTag": "23ujdflewrj3=", + "properties": { + "provisioningState": "Creating" + } + } + } + } +} diff --git a/specification/containerservice/Fleet.Management/examples/2023-10-15/Fleets_Delete.json b/specification/containerservice/Fleet.Management/examples/2023-10-15/Fleets_Delete.json new file mode 100644 index 000000000000..7797b46f5485 --- /dev/null +++ b/specification/containerservice/Fleet.Management/examples/2023-10-15/Fleets_Delete.json @@ -0,0 +1,20 @@ +{ + "operationId": "Fleets_Delete", + "title": "Deletes a Fleet resource asynchronously with a long running operation.", + "parameters": { + "api-version": "2023-10-15", + "subscriptionId": "subid1", + "resourceGroupName": "rg1", + "fleetName": "fleet1" + }, + "responses": { + "202": { + "headers": { + "Location": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operations/00000000-0000-0000-0000-000000000000?api-version=2022-02-01", + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operationResults/00000000-0000-0000-0000-000000000000?api-version=2022-02-01" + } + }, + "200": {}, + "204": {} + } +} diff --git a/specification/containerservice/Fleet.Management/examples/2023-10-15/Fleets_Get.json b/specification/containerservice/Fleet.Management/examples/2023-10-15/Fleets_Get.json new file mode 100644 index 000000000000..909f18272406 --- /dev/null +++ b/specification/containerservice/Fleet.Management/examples/2023-10-15/Fleets_Get.json @@ -0,0 +1,39 @@ +{ + "operationId": "Fleets_Get", + "title": "Gets a Fleet resource.", + "parameters": { + "api-version": "2023-10-15", + "subscriptionId": "subid1", + "resourceGroupName": "rg1", + "fleetName": "fleet1" + }, + "responses": { + "200": { + "headers": { + "ETag": "23ujdflewrj3=" + }, + "body": { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/fleets/fleet-1", + "name": "fleet-1", + "type": "Microsoft.ContainerService/fleets", + "systemData": { + "createdBy": "someUser", + "createdByType": "User", + "createdAt": "2022-03-23T05:40:40.657Z", + "lastModifiedBy": "someOtherUser", + "lastModifiedByType": "User", + "lastModifiedAt": "2022-03-23T05:40:40.657Z" + }, + "tags": { + "tier": "production", + "archv2": "" + }, + "location": "East US", + "eTag": "23ujdflewrj3=", + "properties": { + "provisioningState": "Succeeded" + } + } + } + } +} diff --git a/specification/containerservice/Fleet.Management/examples/2023-10-15/Fleets_ListByResourceGroup.json b/specification/containerservice/Fleet.Management/examples/2023-10-15/Fleets_ListByResourceGroup.json new file mode 100644 index 000000000000..ead42690693d --- /dev/null +++ b/specification/containerservice/Fleet.Management/examples/2023-10-15/Fleets_ListByResourceGroup.json @@ -0,0 +1,40 @@ +{ + "operationId": "Fleets_ListByResourceGroup", + "title": "Lists the Fleet resources in a resource group.", + "parameters": { + "api-version": "2023-10-15", + "subscriptionId": "subid1", + "resourceGroupName": "rg1" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/fleets/fleet-1", + "name": "fleet1", + "type": "Microsoft.ContainerService/fleets", + "systemData": { + "createdBy": "someUser", + "createdByType": "User", + "createdAt": "2022-03-23T05:40:40.657Z", + "lastModifiedBy": "someOtherUser", + "lastModifiedByType": "User", + "lastModifiedAt": "2022-03-23T05:40:40.657Z" + }, + "tags": { + "tier": "production", + "archv2": "" + }, + "location": "East US", + "eTag": "23ujdflewrj3=", + "properties": { + "provisioningState": "Succeeded" + } + } + ], + "nextLink": null + } + } + } +} diff --git a/specification/containerservice/Fleet.Management/examples/2023-10-15/Fleets_ListBySub.json b/specification/containerservice/Fleet.Management/examples/2023-10-15/Fleets_ListBySub.json new file mode 100644 index 000000000000..7d94fff8c858 --- /dev/null +++ b/specification/containerservice/Fleet.Management/examples/2023-10-15/Fleets_ListBySub.json @@ -0,0 +1,39 @@ +{ + "operationId": "Fleets_ListBySubscription", + "title": "Lists the Fleet resources in a subscription.", + "parameters": { + "api-version": "2023-10-15", + "subscriptionId": "subid1" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/fleets/fleet1", + "name": "fleet-1", + "type": "Microsoft.ContainerService/fleets", + "systemData": { + "createdBy": "someUser", + "createdByType": "User", + "createdAt": "2022-03-23T05:40:40.657Z", + "lastModifiedBy": "someOtherUser", + "lastModifiedByType": "User", + "lastModifiedAt": "2022-03-23T05:40:40.657Z" + }, + "tags": { + "tier": "production", + "archv2": "" + }, + "location": "East US", + "eTag": "23ujdflewrj3=", + "properties": { + "provisioningState": "Succeeded" + } + } + ], + "nextLink": null + } + } + } +} diff --git a/specification/containerservice/Fleet.Management/examples/2023-10-15/Fleets_ListCredentialsResult.json b/specification/containerservice/Fleet.Management/examples/2023-10-15/Fleets_ListCredentialsResult.json new file mode 100644 index 000000000000..fa7289c86002 --- /dev/null +++ b/specification/containerservice/Fleet.Management/examples/2023-10-15/Fleets_ListCredentialsResult.json @@ -0,0 +1,22 @@ +{ + "operationId": "Fleets_ListCredentials", + "title": "Lists the user credentials of a Fleet.", + "parameters": { + "api-version": "2023-10-15", + "subscriptionId": "subid1", + "resourceGroupName": "rg1", + "fleetName": "fleet" + }, + "responses": { + "200": { + "body": { + "kubeconfigs": [ + { + "name": "credentialName1", + "value": "Y3JlZGVudGlhbFZhbHVlMQ==" + } + ] + } + } + } +} diff --git a/specification/containerservice/Fleet.Management/examples/2023-10-15/Fleets_PatchTags.json b/specification/containerservice/Fleet.Management/examples/2023-10-15/Fleets_PatchTags.json new file mode 100644 index 000000000000..5b8753da7dbb --- /dev/null +++ b/specification/containerservice/Fleet.Management/examples/2023-10-15/Fleets_PatchTags.json @@ -0,0 +1,52 @@ +{ + "operationId": "Fleets_Update", + "title": "Update a Fleet.", + "parameters": { + "api-version": "2023-10-15", + "subscriptionId": "subid1", + "resourceGroupName": "rg1", + "fleetName": "fleet1", + "If-Match": "dfjkwelr7384", + "properties": { + "tags": { + "tier": "secure", + "env": "prod" + } + } + }, + "responses": { + "200": { + "headers": { + "ETag": "23ujdflewrj3=" + }, + "body": { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/fleets/fleet-1", + "name": "fleet-1", + "type": "Microsoft.ContainerService/fleets", + "systemData": { + "createdBy": "someUser", + "createdByType": "User", + "createdAt": "2022-03-23T05:40:40.657Z", + "lastModifiedBy": "someOtherUser", + "lastModifiedByType": "User", + "lastModifiedAt": "2022-03-23T05:40:40.657Z" + }, + "tags": { + "tier": "secure", + "env": "prod" + }, + "location": "East US", + "eTag": "23ujdflewrj3=", + "properties": { + "provisioningState": "Succeeded" + } + } + }, + "202": { + "headers": { + "Retry-After": "20", + "Location": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operations/00000000-0000-0000-0000-000000000000?api-version=2022-02-01" + } + } + } +} diff --git a/specification/containerservice/Fleet.Management/examples/2023-10-15/Operations_List.json b/specification/containerservice/Fleet.Management/examples/2023-10-15/Operations_List.json new file mode 100644 index 000000000000..cdc0a85b3463 --- /dev/null +++ b/specification/containerservice/Fleet.Management/examples/2023-10-15/Operations_List.json @@ -0,0 +1,25 @@ +{ + "operationId": "Operations_List", + "title": "List the operations for the provider.", + "parameters": { + "api-version": "2023-08-15-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "display": { + "description": "Gets the status of an asynchronous operation", + "operation": "Get Operation", + "provider": "Microsoft Container Service", + "resource": "Operation" + }, + "name": "Microsoft.ContainerService/locations/operations/read", + "origin": "user,system" + } + ] + } + } + } +} diff --git a/specification/containerservice/Fleet.Management/examples/2023-10-15/UpdateRuns_CreateOrUpdate.json b/specification/containerservice/Fleet.Management/examples/2023-10-15/UpdateRuns_CreateOrUpdate.json new file mode 100644 index 000000000000..a709457bda96 --- /dev/null +++ b/specification/containerservice/Fleet.Management/examples/2023-10-15/UpdateRuns_CreateOrUpdate.json @@ -0,0 +1,196 @@ +{ + "operationId": "UpdateRuns_CreateOrUpdate", + "title": "Create an UpdateRun.", + "parameters": { + "api-version": "2023-10-15", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "rg1", + "fleetName": "fleet1", + "updateRunName": "run1", + "resource": { + "properties": { + "updateStrategyId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ContainerService/fleets/myFleet/updateStrategies/strategy1", + "strategy": { + "stages": [ + { + "name": "stage1", + "groups": [ + { + "name": "group-a" + } + ], + "afterStageWaitInSeconds": 3600 + } + ] + }, + "managedClusterUpdate": { + "upgrade": { + "type": "Full", + "kubernetesVersion": "1.26.1" + }, + "nodeImageSelection": { + "type": "Latest" + } + } + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ContainerService/fleets/myFleet/updateRuns/run1", + "name": "run1", + "type": "Microsoft.ContainerService/fleets/updateRuns", + "systemData": { + "createdBy": "@contoso.com", + "createdByType": "User", + "createdAt": "2023-03-01T01:10:08.395Z", + "lastModifiedBy": "@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2023-03-01T01:10:08.395Z" + }, + "properties": { + "provisioningState": "Succeeded", + "updateStrategyId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ContainerService/fleets/myFleet/updateStrategies/strategy1", + "strategy": { + "stages": [ + { + "name": "stage1", + "groups": [ + { + "name": "group-a" + } + ], + "afterStageWaitInSeconds": 3600 + } + ] + }, + "managedClusterUpdate": { + "upgrade": { + "type": "Full", + "kubernetesVersion": "1.26.1" + }, + "nodeImageSelection": { + "type": "Latest" + } + }, + "status": { + "status": { + "state": "NotStarted" + }, + "stages": [ + { + "status": { + "state": "NotStarted" + }, + "name": "stage1", + "groups": [ + { + "status": { + "state": "NotStarted" + }, + "name": "group-a", + "members": [ + { + "status": { + "state": "NotStarted" + }, + "name": "member-one", + "clusterResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myClusters/providers/Microsoft.ContainerService/managedClusters/myCluster" + } + ] + } + ], + "afterStageWaitStatus": { + "status": { + "state": "NotStarted" + }, + "waitDurationInSeconds": 3600 + } + } + ] + } + }, + "eTag": "\"EtagValue\"" + } + }, + "201": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ContainerService/fleets/myFleet/updateRuns/run1", + "name": "run1", + "type": "Microsoft.ContainerService/fleets/updateRuns", + "systemData": { + "createdBy": "@contoso.com", + "createdByType": "User", + "createdAt": "2023-03-01T01:10:08.395Z", + "lastModifiedBy": "@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2023-03-01T01:10:08.395Z" + }, + "properties": { + "provisioningState": "Succeeded", + "updateStrategyId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ContainerService/fleets/myFleet/updateStrategies/strategy1", + "strategy": { + "stages": [ + { + "name": "stage1", + "groups": [ + { + "name": "group-a" + } + ], + "afterStageWaitInSeconds": 3600 + } + ] + }, + "managedClusterUpdate": { + "upgrade": { + "type": "Full", + "kubernetesVersion": "1.26.1" + }, + "nodeImageSelection": { + "type": "Latest" + } + }, + "status": { + "status": { + "state": "NotStarted" + }, + "stages": [ + { + "status": { + "state": "NotStarted" + }, + "name": "stage1", + "groups": [ + { + "status": { + "state": "NotStarted" + }, + "name": "group-a", + "members": [ + { + "status": { + "state": "NotStarted" + }, + "name": "member-one", + "clusterResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myClusters/providers/Microsoft.ContainerService/managedClusters/myCluster" + } + ] + } + ], + "afterStageWaitStatus": { + "status": { + "state": "NotStarted" + }, + "waitDurationInSeconds": 3600 + } + } + ] + } + }, + "eTag": "\"EtagValue\"" + } + } + } +} diff --git a/specification/containerservice/Fleet.Management/examples/2023-10-15/UpdateRuns_Delete.json b/specification/containerservice/Fleet.Management/examples/2023-10-15/UpdateRuns_Delete.json new file mode 100644 index 000000000000..9b19b7056cf2 --- /dev/null +++ b/specification/containerservice/Fleet.Management/examples/2023-10-15/UpdateRuns_Delete.json @@ -0,0 +1,21 @@ +{ + "operationId": "UpdateRuns_Delete", + "title": "Delete an updateRun resource.", + "parameters": { + "api-version": "2023-10-15", + "subscriptionId": "subid1", + "resourceGroupName": "rg1", + "fleetName": "fleet1", + "updateRunName": "run1" + }, + "responses": { + "202": { + "headers": { + "Location": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operations/00000000-0000-0000-0000-000000000000?api-version=2022-09-02-preview", + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operationResults/00000000-0000-0000-0000-000000000000?api-version=2022-09-02-preview" + } + }, + "200": {}, + "204": {} + } +} diff --git a/specification/containerservice/Fleet.Management/examples/2023-10-15/UpdateRuns_Get.json b/specification/containerservice/Fleet.Management/examples/2023-10-15/UpdateRuns_Get.json new file mode 100644 index 000000000000..cb91516da2f5 --- /dev/null +++ b/specification/containerservice/Fleet.Management/examples/2023-10-15/UpdateRuns_Get.json @@ -0,0 +1,90 @@ +{ + "operationId": "UpdateRuns_Get", + "title": "Gets an UpdateRun resource.", + "parameters": { + "api-version": "2023-10-15", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "rg1", + "fleetName": "fleet1", + "updateRunName": "run1" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ContainerService/fleets/myFleet/updateRuns/run1", + "name": "run1", + "type": "Microsoft.ContainerService/fleets/updateRuns", + "systemData": { + "createdBy": "@contoso.com", + "createdByType": "User", + "createdAt": "2023-03-01T01:10:08.395Z", + "lastModifiedBy": "@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2023-03-01T01:10:08.395Z" + }, + "properties": { + "provisioningState": "Succeeded", + "strategy": { + "stages": [ + { + "name": "stage1", + "groups": [ + { + "name": "group-a" + } + ], + "afterStageWaitInSeconds": 3600 + } + ] + }, + "managedClusterUpdate": { + "upgrade": { + "type": "Full", + "kubernetesVersion": "1.26.1" + }, + "nodeImageSelection": { + "type": "Latest" + } + }, + "status": { + "status": { + "state": "NotStarted" + }, + "stages": [ + { + "status": { + "state": "NotStarted" + }, + "name": "stage1", + "groups": [ + { + "status": { + "state": "NotStarted" + }, + "name": "group-a", + "members": [ + { + "status": { + "state": "NotStarted" + }, + "name": "member-one", + "clusterResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myClusters/providers/Microsoft.ContainerService/managedClusters/myCluster" + } + ] + } + ], + "afterStageWaitStatus": { + "status": { + "state": "NotStarted" + }, + "waitDurationInSeconds": 3600 + } + } + ] + } + }, + "eTag": "\"EtagValue\"" + } + } + } +} diff --git a/specification/containerservice/Fleet.Management/examples/2023-10-15/UpdateRuns_ListByFleet.json b/specification/containerservice/Fleet.Management/examples/2023-10-15/UpdateRuns_ListByFleet.json new file mode 100644 index 000000000000..313e6753f838 --- /dev/null +++ b/specification/containerservice/Fleet.Management/examples/2023-10-15/UpdateRuns_ListByFleet.json @@ -0,0 +1,94 @@ +{ + "operationId": "UpdateRuns_ListByFleet", + "title": "Lists the UpdateRun resources by fleet.", + "parameters": { + "api-version": "2023-10-15", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "rg1", + "fleetName": "fleet1" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ContainerService/fleets/myFleet/updateRuns/run1", + "name": "run1", + "type": "Microsoft.ContainerService/fleets/updateRuns", + "systemData": { + "createdBy": "@contoso.com", + "createdByType": "User", + "createdAt": "2023-03-01T01:10:08.395Z", + "lastModifiedBy": "@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2023-03-01T01:10:08.395Z" + }, + "properties": { + "provisioningState": "Succeeded", + "strategy": { + "stages": [ + { + "name": "stage1", + "groups": [ + { + "name": "group-a" + } + ], + "afterStageWaitInSeconds": 3600 + } + ] + }, + "managedClusterUpdate": { + "upgrade": { + "type": "Full", + "kubernetesVersion": "1.26.1" + }, + "nodeImageSelection": { + "type": "Latest" + } + }, + "status": { + "status": { + "state": "NotStarted" + }, + "stages": [ + { + "status": { + "state": "NotStarted" + }, + "name": "stage1", + "groups": [ + { + "status": { + "state": "NotStarted" + }, + "name": "group-a", + "members": [ + { + "status": { + "state": "NotStarted" + }, + "name": "member-one", + "clusterResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myClusters/providers/Microsoft.ContainerService/managedClusters/myCluster" + } + ] + } + ], + "afterStageWaitStatus": { + "status": { + "state": "NotStarted" + }, + "waitDurationInSeconds": 3600 + } + } + ] + } + }, + "eTag": "\"EtagValue\"" + } + ], + "nextLink": "http://nextlink.contoso.com" + } + } + } +} diff --git a/specification/containerservice/Fleet.Management/examples/2023-10-15/UpdateRuns_Start.json b/specification/containerservice/Fleet.Management/examples/2023-10-15/UpdateRuns_Start.json new file mode 100644 index 000000000000..798034ce51c6 --- /dev/null +++ b/specification/containerservice/Fleet.Management/examples/2023-10-15/UpdateRuns_Start.json @@ -0,0 +1,99 @@ +{ + "operationId": "UpdateRuns_Start", + "title": "Starts an UpdateRun.", + "parameters": { + "api-version": "2023-10-15", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "rg1", + "fleetName": "fleet1", + "updateRunName": "run1" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ContainerService/fleets/myFleet/updateRuns/run1", + "name": "run1", + "type": "Microsoft.ContainerService/fleets/updateRuns", + "systemData": { + "createdBy": "@contoso.com", + "createdByType": "User", + "createdAt": "2023-03-01T01:09:08.395Z", + "lastModifiedBy": "@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2023-03-01T01:10:08.395Z" + }, + "properties": { + "provisioningState": "Succeeded", + "strategy": { + "stages": [ + { + "name": "stage1", + "groups": [ + { + "name": "group-a" + } + ], + "afterStageWaitInSeconds": 3600 + } + ] + }, + "managedClusterUpdate": { + "upgrade": { + "type": "Full", + "kubernetesVersion": "1.26.1" + }, + "nodeImageSelection": { + "type": "Latest" + } + }, + "status": { + "status": { + "startTime": "2023-03-01T01:10:08.395Z", + "state": "Running" + }, + "stages": [ + { + "status": { + "startTime": "2023-03-01T01:10:08.395Z", + "state": "Running" + }, + "name": "stage1", + "groups": [ + { + "status": { + "startTime": "2023-03-01T01:10:08.395Z", + "state": "Running" + }, + "name": "group-a", + "members": [ + { + "status": { + "state": "Running" + }, + "name": "member-one", + "clusterResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myClusters/providers/Microsoft.ContainerService/managedClusters/myCluster" + } + ] + } + ], + "afterStageWaitStatus": { + "status": { + "state": "NotStarted" + }, + "waitDurationInSeconds": 3600 + } + } + ] + } + }, + "eTag": "\"EtagValue\"" + } + }, + "202": { + "headers": { + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operationResults/00000000-0000-0000-0000-000000000000?api-version=2022-02-01", + "Location": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operationResults/00000000-0000-0000-0000-000000000000?api-version=2022-02-01" + } + } + } +} diff --git a/specification/containerservice/Fleet.Management/examples/2023-10-15/UpdateRuns_Stop.json b/specification/containerservice/Fleet.Management/examples/2023-10-15/UpdateRuns_Stop.json new file mode 100644 index 000000000000..3d4f2b89272b --- /dev/null +++ b/specification/containerservice/Fleet.Management/examples/2023-10-15/UpdateRuns_Stop.json @@ -0,0 +1,99 @@ +{ + "operationId": "UpdateRuns_Stop", + "title": "Stops an UpdateRun.", + "parameters": { + "api-version": "2023-10-15", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "rg1", + "fleetName": "fleet1", + "updateRunName": "run1" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ContainerService/fleets/myFleet/updateRuns/run1", + "name": "run1", + "type": "Microsoft.ContainerService/fleets/updateRuns", + "systemData": { + "createdBy": "@contoso.com", + "createdByType": "User", + "createdAt": "2023-03-01T01:09:08.395Z", + "lastModifiedBy": "@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2023-03-01T01:10:08.395Z" + }, + "properties": { + "provisioningState": "Succeeded", + "strategy": { + "stages": [ + { + "name": "stage1", + "groups": [ + { + "name": "group-a" + } + ], + "afterStageWaitInSeconds": 3600 + } + ] + }, + "managedClusterUpdate": { + "upgrade": { + "type": "Full", + "kubernetesVersion": "1.26.1" + }, + "nodeImageSelection": { + "type": "Latest" + } + }, + "status": { + "status": { + "startTime": "2023-03-01T01:10:08.395Z", + "state": "Stopping" + }, + "stages": [ + { + "status": { + "startTime": "2023-03-01T01:10:08.395Z", + "state": "Stopping" + }, + "name": "stage1", + "groups": [ + { + "status": { + "startTime": "2023-03-01T01:10:08.395Z", + "state": "Stopping" + }, + "name": "group-a", + "members": [ + { + "status": { + "state": "Stopping" + }, + "name": "member-one", + "clusterResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myClusters/providers/Microsoft.ContainerService/managedClusters/myCluster" + } + ] + } + ], + "afterStageWaitStatus": { + "status": { + "state": "NotStarted" + }, + "waitDurationInSeconds": 3600 + } + } + ] + } + }, + "eTag": "\"EtagValue\"" + } + }, + "202": { + "headers": { + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operationResults/00000000-0000-0000-0000-000000000000?api-version=2022-02-01", + "Location": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operationResults/00000000-0000-0000-0000-000000000000?api-version=2022-02-01" + } + } + } +} diff --git a/specification/containerservice/Fleet.Management/examples/2023-10-15/UpdateStrategies_CreateOrUpdate.json b/specification/containerservice/Fleet.Management/examples/2023-10-15/UpdateStrategies_CreateOrUpdate.json new file mode 100644 index 000000000000..cfd8fa9f12aa --- /dev/null +++ b/specification/containerservice/Fleet.Management/examples/2023-10-15/UpdateStrategies_CreateOrUpdate.json @@ -0,0 +1,94 @@ +{ + "operationId": "FleetUpdateStrategies_CreateOrUpdate", + "title": "Create a FleetUpdateStrategy.", + "parameters": { + "api-version": "2023-10-15", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "rg1", + "fleetName": "fleet1", + "updateStrategyName": "strartegy1", + "resource": { + "properties": { + "strategy": { + "stages": [ + { + "name": "stage1", + "groups": [ + { + "name": "group-a" + } + ], + "afterStageWaitInSeconds": 3600 + } + ] + } + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ContainerService/fleets/myFleet/updateStrategies/strategy1", + "name": "strategy1", + "type": "Microsoft.ContainerService/fleets/updateStrategies", + "systemData": { + "createdBy": "@contoso.com", + "createdByType": "User", + "createdAt": "2023-03-01T01:10:08.395Z", + "lastModifiedBy": "@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2023-03-01T01:10:08.395Z" + }, + "properties": { + "provisioningState": "Succeeded", + "strategy": { + "stages": [ + { + "name": "stage1", + "groups": [ + { + "name": "group-a" + } + ], + "afterStageWaitInSeconds": 3600 + } + ] + } + }, + "eTag": "\"EtagValue\"" + } + }, + "201": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ContainerService/fleets/myFleet/updateStrategies/strategy1", + "name": "strategy1", + "type": "Microsoft.ContainerService/fleets/updateStrategies", + "systemData": { + "createdBy": "@contoso.com", + "createdByType": "User", + "createdAt": "2023-03-01T01:10:08.395Z", + "lastModifiedBy": "@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2023-03-01T01:10:08.395Z" + }, + "properties": { + "provisioningState": "Succeeded", + "strategy": { + "stages": [ + { + "name": "stage1", + "groups": [ + { + "name": "group-a" + } + ], + "afterStageWaitInSeconds": 3600 + } + ] + } + }, + "eTag": "\"EtagValue\"" + } + } + } +} diff --git a/specification/containerservice/Fleet.Management/examples/2023-10-15/UpdateStrategies_Delete.json b/specification/containerservice/Fleet.Management/examples/2023-10-15/UpdateStrategies_Delete.json new file mode 100644 index 000000000000..1ec03ee79ef7 --- /dev/null +++ b/specification/containerservice/Fleet.Management/examples/2023-10-15/UpdateStrategies_Delete.json @@ -0,0 +1,21 @@ +{ + "operationId": "FleetUpdateStrategies_Delete", + "title": "Delete a FleetUpdateStrategy resource.", + "parameters": { + "api-version": "2023-10-15", + "subscriptionId": "subid1", + "resourceGroupName": "rg1", + "fleetName": "fleet1", + "updateStrategyName": "strategy1" + }, + "responses": { + "202": { + "headers": { + "Location": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operations/00000000-0000-0000-0000-000000000000?api-version=2022-09-02-preview", + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operationResults/00000000-0000-0000-0000-000000000000?api-version=2022-09-02-preview" + } + }, + "200": {}, + "204": {} + } +} diff --git a/specification/containerservice/Fleet.Management/examples/2023-10-15/UpdateStrategies_Get.json b/specification/containerservice/Fleet.Management/examples/2023-10-15/UpdateStrategies_Get.json new file mode 100644 index 000000000000..6223ef2e7e5a --- /dev/null +++ b/specification/containerservice/Fleet.Management/examples/2023-10-15/UpdateStrategies_Get.json @@ -0,0 +1,45 @@ +{ + "operationId": "FleetUpdateStrategies_Get", + "title": "Get a FleetUpdateStrategy resource.", + "parameters": { + "api-version": "2023-10-15", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "rg1", + "fleetName": "fleet1", + "updateStrategyName": "strategy1" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ContainerService/fleets/myFleet/updateStrategies/strategy1", + "name": "strategy1", + "type": "Microsoft.ContainerService/fleets/updateStrategies", + "systemData": { + "createdBy": "@contoso.com", + "createdByType": "User", + "createdAt": "2023-03-01T01:10:08.395Z", + "lastModifiedBy": "@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2023-03-01T01:10:08.395Z" + }, + "properties": { + "provisioningState": "Succeeded", + "strategy": { + "stages": [ + { + "name": "stage1", + "groups": [ + { + "name": "group-a" + } + ], + "afterStageWaitInSeconds": 3600 + } + ] + } + }, + "eTag": "\"EtagValue\"" + } + } + } +} diff --git a/specification/containerservice/Fleet.Management/examples/2023-10-15/UpdateStrategies_ListByFleet.json b/specification/containerservice/Fleet.Management/examples/2023-10-15/UpdateStrategies_ListByFleet.json new file mode 100644 index 000000000000..b6c447d1311a --- /dev/null +++ b/specification/containerservice/Fleet.Management/examples/2023-10-15/UpdateStrategies_ListByFleet.json @@ -0,0 +1,49 @@ +{ + "operationId": "FleetUpdateStrategies_ListByFleet", + "title": "List the FleetUpdateStrategy resources by fleet.", + "parameters": { + "api-version": "2023-10-15", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "rg1", + "fleetName": "fleet1" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ContainerService/fleets/myFleet/updateStrategies/strategy1", + "name": "strategy1", + "type": "Microsoft.ContainerService/fleets/updateStrategies", + "systemData": { + "createdBy": "@contoso.com", + "createdByType": "User", + "createdAt": "2023-03-01T01:10:08.395Z", + "lastModifiedBy": "@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2023-03-01T01:10:08.395Z" + }, + "properties": { + "provisioningState": "Succeeded", + "strategy": { + "stages": [ + { + "name": "stage1", + "groups": [ + { + "name": "group-a" + } + ], + "afterStageWaitInSeconds": 3600 + } + ] + } + }, + "eTag": "\"EtagValue\"" + } + ], + "nextLink": "http://nextlink.contoso.com" + } + } + } +} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/FleetMembers_Create.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/FleetMembers_Create.json new file mode 100644 index 000000000000..b9677730252a --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/FleetMembers_Create.json @@ -0,0 +1,68 @@ +{ + "operationId": "FleetMembers_Create", + "title": "Creates a FleetMember resource with a long running operation.", + "parameters": { + "api-version": "2023-10-15", + "subscriptionId": "subid1", + "resourceGroupName": "rg1", + "fleetName": "fleet1", + "fleetMemberName": "member-1", + "resource": { + "properties": { + "clusterResourceId": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/cluster-1" + } + } + }, + "responses": { + "201": { + "headers": { + "ETag": "23ujdflewrj3=", + "Location": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operations/00000000-0000-0000-0000-000000000000?api-version=2022-02-01", + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operationResults/00000000-0000-0000-0000-000000000000?api-version=2022-02-01" + }, + "body": { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/fleets/fleet-1/members/member-1", + "name": "member-1", + "type": "Microsoft.ContainerService/fleets/members", + "systemData": { + "createdBy": "someUser", + "createdByType": "User", + "createdAt": "2022-03-23T05:40:40.657Z", + "lastModifiedBy": "someOtherUser", + "lastModifiedByType": "User", + "lastModifiedAt": "2022-03-23T05:40:40.657Z" + }, + "eTag": "23ujdflewrj3=", + "properties": { + "clusterResourceId": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/cluster-1", + "provisioningState": "Succeeded" + } + } + }, + "200": { + "headers": { + "ETag": "23ujdflewrj3=", + "Location": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operations/00000000-0000-0000-0000-000000000000?api-version=2022-02-01", + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operationResults/00000000-0000-0000-0000-000000000000?api-version=2022-02-01" + }, + "body": { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/fleets/fleet-1/members/member-1", + "name": "member-1", + "type": "Microsoft.ContainerService/fleets/members", + "systemData": { + "createdBy": "someUser", + "createdByType": "User", + "createdAt": "2022-03-23T05:40:40.657Z", + "lastModifiedBy": "someOtherUser", + "lastModifiedByType": "User", + "lastModifiedAt": "2022-03-23T05:40:40.657Z" + }, + "eTag": "23ujdflewrj3=", + "properties": { + "clusterResourceId": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/cluster-1", + "provisioningState": "Succeeded" + } + } + } + } +} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/FleetMembers_Delete.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/FleetMembers_Delete.json new file mode 100644 index 000000000000..3ee851eb4979 --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/FleetMembers_Delete.json @@ -0,0 +1,21 @@ +{ + "operationId": "FleetMembers_Delete", + "title": "Deletes a FleetMember resource asynchronously with a long running operation.", + "parameters": { + "api-version": "2023-10-15", + "subscriptionId": "subid1", + "resourceGroupName": "rg1", + "fleetName": "fleet1", + "fleetMemberName": "member-1" + }, + "responses": { + "202": { + "headers": { + "Location": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operations/00000000-0000-0000-0000-000000000000?api-version=2022-02-01", + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operationResults/00000000-0000-0000-0000-000000000000?api-version=2022-02-01" + } + }, + "200": {}, + "204": {} + } +} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/FleetMembers_Get.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/FleetMembers_Get.json new file mode 100644 index 000000000000..066e27aa6bdf --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/FleetMembers_Get.json @@ -0,0 +1,36 @@ +{ + "operationId": "FleetMembers_Get", + "title": "Gets a FleetMember resource.", + "parameters": { + "api-version": "2023-08-15-preview", + "subscriptionId": "subid1", + "resourceGroupName": "rg1", + "fleetName": "fleet1", + "fleetMemberName": "member-1" + }, + "responses": { + "200": { + "headers": { + "ETag": "kd30rkdfo49=" + }, + "body": { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/fleets/fleet-1/members/member-1", + "name": "member-1", + "type": "Microsoft.ContainerService/fleets/members", + "systemData": { + "createdBy": "someUser", + "createdByType": "User", + "createdAt": "2022-03-23T05:40:40.657Z", + "lastModifiedBy": "someOtherUser", + "lastModifiedByType": "User", + "lastModifiedAt": "2022-03-23T05:40:40.657Z" + }, + "eTag": "kd30rkdfo49=", + "properties": { + "clusterResourceId": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/cluster-1", + "provisioningState": "Succeeded" + } + } + } + } +} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/FleetMembers_ListByFleet.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/FleetMembers_ListByFleet.json new file mode 100644 index 000000000000..d94d94675ce8 --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/FleetMembers_ListByFleet.json @@ -0,0 +1,37 @@ +{ + "operationId": "FleetMembers_ListByFleet", + "title": "Lists the members of a Fleet.", + "parameters": { + "api-version": "2023-08-15-preview", + "subscriptionId": "subid1", + "resourceGroupName": "rg1", + "fleetName": "fleet1" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/fleets/fleet-1/members/member-1", + "name": "member-1", + "type": "Microsoft.ContainerService/fleets/members", + "systemData": { + "createdBy": "someUser", + "createdByType": "User", + "createdAt": "2022-03-23T05:40:40.657Z", + "lastModifiedBy": "someOtherUser", + "lastModifiedByType": "User", + "lastModifiedAt": "2022-03-23T05:40:40.657Z" + }, + "eTag": "kd30rkdfo49=", + "properties": { + "clusterResourceId": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/cluster-1", + "provisioningState": "Succeeded" + } + } + ], + "nextLink": null + } + } + } +} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/FleetMembers_Update.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/FleetMembers_Update.json new file mode 100644 index 000000000000..2f1132980dd4 --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/FleetMembers_Update.json @@ -0,0 +1,48 @@ +{ + "operationId": "FleetMembers_Update", + "title": "Updates a FleetMember resource synchronously.", + "parameters": { + "api-version": "2023-10-15", + "subscriptionId": "subid1", + "resourceGroupName": "rg1", + "fleetName": "fleet1", + "fleetMemberName": "member-1", + "properties": { + "properties": { + "group": "staging" + } + } + }, + "responses": { + "200": { + "headers": { + "ETag": "23ujdflewrj3=" + }, + "body": { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/fleets/fleet-1/members/member-1", + "name": "member-1", + "type": "Microsoft.ContainerService/fleets/members", + "systemData": { + "createdBy": "someUser", + "createdByType": "User", + "createdAt": "2022-03-23T05:40:40.657Z", + "lastModifiedBy": "someOtherUser", + "lastModifiedByType": "User", + "lastModifiedAt": "2022-03-23T05:40:40.657Z" + }, + "eTag": "23ujdflewrj3=", + "properties": { + "clusterResourceId": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/cluster-1", + "group": "staging", + "provisioningState": "Succeeded" + } + } + }, + "202": { + "headers": { + "Retry-After": "20", + "Location": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operations/00000000-0000-0000-0000-000000000000?api-version=2022-02-01" + } + } + } +} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/Fleets_CreateOrUpdate.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/Fleets_CreateOrUpdate.json new file mode 100644 index 000000000000..8f0f82231fa4 --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/Fleets_CreateOrUpdate.json @@ -0,0 +1,78 @@ +{ + "operationId": "Fleets_CreateOrUpdate", + "title": "Creates a Fleet resource with a long running operation.", + "parameters": { + "api-version": "2023-10-15", + "subscriptionId": "subid1", + "resourceGroupName": "rg1", + "fleetName": "fleet1", + "resource": { + "tags": { + "tier": "production", + "archv2": "" + }, + "location": "East US", + "properties": {} + } + }, + "responses": { + "200": { + "headers": { + "ETag": "23ujdflewrj3=", + "Location": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operations/00000000-0000-0000-0000-000000000000?api-version=2022-02-01", + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operationResults/00000000-0000-0000-0000-000000000000?api-version=2022-02-01" + }, + "body": { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/fleets/fleet-1", + "name": "fleet-1", + "type": "Microsoft.ContainerService/fleets", + "systemData": { + "createdBy": "someUser", + "createdByType": "User", + "createdAt": "2022-03-23T05:40:40.657Z", + "lastModifiedBy": "someOtherUser", + "lastModifiedByType": "User", + "lastModifiedAt": "2022-03-23T05:40:40.657Z" + }, + "tags": { + "tier": "production", + "archv2": "" + }, + "location": "East US", + "eTag": "23ujdflewrj3=", + "properties": { + "provisioningState": "Updating" + } + } + }, + "201": { + "headers": { + "ETag": "23ujdflewrj3=", + "Location": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operations/00000000-0000-0000-0000-000000000000?api-version=2022-02-01", + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operationResults/00000000-0000-0000-0000-000000000000?api-version=2022-02-01" + }, + "body": { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/fleets/fleet1", + "name": "fleet1", + "type": "Microsoft.ContainerService/fleets", + "systemData": { + "createdBy": "someUser", + "createdByType": "User", + "createdAt": "2022-03-23T05:40:40.657Z", + "lastModifiedBy": "someOtherUser", + "lastModifiedByType": "User", + "lastModifiedAt": "2022-03-23T05:40:40.657Z" + }, + "tags": { + "tier": "production", + "archv2": "" + }, + "location": "East US", + "eTag": "23ujdflewrj3=", + "properties": { + "provisioningState": "Creating" + } + } + } + } +} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/Fleets_Delete.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/Fleets_Delete.json new file mode 100644 index 000000000000..7797b46f5485 --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/Fleets_Delete.json @@ -0,0 +1,20 @@ +{ + "operationId": "Fleets_Delete", + "title": "Deletes a Fleet resource asynchronously with a long running operation.", + "parameters": { + "api-version": "2023-10-15", + "subscriptionId": "subid1", + "resourceGroupName": "rg1", + "fleetName": "fleet1" + }, + "responses": { + "202": { + "headers": { + "Location": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operations/00000000-0000-0000-0000-000000000000?api-version=2022-02-01", + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operationResults/00000000-0000-0000-0000-000000000000?api-version=2022-02-01" + } + }, + "200": {}, + "204": {} + } +} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/Fleets_Get.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/Fleets_Get.json new file mode 100644 index 000000000000..909f18272406 --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/Fleets_Get.json @@ -0,0 +1,39 @@ +{ + "operationId": "Fleets_Get", + "title": "Gets a Fleet resource.", + "parameters": { + "api-version": "2023-10-15", + "subscriptionId": "subid1", + "resourceGroupName": "rg1", + "fleetName": "fleet1" + }, + "responses": { + "200": { + "headers": { + "ETag": "23ujdflewrj3=" + }, + "body": { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/fleets/fleet-1", + "name": "fleet-1", + "type": "Microsoft.ContainerService/fleets", + "systemData": { + "createdBy": "someUser", + "createdByType": "User", + "createdAt": "2022-03-23T05:40:40.657Z", + "lastModifiedBy": "someOtherUser", + "lastModifiedByType": "User", + "lastModifiedAt": "2022-03-23T05:40:40.657Z" + }, + "tags": { + "tier": "production", + "archv2": "" + }, + "location": "East US", + "eTag": "23ujdflewrj3=", + "properties": { + "provisioningState": "Succeeded" + } + } + } + } +} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/Fleets_ListByResourceGroup.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/Fleets_ListByResourceGroup.json new file mode 100644 index 000000000000..ead42690693d --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/Fleets_ListByResourceGroup.json @@ -0,0 +1,40 @@ +{ + "operationId": "Fleets_ListByResourceGroup", + "title": "Lists the Fleet resources in a resource group.", + "parameters": { + "api-version": "2023-10-15", + "subscriptionId": "subid1", + "resourceGroupName": "rg1" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/fleets/fleet-1", + "name": "fleet1", + "type": "Microsoft.ContainerService/fleets", + "systemData": { + "createdBy": "someUser", + "createdByType": "User", + "createdAt": "2022-03-23T05:40:40.657Z", + "lastModifiedBy": "someOtherUser", + "lastModifiedByType": "User", + "lastModifiedAt": "2022-03-23T05:40:40.657Z" + }, + "tags": { + "tier": "production", + "archv2": "" + }, + "location": "East US", + "eTag": "23ujdflewrj3=", + "properties": { + "provisioningState": "Succeeded" + } + } + ], + "nextLink": null + } + } + } +} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/Fleets_ListBySub.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/Fleets_ListBySub.json new file mode 100644 index 000000000000..7d94fff8c858 --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/Fleets_ListBySub.json @@ -0,0 +1,39 @@ +{ + "operationId": "Fleets_ListBySubscription", + "title": "Lists the Fleet resources in a subscription.", + "parameters": { + "api-version": "2023-10-15", + "subscriptionId": "subid1" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/fleets/fleet1", + "name": "fleet-1", + "type": "Microsoft.ContainerService/fleets", + "systemData": { + "createdBy": "someUser", + "createdByType": "User", + "createdAt": "2022-03-23T05:40:40.657Z", + "lastModifiedBy": "someOtherUser", + "lastModifiedByType": "User", + "lastModifiedAt": "2022-03-23T05:40:40.657Z" + }, + "tags": { + "tier": "production", + "archv2": "" + }, + "location": "East US", + "eTag": "23ujdflewrj3=", + "properties": { + "provisioningState": "Succeeded" + } + } + ], + "nextLink": null + } + } + } +} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/Fleets_ListCredentialsResult.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/Fleets_ListCredentialsResult.json new file mode 100644 index 000000000000..fa7289c86002 --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/Fleets_ListCredentialsResult.json @@ -0,0 +1,22 @@ +{ + "operationId": "Fleets_ListCredentials", + "title": "Lists the user credentials of a Fleet.", + "parameters": { + "api-version": "2023-10-15", + "subscriptionId": "subid1", + "resourceGroupName": "rg1", + "fleetName": "fleet" + }, + "responses": { + "200": { + "body": { + "kubeconfigs": [ + { + "name": "credentialName1", + "value": "Y3JlZGVudGlhbFZhbHVlMQ==" + } + ] + } + } + } +} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/Fleets_PatchTags.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/Fleets_PatchTags.json new file mode 100644 index 000000000000..5b8753da7dbb --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/Fleets_PatchTags.json @@ -0,0 +1,52 @@ +{ + "operationId": "Fleets_Update", + "title": "Update a Fleet.", + "parameters": { + "api-version": "2023-10-15", + "subscriptionId": "subid1", + "resourceGroupName": "rg1", + "fleetName": "fleet1", + "If-Match": "dfjkwelr7384", + "properties": { + "tags": { + "tier": "secure", + "env": "prod" + } + } + }, + "responses": { + "200": { + "headers": { + "ETag": "23ujdflewrj3=" + }, + "body": { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/fleets/fleet-1", + "name": "fleet-1", + "type": "Microsoft.ContainerService/fleets", + "systemData": { + "createdBy": "someUser", + "createdByType": "User", + "createdAt": "2022-03-23T05:40:40.657Z", + "lastModifiedBy": "someOtherUser", + "lastModifiedByType": "User", + "lastModifiedAt": "2022-03-23T05:40:40.657Z" + }, + "tags": { + "tier": "secure", + "env": "prod" + }, + "location": "East US", + "eTag": "23ujdflewrj3=", + "properties": { + "provisioningState": "Succeeded" + } + } + }, + "202": { + "headers": { + "Retry-After": "20", + "Location": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operations/00000000-0000-0000-0000-000000000000?api-version=2022-02-01" + } + } + } +} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/Operations_List.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/Operations_List.json new file mode 100644 index 000000000000..cdc0a85b3463 --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/Operations_List.json @@ -0,0 +1,25 @@ +{ + "operationId": "Operations_List", + "title": "List the operations for the provider.", + "parameters": { + "api-version": "2023-08-15-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "display": { + "description": "Gets the status of an asynchronous operation", + "operation": "Get Operation", + "provider": "Microsoft Container Service", + "resource": "Operation" + }, + "name": "Microsoft.ContainerService/locations/operations/read", + "origin": "user,system" + } + ] + } + } + } +} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/UpdateRuns_CreateOrUpdate.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/UpdateRuns_CreateOrUpdate.json new file mode 100644 index 000000000000..a709457bda96 --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/UpdateRuns_CreateOrUpdate.json @@ -0,0 +1,196 @@ +{ + "operationId": "UpdateRuns_CreateOrUpdate", + "title": "Create an UpdateRun.", + "parameters": { + "api-version": "2023-10-15", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "rg1", + "fleetName": "fleet1", + "updateRunName": "run1", + "resource": { + "properties": { + "updateStrategyId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ContainerService/fleets/myFleet/updateStrategies/strategy1", + "strategy": { + "stages": [ + { + "name": "stage1", + "groups": [ + { + "name": "group-a" + } + ], + "afterStageWaitInSeconds": 3600 + } + ] + }, + "managedClusterUpdate": { + "upgrade": { + "type": "Full", + "kubernetesVersion": "1.26.1" + }, + "nodeImageSelection": { + "type": "Latest" + } + } + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ContainerService/fleets/myFleet/updateRuns/run1", + "name": "run1", + "type": "Microsoft.ContainerService/fleets/updateRuns", + "systemData": { + "createdBy": "@contoso.com", + "createdByType": "User", + "createdAt": "2023-03-01T01:10:08.395Z", + "lastModifiedBy": "@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2023-03-01T01:10:08.395Z" + }, + "properties": { + "provisioningState": "Succeeded", + "updateStrategyId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ContainerService/fleets/myFleet/updateStrategies/strategy1", + "strategy": { + "stages": [ + { + "name": "stage1", + "groups": [ + { + "name": "group-a" + } + ], + "afterStageWaitInSeconds": 3600 + } + ] + }, + "managedClusterUpdate": { + "upgrade": { + "type": "Full", + "kubernetesVersion": "1.26.1" + }, + "nodeImageSelection": { + "type": "Latest" + } + }, + "status": { + "status": { + "state": "NotStarted" + }, + "stages": [ + { + "status": { + "state": "NotStarted" + }, + "name": "stage1", + "groups": [ + { + "status": { + "state": "NotStarted" + }, + "name": "group-a", + "members": [ + { + "status": { + "state": "NotStarted" + }, + "name": "member-one", + "clusterResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myClusters/providers/Microsoft.ContainerService/managedClusters/myCluster" + } + ] + } + ], + "afterStageWaitStatus": { + "status": { + "state": "NotStarted" + }, + "waitDurationInSeconds": 3600 + } + } + ] + } + }, + "eTag": "\"EtagValue\"" + } + }, + "201": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ContainerService/fleets/myFleet/updateRuns/run1", + "name": "run1", + "type": "Microsoft.ContainerService/fleets/updateRuns", + "systemData": { + "createdBy": "@contoso.com", + "createdByType": "User", + "createdAt": "2023-03-01T01:10:08.395Z", + "lastModifiedBy": "@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2023-03-01T01:10:08.395Z" + }, + "properties": { + "provisioningState": "Succeeded", + "updateStrategyId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ContainerService/fleets/myFleet/updateStrategies/strategy1", + "strategy": { + "stages": [ + { + "name": "stage1", + "groups": [ + { + "name": "group-a" + } + ], + "afterStageWaitInSeconds": 3600 + } + ] + }, + "managedClusterUpdate": { + "upgrade": { + "type": "Full", + "kubernetesVersion": "1.26.1" + }, + "nodeImageSelection": { + "type": "Latest" + } + }, + "status": { + "status": { + "state": "NotStarted" + }, + "stages": [ + { + "status": { + "state": "NotStarted" + }, + "name": "stage1", + "groups": [ + { + "status": { + "state": "NotStarted" + }, + "name": "group-a", + "members": [ + { + "status": { + "state": "NotStarted" + }, + "name": "member-one", + "clusterResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myClusters/providers/Microsoft.ContainerService/managedClusters/myCluster" + } + ] + } + ], + "afterStageWaitStatus": { + "status": { + "state": "NotStarted" + }, + "waitDurationInSeconds": 3600 + } + } + ] + } + }, + "eTag": "\"EtagValue\"" + } + } + } +} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/UpdateRuns_Delete.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/UpdateRuns_Delete.json new file mode 100644 index 000000000000..9b19b7056cf2 --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/UpdateRuns_Delete.json @@ -0,0 +1,21 @@ +{ + "operationId": "UpdateRuns_Delete", + "title": "Delete an updateRun resource.", + "parameters": { + "api-version": "2023-10-15", + "subscriptionId": "subid1", + "resourceGroupName": "rg1", + "fleetName": "fleet1", + "updateRunName": "run1" + }, + "responses": { + "202": { + "headers": { + "Location": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operations/00000000-0000-0000-0000-000000000000?api-version=2022-09-02-preview", + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operationResults/00000000-0000-0000-0000-000000000000?api-version=2022-09-02-preview" + } + }, + "200": {}, + "204": {} + } +} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/UpdateRuns_Get.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/UpdateRuns_Get.json new file mode 100644 index 000000000000..cb91516da2f5 --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/UpdateRuns_Get.json @@ -0,0 +1,90 @@ +{ + "operationId": "UpdateRuns_Get", + "title": "Gets an UpdateRun resource.", + "parameters": { + "api-version": "2023-10-15", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "rg1", + "fleetName": "fleet1", + "updateRunName": "run1" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ContainerService/fleets/myFleet/updateRuns/run1", + "name": "run1", + "type": "Microsoft.ContainerService/fleets/updateRuns", + "systemData": { + "createdBy": "@contoso.com", + "createdByType": "User", + "createdAt": "2023-03-01T01:10:08.395Z", + "lastModifiedBy": "@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2023-03-01T01:10:08.395Z" + }, + "properties": { + "provisioningState": "Succeeded", + "strategy": { + "stages": [ + { + "name": "stage1", + "groups": [ + { + "name": "group-a" + } + ], + "afterStageWaitInSeconds": 3600 + } + ] + }, + "managedClusterUpdate": { + "upgrade": { + "type": "Full", + "kubernetesVersion": "1.26.1" + }, + "nodeImageSelection": { + "type": "Latest" + } + }, + "status": { + "status": { + "state": "NotStarted" + }, + "stages": [ + { + "status": { + "state": "NotStarted" + }, + "name": "stage1", + "groups": [ + { + "status": { + "state": "NotStarted" + }, + "name": "group-a", + "members": [ + { + "status": { + "state": "NotStarted" + }, + "name": "member-one", + "clusterResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myClusters/providers/Microsoft.ContainerService/managedClusters/myCluster" + } + ] + } + ], + "afterStageWaitStatus": { + "status": { + "state": "NotStarted" + }, + "waitDurationInSeconds": 3600 + } + } + ] + } + }, + "eTag": "\"EtagValue\"" + } + } + } +} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/UpdateRuns_ListByFleet.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/UpdateRuns_ListByFleet.json new file mode 100644 index 000000000000..313e6753f838 --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/UpdateRuns_ListByFleet.json @@ -0,0 +1,94 @@ +{ + "operationId": "UpdateRuns_ListByFleet", + "title": "Lists the UpdateRun resources by fleet.", + "parameters": { + "api-version": "2023-10-15", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "rg1", + "fleetName": "fleet1" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ContainerService/fleets/myFleet/updateRuns/run1", + "name": "run1", + "type": "Microsoft.ContainerService/fleets/updateRuns", + "systemData": { + "createdBy": "@contoso.com", + "createdByType": "User", + "createdAt": "2023-03-01T01:10:08.395Z", + "lastModifiedBy": "@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2023-03-01T01:10:08.395Z" + }, + "properties": { + "provisioningState": "Succeeded", + "strategy": { + "stages": [ + { + "name": "stage1", + "groups": [ + { + "name": "group-a" + } + ], + "afterStageWaitInSeconds": 3600 + } + ] + }, + "managedClusterUpdate": { + "upgrade": { + "type": "Full", + "kubernetesVersion": "1.26.1" + }, + "nodeImageSelection": { + "type": "Latest" + } + }, + "status": { + "status": { + "state": "NotStarted" + }, + "stages": [ + { + "status": { + "state": "NotStarted" + }, + "name": "stage1", + "groups": [ + { + "status": { + "state": "NotStarted" + }, + "name": "group-a", + "members": [ + { + "status": { + "state": "NotStarted" + }, + "name": "member-one", + "clusterResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myClusters/providers/Microsoft.ContainerService/managedClusters/myCluster" + } + ] + } + ], + "afterStageWaitStatus": { + "status": { + "state": "NotStarted" + }, + "waitDurationInSeconds": 3600 + } + } + ] + } + }, + "eTag": "\"EtagValue\"" + } + ], + "nextLink": "http://nextlink.contoso.com" + } + } + } +} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/UpdateRuns_Start.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/UpdateRuns_Start.json new file mode 100644 index 000000000000..798034ce51c6 --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/UpdateRuns_Start.json @@ -0,0 +1,99 @@ +{ + "operationId": "UpdateRuns_Start", + "title": "Starts an UpdateRun.", + "parameters": { + "api-version": "2023-10-15", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "rg1", + "fleetName": "fleet1", + "updateRunName": "run1" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ContainerService/fleets/myFleet/updateRuns/run1", + "name": "run1", + "type": "Microsoft.ContainerService/fleets/updateRuns", + "systemData": { + "createdBy": "@contoso.com", + "createdByType": "User", + "createdAt": "2023-03-01T01:09:08.395Z", + "lastModifiedBy": "@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2023-03-01T01:10:08.395Z" + }, + "properties": { + "provisioningState": "Succeeded", + "strategy": { + "stages": [ + { + "name": "stage1", + "groups": [ + { + "name": "group-a" + } + ], + "afterStageWaitInSeconds": 3600 + } + ] + }, + "managedClusterUpdate": { + "upgrade": { + "type": "Full", + "kubernetesVersion": "1.26.1" + }, + "nodeImageSelection": { + "type": "Latest" + } + }, + "status": { + "status": { + "startTime": "2023-03-01T01:10:08.395Z", + "state": "Running" + }, + "stages": [ + { + "status": { + "startTime": "2023-03-01T01:10:08.395Z", + "state": "Running" + }, + "name": "stage1", + "groups": [ + { + "status": { + "startTime": "2023-03-01T01:10:08.395Z", + "state": "Running" + }, + "name": "group-a", + "members": [ + { + "status": { + "state": "Running" + }, + "name": "member-one", + "clusterResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myClusters/providers/Microsoft.ContainerService/managedClusters/myCluster" + } + ] + } + ], + "afterStageWaitStatus": { + "status": { + "state": "NotStarted" + }, + "waitDurationInSeconds": 3600 + } + } + ] + } + }, + "eTag": "\"EtagValue\"" + } + }, + "202": { + "headers": { + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operationResults/00000000-0000-0000-0000-000000000000?api-version=2022-02-01", + "Location": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operationResults/00000000-0000-0000-0000-000000000000?api-version=2022-02-01" + } + } + } +} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/UpdateRuns_Stop.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/UpdateRuns_Stop.json new file mode 100644 index 000000000000..3d4f2b89272b --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/UpdateRuns_Stop.json @@ -0,0 +1,99 @@ +{ + "operationId": "UpdateRuns_Stop", + "title": "Stops an UpdateRun.", + "parameters": { + "api-version": "2023-10-15", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "rg1", + "fleetName": "fleet1", + "updateRunName": "run1" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ContainerService/fleets/myFleet/updateRuns/run1", + "name": "run1", + "type": "Microsoft.ContainerService/fleets/updateRuns", + "systemData": { + "createdBy": "@contoso.com", + "createdByType": "User", + "createdAt": "2023-03-01T01:09:08.395Z", + "lastModifiedBy": "@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2023-03-01T01:10:08.395Z" + }, + "properties": { + "provisioningState": "Succeeded", + "strategy": { + "stages": [ + { + "name": "stage1", + "groups": [ + { + "name": "group-a" + } + ], + "afterStageWaitInSeconds": 3600 + } + ] + }, + "managedClusterUpdate": { + "upgrade": { + "type": "Full", + "kubernetesVersion": "1.26.1" + }, + "nodeImageSelection": { + "type": "Latest" + } + }, + "status": { + "status": { + "startTime": "2023-03-01T01:10:08.395Z", + "state": "Stopping" + }, + "stages": [ + { + "status": { + "startTime": "2023-03-01T01:10:08.395Z", + "state": "Stopping" + }, + "name": "stage1", + "groups": [ + { + "status": { + "startTime": "2023-03-01T01:10:08.395Z", + "state": "Stopping" + }, + "name": "group-a", + "members": [ + { + "status": { + "state": "Stopping" + }, + "name": "member-one", + "clusterResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myClusters/providers/Microsoft.ContainerService/managedClusters/myCluster" + } + ] + } + ], + "afterStageWaitStatus": { + "status": { + "state": "NotStarted" + }, + "waitDurationInSeconds": 3600 + } + } + ] + } + }, + "eTag": "\"EtagValue\"" + } + }, + "202": { + "headers": { + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operationResults/00000000-0000-0000-0000-000000000000?api-version=2022-02-01", + "Location": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operationResults/00000000-0000-0000-0000-000000000000?api-version=2022-02-01" + } + } + } +} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/UpdateStrategies_CreateOrUpdate.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/UpdateStrategies_CreateOrUpdate.json new file mode 100644 index 000000000000..cfd8fa9f12aa --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/UpdateStrategies_CreateOrUpdate.json @@ -0,0 +1,94 @@ +{ + "operationId": "FleetUpdateStrategies_CreateOrUpdate", + "title": "Create a FleetUpdateStrategy.", + "parameters": { + "api-version": "2023-10-15", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "rg1", + "fleetName": "fleet1", + "updateStrategyName": "strartegy1", + "resource": { + "properties": { + "strategy": { + "stages": [ + { + "name": "stage1", + "groups": [ + { + "name": "group-a" + } + ], + "afterStageWaitInSeconds": 3600 + } + ] + } + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ContainerService/fleets/myFleet/updateStrategies/strategy1", + "name": "strategy1", + "type": "Microsoft.ContainerService/fleets/updateStrategies", + "systemData": { + "createdBy": "@contoso.com", + "createdByType": "User", + "createdAt": "2023-03-01T01:10:08.395Z", + "lastModifiedBy": "@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2023-03-01T01:10:08.395Z" + }, + "properties": { + "provisioningState": "Succeeded", + "strategy": { + "stages": [ + { + "name": "stage1", + "groups": [ + { + "name": "group-a" + } + ], + "afterStageWaitInSeconds": 3600 + } + ] + } + }, + "eTag": "\"EtagValue\"" + } + }, + "201": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ContainerService/fleets/myFleet/updateStrategies/strategy1", + "name": "strategy1", + "type": "Microsoft.ContainerService/fleets/updateStrategies", + "systemData": { + "createdBy": "@contoso.com", + "createdByType": "User", + "createdAt": "2023-03-01T01:10:08.395Z", + "lastModifiedBy": "@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2023-03-01T01:10:08.395Z" + }, + "properties": { + "provisioningState": "Succeeded", + "strategy": { + "stages": [ + { + "name": "stage1", + "groups": [ + { + "name": "group-a" + } + ], + "afterStageWaitInSeconds": 3600 + } + ] + } + }, + "eTag": "\"EtagValue\"" + } + } + } +} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/UpdateStrategies_Delete.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/UpdateStrategies_Delete.json new file mode 100644 index 000000000000..1ec03ee79ef7 --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/UpdateStrategies_Delete.json @@ -0,0 +1,21 @@ +{ + "operationId": "FleetUpdateStrategies_Delete", + "title": "Delete a FleetUpdateStrategy resource.", + "parameters": { + "api-version": "2023-10-15", + "subscriptionId": "subid1", + "resourceGroupName": "rg1", + "fleetName": "fleet1", + "updateStrategyName": "strategy1" + }, + "responses": { + "202": { + "headers": { + "Location": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operations/00000000-0000-0000-0000-000000000000?api-version=2022-09-02-preview", + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/locations/eastus/operationResults/00000000-0000-0000-0000-000000000000?api-version=2022-09-02-preview" + } + }, + "200": {}, + "204": {} + } +} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/UpdateStrategies_Get.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/UpdateStrategies_Get.json new file mode 100644 index 000000000000..6223ef2e7e5a --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/UpdateStrategies_Get.json @@ -0,0 +1,45 @@ +{ + "operationId": "FleetUpdateStrategies_Get", + "title": "Get a FleetUpdateStrategy resource.", + "parameters": { + "api-version": "2023-10-15", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "rg1", + "fleetName": "fleet1", + "updateStrategyName": "strategy1" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ContainerService/fleets/myFleet/updateStrategies/strategy1", + "name": "strategy1", + "type": "Microsoft.ContainerService/fleets/updateStrategies", + "systemData": { + "createdBy": "@contoso.com", + "createdByType": "User", + "createdAt": "2023-03-01T01:10:08.395Z", + "lastModifiedBy": "@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2023-03-01T01:10:08.395Z" + }, + "properties": { + "provisioningState": "Succeeded", + "strategy": { + "stages": [ + { + "name": "stage1", + "groups": [ + { + "name": "group-a" + } + ], + "afterStageWaitInSeconds": 3600 + } + ] + } + }, + "eTag": "\"EtagValue\"" + } + } + } +} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/UpdateStrategies_ListByFleet.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/UpdateStrategies_ListByFleet.json new file mode 100644 index 000000000000..b6c447d1311a --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/UpdateStrategies_ListByFleet.json @@ -0,0 +1,49 @@ +{ + "operationId": "FleetUpdateStrategies_ListByFleet", + "title": "List the FleetUpdateStrategy resources by fleet.", + "parameters": { + "api-version": "2023-10-15", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "rg1", + "fleetName": "fleet1" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ContainerService/fleets/myFleet/updateStrategies/strategy1", + "name": "strategy1", + "type": "Microsoft.ContainerService/fleets/updateStrategies", + "systemData": { + "createdBy": "@contoso.com", + "createdByType": "User", + "createdAt": "2023-03-01T01:10:08.395Z", + "lastModifiedBy": "@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2023-03-01T01:10:08.395Z" + }, + "properties": { + "provisioningState": "Succeeded", + "strategy": { + "stages": [ + { + "name": "stage1", + "groups": [ + { + "name": "group-a" + } + ], + "afterStageWaitInSeconds": 3600 + } + ] + } + }, + "eTag": "\"EtagValue\"" + } + ], + "nextLink": "http://nextlink.contoso.com" + } + } + } +} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/fleets.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/fleets.json new file mode 100644 index 000000000000..31d83ca7ba19 --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/fleets.json @@ -0,0 +1,2726 @@ +{ + "swagger": "2.0", + "info": { + "title": "ContainerServiceFleetClient", + "version": "2023-10-15", + "description": "Azure Kubernetes Fleet Manager api client.", + "x-typespec-generated": [ + { + "emitter": "@azure-tools/typespec-autorest" + } + ] + }, + "schemes": [ + "https" + ], + "host": "management.azure.com", + "produces": [ + "application/json" + ], + "consumes": [ + "application/json" + ], + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ], + "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" + } + } + }, + "tags": [ + { + "name": "Operations" + }, + { + "name": "Fleets" + }, + { + "name": "FleetMembers" + }, + { + "name": "UpdateRuns" + }, + { + "name": "FleetUpdateStrategies" + } + ], + "paths": { + "/providers/Microsoft.ContainerService/operations": { + "get": { + "operationId": "Operations_List", + "tags": [ + "Operations" + ], + "description": "List the operations for the provider", + "parameters": [ + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "ARM operation completed successfully.", + "schema": { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/definitions/OperationListResult" + } + }, + "default": { + "description": "An unexpected error response.", + "schema": { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "List the operations for the provider.": { + "$ref": "./examples/Operations_List.json" + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerService/fleets": { + "get": { + "operationId": "Fleets_ListBySubscription", + "tags": [ + "Fleets" + ], + "description": "Lists fleets in the specified subscription.", + "parameters": [ + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "ARM operation completed successfully.", + "schema": { + "$ref": "#/definitions/FleetListResult" + } + }, + "default": { + "description": "An unexpected error response.", + "schema": { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "Lists the Fleet resources in a subscription.": { + "$ref": "./examples/Fleets_ListBySub.json" + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/fleets": { + "get": { + "operationId": "Fleets_ListByResourceGroup", + "tags": [ + "Fleets" + ], + "description": "Lists fleets in the specified subscription and resource group.", + "parameters": [ + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + } + ], + "responses": { + "200": { + "description": "ARM operation completed successfully.", + "schema": { + "$ref": "#/definitions/FleetListResult" + } + }, + "default": { + "description": "An unexpected error response.", + "schema": { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "Lists the Fleet resources in a resource group.": { + "$ref": "./examples/Fleets_ListByResourceGroup.json" + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/fleets/{fleetName}": { + "get": { + "operationId": "Fleets_Get", + "tags": [ + "Fleets" + ], + "description": "Gets a Fleet.", + "parameters": [ + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "name": "fleetName", + "in": "path", + "description": "The name of the Fleet resource.", + "required": true, + "type": "string", + "minLength": 1, + "maxLength": 63, + "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" + } + ], + "responses": { + "200": { + "description": "ARM operation completed successfully.", + "schema": { + "$ref": "#/definitions/Fleet" + } + }, + "default": { + "description": "An unexpected error response.", + "schema": { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "Gets a Fleet resource.": { + "$ref": "./examples/Fleets_Get.json" + } + } + }, + "put": { + "operationId": "Fleets_CreateOrUpdate", + "tags": [ + "Fleets" + ], + "description": "Creates or updates a Fleet.", + "parameters": [ + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "name": "If-Match", + "in": "header", + "description": "The request should only proceed if an entity matches this string.", + "required": false, + "type": "string", + "x-ms-client-name": "ifMatch" + }, + { + "name": "If-None-Match", + "in": "header", + "description": "The request should only proceed if no entity matches this string.", + "required": false, + "type": "string", + "x-ms-client-name": "ifNoneMatch" + }, + { + "name": "fleetName", + "in": "path", + "description": "The name of the Fleet resource.", + "required": true, + "type": "string", + "minLength": 1, + "maxLength": 63, + "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" + }, + { + "name": "resource", + "in": "body", + "description": "Resource create parameters.", + "required": true, + "schema": { + "$ref": "#/definitions/Fleet" + } + } + ], + "responses": { + "200": { + "description": "Resource 'Fleet' update operation succeeded", + "schema": { + "$ref": "#/definitions/Fleet" + } + }, + "201": { + "description": "Resource 'Fleet' create operation succeeded", + "schema": { + "$ref": "#/definitions/Fleet" + }, + "headers": { + "Retry-After": { + "type": "integer", + "format": "int32", + "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." + } + } + }, + "default": { + "description": "An unexpected error response.", + "schema": { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "Creates a Fleet resource with a long running operation.": { + "$ref": "./examples/Fleets_CreateOrUpdate.json" + } + }, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" + }, + "x-ms-long-running-operation": true + }, + "patch": { + "operationId": "Fleets_Update", + "tags": [ + "Fleets" + ], + "description": "Update a Fleet", + "parameters": [ + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "name": "If-Match", + "in": "header", + "description": "The request should only proceed if an entity matches this string.", + "required": false, + "type": "string", + "x-ms-client-name": "ifMatch" + }, + { + "name": "fleetName", + "in": "path", + "description": "The name of the Fleet resource.", + "required": true, + "type": "string", + "minLength": 1, + "maxLength": 63, + "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" + }, + { + "name": "properties", + "in": "body", + "description": "The resource properties to be updated.", + "required": true, + "schema": { + "$ref": "#/definitions/FleetPatch" + } + } + ], + "responses": { + "200": { + "description": "ARM operation completed successfully.", + "schema": { + "$ref": "#/definitions/Fleet" + } + }, + "202": { + "description": "Resource update request accepted.", + "headers": { + "Retry-After": { + "type": "integer", + "format": "int32", + "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." + }, + "Location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + } + } + }, + "default": { + "description": "An unexpected error response.", + "schema": { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "Update a Fleet.": { + "$ref": "./examples/Fleets_PatchTags.json" + } + }, + "x-ms-long-running-operation-options": { + "final-state-via": "location" + }, + "x-ms-long-running-operation": true + }, + "delete": { + "operationId": "Fleets_Delete", + "tags": [ + "Fleets" + ], + "description": "Delete a Fleet", + "parameters": [ + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "name": "If-Match", + "in": "header", + "description": "The request should only proceed if an entity matches this string.", + "required": false, + "type": "string", + "x-ms-client-name": "ifMatch" + }, + { + "name": "fleetName", + "in": "path", + "description": "The name of the Fleet resource.", + "required": true, + "type": "string", + "minLength": 1, + "maxLength": 63, + "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" + } + ], + "responses": { + "200": { + "description": "Resource deleted successfully." + }, + "202": { + "description": "Resource deletion accepted.", + "headers": { + "Retry-After": { + "type": "integer", + "format": "int32", + "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." + }, + "Location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + } + } + }, + "204": { + "description": "Resource deleted successfully." + }, + "default": { + "description": "An unexpected error response.", + "schema": { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "Deletes a Fleet resource asynchronously with a long running operation.": { + "$ref": "./examples/Fleets_Delete.json" + } + }, + "x-ms-long-running-operation-options": { + "final-state-via": "location" + }, + "x-ms-long-running-operation": true + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/fleets/{fleetName}/listCredentials": { + "post": { + "operationId": "Fleets_ListCredentials", + "tags": [ + "Fleets" + ], + "description": "Lists the user credentials of a Fleet.", + "parameters": [ + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "name": "fleetName", + "in": "path", + "description": "The name of the Fleet resource.", + "required": true, + "type": "string", + "minLength": 1, + "maxLength": 63, + "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" + } + ], + "responses": { + "200": { + "description": "ARM operation completed successfully.", + "schema": { + "$ref": "#/definitions/FleetCredentialResults" + } + }, + "default": { + "description": "An unexpected error response.", + "schema": { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "Lists the user credentials of a Fleet.": { + "$ref": "./examples/Fleets_ListCredentialsResult.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/fleets/{fleetName}/members": { + "get": { + "operationId": "FleetMembers_ListByFleet", + "tags": [ + "FleetMembers" + ], + "description": "List FleetMember resources by Fleet", + "parameters": [ + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "name": "fleetName", + "in": "path", + "description": "The name of the Fleet resource.", + "required": true, + "type": "string", + "minLength": 1, + "maxLength": 63, + "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" + } + ], + "responses": { + "200": { + "description": "ARM operation completed successfully.", + "schema": { + "$ref": "#/definitions/FleetMemberListResult" + } + }, + "default": { + "description": "An unexpected error response.", + "schema": { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "Lists the members of a Fleet.": { + "$ref": "./examples/FleetMembers_ListByFleet.json" + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/fleets/{fleetName}/members/{fleetMemberName}": { + "get": { + "operationId": "FleetMembers_Get", + "tags": [ + "FleetMembers" + ], + "description": "Get a FleetMember", + "parameters": [ + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "name": "fleetName", + "in": "path", + "description": "The name of the Fleet resource.", + "required": true, + "type": "string", + "minLength": 1, + "maxLength": 63, + "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" + }, + { + "name": "fleetMemberName", + "in": "path", + "description": "The name of the Fleet member resource.", + "required": true, + "type": "string", + "minLength": 1, + "maxLength": 50, + "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" + } + ], + "responses": { + "200": { + "description": "ARM operation completed successfully.", + "schema": { + "$ref": "#/definitions/FleetMember" + } + }, + "default": { + "description": "An unexpected error response.", + "schema": { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "Gets a FleetMember resource.": { + "$ref": "./examples/FleetMembers_Get.json" + } + } + }, + "put": { + "operationId": "FleetMembers_Create", + "tags": [ + "FleetMembers" + ], + "description": "Create a FleetMember", + "parameters": [ + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "name": "If-Match", + "in": "header", + "description": "The request should only proceed if an entity matches this string.", + "required": false, + "type": "string", + "x-ms-client-name": "ifMatch" + }, + { + "name": "If-None-Match", + "in": "header", + "description": "The request should only proceed if no entity matches this string.", + "required": false, + "type": "string", + "x-ms-client-name": "ifNoneMatch" + }, + { + "name": "fleetName", + "in": "path", + "description": "The name of the Fleet resource.", + "required": true, + "type": "string", + "minLength": 1, + "maxLength": 63, + "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" + }, + { + "name": "fleetMemberName", + "in": "path", + "description": "The name of the Fleet member resource.", + "required": true, + "type": "string", + "minLength": 1, + "maxLength": 50, + "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" + }, + { + "name": "resource", + "in": "body", + "description": "Resource create parameters.", + "required": true, + "schema": { + "$ref": "#/definitions/FleetMember" + } + } + ], + "responses": { + "200": { + "description": "Resource 'FleetMember' update operation succeeded", + "schema": { + "$ref": "#/definitions/FleetMember" + } + }, + "201": { + "description": "Resource 'FleetMember' create operation succeeded", + "schema": { + "$ref": "#/definitions/FleetMember" + }, + "headers": { + "Retry-After": { + "type": "integer", + "format": "int32", + "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." + } + } + }, + "default": { + "description": "An unexpected error response.", + "schema": { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "Creates a FleetMember resource with a long running operation.": { + "$ref": "./examples/FleetMembers_Create.json" + } + }, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" + }, + "x-ms-long-running-operation": true + }, + "patch": { + "operationId": "FleetMembers_Update", + "tags": [ + "FleetMembers" + ], + "description": "Update a FleetMember", + "parameters": [ + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "name": "If-Match", + "in": "header", + "description": "The request should only proceed if an entity matches this string.", + "required": false, + "type": "string", + "x-ms-client-name": "ifMatch" + }, + { + "name": "fleetName", + "in": "path", + "description": "The name of the Fleet resource.", + "required": true, + "type": "string", + "minLength": 1, + "maxLength": 63, + "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" + }, + { + "name": "fleetMemberName", + "in": "path", + "description": "The name of the Fleet member resource.", + "required": true, + "type": "string", + "minLength": 1, + "maxLength": 50, + "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" + }, + { + "name": "properties", + "in": "body", + "description": "The resource properties to be updated.", + "required": true, + "schema": { + "$ref": "#/definitions/FleetMemberUpdate" + } + } + ], + "responses": { + "200": { + "description": "ARM operation completed successfully.", + "schema": { + "$ref": "#/definitions/FleetMember" + } + }, + "202": { + "description": "Resource update request accepted.", + "headers": { + "Retry-After": { + "type": "integer", + "format": "int32", + "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." + }, + "Location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + } + } + }, + "default": { + "description": "An unexpected error response.", + "schema": { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "Updates a FleetMember resource synchronously.": { + "$ref": "./examples/FleetMembers_Update.json" + } + }, + "x-ms-long-running-operation-options": { + "final-state-via": "location" + }, + "x-ms-long-running-operation": true + }, + "delete": { + "operationId": "FleetMembers_Delete", + "tags": [ + "FleetMembers" + ], + "description": "Delete a FleetMember", + "parameters": [ + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "name": "If-Match", + "in": "header", + "description": "The request should only proceed if an entity matches this string.", + "required": false, + "type": "string", + "x-ms-client-name": "ifMatch" + }, + { + "name": "fleetName", + "in": "path", + "description": "The name of the Fleet resource.", + "required": true, + "type": "string", + "minLength": 1, + "maxLength": 63, + "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" + }, + { + "name": "fleetMemberName", + "in": "path", + "description": "The name of the Fleet member resource.", + "required": true, + "type": "string", + "minLength": 1, + "maxLength": 50, + "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" + } + ], + "responses": { + "200": { + "description": "Resource deleted successfully." + }, + "202": { + "description": "Resource deletion accepted.", + "headers": { + "Retry-After": { + "type": "integer", + "format": "int32", + "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." + }, + "Location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + } + } + }, + "204": { + "description": "Resource deleted successfully." + }, + "default": { + "description": "An unexpected error response.", + "schema": { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "Deletes a FleetMember resource asynchronously with a long running operation.": { + "$ref": "./examples/FleetMembers_Delete.json" + } + }, + "x-ms-long-running-operation-options": { + "final-state-via": "location" + }, + "x-ms-long-running-operation": true + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/fleets/{fleetName}/updateRuns": { + "get": { + "operationId": "UpdateRuns_ListByFleet", + "tags": [ + "UpdateRuns" + ], + "description": "List UpdateRun resources by Fleet", + "parameters": [ + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "name": "fleetName", + "in": "path", + "description": "The name of the Fleet resource.", + "required": true, + "type": "string", + "minLength": 1, + "maxLength": 63, + "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" + } + ], + "responses": { + "200": { + "description": "ARM operation completed successfully.", + "schema": { + "$ref": "#/definitions/UpdateRunListResult" + } + }, + "default": { + "description": "An unexpected error response.", + "schema": { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "Lists the UpdateRun resources by fleet.": { + "$ref": "./examples/UpdateRuns_ListByFleet.json" + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/fleets/{fleetName}/updateRuns/{updateRunName}": { + "get": { + "operationId": "UpdateRuns_Get", + "tags": [ + "UpdateRuns" + ], + "description": "Get a UpdateRun", + "parameters": [ + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "name": "fleetName", + "in": "path", + "description": "The name of the Fleet resource.", + "required": true, + "type": "string", + "minLength": 1, + "maxLength": 63, + "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" + }, + { + "name": "updateRunName", + "in": "path", + "description": "The name of the UpdateRun resource.", + "required": true, + "type": "string", + "minLength": 1, + "maxLength": 50, + "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" + } + ], + "responses": { + "200": { + "description": "ARM operation completed successfully.", + "schema": { + "$ref": "#/definitions/UpdateRun" + } + }, + "default": { + "description": "An unexpected error response.", + "schema": { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "Gets an UpdateRun resource.": { + "$ref": "./examples/UpdateRuns_Get.json" + } + } + }, + "put": { + "operationId": "UpdateRuns_CreateOrUpdate", + "tags": [ + "UpdateRuns" + ], + "description": "Create a UpdateRun", + "parameters": [ + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "name": "If-Match", + "in": "header", + "description": "The request should only proceed if an entity matches this string.", + "required": false, + "type": "string", + "x-ms-client-name": "ifMatch" + }, + { + "name": "If-None-Match", + "in": "header", + "description": "The request should only proceed if no entity matches this string.", + "required": false, + "type": "string", + "x-ms-client-name": "ifNoneMatch" + }, + { + "name": "fleetName", + "in": "path", + "description": "The name of the Fleet resource.", + "required": true, + "type": "string", + "minLength": 1, + "maxLength": 63, + "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" + }, + { + "name": "updateRunName", + "in": "path", + "description": "The name of the UpdateRun resource.", + "required": true, + "type": "string", + "minLength": 1, + "maxLength": 50, + "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" + }, + { + "name": "resource", + "in": "body", + "description": "Resource create parameters.", + "required": true, + "schema": { + "$ref": "#/definitions/UpdateRun" + } + } + ], + "responses": { + "200": { + "description": "Resource 'UpdateRun' update operation succeeded", + "schema": { + "$ref": "#/definitions/UpdateRun" + } + }, + "201": { + "description": "Resource 'UpdateRun' create operation succeeded", + "schema": { + "$ref": "#/definitions/UpdateRun" + }, + "headers": { + "Retry-After": { + "type": "integer", + "format": "int32", + "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." + } + } + }, + "default": { + "description": "An unexpected error response.", + "schema": { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "Create an UpdateRun.": { + "$ref": "./examples/UpdateRuns_CreateOrUpdate.json" + } + }, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" + }, + "x-ms-long-running-operation": true + }, + "delete": { + "operationId": "UpdateRuns_Delete", + "tags": [ + "UpdateRuns" + ], + "description": "Delete a UpdateRun", + "parameters": [ + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "name": "If-Match", + "in": "header", + "description": "The request should only proceed if an entity matches this string.", + "required": false, + "type": "string", + "x-ms-client-name": "ifMatch" + }, + { + "name": "fleetName", + "in": "path", + "description": "The name of the Fleet resource.", + "required": true, + "type": "string", + "minLength": 1, + "maxLength": 63, + "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" + }, + { + "name": "updateRunName", + "in": "path", + "description": "The name of the UpdateRun resource.", + "required": true, + "type": "string", + "minLength": 1, + "maxLength": 50, + "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" + } + ], + "responses": { + "200": { + "description": "Resource deleted successfully." + }, + "202": { + "description": "The request has been accepted for processing, but processing has not yet completed.", + "headers": { + "Retry-After": { + "type": "integer", + "format": "int32", + "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." + }, + "location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + } + } + }, + "204": { + "description": "Resource deleted successfully." + }, + "default": { + "description": "An unexpected error response.", + "schema": { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "Delete an updateRun resource.": { + "$ref": "./examples/UpdateRuns_Delete.json" + } + }, + "x-ms-long-running-operation-options": { + "final-state-via": "location" + }, + "x-ms-long-running-operation": true + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/fleets/{fleetName}/updateRuns/{updateRunName}/start": { + "post": { + "operationId": "UpdateRuns_Start", + "tags": [ + "UpdateRuns" + ], + "description": "Starts an UpdateRun.", + "parameters": [ + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "name": "If-Match", + "in": "header", + "description": "The request should only proceed if an entity matches this string.", + "required": false, + "type": "string", + "x-ms-client-name": "ifMatch" + }, + { + "name": "fleetName", + "in": "path", + "description": "The name of the Fleet resource.", + "required": true, + "type": "string", + "minLength": 1, + "maxLength": 63, + "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" + }, + { + "name": "updateRunName", + "in": "path", + "description": "The name of the UpdateRun resource.", + "required": true, + "type": "string", + "minLength": 1, + "maxLength": 50, + "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" + } + ], + "responses": { + "200": { + "description": "ARM operation completed successfully.", + "schema": { + "$ref": "#/definitions/UpdateRun" + } + }, + "202": { + "description": "The request has been accepted for processing, but processing has not yet completed.", + "headers": { + "Retry-After": { + "type": "integer", + "format": "int32", + "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." + }, + "location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + } + } + }, + "default": { + "description": "An unexpected error response.", + "schema": { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "Starts an UpdateRun.": { + "$ref": "./examples/UpdateRuns_Start.json" + } + }, + "x-ms-long-running-operation-options": { + "final-state-via": "location" + }, + "x-ms-long-running-operation": true + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/fleets/{fleetName}/updateRuns/{updateRunName}/stop": { + "post": { + "operationId": "UpdateRuns_Stop", + "tags": [ + "UpdateRuns" + ], + "description": "Stops an UpdateRun.", + "parameters": [ + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "name": "If-Match", + "in": "header", + "description": "The request should only proceed if an entity matches this string.", + "required": false, + "type": "string", + "x-ms-client-name": "ifMatch" + }, + { + "name": "fleetName", + "in": "path", + "description": "The name of the Fleet resource.", + "required": true, + "type": "string", + "minLength": 1, + "maxLength": 63, + "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" + }, + { + "name": "updateRunName", + "in": "path", + "description": "The name of the UpdateRun resource.", + "required": true, + "type": "string", + "minLength": 1, + "maxLength": 50, + "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" + } + ], + "responses": { + "200": { + "description": "ARM operation completed successfully.", + "schema": { + "$ref": "#/definitions/UpdateRun" + } + }, + "202": { + "description": "The request has been accepted for processing, but processing has not yet completed.", + "headers": { + "Retry-After": { + "type": "integer", + "format": "int32", + "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." + }, + "location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + } + } + }, + "default": { + "description": "An unexpected error response.", + "schema": { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "Stops an UpdateRun.": { + "$ref": "./examples/UpdateRuns_Stop.json" + } + }, + "x-ms-long-running-operation-options": { + "final-state-via": "location" + }, + "x-ms-long-running-operation": true + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/fleets/{fleetName}/updateStrategies": { + "get": { + "operationId": "FleetUpdateStrategies_ListByFleet", + "tags": [ + "FleetUpdateStrategies" + ], + "description": "List FleetUpdateStrategy resources by Fleet", + "parameters": [ + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "name": "fleetName", + "in": "path", + "description": "The name of the Fleet resource.", + "required": true, + "type": "string", + "minLength": 1, + "maxLength": 63, + "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" + } + ], + "responses": { + "200": { + "description": "ARM operation completed successfully.", + "schema": { + "$ref": "#/definitions/FleetUpdateStrategyListResult" + } + }, + "default": { + "description": "An unexpected error response.", + "schema": { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "List the FleetUpdateStrategy resources by fleet.": { + "$ref": "./examples/UpdateStrategies_ListByFleet.json" + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/fleets/{fleetName}/updateStrategies/{updateStrategyName}": { + "get": { + "operationId": "FleetUpdateStrategies_Get", + "tags": [ + "FleetUpdateStrategies" + ], + "description": "Get a FleetUpdateStrategy", + "parameters": [ + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "name": "fleetName", + "in": "path", + "description": "The name of the Fleet resource.", + "required": true, + "type": "string", + "minLength": 1, + "maxLength": 63, + "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" + }, + { + "name": "updateStrategyName", + "in": "path", + "description": "The name of the UpdateStrategy resource.", + "required": true, + "type": "string", + "minLength": 1, + "maxLength": 50, + "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" + } + ], + "responses": { + "200": { + "description": "ARM operation completed successfully.", + "schema": { + "$ref": "#/definitions/FleetUpdateStrategy" + } + }, + "default": { + "description": "An unexpected error response.", + "schema": { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "Get a FleetUpdateStrategy resource.": { + "$ref": "./examples/UpdateStrategies_Get.json" + } + } + }, + "put": { + "operationId": "FleetUpdateStrategies_CreateOrUpdate", + "tags": [ + "FleetUpdateStrategies" + ], + "description": "Create a FleetUpdateStrategy", + "parameters": [ + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "name": "If-Match", + "in": "header", + "description": "The request should only proceed if an entity matches this string.", + "required": false, + "type": "string", + "x-ms-client-name": "ifMatch" + }, + { + "name": "If-None-Match", + "in": "header", + "description": "The request should only proceed if no entity matches this string.", + "required": false, + "type": "string", + "x-ms-client-name": "ifNoneMatch" + }, + { + "name": "fleetName", + "in": "path", + "description": "The name of the Fleet resource.", + "required": true, + "type": "string", + "minLength": 1, + "maxLength": 63, + "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" + }, + { + "name": "updateStrategyName", + "in": "path", + "description": "The name of the UpdateStrategy resource.", + "required": true, + "type": "string", + "minLength": 1, + "maxLength": 50, + "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" + }, + { + "name": "resource", + "in": "body", + "description": "Resource create parameters.", + "required": true, + "schema": { + "$ref": "#/definitions/FleetUpdateStrategy" + } + } + ], + "responses": { + "200": { + "description": "Resource 'FleetUpdateStrategy' update operation succeeded", + "schema": { + "$ref": "#/definitions/FleetUpdateStrategy" + } + }, + "201": { + "description": "Resource 'FleetUpdateStrategy' create operation succeeded", + "schema": { + "$ref": "#/definitions/FleetUpdateStrategy" + }, + "headers": { + "Retry-After": { + "type": "integer", + "format": "int32", + "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." + } + } + }, + "default": { + "description": "An unexpected error response.", + "schema": { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "Create a FleetUpdateStrategy.": { + "$ref": "./examples/UpdateStrategies_CreateOrUpdate.json" + } + }, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" + }, + "x-ms-long-running-operation": true + }, + "delete": { + "operationId": "FleetUpdateStrategies_Delete", + "tags": [ + "FleetUpdateStrategies" + ], + "description": "Delete a FleetUpdateStrategy", + "parameters": [ + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "name": "If-Match", + "in": "header", + "description": "The request should only proceed if an entity matches this string.", + "required": false, + "type": "string", + "x-ms-client-name": "ifMatch" + }, + { + "name": "fleetName", + "in": "path", + "description": "The name of the Fleet resource.", + "required": true, + "type": "string", + "minLength": 1, + "maxLength": 63, + "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" + }, + { + "name": "updateStrategyName", + "in": "path", + "description": "The name of the UpdateStrategy resource.", + "required": true, + "type": "string", + "minLength": 1, + "maxLength": 50, + "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" + } + ], + "responses": { + "200": { + "description": "Resource deleted successfully." + }, + "202": { + "description": "The request has been accepted for processing, but processing has not yet completed.", + "headers": { + "Retry-After": { + "type": "integer", + "format": "int32", + "description": "The Retry-After header can indicate how long the client should wait before polling the operation status." + }, + "location": { + "type": "string", + "description": "The Location header contains the URL where the status of the long running operation can be checked." + } + } + }, + "204": { + "description": "Resource deleted successfully." + }, + "default": { + "description": "An unexpected error response.", + "schema": { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "Delete a FleetUpdateStrategy resource.": { + "$ref": "./examples/UpdateStrategies_Delete.json" + } + }, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" + }, + "x-ms-long-running-operation": true + } + } + }, + "definitions": { + "APIServerAccessProfile": { + "type": "object", + "description": "Access profile for the Fleet hub API server.", + "properties": { + "enablePrivateCluster": { + "type": "boolean", + "description": "Whether to create the Fleet hub as a private cluster or not.", + "x-ms-mutability": [ + "read", + "create" + ] + }, + "enableVnetIntegration": { + "type": "boolean", + "description": "Whether to enable apiserver vnet integration for the Fleet hub or not.", + "x-ms-mutability": [ + "read", + "create" + ] + }, + "subnetId": { + "$ref": "#/definitions/SubnetResourceId", + "description": "The subnet to be used when apiserver vnet integration is enabled. It is required when creating a new Fleet with BYO vnet.", + "x-ms-mutability": [ + "read", + "create" + ] + } + } + }, + "AgentProfile": { + "type": "object", + "description": "Agent profile for the Fleet hub.", + "properties": { + "subnetId": { + "$ref": "#/definitions/SubnetResourceId", + "description": "The ID of the subnet which the Fleet hub node will join on startup. If this is not specified, a vnet and subnet will be generated and used.", + "x-ms-mutability": [ + "read", + "create" + ] + } + } + }, + "ClusterResourceId": { + "type": "string", + "format": "arm-id", + "description": "A type definition that refers the id to an ARM resource.", + "x-ms-arm-id-details": { + "allowedResources": [ + { + "type": "Microsoft.ContainerService/managedClusters" + } + ] + } + }, + "Fleet": { + "type": "object", + "description": "The Fleet resource.", + "properties": { + "properties": { + "$ref": "#/definitions/FleetProperties", + "description": "The resource-specific properties for this resource.", + "x-ms-client-flatten": true, + "x-ms-mutability": [ + "read", + "create" + ] + }, + "eTag": { + "type": "string", + "description": "If eTag is provided in the response body, it may also be provided as a header per the normal etag convention. Entity tags are used for comparing two or more entities from the same requested resource. HTTP/1.1 uses entity tags in the etag (section 14.19), If-Match (section 14.24), If-None-Match (section 14.26), and If-Range (section 14.27) header fields.", + "readOnly": true + }, + "identity": { + "$ref": "../../../../../../common-types/resource-management/v4/managedidentity.json#/definitions/ManagedServiceIdentity", + "description": "Managed identity." + } + }, + "allOf": [ + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/definitions/TrackedResource" + } + ] + }, + "FleetCredentialResult": { + "type": "object", + "description": "One credential result item.", + "properties": { + "name": { + "type": "string", + "description": "The name of the credential.", + "readOnly": true + }, + "value": { + "type": "string", + "format": "byte", + "description": "Base64-encoded Kubernetes configuration file.", + "readOnly": true + } + } + }, + "FleetCredentialResults": { + "type": "object", + "description": "The Credential results response.", + "properties": { + "kubeconfigs": { + "type": "array", + "description": "Array of base64-encoded Kubernetes configuration files.", + "items": { + "$ref": "#/definitions/FleetCredentialResult" + }, + "readOnly": true, + "x-ms-identifiers": [ + "name" + ] + } + } + }, + "FleetHubProfile": { + "type": "object", + "description": "The FleetHubProfile configures the fleet hub.", + "properties": { + "dnsPrefix": { + "type": "string", + "description": "DNS prefix used to create the FQDN for the Fleet hub.", + "minLength": 1, + "maxLength": 54, + "pattern": "^[a-zA-Z0-9]$|^[a-zA-Z0-9][a-zA-Z0-9-]{0,52}[a-zA-Z0-9]$", + "x-ms-mutability": [ + "read", + "create" + ] + }, + "apiServerAccessProfile": { + "$ref": "#/definitions/APIServerAccessProfile", + "description": "The access profile for the Fleet hub API server.", + "x-ms-mutability": [ + "read", + "create" + ] + }, + "agentProfile": { + "$ref": "#/definitions/AgentProfile", + "description": "The agent profile for the Fleet hub.", + "x-ms-mutability": [ + "read", + "create" + ] + }, + "fqdn": { + "type": "string", + "description": "The FQDN of the Fleet hub.", + "readOnly": true + }, + "kubernetesVersion": { + "type": "string", + "description": "The Kubernetes version of the Fleet hub.", + "readOnly": true + }, + "vmSize": { + "type": "string", + "description": "The virtual machine size of the Fleet hub.", + "x-ms-mutability": [ + "read", + "create" + ] + } + } + }, + "FleetListResult": { + "type": "object", + "description": "The response of a Fleet list operation.", + "properties": { + "value": { + "type": "array", + "description": "The Fleet items on this page", + "items": { + "$ref": "#/definitions/Fleet" + } + }, + "nextLink": { + "type": "string", + "format": "uri", + "description": "The link to the next page of items" + } + }, + "required": [ + "value" + ] + }, + "FleetMember": { + "type": "object", + "description": "A member of the Fleet. It contains a reference to an existing Kubernetes cluster on Azure.", + "properties": { + "properties": { + "$ref": "#/definitions/FleetMemberProperties", + "description": "The resource-specific properties for this resource.", + "x-ms-client-flatten": true, + "x-ms-mutability": [ + "read", + "create" + ] + }, + "eTag": { + "type": "string", + "description": "If eTag is provided in the response body, it may also be provided as a header per the normal etag convention. Entity tags are used for comparing two or more entities from the same requested resource. HTTP/1.1 uses entity tags in the etag (section 14.19), If-Match (section 14.24), If-None-Match (section 14.26), and If-Range (section 14.27) header fields.", + "readOnly": true + } + }, + "allOf": [ + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource" + } + ] + }, + "FleetMemberListResult": { + "type": "object", + "description": "The response of a FleetMember list operation.", + "properties": { + "value": { + "type": "array", + "description": "The FleetMember items on this page", + "items": { + "$ref": "#/definitions/FleetMember" + } + }, + "nextLink": { + "type": "string", + "format": "uri", + "description": "The link to the next page of items" + } + }, + "required": [ + "value" + ] + }, + "FleetMemberProperties": { + "type": "object", + "description": "A member of the Fleet. It contains a reference to an existing Kubernetes cluster on Azure.", + "properties": { + "clusterResourceId": { + "$ref": "#/definitions/ClusterResourceId", + "description": "The ARM resource id of the cluster that joins the Fleet. Must be a valid Azure resource id. e.g.: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{clusterName}'.", + "x-ms-mutability": [ + "read", + "create" + ] + }, + "group": { + "type": "string", + "description": "The group this member belongs to for multi-cluster update management.", + "minLength": 1, + "maxLength": 50, + "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" + }, + "provisioningState": { + "$ref": "#/definitions/FleetMemberProvisioningState", + "description": "The status of the last operation.", + "readOnly": true + } + }, + "required": [ + "clusterResourceId" + ] + }, + "FleetMemberProvisioningState": { + "type": "string", + "description": "The provisioning state of the last accepted operation.", + "enum": [ + "Succeeded", + "Failed", + "Canceled", + "Joining", + "Leaving", + "Updating" + ], + "x-ms-enum": { + "name": "FleetMemberProvisioningState", + "modelAsString": true, + "values": [ + { + "name": "Succeeded", + "value": "Succeeded", + "description": "Resource has been created." + }, + { + "name": "Failed", + "value": "Failed", + "description": "Resource creation failed." + }, + { + "name": "Canceled", + "value": "Canceled", + "description": "Resource creation was canceled." + }, + { + "name": "Joining", + "value": "Joining", + "description": "The provisioning state of a member joining a fleet." + }, + { + "name": "Leaving", + "value": "Leaving", + "description": "The provisioning state of a member leaving a fleet." + }, + { + "name": "Updating", + "value": "Updating", + "description": "The provisioning state of a member being updated." + } + ] + } + }, + "FleetMemberUpdate": { + "type": "object", + "description": "The type used for update operations of the FleetMember.", + "properties": { + "properties": { + "$ref": "#/definitions/FleetMemberUpdateProperties", + "x-ms-client-flatten": true + } + } + }, + "FleetMemberUpdateProperties": { + "type": "object", + "description": "The updatable properties of the FleetMember.", + "properties": { + "group": { + "type": "string", + "description": "The group this member belongs to for multi-cluster update management.", + "minLength": 1, + "maxLength": 50, + "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" + } + } + }, + "FleetPatch": { + "type": "object", + "description": "Properties of a Fleet that can be patched.", + "properties": { + "tags": { + "type": "object", + "description": "Resource tags.", + "additionalProperties": { + "type": "string" + } + }, + "identity": { + "$ref": "../../../../../../common-types/resource-management/v4/managedidentity.json#/definitions/ManagedServiceIdentity", + "description": "Managed identity." + } + } + }, + "FleetProperties": { + "type": "object", + "description": "Fleet properties.", + "properties": { + "provisioningState": { + "$ref": "#/definitions/FleetProvisioningState", + "description": "The status of the last operation.", + "readOnly": true + }, + "hubProfile": { + "$ref": "#/definitions/FleetHubProfile", + "description": "The FleetHubProfile configures the Fleet's hub." + } + } + }, + "FleetProvisioningState": { + "type": "string", + "description": "The provisioning state of the last accepted operation.", + "enum": [ + "Succeeded", + "Failed", + "Canceled", + "Creating", + "Updating", + "Deleting" + ], + "x-ms-enum": { + "name": "FleetProvisioningState", + "modelAsString": true, + "values": [ + { + "name": "Succeeded", + "value": "Succeeded", + "description": "Resource has been created." + }, + { + "name": "Failed", + "value": "Failed", + "description": "Resource creation failed." + }, + { + "name": "Canceled", + "value": "Canceled", + "description": "Resource creation was canceled." + }, + { + "name": "Creating", + "value": "Creating", + "description": "The provisioning state of a fleet being created." + }, + { + "name": "Updating", + "value": "Updating", + "description": "The provisioning state of a fleet being updated." + }, + { + "name": "Deleting", + "value": "Deleting", + "description": "The provisioning state of a fleet being deleted." + } + ] + } + }, + "FleetUpdateStrategy": { + "type": "object", + "description": "Defines a multi-stage process to perform update operations across members of a Fleet.", + "properties": { + "properties": { + "$ref": "#/definitions/FleetUpdateStrategyProperties", + "description": "The resource-specific properties for this resource.", + "x-ms-client-flatten": true, + "x-ms-mutability": [ + "read", + "create" + ] + }, + "eTag": { + "type": "string", + "description": "If eTag is provided in the response body, it may also be provided as a header per the normal etag convention. Entity tags are used for comparing two or more entities from the same requested resource. HTTP/1.1 uses entity tags in the etag (section 14.19), If-Match (section 14.24), If-None-Match (section 14.26), and If-Range (section 14.27) header fields.", + "readOnly": true + } + }, + "allOf": [ + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource" + } + ] + }, + "FleetUpdateStrategyListResult": { + "type": "object", + "description": "The response of a FleetUpdateStrategy list operation.", + "properties": { + "value": { + "type": "array", + "description": "The FleetUpdateStrategy items on this page", + "items": { + "$ref": "#/definitions/FleetUpdateStrategy" + } + }, + "nextLink": { + "type": "string", + "format": "uri", + "description": "The link to the next page of items" + } + }, + "required": [ + "value" + ] + }, + "FleetUpdateStrategyProperties": { + "type": "object", + "description": "The properties of the UpdateStrategy.", + "properties": { + "provisioningState": { + "$ref": "#/definitions/FleetUpdateStrategyProvisioningState", + "description": "The provisioning state of the UpdateStrategy resource.", + "readOnly": true + }, + "strategy": { + "$ref": "#/definitions/UpdateRunStrategy", + "description": "Defines the update sequence of the clusters.", + "x-ms-mutability": [ + "read", + "update", + "create" + ] + } + }, + "required": [ + "strategy" + ] + }, + "FleetUpdateStrategyProvisioningState": { + "type": "string", + "description": "The provisioning state of the UpdateStrategy resource.", + "enum": [ + "Succeeded", + "Failed", + "Canceled" + ], + "x-ms-enum": { + "name": "FleetUpdateStrategyProvisioningState", + "modelAsString": true, + "values": [ + { + "name": "Succeeded", + "value": "Succeeded", + "description": "Resource has been created." + }, + { + "name": "Failed", + "value": "Failed", + "description": "Resource creation failed." + }, + { + "name": "Canceled", + "value": "Canceled", + "description": "Resource creation was canceled." + } + ] + } + }, + "FleetUpdateStrategyResourceId": { + "type": "string", + "format": "arm-id", + "description": "A type definition that refers the id to an ARM resource.", + "x-ms-arm-id-details": { + "allowedResources": [ + { + "type": "Microsoft.ContainerService/fleets/updateStrategies" + } + ] + } + }, + "KubernetesVersion": { + "type": "string" + }, + "ManagedClusterUpdate": { + "type": "object", + "description": "The update to be applied to the ManagedClusters.", + "properties": { + "upgrade": { + "$ref": "#/definitions/ManagedClusterUpgradeSpec", + "description": "The upgrade to apply to the ManagedClusters." + }, + "nodeImageSelection": { + "$ref": "#/definitions/NodeImageSelection", + "description": "The node image upgrade to be applied to the target nodes in update run.", + "x-ms-mutability": [ + "read", + "create" + ] + } + }, + "required": [ + "upgrade" + ] + }, + "ManagedClusterUpgradeSpec": { + "type": "object", + "description": "The upgrade to apply to a ManagedCluster.", + "properties": { + "type": { + "$ref": "#/definitions/ManagedClusterUpgradeType", + "description": "The upgrade type.\nFull requires the KubernetesVersion property to be set.\nNodeImageOnly requires the KubernetesVersion property not to be set." + }, + "kubernetesVersion": { + "$ref": "#/definitions/KubernetesVersion", + "description": "The Kubernetes version to upgrade the member clusters to." + } + }, + "required": [ + "type" + ] + }, + "ManagedClusterUpgradeType": { + "type": "string", + "description": "The type of upgrade to perform when targeting ManagedClusters.", + "enum": [ + "Full", + "NodeImageOnly" + ], + "x-ms-enum": { + "name": "ManagedClusterUpgradeType", + "modelAsString": true, + "values": [ + { + "name": "Full", + "value": "Full", + "description": "Full upgrades the control plane and all agent pools of the target ManagedClusters." + }, + { + "name": "NodeImageOnly", + "value": "NodeImageOnly", + "description": "NodeImageOnly upgrades only the node images of the target ManagedClusters." + } + ] + } + }, + "MemberUpdateStatus": { + "type": "object", + "description": "The status of a member update operation.", + "properties": { + "status": { + "$ref": "#/definitions/UpdateStatus", + "description": "The status of the MemberUpdate operation.", + "readOnly": true + }, + "name": { + "type": "string", + "description": "The name of the FleetMember.", + "readOnly": true + }, + "clusterResourceId": { + "type": "string", + "description": "The Azure resource id of the target Kubernetes cluster.", + "readOnly": true + }, + "operationId": { + "type": "string", + "description": "The operation resource id of the latest attempt to perform the operation.", + "readOnly": true + }, + "message": { + "type": "string", + "description": "The status message after processing the member update operation.", + "readOnly": true + } + } + }, + "NodeImageSelection": { + "type": "object", + "description": "The node image upgrade to be applied to the target nodes in update run.", + "properties": { + "type": { + "$ref": "#/definitions/NodeImageSelectionType", + "description": "The node image upgrade type.", + "x-ms-mutability": [ + "read", + "create" + ] + } + }, + "required": [ + "type" + ] + }, + "NodeImageSelectionStatus": { + "type": "object", + "description": "The node image upgrade specs for the update run.", + "properties": { + "selectedNodeImageVersions": { + "type": "array", + "description": "The image versions to upgrade the nodes to.", + "items": { + "$ref": "#/definitions/NodeImageVersion" + }, + "readOnly": true, + "x-ms-identifiers": [ + "version" + ] + } + } + }, + "NodeImageSelectionType": { + "type": "string", + "description": "The node image upgrade type.", + "enum": [ + "Latest", + "Consistent" + ], + "x-ms-enum": { + "name": "NodeImageSelectionType", + "modelAsString": true, + "values": [ + { + "name": "Latest", + "value": "Latest", + "description": "Use the latest image version when upgrading nodes. Clusters may use different image versions (e.g., 'AKSUbuntu-1804gen2containerd-2021.10.12' and 'AKSUbuntu-1804gen2containerd-2021.10.19') because, for example, the latest available version is different in different regions." + }, + { + "name": "Consistent", + "value": "Consistent", + "description": "The image versions to upgrade nodes to are selected as described below: for each node pool in managed clusters affected by the update run, the system selects the latest image version such that it is available across all other node pools (in all other clusters) of the same image type. As a result, all node pools of the same image type will be upgraded to the same image version. For example, if the latest image version for image type 'AKSUbuntu-1804gen2containerd' is 'AKSUbuntu-1804gen2containerd-2021.10.12' for a node pool in cluster A in region X, and is 'AKSUbuntu-1804gen2containerd-2021.10.17' for a node pool in cluster B in region Y, the system will upgrade both node pools to image version 'AKSUbuntu-1804gen2containerd-2021.10.12'." + } + ] + } + }, + "NodeImageVersion": { + "type": "object", + "description": "The node upgrade image version.", + "properties": { + "version": { + "type": "string", + "description": "The image version to upgrade the nodes to (e.g., 'AKSUbuntu-1804gen2containerd-2022.12.13').", + "readOnly": true + } + } + }, + "SubnetResourceId": { + "type": "string", + "format": "arm-id", + "description": "A type definition that refers the id to an ARM resource.", + "x-ms-arm-id-details": { + "allowedResources": [ + { + "type": "Microsoft.Network/virtualNetworks/subnets" + } + ] + } + }, + "UpdateGroup": { + "type": "object", + "description": "A group to be updated.", + "properties": { + "name": { + "type": "string", + "description": "Name of the group.\nIt must match a group name of an existing fleet member. ", + "minLength": 1, + "maxLength": 50, + "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" + } + }, + "required": [ + "name" + ] + }, + "UpdateGroupStatus": { + "type": "object", + "description": "The status of a UpdateGroup.", + "properties": { + "status": { + "$ref": "#/definitions/UpdateStatus", + "description": "The status of the UpdateGroup.", + "readOnly": true + }, + "name": { + "type": "string", + "description": "The name of the UpdateGroup.", + "readOnly": true + }, + "members": { + "type": "array", + "description": "The list of member this UpdateGroup updates.", + "items": { + "$ref": "#/definitions/MemberUpdateStatus" + }, + "readOnly": true, + "x-ms-identifiers": [ + "name" + ] + } + } + }, + "UpdateRun": { + "type": "object", + "description": "A multi-stage process to perform update operations across members of a Fleet.", + "properties": { + "properties": { + "$ref": "#/definitions/UpdateRunProperties", + "description": "The resource-specific properties for this resource.", + "x-ms-client-flatten": true, + "x-ms-mutability": [ + "read", + "create" + ] + }, + "eTag": { + "type": "string", + "description": "If eTag is provided in the response body, it may also be provided as a header per the normal etag convention. Entity tags are used for comparing two or more entities from the same requested resource. HTTP/1.1 uses entity tags in the etag (section 14.19), If-Match (section 14.24), If-None-Match (section 14.26), and If-Range (section 14.27) header fields.", + "readOnly": true + } + }, + "allOf": [ + { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource" + } + ] + }, + "UpdateRunListResult": { + "type": "object", + "description": "The response of a UpdateRun list operation.", + "properties": { + "value": { + "type": "array", + "description": "The UpdateRun items on this page", + "items": { + "$ref": "#/definitions/UpdateRun" + } + }, + "nextLink": { + "type": "string", + "format": "uri", + "description": "The link to the next page of items" + } + }, + "required": [ + "value" + ] + }, + "UpdateRunProperties": { + "type": "object", + "description": "The properties of the UpdateRun.", + "properties": { + "provisioningState": { + "$ref": "#/definitions/UpdateRunProvisioningState", + "description": "The provisioning state of the UpdateRun resource.", + "readOnly": true + }, + "updateStrategyId": { + "$ref": "#/definitions/FleetUpdateStrategyResourceId", + "description": "The resource id of the FleetUpdateStrategy resource to reference.\n\nWhen creating a new run, there are three ways to define a strategy for the run:\n1. Define a new strategy in place: Set the \"strategy\" field.\n2. Use an existing strategy: Set the \"updateStrategyId\" field. (since 2023-08-15-preview)\n3. Use the default strategy to update all the members one by one: Leave both \"updateStrategyId\" and \"strategy\" unset. (since 2023-08-15-preview)\n\nSetting both \"updateStrategyId\" and \"strategy\" is invalid.\n\nUpdateRuns created by \"updateStrategyId\" snapshot the referenced UpdateStrategy at the time of creation and store it in the \"strategy\" field. \nSubsequent changes to the referenced FleetUpdateStrategy resource do not propagate. \nUpdateRunStrategy changes can be made directly on the \"strategy\" field before launching the UpdateRun." + }, + "strategy": { + "$ref": "#/definitions/UpdateRunStrategy", + "description": "The strategy defines the order in which the clusters will be updated. \nIf not set, all members will be updated sequentially. The UpdateRun status will show a single UpdateStage and a single UpdateGroup targeting all members.\nThe strategy of the UpdateRun can be modified until the run is started." + }, + "managedClusterUpdate": { + "$ref": "#/definitions/ManagedClusterUpdate", + "description": "The update to be applied to all clusters in the UpdateRun. The managedClusterUpdate can be modified until the run is started." + }, + "status": { + "$ref": "#/definitions/UpdateRunStatus", + "description": "The status of the UpdateRun.", + "readOnly": true + } + }, + "required": [ + "managedClusterUpdate" + ] + }, + "UpdateRunProvisioningState": { + "type": "string", + "description": "The provisioning state of the UpdateRun resource.", + "enum": [ + "Succeeded", + "Failed", + "Canceled" + ], + "x-ms-enum": { + "name": "UpdateRunProvisioningState", + "modelAsString": true, + "values": [ + { + "name": "Succeeded", + "value": "Succeeded", + "description": "Resource has been created." + }, + { + "name": "Failed", + "value": "Failed", + "description": "Resource creation failed." + }, + { + "name": "Canceled", + "value": "Canceled", + "description": "Resource creation was canceled." + } + ] + } + }, + "UpdateRunStatus": { + "type": "object", + "description": "The status of a UpdateRun.", + "properties": { + "status": { + "$ref": "#/definitions/UpdateStatus", + "description": "The status of the UpdateRun.", + "readOnly": true + }, + "stages": { + "type": "array", + "description": "The stages composing an update run. Stages are run sequentially withing an UpdateRun.", + "items": { + "$ref": "#/definitions/UpdateStageStatus" + }, + "readOnly": true, + "x-ms-identifiers": [ + "name" + ] + }, + "nodeImageSelection": { + "$ref": "#/definitions/NodeImageSelectionStatus", + "description": "The node image upgrade specs for the update run. It is only set in update run when `NodeImageSelection.type` is `Consistent`.", + "readOnly": true + } + } + }, + "UpdateRunStrategy": { + "type": "object", + "description": "Defines the update sequence of the clusters via stages and groups.\n\nStages within a run are executed sequentially one after another.\nGroups within a stage are executed in parallel.\nMember clusters within a group are updated sequentially one after another.\n\nA valid strategy contains no duplicate groups within or across stages.", + "properties": { + "stages": { + "type": "array", + "description": "The list of stages that compose this update run. Min size: 1.", + "items": { + "$ref": "#/definitions/UpdateStage" + }, + "x-ms-identifiers": [ + "name" + ] + } + }, + "required": [ + "stages" + ] + }, + "UpdateStage": { + "type": "object", + "description": "Defines a stage which contains the groups to update and the steps to take (e.g., wait for a time period) before starting the next stage.", + "properties": { + "name": { + "type": "string", + "description": "The name of the stage. Must be unique within the UpdateRun.", + "minLength": 1, + "maxLength": 50, + "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" + }, + "groups": { + "type": "array", + "description": "Defines the groups to be executed in parallel in this stage. Duplicate groups are not allowed. Min size: 1.", + "items": { + "$ref": "#/definitions/UpdateGroup" + }, + "x-ms-identifiers": [ + "name" + ] + }, + "afterStageWaitInSeconds": { + "type": "integer", + "format": "int32", + "description": "The time in seconds to wait at the end of this stage before starting the next one. Defaults to 0 seconds if unspecified." + } + }, + "required": [ + "name" + ] + }, + "UpdateStageStatus": { + "type": "object", + "description": "The status of a UpdateStage.", + "properties": { + "status": { + "$ref": "#/definitions/UpdateStatus", + "description": "The status of the UpdateStage.", + "readOnly": true + }, + "name": { + "type": "string", + "description": "The name of the UpdateStage.", + "readOnly": true + }, + "groups": { + "type": "array", + "description": "The list of groups to be updated as part of this UpdateStage.", + "items": { + "$ref": "#/definitions/UpdateGroupStatus" + }, + "readOnly": true, + "x-ms-identifiers": [ + "name" + ] + }, + "afterStageWaitStatus": { + "$ref": "#/definitions/WaitStatus", + "description": "The status of the wait period configured on the UpdateStage.", + "readOnly": true + } + } + }, + "UpdateState": { + "type": "string", + "description": "The state of the UpdateRun, UpdateStage, UpdateGroup, or MemberUpdate.", + "enum": [ + "NotStarted", + "Running", + "Stopping", + "Stopped", + "Skipped", + "Failed", + "Completed" + ], + "x-ms-enum": { + "name": "UpdateState", + "modelAsString": true, + "values": [ + { + "name": "NotStarted", + "value": "NotStarted", + "description": "The state of an UpdateRun/UpdateStage/UpdateGroup/MemberUpdate that has not been started." + }, + { + "name": "Running", + "value": "Running", + "description": "The state of an UpdateRun/UpdateStage/UpdateGroup/MemberUpdate that is running." + }, + { + "name": "Stopping", + "value": "Stopping", + "description": "The state of an UpdateRun/UpdateStage/UpdateGroup/MemberUpdate that is being stopped." + }, + { + "name": "Stopped", + "value": "Stopped", + "description": "The state of an UpdateRun/UpdateStage/UpdateGroup/MemberUpdate that has stopped." + }, + { + "name": "Skipped", + "value": "Skipped", + "description": "The state of an UpdateRun/UpdateStage/UpdateGroup/MemberUpdate that has been skipped." + }, + { + "name": "Failed", + "value": "Failed", + "description": "The state of an UpdateRun/UpdateStage/UpdateGroup/MemberUpdate that has failed." + }, + { + "name": "Completed", + "value": "Completed", + "description": "The state of an UpdateRun/UpdateStage/UpdateGroup/MemberUpdate that has completed." + } + ] + } + }, + "UpdateStatus": { + "type": "object", + "description": "The status for an operation or group of operations.", + "properties": { + "startTime": { + "type": "string", + "format": "date-time", + "description": "The time the operation or group was started.", + "readOnly": true + }, + "completedTime": { + "type": "string", + "format": "date-time", + "description": "The time the operation or group was completed.", + "readOnly": true + }, + "state": { + "$ref": "#/definitions/UpdateState", + "description": "The State of the operation or group.", + "readOnly": true + }, + "error": { + "$ref": "../../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorDetail", + "description": "The error details when a failure is encountered.", + "readOnly": true + } + } + }, + "WaitStatus": { + "type": "object", + "description": "The status of the wait duration.", + "properties": { + "status": { + "$ref": "#/definitions/UpdateStatus", + "description": "The status of the wait duration.", + "readOnly": true + }, + "waitDurationInSeconds": { + "type": "integer", + "format": "int32", + "description": "The wait duration configured in seconds.", + "readOnly": true + } + } + } + }, + "parameters": {} +} From 782b79e664b28b2985057018d8a673dcbe4a650a Mon Sep 17 00:00:00 2001 From: zman-ms Date: Tue, 12 Sep 2023 16:16:40 -0700 Subject: [PATCH 11/16] fixed example --- .../Fleet.Management/examples/2023-10-15/Operations_List.json | 2 +- .../fleet/stable/2023-10-15/examples/Operations_List.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/containerservice/Fleet.Management/examples/2023-10-15/Operations_List.json b/specification/containerservice/Fleet.Management/examples/2023-10-15/Operations_List.json index cdc0a85b3463..79a40171ea2c 100644 --- a/specification/containerservice/Fleet.Management/examples/2023-10-15/Operations_List.json +++ b/specification/containerservice/Fleet.Management/examples/2023-10-15/Operations_List.json @@ -2,7 +2,7 @@ "operationId": "Operations_List", "title": "List the operations for the provider.", "parameters": { - "api-version": "2023-08-15-preview" + "api-version": "2023-10-15" }, "responses": { "200": { diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/Operations_List.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/Operations_List.json index cdc0a85b3463..79a40171ea2c 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/Operations_List.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/Operations_List.json @@ -2,7 +2,7 @@ "operationId": "Operations_List", "title": "List the operations for the provider.", "parameters": { - "api-version": "2023-08-15-preview" + "api-version": "2023-10-15" }, "responses": { "200": { From ac92c38fd0937b46fafb5bfd568155bb5ae007ef Mon Sep 17 00:00:00 2001 From: zman-ms Date: Tue, 12 Sep 2023 16:24:29 -0700 Subject: [PATCH 12/16] fix example --- .../examples/2023-10-15/FleetMembers_Get.json | 2 +- .../2023-10-15/FleetMembers_ListByFleet.json | 2 +- .../Fleet.Management/fleet.tsp | 1 + .../2023-10-15/examples/FleetMembers_Get.json | 2 +- .../examples/FleetMembers_ListByFleet.json | 2 +- .../fleet/stable/2023-10-15/fleets.json | 111 ------------------ 6 files changed, 5 insertions(+), 115 deletions(-) diff --git a/specification/containerservice/Fleet.Management/examples/2023-10-15/FleetMembers_Get.json b/specification/containerservice/Fleet.Management/examples/2023-10-15/FleetMembers_Get.json index 066e27aa6bdf..77c580fbd7bd 100644 --- a/specification/containerservice/Fleet.Management/examples/2023-10-15/FleetMembers_Get.json +++ b/specification/containerservice/Fleet.Management/examples/2023-10-15/FleetMembers_Get.json @@ -2,7 +2,7 @@ "operationId": "FleetMembers_Get", "title": "Gets a FleetMember resource.", "parameters": { - "api-version": "2023-08-15-preview", + "api-version": "2023-10-15", "subscriptionId": "subid1", "resourceGroupName": "rg1", "fleetName": "fleet1", diff --git a/specification/containerservice/Fleet.Management/examples/2023-10-15/FleetMembers_ListByFleet.json b/specification/containerservice/Fleet.Management/examples/2023-10-15/FleetMembers_ListByFleet.json index d94d94675ce8..045e2ba3f962 100644 --- a/specification/containerservice/Fleet.Management/examples/2023-10-15/FleetMembers_ListByFleet.json +++ b/specification/containerservice/Fleet.Management/examples/2023-10-15/FleetMembers_ListByFleet.json @@ -2,7 +2,7 @@ "operationId": "FleetMembers_ListByFleet", "title": "Lists the members of a Fleet.", "parameters": { - "api-version": "2023-08-15-preview", + "api-version": "2023-10-15", "subscriptionId": "subid1", "resourceGroupName": "rg1", "fleetName": "fleet1" diff --git a/specification/containerservice/Fleet.Management/fleet.tsp b/specification/containerservice/Fleet.Management/fleet.tsp index 0205267721d1..d491000b04cc 100644 --- a/specification/containerservice/Fleet.Management/fleet.tsp +++ b/specification/containerservice/Fleet.Management/fleet.tsp @@ -49,6 +49,7 @@ model FleetProperties { provisioningState?: FleetProvisioningState; @doc("The FleetHubProfile configures the Fleet's hub.") + @removed(Versions.v2023_10_15) hubProfile?: FleetHubProfile; } diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/FleetMembers_Get.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/FleetMembers_Get.json index 066e27aa6bdf..77c580fbd7bd 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/FleetMembers_Get.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/FleetMembers_Get.json @@ -2,7 +2,7 @@ "operationId": "FleetMembers_Get", "title": "Gets a FleetMember resource.", "parameters": { - "api-version": "2023-08-15-preview", + "api-version": "2023-10-15", "subscriptionId": "subid1", "resourceGroupName": "rg1", "fleetName": "fleet1", diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/FleetMembers_ListByFleet.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/FleetMembers_ListByFleet.json index d94d94675ce8..045e2ba3f962 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/FleetMembers_ListByFleet.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/examples/FleetMembers_ListByFleet.json @@ -2,7 +2,7 @@ "operationId": "FleetMembers_ListByFleet", "title": "Lists the members of a Fleet.", "parameters": { - "api-version": "2023-08-15-preview", + "api-version": "2023-10-15", "subscriptionId": "subid1", "resourceGroupName": "rg1", "fleetName": "fleet1" diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/fleets.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/fleets.json index 31d83ca7ba19..e1feabef7a95 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/fleets.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/stable/2023-10-15/fleets.json @@ -1658,50 +1658,6 @@ } }, "definitions": { - "APIServerAccessProfile": { - "type": "object", - "description": "Access profile for the Fleet hub API server.", - "properties": { - "enablePrivateCluster": { - "type": "boolean", - "description": "Whether to create the Fleet hub as a private cluster or not.", - "x-ms-mutability": [ - "read", - "create" - ] - }, - "enableVnetIntegration": { - "type": "boolean", - "description": "Whether to enable apiserver vnet integration for the Fleet hub or not.", - "x-ms-mutability": [ - "read", - "create" - ] - }, - "subnetId": { - "$ref": "#/definitions/SubnetResourceId", - "description": "The subnet to be used when apiserver vnet integration is enabled. It is required when creating a new Fleet with BYO vnet.", - "x-ms-mutability": [ - "read", - "create" - ] - } - } - }, - "AgentProfile": { - "type": "object", - "description": "Agent profile for the Fleet hub.", - "properties": { - "subnetId": { - "$ref": "#/definitions/SubnetResourceId", - "description": "The ID of the subnet which the Fleet hub node will join on startup. If this is not specified, a vnet and subnet will be generated and used.", - "x-ms-mutability": [ - "read", - "create" - ] - } - } - }, "ClusterResourceId": { "type": "string", "format": "arm-id", @@ -1777,57 +1733,6 @@ } } }, - "FleetHubProfile": { - "type": "object", - "description": "The FleetHubProfile configures the fleet hub.", - "properties": { - "dnsPrefix": { - "type": "string", - "description": "DNS prefix used to create the FQDN for the Fleet hub.", - "minLength": 1, - "maxLength": 54, - "pattern": "^[a-zA-Z0-9]$|^[a-zA-Z0-9][a-zA-Z0-9-]{0,52}[a-zA-Z0-9]$", - "x-ms-mutability": [ - "read", - "create" - ] - }, - "apiServerAccessProfile": { - "$ref": "#/definitions/APIServerAccessProfile", - "description": "The access profile for the Fleet hub API server.", - "x-ms-mutability": [ - "read", - "create" - ] - }, - "agentProfile": { - "$ref": "#/definitions/AgentProfile", - "description": "The agent profile for the Fleet hub.", - "x-ms-mutability": [ - "read", - "create" - ] - }, - "fqdn": { - "type": "string", - "description": "The FQDN of the Fleet hub.", - "readOnly": true - }, - "kubernetesVersion": { - "type": "string", - "description": "The Kubernetes version of the Fleet hub.", - "readOnly": true - }, - "vmSize": { - "type": "string", - "description": "The virtual machine size of the Fleet hub.", - "x-ms-mutability": [ - "read", - "create" - ] - } - } - }, "FleetListResult": { "type": "object", "description": "The response of a Fleet list operation.", @@ -2020,10 +1925,6 @@ "$ref": "#/definitions/FleetProvisioningState", "description": "The status of the last operation.", "readOnly": true - }, - "hubProfile": { - "$ref": "#/definitions/FleetHubProfile", - "description": "The FleetHubProfile configures the Fleet's hub." } } }, @@ -2351,18 +2252,6 @@ } } }, - "SubnetResourceId": { - "type": "string", - "format": "arm-id", - "description": "A type definition that refers the id to an ARM resource.", - "x-ms-arm-id-details": { - "allowedResources": [ - { - "type": "Microsoft.Network/virtualNetworks/subnets" - } - ] - } - }, "UpdateGroup": { "type": "object", "description": "A group to be updated.", From 31617d93d2d73682295a8fa356c1aaf50c22dd9b Mon Sep 17 00:00:00 2001 From: zman-ms Date: Tue, 12 Sep 2023 16:32:26 -0700 Subject: [PATCH 13/16] fix readme --- .../Microsoft.ContainerService/fleet/readme.go.md | 1 + .../fleet/readme.java.md | 14 ++++++++++++++ .../fleet/readme.python.md | 10 ++++++++++ 3 files changed, 25 insertions(+) diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/readme.go.md b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/readme.go.md index 4ea2aea002f7..d9d1fcdf95b1 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/readme.go.md +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/readme.go.md @@ -20,6 +20,7 @@ azure-arm: true ``` yaml $(go) && $(multiapi) batch: + - tag: package-2023-10 - tag: package-2023-08-preview - tag: package-2023-06-preview - tag: package-2023-03-preview diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/readme.java.md b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/readme.java.md index 477169cb9922..268b3c838764 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/readme.java.md +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/readme.java.md @@ -18,6 +18,7 @@ description: "Azure Kubernetes Fleet Manager Client" ``` yaml $(java) && $(multiapi) batch: + - tag: package-2023-10 - tag: package-2023-08-preview - tag: package-2023-06-preview - tag: package-2023-03-preview @@ -26,6 +27,19 @@ batch: - tag: package-2022-06-preview ``` +### Tag: package-2023-10 and java + +These settings apply only when `--tag=package-2023-10` is specified on the command line. +Please also specify `--azure-libraries-for-java-folder=`. + +``` yaml $(tag) == 'package-2023-10' && $(java) && $(multiapi) +java: + namespace: com.microsoft.azure.management.containerservicefleet.v2023_10_15 + output-folder: $(azure-libraries-for-java-folder)/sdk/containerservice/mgmt-v2023_10_15 +regenerate-manager: true +generate-interface: true +``` + ### Tag: package-2023-08-preview and java These settings apply only when `--tag=package-2023-08-preview` is specified on the command line. diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/readme.python.md b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/readme.python.md index 3f3e491b2cbd..d3d0286e0f53 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/readme.python.md +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/readme.python.md @@ -20,6 +20,7 @@ Generate all API versions currently shipped for this package default-api-version: "2023-08-15-preview" multiapi: true batch: + - tag: package-2023-10 - tag: package-2023-08-preview - tag: package-2023-06-preview - tag: package-2023-03-preview @@ -34,6 +35,15 @@ output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservic clear-output-folder: false perform-load: false ``` +### Tag: package-2023-10 and python + +These settings apply only when `--tag=package-2023-10 --python` is specified on the command line. +Please also specify `--python-sdks-folder=`. + +``` yaml $(tag) == 'package-2023-10' && $(python) +namespace: azure.mgmt.containerservicefleet.v2023_10_15 +output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservicefleet/azure/mgmt/containerservicefleet/v2023_10_15 +``` ### Tag: package-2023-08-preview and python From 25ab66cbfe346797d7705d4626a0333ef6077369 Mon Sep 17 00:00:00 2001 From: zman-ms Date: Mon, 18 Sep 2023 12:31:42 -0700 Subject: [PATCH 14/16] rebase --- .../Microsoft.ContainerService/fleet/readme.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/readme.md b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/readme.md index bb0e0b0a1386..677fe4a7bf6d 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/readme.md +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/readme.md @@ -27,9 +27,17 @@ These are the global settings for the ContainerServices API. ``` yaml openapi-type: arm -tag: package-2023-08-preview +tag: package-2023-10 ``` +### Tag: package-2023-10 + +These settings apply only when `--tag=package-2023-10` is specified on the command line. + +```yaml $(tag) == 'package-2023-10' +input-file: + - stable/2023-10-15/fleets.json +``` ### Tag: package-2023-08-preview From ba7d26250a633f6fabac06aecdc6dc2f8367e38f Mon Sep 17 00:00:00 2001 From: zman-ms Date: Thu, 14 Sep 2023 17:30:02 -0700 Subject: [PATCH 15/16] suppress versioning error --- specification/containerservice/Fleet.Management/fleet.tsp | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/containerservice/Fleet.Management/fleet.tsp b/specification/containerservice/Fleet.Management/fleet.tsp index d491000b04cc..7efa396acd38 100644 --- a/specification/containerservice/Fleet.Management/fleet.tsp +++ b/specification/containerservice/Fleet.Management/fleet.tsp @@ -48,6 +48,7 @@ model FleetProperties { @doc("The status of the last operation.") provisioningState?: FleetProvisioningState; + #suppress "@azure-tools/typespec-providerhub/non-breaking-versioning" "https://github.com/Azure/typespec-azure/issues/3558" @doc("The FleetHubProfile configures the Fleet's hub.") @removed(Versions.v2023_10_15) hubProfile?: FleetHubProfile; From 4df12989532bc0bc628ba09157705fec5db30f29 Mon Sep 17 00:00:00 2001 From: zman-ms Date: Tue, 26 Sep 2023 14:30:04 -0700 Subject: [PATCH 16/16] compile --- .../examples/FleetMembers_Create.json | 8 -- .../examples/FleetMembers_Delete.json | 8 -- .../examples/FleetMembers_Get.json | 8 -- .../examples/FleetMembers_ListByFleet.json | 8 -- .../examples/FleetMembers_Update.json | 8 -- .../examples/Fleets_CreateOrUpdate.json | 55 --------- .../examples/Fleets_Delete.json | 8 -- .../examples/Fleets_Get.json | 24 ---- .../examples/Fleets_ListByResourceGroup.json | 24 ---- .../examples/Fleets_ListBySub.json | 24 ---- .../Fleets_ListCredentialsResult.json | 8 -- .../examples/Fleets_PatchTags.json | 24 ---- .../examples/Operations_List.json | 8 -- .../examples/UpdateRuns_CreateOrUpdate.json | 29 ----- .../examples/UpdateRuns_Delete.json | 8 -- .../examples/UpdateRuns_Get.json | 8 -- .../examples/UpdateRuns_ListByFleet.json | 8 -- .../examples/UpdateRuns_Start.json | 8 -- .../examples/UpdateRuns_Stop.json | 8 -- .../preview/2023-08-15-preview/fleets.json | 115 ------------------ 20 files changed, 399 deletions(-) diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Create.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Create.json index 650b8ad75758..4c13eff90052 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Create.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Create.json @@ -2,15 +2,7 @@ "operationId": "FleetMembers_Create", "title": "Creates a FleetMember resource with a long running operation.", "parameters": { -<<<<<<< HEAD -<<<<<<< HEAD "api-version": "2023-08-15-preview", -======= - "api-version": "2023-06-15-preview", ->>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) -======= - "api-version": "2023-08-15-preview", ->>>>>>> 149b98b920 (Updates API version in new specs and examples) "subscriptionId": "subid1", "resourceGroupName": "rg1", "fleetName": "fleet1", diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Delete.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Delete.json index 70a114fe67b9..329442e4975e 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Delete.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Delete.json @@ -2,15 +2,7 @@ "operationId": "FleetMembers_Delete", "title": "Deletes a FleetMember resource asynchronously with a long running operation.", "parameters": { -<<<<<<< HEAD -<<<<<<< HEAD "api-version": "2023-08-15-preview", -======= - "api-version": "2023-06-15-preview", ->>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) -======= - "api-version": "2023-08-15-preview", ->>>>>>> 149b98b920 (Updates API version in new specs and examples) "subscriptionId": "subid1", "resourceGroupName": "rg1", "fleetName": "fleet1", diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Get.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Get.json index 2b68c28c4274..066e27aa6bdf 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Get.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Get.json @@ -2,15 +2,7 @@ "operationId": "FleetMembers_Get", "title": "Gets a FleetMember resource.", "parameters": { -<<<<<<< HEAD -<<<<<<< HEAD "api-version": "2023-08-15-preview", -======= - "api-version": "2023-06-15-preview", ->>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) -======= - "api-version": "2023-08-15-preview", ->>>>>>> 149b98b920 (Updates API version in new specs and examples) "subscriptionId": "subid1", "resourceGroupName": "rg1", "fleetName": "fleet1", diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_ListByFleet.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_ListByFleet.json index 7dac8ef72be7..d94d94675ce8 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_ListByFleet.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_ListByFleet.json @@ -2,15 +2,7 @@ "operationId": "FleetMembers_ListByFleet", "title": "Lists the members of a Fleet.", "parameters": { -<<<<<<< HEAD -<<<<<<< HEAD "api-version": "2023-08-15-preview", -======= - "api-version": "2023-06-15-preview", ->>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) -======= - "api-version": "2023-08-15-preview", ->>>>>>> 149b98b920 (Updates API version in new specs and examples) "subscriptionId": "subid1", "resourceGroupName": "rg1", "fleetName": "fleet1" diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Update.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Update.json index 9f48dfb7e7f1..dc4f64f91383 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Update.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/FleetMembers_Update.json @@ -2,15 +2,7 @@ "operationId": "FleetMembers_Update", "title": "Updates a FleetMember resource synchronously.", "parameters": { -<<<<<<< HEAD -<<<<<<< HEAD "api-version": "2023-08-15-preview", -======= - "api-version": "2023-06-15-preview", ->>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) -======= - "api-version": "2023-08-15-preview", ->>>>>>> 149b98b920 (Updates API version in new specs and examples) "subscriptionId": "subid1", "resourceGroupName": "rg1", "fleetName": "fleet1", diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_CreateOrUpdate.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_CreateOrUpdate.json index 2b2ddd1bf2f9..48c12421b097 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_CreateOrUpdate.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_CreateOrUpdate.json @@ -2,15 +2,7 @@ "operationId": "Fleets_CreateOrUpdate", "title": "Creates a Fleet resource with a long running operation.", "parameters": { -<<<<<<< HEAD -<<<<<<< HEAD "api-version": "2023-08-15-preview", -======= - "api-version": "2023-06-15-preview", ->>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) -======= - "api-version": "2023-08-15-preview", ->>>>>>> 149b98b920 (Updates API version in new specs and examples) "subscriptionId": "subid1", "resourceGroupName": "rg1", "fleetName": "fleet1", @@ -22,25 +14,10 @@ "location": "East US", "properties": { "hubProfile": { -<<<<<<< HEAD -<<<<<<< HEAD - "dnsPrefix": "dnsprefix1", - "agentProfile": { - "vmSize": "Standard_DS1" - } -======= - "dnsPrefix": "dnsprefix1" ->>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) -======= "dnsPrefix": "dnsprefix1", -<<<<<<< HEAD - "vmSize": "Standard_DS1" ->>>>>>> 092b424f5c ([Fleet] Add VMSize to hub profile (#25709)) -======= "agentProfile": { "vmSize": "Standard_DS1" } ->>>>>>> d158b9b8b6 ([Fleet] Move VMSize into AgentProfile (#25805)) } } } @@ -74,27 +51,11 @@ "hubProfile": { "dnsPrefix": "dnsprefix1", "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", "agentProfile": { "vmSize": "Standard_DS1" } -<<<<<<< HEAD -======= - "kubernetesVersion": "1.22.4" ->>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) -======= -======= - "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", ->>>>>>> 19e857e8a6 (Add portal FQDN to fleet hub profile (#25766)) - "kubernetesVersion": "1.22.4", - "vmSize": "Standard_DS1" ->>>>>>> 092b424f5c ([Fleet] Add VMSize to hub profile (#25709)) -======= ->>>>>>> d158b9b8b6 ([Fleet] Move VMSize into AgentProfile (#25805)) }, "provisioningState": "Updating" } @@ -128,27 +89,11 @@ "hubProfile": { "dnsPrefix": "dnsprefix1", "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", "agentProfile": { "vmSize": "Standard_DS1" } -<<<<<<< HEAD -======= - "kubernetesVersion": "1.22.4" ->>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) -======= -======= - "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", ->>>>>>> 19e857e8a6 (Add portal FQDN to fleet hub profile (#25766)) - "kubernetesVersion": "1.22.4", - "vmSize": "Standard_DS1" ->>>>>>> 092b424f5c ([Fleet] Add VMSize to hub profile (#25709)) -======= ->>>>>>> d158b9b8b6 ([Fleet] Move VMSize into AgentProfile (#25805)) }, "provisioningState": "Creating" } diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_Delete.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_Delete.json index feef16ca1c71..79b64cae3917 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_Delete.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_Delete.json @@ -2,15 +2,7 @@ "operationId": "Fleets_Delete", "title": "Deletes a Fleet resource asynchronously with a long running operation.", "parameters": { -<<<<<<< HEAD -<<<<<<< HEAD "api-version": "2023-08-15-preview", -======= - "api-version": "2023-06-15-preview", ->>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) -======= - "api-version": "2023-08-15-preview", ->>>>>>> 149b98b920 (Updates API version in new specs and examples) "subscriptionId": "subid1", "resourceGroupName": "rg1", "fleetName": "fleet1" diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_Get.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_Get.json index 7998c56a15ee..76846af0ee11 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_Get.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_Get.json @@ -2,15 +2,7 @@ "operationId": "Fleets_Get", "title": "Gets a Fleet resource.", "parameters": { -<<<<<<< HEAD -<<<<<<< HEAD "api-version": "2023-08-15-preview", -======= - "api-version": "2023-06-15-preview", ->>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) -======= - "api-version": "2023-08-15-preview", ->>>>>>> 149b98b920 (Updates API version in new specs and examples) "subscriptionId": "subid1", "resourceGroupName": "rg1", "fleetName": "fleet1" @@ -42,27 +34,11 @@ "hubProfile": { "dnsPrefix": "dnsprefix1", "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", "agentProfile": { "vmSize": "Standard_DS1" } -<<<<<<< HEAD -======= - "kubernetesVersion": "1.22.4" ->>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) -======= -======= - "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", ->>>>>>> 19e857e8a6 (Add portal FQDN to fleet hub profile (#25766)) - "kubernetesVersion": "1.22.4", - "vmSize": "Standard_DS1" ->>>>>>> 092b424f5c ([Fleet] Add VMSize to hub profile (#25709)) -======= ->>>>>>> d158b9b8b6 ([Fleet] Move VMSize into AgentProfile (#25805)) }, "provisioningState": "Succeeded" } diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListByResourceGroup.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListByResourceGroup.json index 76b95ac38c6f..dccf77273622 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListByResourceGroup.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListByResourceGroup.json @@ -2,15 +2,7 @@ "operationId": "Fleets_ListByResourceGroup", "title": "Lists the Fleet resources in a resource group.", "parameters": { -<<<<<<< HEAD -<<<<<<< HEAD "api-version": "2023-08-15-preview", -======= - "api-version": "2023-06-15-preview", ->>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) -======= - "api-version": "2023-08-15-preview", ->>>>>>> 149b98b920 (Updates API version in new specs and examples) "subscriptionId": "subid1", "resourceGroupName": "rg1" }, @@ -40,27 +32,11 @@ "hubProfile": { "dnsPrefix": "dnsprefix1", "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", "agentProfile": { "vmSize": "Standard_DS1" } -<<<<<<< HEAD -======= - "kubernetesVersion": "1.22.4" ->>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) -======= -======= - "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", ->>>>>>> 19e857e8a6 (Add portal FQDN to fleet hub profile (#25766)) - "kubernetesVersion": "1.22.4", - "vmSize": "Standard_DS1" ->>>>>>> 092b424f5c ([Fleet] Add VMSize to hub profile (#25709)) -======= ->>>>>>> d158b9b8b6 ([Fleet] Move VMSize into AgentProfile (#25805)) }, "provisioningState": "Succeeded" } diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListBySub.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListBySub.json index c92f83231372..7dcee17d809b 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListBySub.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListBySub.json @@ -2,15 +2,7 @@ "operationId": "Fleets_ListBySubscription", "title": "Lists the Fleet resources in a subscription.", "parameters": { -<<<<<<< HEAD -<<<<<<< HEAD "api-version": "2023-08-15-preview", -======= - "api-version": "2023-06-15-preview", ->>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) -======= - "api-version": "2023-08-15-preview", ->>>>>>> 149b98b920 (Updates API version in new specs and examples) "subscriptionId": "subid1" }, "responses": { @@ -39,27 +31,11 @@ "hubProfile": { "dnsPrefix": "dnsprefix1", "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", "agentProfile": { "vmSize": "Standard_DS1" } -<<<<<<< HEAD -======= - "kubernetesVersion": "1.22.4" ->>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) -======= -======= - "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", ->>>>>>> 19e857e8a6 (Add portal FQDN to fleet hub profile (#25766)) - "kubernetesVersion": "1.22.4", - "vmSize": "Standard_DS1" ->>>>>>> 092b424f5c ([Fleet] Add VMSize to hub profile (#25709)) -======= ->>>>>>> d158b9b8b6 ([Fleet] Move VMSize into AgentProfile (#25805)) }, "provisioningState": "Succeeded" } diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListCredentialsResult.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListCredentialsResult.json index a352c5ce4a67..292774324fb6 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListCredentialsResult.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListCredentialsResult.json @@ -2,15 +2,7 @@ "operationId": "Fleets_ListCredentials", "title": "Lists the user credentials of a Fleet.", "parameters": { -<<<<<<< HEAD -<<<<<<< HEAD "api-version": "2023-08-15-preview", -======= - "api-version": "2023-06-15-preview", ->>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) -======= - "api-version": "2023-08-15-preview", ->>>>>>> 149b98b920 (Updates API version in new specs and examples) "subscriptionId": "subid1", "resourceGroupName": "rg1", "fleetName": "fleet" diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_PatchTags.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_PatchTags.json index fea3dc17e45a..52f18e156b32 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_PatchTags.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_PatchTags.json @@ -2,15 +2,7 @@ "operationId": "Fleets_Update", "title": "Update a Fleet.", "parameters": { -<<<<<<< HEAD -<<<<<<< HEAD "api-version": "2023-08-15-preview", -======= - "api-version": "2023-06-15-preview", ->>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) -======= - "api-version": "2023-08-15-preview", ->>>>>>> 149b98b920 (Updates API version in new specs and examples) "subscriptionId": "subid1", "resourceGroupName": "rg1", "fleetName": "fleet1", @@ -49,27 +41,11 @@ "hubProfile": { "dnsPrefix": "dnsprefix1", "fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", "kubernetesVersion": "1.22.4", "agentProfile": { "vmSize": "Standard_DS1" } -<<<<<<< HEAD -======= - "kubernetesVersion": "1.22.4" ->>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) -======= -======= - "portalFqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io", ->>>>>>> 19e857e8a6 (Add portal FQDN to fleet hub profile (#25766)) - "kubernetesVersion": "1.22.4", - "vmSize": "Standard_DS1" ->>>>>>> 092b424f5c ([Fleet] Add VMSize to hub profile (#25709)) -======= ->>>>>>> d158b9b8b6 ([Fleet] Move VMSize into AgentProfile (#25805)) }, "provisioningState": "Succeeded" } diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Operations_List.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Operations_List.json index 7eaf68d47935..cdc0a85b3463 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Operations_List.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Operations_List.json @@ -2,15 +2,7 @@ "operationId": "Operations_List", "title": "List the operations for the provider.", "parameters": { -<<<<<<< HEAD -<<<<<<< HEAD "api-version": "2023-08-15-preview" -======= - "api-version": "2023-06-15-preview" ->>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) -======= - "api-version": "2023-08-15-preview" ->>>>>>> 149b98b920 (Updates API version in new specs and examples) }, "responses": { "200": { diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_CreateOrUpdate.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_CreateOrUpdate.json index 111ea1ced067..ee9175813aa3 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_CreateOrUpdate.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_CreateOrUpdate.json @@ -2,29 +2,14 @@ "operationId": "UpdateRuns_CreateOrUpdate", "title": "Create an UpdateRun.", "parameters": { -<<<<<<< HEAD -<<<<<<< HEAD "api-version": "2023-08-15-preview", -======= - "api-version": "2023-06-15-preview", ->>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) -======= - "api-version": "2023-08-15-preview", ->>>>>>> 149b98b920 (Updates API version in new specs and examples) "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "rg1", "fleetName": "fleet1", "updateRunName": "run1", "resource": { "properties": { -<<<<<<< HEAD -<<<<<<< HEAD - "updateStrategyId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ContainerService/fleets/myFleet/updateStrategies/strategy1", -======= ->>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) -======= "updateStrategyId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ContainerService/fleets/myFleet/updateStrategies/strategy1", ->>>>>>> 69af7c5c07 ([Fleet][Dev] Strategy resource API (#25582)) "strategy": { "stages": [ { @@ -66,14 +51,7 @@ }, "properties": { "provisioningState": "Succeeded", -<<<<<<< HEAD -<<<<<<< HEAD "updateStrategyId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ContainerService/fleets/myFleet/updateStrategies/strategy1", -======= ->>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) -======= - "updateStrategyId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ContainerService/fleets/myFleet/updateStrategies/strategy1", ->>>>>>> 69af7c5c07 ([Fleet][Dev] Strategy resource API (#25582)) "strategy": { "stages": [ { @@ -151,14 +129,7 @@ }, "properties": { "provisioningState": "Succeeded", -<<<<<<< HEAD -<<<<<<< HEAD - "updateStrategyId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ContainerService/fleets/myFleet/updateStrategies/strategy1", -======= ->>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) -======= "updateStrategyId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ContainerService/fleets/myFleet/updateStrategies/strategy1", ->>>>>>> 69af7c5c07 ([Fleet][Dev] Strategy resource API (#25582)) "strategy": { "stages": [ { diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Delete.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Delete.json index 934a15346fd5..fc0c94e82b0c 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Delete.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Delete.json @@ -2,15 +2,7 @@ "operationId": "UpdateRuns_Delete", "title": "Delete an updateRun resource.", "parameters": { -<<<<<<< HEAD -<<<<<<< HEAD "api-version": "2023-08-15-preview", -======= - "api-version": "2023-06-15-preview", ->>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) -======= - "api-version": "2023-08-15-preview", ->>>>>>> 149b98b920 (Updates API version in new specs and examples) "subscriptionId": "subid1", "resourceGroupName": "rg1", "fleetName": "fleet1", diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Get.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Get.json index 95170f543a66..b4d32c98f967 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Get.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Get.json @@ -2,15 +2,7 @@ "operationId": "UpdateRuns_Get", "title": "Gets an UpdateRun resource.", "parameters": { -<<<<<<< HEAD -<<<<<<< HEAD "api-version": "2023-08-15-preview", -======= - "api-version": "2023-06-15-preview", ->>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) -======= - "api-version": "2023-08-15-preview", ->>>>>>> 149b98b920 (Updates API version in new specs and examples) "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "rg1", "fleetName": "fleet1", diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_ListByFleet.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_ListByFleet.json index bdbcba09a324..9668c951be8a 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_ListByFleet.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_ListByFleet.json @@ -2,15 +2,7 @@ "operationId": "UpdateRuns_ListByFleet", "title": "Lists the UpdateRun resources by fleet.", "parameters": { -<<<<<<< HEAD -<<<<<<< HEAD "api-version": "2023-08-15-preview", -======= - "api-version": "2023-06-15-preview", ->>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) -======= - "api-version": "2023-08-15-preview", ->>>>>>> 149b98b920 (Updates API version in new specs and examples) "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "rg1", "fleetName": "fleet1" diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Start.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Start.json index 41f08435d74e..f83c6af39a06 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Start.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Start.json @@ -2,15 +2,7 @@ "operationId": "UpdateRuns_Start", "title": "Starts an UpdateRun.", "parameters": { -<<<<<<< HEAD -<<<<<<< HEAD "api-version": "2023-08-15-preview", -======= - "api-version": "2023-06-15-preview", ->>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) -======= - "api-version": "2023-08-15-preview", ->>>>>>> 149b98b920 (Updates API version in new specs and examples) "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "rg1", "fleetName": "fleet1", diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Stop.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Stop.json index d9bfc0641615..cbc0667f9d15 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Stop.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/UpdateRuns_Stop.json @@ -2,15 +2,7 @@ "operationId": "UpdateRuns_Stop", "title": "Stops an UpdateRun.", "parameters": { -<<<<<<< HEAD -<<<<<<< HEAD "api-version": "2023-08-15-preview", -======= - "api-version": "2023-06-15-preview", ->>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) -======= - "api-version": "2023-08-15-preview", ->>>>>>> 149b98b920 (Updates API version in new specs and examples) "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "rg1", "fleetName": "fleet1", diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/fleets.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/fleets.json index 328ba47278d6..c43c26eeec96 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/fleets.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/fleets.json @@ -50,18 +50,9 @@ }, { "name": "UpdateRuns" -<<<<<<< HEAD -<<<<<<< HEAD }, { "name": "FleetUpdateStrategies" -======= ->>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) -======= - }, - { - "name": "FleetUpdateStrategies" ->>>>>>> 69af7c5c07 ([Fleet][Dev] Strategy resource API (#25582)) } ], "paths": { @@ -1371,10 +1362,6 @@ }, "x-ms-long-running-operation": true } -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> 69af7c5c07 ([Fleet][Dev] Strategy resource API (#25582)) }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/fleets/{fleetName}/updateStrategies": { "get": { @@ -1668,11 +1655,6 @@ }, "x-ms-long-running-operation": true } -<<<<<<< HEAD -======= ->>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) -======= ->>>>>>> 69af7c5c07 ([Fleet][Dev] Strategy resource API (#25582)) } }, "definitions": { @@ -1717,10 +1699,6 @@ "read", "create" ] -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> d158b9b8b6 ([Fleet] Move VMSize into AgentProfile (#25805)) }, "vmSize": { "type": "string", @@ -1729,11 +1707,6 @@ "read", "create" ] -<<<<<<< HEAD -======= ->>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) -======= ->>>>>>> d158b9b8b6 ([Fleet] Move VMSize into AgentProfile (#25805)) } } }, @@ -1852,33 +1825,11 @@ "type": "string", "description": "The Kubernetes version of the Fleet hub.", "readOnly": true -<<<<<<< HEAD -<<<<<<< HEAD - }, - "portalFqdn": { - "type": "string", - "description": "The Azure Portal FQDN of the Fleet hub.", - "readOnly": true -======= ->>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) -======= }, "portalFqdn": { "type": "string", "description": "The Azure Portal FQDN of the Fleet hub.", "readOnly": true -<<<<<<< HEAD - }, - "vmSize": { - "type": "string", - "description": "The virtual machine size of the Fleet hub.", - "x-ms-mutability": [ - "read", - "create" - ] ->>>>>>> 092b424f5c ([Fleet] Add VMSize to hub profile (#25709)) -======= ->>>>>>> d158b9b8b6 ([Fleet] Move VMSize into AgentProfile (#25805)) } } }, @@ -2129,10 +2080,6 @@ ] } }, -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> 69af7c5c07 ([Fleet][Dev] Strategy resource API (#25582)) "FleetUpdateStrategy": { "type": "object", "description": "Defines a multi-stage process to perform update operations across members of a Fleet.", @@ -2244,11 +2191,6 @@ ] } }, -<<<<<<< HEAD -======= ->>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) -======= ->>>>>>> 69af7c5c07 ([Fleet][Dev] Strategy resource API (#25582)) "KubernetesVersion": { "type": "string" }, @@ -2432,15 +2374,7 @@ "properties": { "name": { "type": "string", -<<<<<<< HEAD -<<<<<<< HEAD "description": "Name of the group.\nIt must match a group name of an existing fleet member. ", -======= - "description": "The name of the Fleet member group to update. \nIt should match the name of an existing FleetMember group.\nA group can only appear once across all UpdateStages in the UpdateRun.", ->>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) -======= - "description": "Name of the group.\nIt must match a group name of an existing fleet member. ", ->>>>>>> 69af7c5c07 ([Fleet][Dev] Strategy resource API (#25582)) "minLength": 1, "maxLength": 50, "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" @@ -2479,15 +2413,7 @@ }, "UpdateRun": { "type": "object", -<<<<<<< HEAD -<<<<<<< HEAD - "description": "A multi-stage process to perform update operations across members of a Fleet.", -======= - "description": "An UpdateRun is a multi-stage process to perform update operations across members of a Fleet.", ->>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) -======= "description": "A multi-stage process to perform update operations across members of a Fleet.", ->>>>>>> 69af7c5c07 ([Fleet][Dev] Strategy resource API (#25582)) "properties": { "properties": { "$ref": "#/definitions/UpdateRunProperties", @@ -2540,19 +2466,10 @@ "description": "The provisioning state of the UpdateRun resource.", "readOnly": true }, -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> 69af7c5c07 ([Fleet][Dev] Strategy resource API (#25582)) "updateStrategyId": { "$ref": "#/definitions/FleetUpdateStrategyResourceId", "description": "The resource id of the FleetUpdateStrategy resource to reference.\n\nWhen creating a new run, there are three ways to define a strategy for the run:\n1. Define a new strategy in place: Set the \"strategy\" field.\n2. Use an existing strategy: Set the \"updateStrategyId\" field. (since 2023-08-15-preview)\n3. Use the default strategy to update all the members one by one: Leave both \"updateStrategyId\" and \"strategy\" unset. (since 2023-08-15-preview)\n\nSetting both \"updateStrategyId\" and \"strategy\" is invalid.\n\nUpdateRuns created by \"updateStrategyId\" snapshot the referenced UpdateStrategy at the time of creation and store it in the \"strategy\" field. \nSubsequent changes to the referenced FleetUpdateStrategy resource do not propagate. \nUpdateRunStrategy changes can be made directly on the \"strategy\" field before launching the UpdateRun." }, -<<<<<<< HEAD -======= ->>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) -======= ->>>>>>> 69af7c5c07 ([Fleet][Dev] Strategy resource API (#25582)) "strategy": { "$ref": "#/definitions/UpdateRunStrategy", "description": "The strategy defines the order in which the clusters will be updated. \nIf not set, all members will be updated sequentially. The UpdateRun status will show a single UpdateStage and a single UpdateGroup targeting all members.\nThe strategy of the UpdateRun can be modified until the run is started." @@ -2630,27 +2547,11 @@ }, "UpdateRunStrategy": { "type": "object", -<<<<<<< HEAD -<<<<<<< HEAD - "description": "Defines the update sequence of the clusters via stages and groups.\n\nStages within a run are executed sequentially one after another.\nGroups within a stage are executed in parallel.\nMember clusters within a group are updated sequentially one after another.\n\nA valid strategy contains no duplicate groups within or across stages.", - "properties": { - "stages": { - "type": "array", - "description": "The list of stages that compose this update run. Min size: 1.", -======= - "description": "The UpdateRunStrategy configures the sequence of Stages and Groups in which the clusters will be updated.", - "properties": { - "stages": { - "type": "array", - "description": "The list of stages that compose this update run.", ->>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) -======= "description": "Defines the update sequence of the clusters via stages and groups.\n\nStages within a run are executed sequentially one after another.\nGroups within a stage are executed in parallel.\nMember clusters within a group are updated sequentially one after another.\n\nA valid strategy contains no duplicate groups within or across stages.", "properties": { "stages": { "type": "array", "description": "The list of stages that compose this update run. Min size: 1.", ->>>>>>> 69af7c5c07 ([Fleet][Dev] Strategy resource API (#25582)) "items": { "$ref": "#/definitions/UpdateStage" }, @@ -2665,15 +2566,7 @@ }, "UpdateStage": { "type": "object", -<<<<<<< HEAD -<<<<<<< HEAD - "description": "Defines a stage which contains the groups to update and the steps to take (e.g., wait for a time period) before starting the next stage.", -======= - "description": "Contains the groups to be updated by an UpdateRun.\nUpdate order:\n- Sequential between stages: Stages run sequentially. The previous stage must complete before the next one starts.\n- Parallel within a stage: Groups within a stage run in parallel.\n- Sequential within a group: Clusters within a group are updated sequentially.", ->>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) -======= "description": "Defines a stage which contains the groups to update and the steps to take (e.g., wait for a time period) before starting the next stage.", ->>>>>>> 69af7c5c07 ([Fleet][Dev] Strategy resource API (#25582)) "properties": { "name": { "type": "string", @@ -2684,15 +2577,7 @@ }, "groups": { "type": "array", -<<<<<<< HEAD -<<<<<<< HEAD - "description": "Defines the groups to be executed in parallel in this stage. Duplicate groups are not allowed. Min size: 1.", -======= - "description": "A list of group names that compose the stage.\nThe groups will be updated in parallel. Each group name can only appear once in the UpdateRun.", ->>>>>>> ac616c3619 (Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview) -======= "description": "Defines the groups to be executed in parallel in this stage. Duplicate groups are not allowed. Min size: 1.", ->>>>>>> 69af7c5c07 ([Fleet][Dev] Strategy resource API (#25582)) "items": { "$ref": "#/definitions/UpdateGroup" },