Skip to content

Commit 8a605e2

Browse files
azure-powershell-botJoyerJin
azure-powershell-bot
and
JoyerJin
authored
Migrate Fleet from generation to main (#24721)
* Move Fleet to main * Update Fleet * Update fleet --------- Co-authored-by: JoyerJin <[email protected]>
1 parent cb76fb2 commit 8a605e2

File tree

89 files changed

+2503
-2971
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+2503
-2971
lines changed

‎src/Fleet/Fleet.Autorest/README.md

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,12 @@ require:
3333
# readme.azure.noprofile.md is the common configuration file
3434
- $(this-folder)/../../readme.azure.noprofile.md
3535
- $(repo)/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/readme.md
36-
36+
3737
title: Fleet
3838
module-version: 0.1.0
3939
subject-prefix: $(service-name)
40-
disable-transform-identity-type: true
41-
flatten-userassignedidentity: false
4240

4341
directive:
44-
# # # Following is two common directive which are normally required in all the RPs
45-
# # # 1. Remove the unexpanded parameter set
46-
# # # 2. For New-* cmdlets, ViaIdentity is not required, so CreateViaIdentityExpanded is removed as well
47-
- where:
48-
variant: ^(Create|Update)(?!.*?(Expanded|JsonFilePath|JsonString))
49-
remove: true
5042
# Fix required parameter missing
5143
- from: swagger-document
5244
where: $.definitions.FleetMember
@@ -74,15 +66,17 @@ directive:
7466
- from: swagger-document
7567
where: $.definitions.NodeImageSelection.properties.type
7668
transform: $['x-ms-mutability'] = ["read", "update", "create"]
69+
# # # Following is two common directive which are normally required in all the RPs
70+
# # # 1. Remove the unexpanded parameter set
71+
# # # 2. For New-* cmdlets, ViaIdentity is not required, so CreateViaIdentityExpanded is removed as well
72+
- where:
73+
variant: ^(Create|Update)(?!.*?(Expanded|JsonFilePath|JsonString))
74+
remove: true
7775
# Hide set cmdlet
7876
- where:
7977
verb: Set
8078
remove: true
81-
# Rename IdentityUserAssignedIdentity, UpdateStrategyName
82-
- where:
83-
parameter-name: IdentityUserAssignedIdentity
84-
set:
85-
parameter-name: UserAssignedIdentity
79+
# Rename UpdateStrategyName
8680
- where:
8781
parameter-name: UpdateStrategyName
8882
subject: FleetUpdateStrategy

‎src/Fleet/Fleet.Autorest/UX/Microsoft.ContainerService/fleets-updateRuns.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"commands": [
88
{
99
"name": "Get-AzFleetUpdateRun",
10-
"description": "Get a GetRun",
10+
"description": "Get a UpdateRun",
1111
"path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/fleets/{fleetName}/updateRuns/{updateRunName}",
1212
"help": {
1313
"learnMore": {
@@ -26,7 +26,7 @@
2626
},
2727
"examples": [
2828
{
29-
"description": "Get a GetRun",
29+
"description": "Get a UpdateRun",
3030
"parameters": [
3131
{
3232
"name": "-FleetName",
@@ -50,7 +50,7 @@
5050
},
5151
{
5252
"name": "Remove-AzFleetUpdateRun",
53-
"description": "Delete a DeleteRun",
53+
"description": "Delete a UpdateRun",
5454
"path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/fleets/{fleetName}/updateRuns/{updateRunName}",
5555
"help": {
5656
"learnMore": {
@@ -69,7 +69,7 @@
6969
},
7070
"examples": [
7171
{
72-
"description": "Delete a DeleteRun",
72+
"description": "Delete a UpdateRun",
7373
"parameters": [
7474
{
7575
"name": "-FleetName",
@@ -93,7 +93,7 @@
9393
},
9494
{
9595
"name": "Start-AzFleetUpdateRun",
96-
"description": "Starts an StartRun.",
96+
"description": "Starts an UpdateRun.",
9797
"path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/fleets/{fleetName}/updateRuns/{updateRunName}/start",
9898
"help": {
9999
"learnMore": {
@@ -112,7 +112,7 @@
112112
},
113113
"examples": [
114114
{
115-
"description": "Starts an StartRun.",
115+
"description": "Starts an UpdateRun.",
116116
"parameters": [
117117
{
118118
"name": "-FleetName",
@@ -136,7 +136,7 @@
136136
},
137137
{
138138
"name": "Stop-AzFleetUpdateRun",
139-
"description": "Stops an StopRun.",
139+
"description": "Stops an UpdateRun.",
140140
"path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/fleets/{fleetName}/updateRuns/{updateRunName}/stop",
141141
"help": {
142142
"learnMore": {
@@ -155,7 +155,7 @@
155155
},
156156
"examples": [
157157
{
158-
"description": "Stops an StopRun.",
158+
"description": "Stops an UpdateRun.",
159159
"parameters": [
160160
{
161161
"name": "-FleetName",

‎src/Fleet/Fleet.Autorest/UX/Microsoft.ContainerService/fleets-updateStrategies.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"commands": [
88
{
99
"name": "Get-AzFleetUpdateStrategy",
10-
"description": "Get a FleetGettrategy",
10+
"description": "Get a FleetUpdateStrategy",
1111
"path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/fleets/{fleetName}/updateStrategies/{updateStrategyName}",
1212
"help": {
1313
"learnMore": {
@@ -26,7 +26,7 @@
2626
},
2727
"examples": [
2828
{
29-
"description": "Get a FleetGettrategy",
29+
"description": "Get a FleetUpdateStrategy",
3030
"parameters": [
3131
{
3232
"name": "-FleetName",
@@ -50,7 +50,7 @@
5050
},
5151
{
5252
"name": "Remove-AzFleetUpdateStrategy",
53-
"description": "Delete a FleetDeletetrategy",
53+
"description": "Delete a FleetUpdateStrategy",
5454
"path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/fleets/{fleetName}/updateStrategies/{updateStrategyName}",
5555
"help": {
5656
"learnMore": {
@@ -69,7 +69,7 @@
6969
},
7070
"examples": [
7171
{
72-
"description": "Delete a FleetDeletetrategy",
72+
"description": "Delete a FleetUpdateStrategy",
7373
"parameters": [
7474
{
7575
"name": "-FleetName",

‎src/Fleet/Fleet.Autorest/examples/New-AzFleet.md

Lines changed: 70 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
### Example 1: Creates a Fleet resource
1+
### Example 1: Creates a Fleet resource with none identity type
22
```powershell
33
New-AzFleet -Name sss -ResourceGroupName ps1-test -Location eastus
44
```
@@ -26,4 +26,73 @@ Tag : {
2626
Type : Microsoft.ContainerService/fleets
2727
```
2828

29+
This command creates a Fleet resource with none identity type.
30+
31+
32+
### Example 2: Creates a Fleet resource with EnableSystemAssignedIdentity
33+
```powershell
34+
New-AzFleet -Name testfleet02 -ResourceGroupName joyer-test -Location eastus -Tag @{"456"="asd"} -EnableSystemAssignedIdentity
35+
```
36+
37+
```output
38+
ETag : "0a006dc9-0000-0100-0000-661cd4f70000"
39+
Id : /subscriptions/9e223dbe-3399-4e19-88eb-0975f02ac87f/resourceGroups/joyer-test/providers/Microsoft.ContainerService/fleets/testfleet02
40+
IdentityPrincipalId : 978528a9-fa0f-4cdb-8282-95b3b30bb883
41+
IdentityTenantId : 72f988bf-86f1-41af-91ab-2d7cd011db47
42+
IdentityType : SystemAssigned
43+
IdentityUserAssignedIdentity : {
44+
}
45+
Location : eastus
46+
Name : testfleet02
47+
ProvisioningState : Succeeded
48+
ResourceGroupName : joyer-test
49+
SystemDataCreatedAt : 4/15/2024 7:19:15 AM
50+
SystemDataCreatedBy : [email protected]
51+
SystemDataCreatedByType : User
52+
SystemDataLastModifiedAt : 4/15/2024 7:19:15 AM
53+
SystemDataLastModifiedBy : [email protected]
54+
SystemDataLastModifiedByType : User
55+
Tag : {
56+
"456": "asd"
57+
}
58+
Type : Microsoft.ContainerService/fleets
59+
```
60+
61+
This command creates a Fleet resource with system assigned identity type.
62+
63+
64+
### Example 3: Creates a Fleet resource with user assigned identity type
65+
```powershell
66+
$mi = Get-AzUserAssignedIdentity -Name testUserAssignedMI -ResourceGroupName joyer-test
67+
New-AzFleet -Name testfleet03 -ResourceGroupName joyer-test -Location eastus -Tag @{"789"="asd"} -UserAssignedIdentity $mi.Id
68+
```
69+
70+
```output
71+
ETag : "0a00e0c9-0000-0100-0000-661cd8010000"
72+
Id : /subscriptions/9e223dbe-3399-4e19-88eb-0975f02ac87f/resourceGroups/joyer-test/providers/Microsoft.ContainerService/fleets/testflee
73+
t03
74+
IdentityPrincipalId :
75+
IdentityTenantId :
76+
IdentityType : UserAssigned
77+
IdentityUserAssignedIdentity : {
78+
"/subscriptions/9e223dbe-3399-4e19-88eb-0975f02ac87f/resourcegroups/joyer-test/providers/Microsoft.ManagedIdentity/userAssignedI
79+
dentities/testUserAssignedMI": {
80+
}
81+
}
82+
Location : eastus
83+
Name : testfleet03
84+
ProvisioningState : Succeeded
85+
ResourceGroupName : joyer-test
86+
SystemDataCreatedAt : 4/15/2024 7:32:16 AM
87+
SystemDataCreatedBy : [email protected]
88+
SystemDataCreatedByType : User
89+
SystemDataLastModifiedAt : 4/15/2024 7:32:16 AM
90+
SystemDataLastModifiedBy : [email protected]
91+
SystemDataLastModifiedByType : User
92+
Tag : {
93+
"789": "asd"
94+
}
95+
Type : Microsoft.ContainerService/fleets
96+
```
97+
2998
This command creates a Fleet resource with a long running operation.

‎src/Fleet/Fleet.Autorest/examples/Update-AzFleet.md

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,35 @@ Type : Microsoft.ContainerService/fleets
2929

3030
This command updates tag of a fleet.
3131

32+
33+
### Example 2: disable system assigned identity of specified fleet
34+
```powershell
35+
Update-AzFleet -ResourceGroupName joyer-test -Name testfleet03 -EnableSystemAssignedIdentity 0
36+
```
37+
38+
```output
39+
ETag : "0a00e5cc-0000-0100-0000-661cea3b0000"
40+
Id : /subscriptions/9e223dbe-3399-4e19-88eb-0975f02ac87f/resourceGroups/joyer-test/providers/Microsoft.ContainerService/fleets/testflee
41+
t02
42+
IdentityPrincipalId :
43+
IdentityTenantId :
44+
IdentityType : None
45+
IdentityUserAssignedIdentity : {
46+
}
47+
Location : eastus
48+
Name : testfleet02
49+
ProvisioningState : Succeeded
50+
ResourceGroupName : joyer-test
51+
SystemDataCreatedAt : 4/15/2024 7:19:15 AM
52+
SystemDataCreatedBy : [email protected]
53+
SystemDataCreatedByType : User
54+
SystemDataLastModifiedAt : 4/15/2024 8:50:01 AM
55+
SystemDataLastModifiedBy : [email protected]
56+
SystemDataLastModifiedByType : User
57+
Tag : {
58+
"456": "asd"
59+
}
60+
Type : Microsoft.ContainerService/fleets
61+
```
62+
63+
This command updates EnableSystemAssignedIdentity of a fleet.

‎src/Fleet/Fleet.Autorest/exports/Get-AzFleetUpdateRun.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
<#
1818
.Synopsis
19-
Get a GetRun
19+
Get a UpdateRun
2020
.Description
21-
Get a GetRun
21+
Get a UpdateRun
2222
.Example
2323
Get-AzFleetUpdateRun -FleetName testfleet01 -ResourceGroupName K8sFleet-Test
2424
.Example

‎src/Fleet/Fleet.Autorest/exports/Get-AzFleetUpdateStrategy.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
<#
1818
.Synopsis
19-
Get a FleetGettrategy
19+
Get a FleetUpdateStrategy
2020
.Description
21-
Get a FleetGettrategy
21+
Get a FleetUpdateStrategy
2222
.Example
2323
Get-AzFleetUpdateStrategy -FleetName testfleet01 -ResourceGroupName K8sFleet-Test
2424
.Example

‎src/Fleet/Fleet.Autorest/exports/New-AzFleet.ps1

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ Create a Fleet.
2121
Create a Fleet.
2222
.Example
2323
New-AzFleet -Name sss -ResourceGroupName ps1-test -Location eastus
24+
.Example
25+
New-AzFleet -Name testfleet02 -ResourceGroupName joyer-test -Location eastus -Tag @{"456"="asd"} -EnableSystemAssignedIdentity
26+
.Example
27+
$mi = Get-AzUserAssignedIdentity -Name testUserAssignedMI -ResourceGroupName joyer-test
28+
New-AzFleet -Name testfleet03 -ResourceGroupName joyer-test -Location eastus -Tag @{"789"="asd"} -UserAssignedIdentity $mi.Id
2429
2530
.Inputs
2631
Microsoft.Azure.PowerShell.Cmdlets.Fleet.Models.IFleetIdentity
@@ -100,11 +105,10 @@ param(
100105

101106
[Parameter(ParameterSetName='CreateExpanded')]
102107
[Parameter(ParameterSetName='CreateViaIdentityExpanded')]
103-
[Microsoft.Azure.PowerShell.Cmdlets.Fleet.PSArgumentCompleterAttribute("None", "SystemAssigned", "UserAssigned", "SystemAssigned, UserAssigned")]
104108
[Microsoft.Azure.PowerShell.Cmdlets.Fleet.Category('Body')]
105-
[System.String]
106-
# Type of managed service identity (where both SystemAssigned and UserAssigned types are allowed).
107-
${IdentityType},
109+
[System.Management.Automation.SwitchParameter]
110+
# Decides if enable a system assigned identity for the resource.
111+
${EnableSystemAssignedIdentity},
108112

109113
[Parameter(ParameterSetName='CreateExpanded')]
110114
[Parameter(ParameterSetName='CreateViaIdentityExpanded')]
@@ -116,12 +120,11 @@ param(
116120

117121
[Parameter(ParameterSetName='CreateExpanded')]
118122
[Parameter(ParameterSetName='CreateViaIdentityExpanded')]
123+
[AllowEmptyCollection()]
119124
[Microsoft.Azure.PowerShell.Cmdlets.Fleet.Category('Body')]
120-
[Microsoft.Azure.PowerShell.Cmdlets.Fleet.Runtime.Info(PossibleTypes=([Microsoft.Azure.PowerShell.Cmdlets.Fleet.Models.IUserAssignedIdentities]))]
121-
[System.Collections.Hashtable]
122-
# The set of user assigned identities associated with the resource.
123-
# The userAssignedIdentities dictionary keys will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}.
124-
# The dictionary values can be empty objects ({}) in requests.
125+
[System.String[]]
126+
# The array of user assigned identities associated with the resource.
127+
# The elements in array will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}.'
125128
${UserAssignedIdentity},
126129

127130
[Parameter(ParameterSetName='CreateViaJsonFilePath', Mandatory)]

‎src/Fleet/Fleet.Autorest/exports/New-AzFleetUpdateRun.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
<#
1818
.Synopsis
19-
Create a CreateRun
19+
Create a UpdateRun
2020
.Description
21-
Create a CreateRun
21+
Create a UpdateRun
2222
.Example
2323
New-AzFleetUpdateRun -FleetName testfleet01 -Name run1 -ResourceGroupName K8sFleet-Test -UpgradeType Full -UpgradeKubernetesVersion "1.26.1" -NodeImageSelectionType Latest
2424

‎src/Fleet/Fleet.Autorest/exports/New-AzFleetUpdateStrategy.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
<#
1818
.Synopsis
19-
Create a FleetCreatetrategy
19+
Create a FleetUpdateStrategy
2020
.Description
21-
Create a FleetCreatetrategy
21+
Create a FleetUpdateStrategy
2222
.Example
2323
$stage = New-AzFleetUpdateStageObject -Name stag1 -Group @{name='group-a'} -AfterStageWaitInSecond 3600
2424
New-AzFleetUpdateStrategy -FleetName testfleet01 -ResourceGroupName K8sFleet-Test -Name strategy1 -StrategyStage $stage

0 commit comments

Comments
 (0)