Skip to content

Commit

Permalink
[Fleet][Dev] API 0615 changes (#25020)
Browse files Browse the repository at this point in the history
* Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-03-15-preview to version 2023-06-15-preview

* Updates readme

* Updates API version in new specs and examples

* sync with ADO repo

* exclude unneeded file changes

* revert tsp config

* revert helpers.tsp

* remove package files

* remove package files

* add known word containerd

* format

* remove .npmrc

* revert custom word

* revert package-lock.json

* re-generate json

* add example

* add example

* fix read-only fields

* fix read-only fields

* re-generate json with latest compiler

* add custom word back

* re-generate json

* restore config

* add examples

* add examples

* add examples

* add examples

* add examples

* add examples

* prettier

* fix examples

* git ignore

* review commoents

* fix examples

* make node image selection optional

* fix warnings

* fix warnings

* fix warnings

* fix docs

* revert package changes

* compile
  • Loading branch information
zman-ms authored Jul 28, 2023
1 parent 48ca510 commit 36e9ac6
Show file tree
Hide file tree
Showing 42 changed files with 1,755 additions and 53 deletions.
1 change: 1 addition & 0 deletions custom-words.txt
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,7 @@ connectionstrings
conntrack
consistencygroup
consumergroups
containerd
containerid
containerinstance
containerlogs
Expand Down
4 changes: 4 additions & 0 deletions specification/containerservice/Fleet.Management/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
node_modules
output
package.json
package-lock.json
24 changes: 24 additions & 0 deletions specification/containerservice/Fleet.Management/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Fleet service cadl project

## Getting started

- environment setup: https://microsoft.github.io/typespec/introduction/installation

## Generate fleet swagger

## NPM registry authentication

We have to use the Central Feed Service for NPM to fetch the typespec dependencies.
The `.npmrc` file configures the folder accordingly for CI.

in development, you can tell npm to use the standard public registry by specifying it:

`npm install --registry https://registry.npmjs.org`

then:

`tsp compile .`

## Development

Always edit `tsp` files, and generate swagger, never edit the swagger directly.
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@
"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"
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@
"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"
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@
"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"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
{
"operationId": "FleetMembers_Create",
"title": "Creates a FleetMember resource with a long running operation.",
"parameters": {
"api-version": "2023-06-15-preview",
"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"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"operationId": "FleetMembers_Delete",
"title": "Deletes a FleetMember resource asynchronously with a long running operation.",
"parameters": {
"api-version": "2023-06-15-preview",
"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": {}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"operationId": "FleetMembers_Get",
"title": "Gets a FleetMember resource.",
"parameters": {
"api-version": "2023-06-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"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"operationId": "FleetMembers_ListByFleet",
"title": "Lists the members of a Fleet.",
"parameters": {
"api-version": "2023-06-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
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"operationId": "FleetMembers_Update",
"title": "Updates a FleetMember resource synchronously.",
"parameters": {
"api-version": "2023-06-15-preview",
"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"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
{
"operationId": "Fleets_CreateOrUpdate",
"title": "Creates a Fleet resource with a long running operation.",
"parameters": {
"api-version": "2023-06-15-preview",
"subscriptionId": "subid1",
"resourceGroupName": "rg1",
"fleetName": "fleet1",
"resource": {
"tags": {
"tier": "production",
"archv2": ""
},
"location": "East US",
"properties": {
"hubProfile": {
"dnsPrefix": "dnsprefix1"
}
}
}
},
"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": {
"hubProfile": {
"dnsPrefix": "dnsprefix1",
"fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io",
"kubernetesVersion": "1.22.4"
},
"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": {
"hubProfile": {
"dnsPrefix": "dnsprefix1",
"fqdn": "dnsprefix1-abcd1234.flt.eastus.azmk8s.io",
"kubernetesVersion": "1.22.4"
},
"provisioningState": "Creating"
}
}
}
}
}
Loading

0 comments on commit 36e9ac6

Please sign in to comment.