Skip to content

[Fleet] Move VMSize into AgentProfile #25805

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
serbrech merged 2 commits into from
Sep 15, 2023
Merged

[Fleet] Move VMSize into AgentProfile #25805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d2dcd4
move vm size into agent profile
zman-ms Sep 15, 2023
f778e47
re-generate
zman-ms Sep 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions .../containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_CreateOrUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
"properties": {
"hubProfile": {
"dnsPrefix": "dnsprefix1",
"vmSize": "Standard_DS1"
"agentProfile": {
"vmSize": "Standard_DS1"
}
}
}
}
Expand Down Expand Up @@ -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"
}
Expand Down Expand Up @@ -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"
}
Expand Down
4 changes: 3 additions & 1 deletion specification/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_Get.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
4 changes: 3 additions & 1 deletion ...ainerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_ListByResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
4 changes: 3 additions & 1 deletion ...ation/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_ListBySub.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
4 changes: 3 additions & 1 deletion ...ation/containerservice/Fleet.Management/examples/2023-08-15-preview/Fleets_PatchTags.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
10 changes: 5 additions & 5 deletions specification/containerservice/Fleet.Management/fleet.tsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -118,6 +113,11 @@ model AgentProfile {
@visibility("read", "create")
@doc("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.")
subnetId?: SubnetResourceId;

@added(Versions.v2023_08_15_preview)
@doc("The virtual machine size of the Fleet hub.")
@visibility("read", "create")
vmSize?: string;
}

@lroStatus
Expand Down
12 changes: 9 additions & 3 deletions ...oft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_CreateOrUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
"properties": {
"hubProfile": {
"dnsPrefix": "dnsprefix1",
"vmSize": "Standard_DS1"
"agentProfile": {
"vmSize": "Standard_DS1"
}
}
}
}
Expand Down Expand Up @@ -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"
}
Expand Down Expand Up @@ -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"
}
Expand Down
4 changes: 3 additions & 1 deletion ...ager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_Get.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
4 changes: 3 additions & 1 deletion ...ontainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListByResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
4 changes: 3 additions & 1 deletion ...icrosoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_ListBySub.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
4 changes: 3 additions & 1 deletion ...icrosoft.ContainerService/fleet/preview/2023-08-15-preview/examples/Fleets_PatchTags.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
16 changes: 8 additions & 8 deletions .../resource-manager/Microsoft.ContainerService/fleet/preview/2023-08-15-preview/fleets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1699,6 +1699,14 @@
"read",
"create"
]
},
"vmSize": {
"type": "string",
"description": "The virtual machine size of the Fleet hub.",
"x-ms-mutability": [
"read",
"create"
]
}
}
},
Expand Down Expand Up @@ -1822,14 +1830,6 @@
"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.",
"x-ms-mutability": [
"read",
"create"
]
}
}
},
Expand Down