Adding memberSelector to UpdateGroup in dev-aks-fleet-2026-05-01-preview (#41988)

nibooy · yoobinshin · Sean Hobbs · commit 6abf7f99ab54 · 2026-04-10T20:57:37.000-07:00
* add memberselector to updategroup in typespec

* update examples

* compile tsp and regenerate swagger

* update comments

---------

Co-authored-by: yoobinshin &lt;yoobinshin@microsoft.com&gt;
diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/examples/2026-05-01-preview/UpdateRuns_CreateOrUpdate.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/examples/2026-05-01-preview/UpdateRuns_CreateOrUpdate.json
@@ -19,6 +19,9 @@
                 {
                   "name": "group-a",
                   "maxConcurrency": "2",
+                  "memberSelector": {
+                    "byLabel": "tier=frontend"
+                  },
                   "beforeGates": [
                     {
                       "displayName": "gate before group-a",
@@ -106,6 +109,9 @@
                   {
                     "name": "group-a",
                     "maxConcurrency": "2",
+                    "memberSelector": {
+                      "byLabel": "tier=frontend"
+                    },
                     "beforeGates": [
                       {
                         "displayName": "gate before group-a",
@@ -286,6 +292,9 @@
                   {
                     "name": "group-a",
                     "maxConcurrency": "2",
+                    "memberSelector": {
+                      "byLabel": "tier=frontend"
+                    },
                     "beforeGates": [
                       {
                         "displayName": "gate before group-a",
diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/examples/2026-05-01-preview/UpdateRuns_Get.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/examples/2026-05-01-preview/UpdateRuns_Get.json
@@ -33,6 +33,9 @@
                   {
                     "name": "group-a",
                     "maxConcurrency": "2",
+                    "memberSelector": {
+                      "byLabel": "tier=frontend"
+                    },
                     "beforeGates": [
                       {
                         "displayName": "gate before group-a",
diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/examples/2026-05-01-preview/UpdateRuns_ListByFleet.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/examples/2026-05-01-preview/UpdateRuns_ListByFleet.json
@@ -34,6 +34,9 @@
                       {
                         "name": "group-a",
                         "maxConcurrency": "2",
+                        "memberSelector": {
+                          "byLabel": "tier=frontend"
+                        },
                         "beforeGates": [
                           {
                             "displayName": "gate before group-a",
diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/examples/2026-05-01-preview/UpdateRuns_Skip.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/examples/2026-05-01-preview/UpdateRuns_Skip.json
@@ -44,11 +44,17 @@
                 "groups": [
                   {
                     "name": "group-a",
-                    "maxConcurrency": "2"
+                    "maxConcurrency": "2",
+                    "memberSelector": {
+                      "byLabel": "tier=frontend"
+                    }
                   },
                   {
                     "name": "group-b",
-                    "maxConcurrency": "2"
+                    "maxConcurrency": "2",
+                    "memberSelector": {
+                      "byLabel": "tier=frontend"
+                    }
                   }
                 ],
                 "afterStageWaitInSeconds": 3600
diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/examples/2026-05-01-preview/UpdateRuns_Start.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/examples/2026-05-01-preview/UpdateRuns_Start.json
@@ -32,7 +32,10 @@
                 "groups": [
                   {
                     "name": "group-a",
-                    "maxConcurrency": "5"
+                    "maxConcurrency": "5",
+                    "memberSelector": {
+                      "byLabel": "tier=frontend"
+                    }
                   }
                 ],
                 "afterStageWaitInSeconds": 3600
diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/examples/2026-05-01-preview/UpdateRuns_Stop.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/examples/2026-05-01-preview/UpdateRuns_Stop.json
@@ -32,7 +32,10 @@
                 "groups": [
                   {
                     "name": "group-a",
-                    "maxConcurrency": "5"
+                    "maxConcurrency": "5",
+                    "memberSelector": {
+                      "byLabel": "tier=frontend"
+                    }
                   }
                 ],
                 "afterStageWaitInSeconds": 3600
diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/examples/2026-05-01-preview/UpdateStrategies_CreateOrUpdate.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/examples/2026-05-01-preview/UpdateStrategies_CreateOrUpdate.json
@@ -18,6 +18,9 @@
                 {
                   "name": "group-a",
                   "maxConcurrency": "5",
+                  "memberSelector": {
+                    "byLabel": "tier=frontend"
+                  },
                   "beforeGates": [
                     {
                       "displayName": "gate before group-a",
@@ -84,6 +87,9 @@
                   {
                     "name": "group-a",
                     "maxConcurrency": "5",
+                    "memberSelector": {
+                      "byLabel": "tier=frontend"
+                    },
                     "beforeGates": [
                       {
                         "displayName": "gate before group-a",
@@ -150,6 +156,9 @@
                   {
                     "name": "group-a",
                     "maxConcurrency": "5",
+                    "memberSelector": {
+                      "byLabel": "tier=frontend"
+                    },
                     "beforeGates": [
                       {
                         "displayName": "gate before group-a",
diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/examples/2026-05-01-preview/UpdateStrategies_Get.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/examples/2026-05-01-preview/UpdateStrategies_Get.json
@@ -33,6 +33,9 @@
                   {
                     "name": "group-a",
                     "maxConcurrency": "5",
+                    "memberSelector": {
+                      "byLabel": "tier=frontend"
+                    },
                     "beforeGates": [
                       {
                         "displayName": "gate before group-a",
diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/examples/2026-05-01-preview/UpdateStrategies_ListByFleet.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/examples/2026-05-01-preview/UpdateStrategies_ListByFleet.json
@@ -34,6 +34,9 @@
                       {
                         "name": "group-a",
                         "maxConcurrency": "5",
+                        "memberSelector": {
+                          "byLabel": "tier=frontend"
+                        },
                         "beforeGates": [
                           {
                             "displayName": "gate before group-a",
diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2026-05-01-preview/examples/UpdateRuns_CreateOrUpdate.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2026-05-01-preview/examples/UpdateRuns_CreateOrUpdate.json
@@ -19,6 +19,9 @@
                 {
                   "name": "group-a",
                   "maxConcurrency": "2",
+                  "memberSelector": {
+                    "byLabel": "tier=frontend"
+                  },
                   "beforeGates": [
                     {
                       "displayName": "gate before group-a",
@@ -106,6 +109,9 @@
                   {
                     "name": "group-a",
                     "maxConcurrency": "2",
+                    "memberSelector": {
+                      "byLabel": "tier=frontend"
+                    },
                     "beforeGates": [
                       {
                         "displayName": "gate before group-a",
@@ -286,6 +292,9 @@
                   {
                     "name": "group-a",
                     "maxConcurrency": "2",
+                    "memberSelector": {
+                      "byLabel": "tier=frontend"
+                    },
                     "beforeGates": [
                       {
                         "displayName": "gate before group-a",
diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2026-05-01-preview/examples/UpdateRuns_Get.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2026-05-01-preview/examples/UpdateRuns_Get.json
@@ -33,6 +33,9 @@
                   {
                     "name": "group-a",
                     "maxConcurrency": "2",
+                    "memberSelector": {
+                      "byLabel": "tier=frontend"
+                    },
                     "beforeGates": [
                       {
                         "displayName": "gate before group-a",
diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2026-05-01-preview/examples/UpdateRuns_ListByFleet.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2026-05-01-preview/examples/UpdateRuns_ListByFleet.json
@@ -34,6 +34,9 @@
                       {
                         "name": "group-a",
                         "maxConcurrency": "2",
+                        "memberSelector": {
+                          "byLabel": "tier=frontend"
+                        },
                         "beforeGates": [
                           {
                             "displayName": "gate before group-a",
diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2026-05-01-preview/examples/UpdateRuns_Skip.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2026-05-01-preview/examples/UpdateRuns_Skip.json
@@ -44,11 +44,17 @@
                 "groups": [
                   {
                     "name": "group-a",
-                    "maxConcurrency": "2"
+                    "maxConcurrency": "2",
+                    "memberSelector": {
+                      "byLabel": "tier=frontend"
+                    }
                   },
                   {
                     "name": "group-b",
-                    "maxConcurrency": "2"
+                    "maxConcurrency": "2",
+                    "memberSelector": {
+                      "byLabel": "tier=frontend"
+                    }
                   }
                 ],
                 "afterStageWaitInSeconds": 3600
diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2026-05-01-preview/examples/UpdateRuns_Start.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2026-05-01-preview/examples/UpdateRuns_Start.json
@@ -32,7 +32,10 @@
                 "groups": [
                   {
                     "name": "group-a",
-                    "maxConcurrency": "5"
+                    "maxConcurrency": "5",
+                    "memberSelector": {
+                      "byLabel": "tier=frontend"
+                    }
                   }
                 ],
                 "afterStageWaitInSeconds": 3600
diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2026-05-01-preview/examples/UpdateRuns_Stop.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2026-05-01-preview/examples/UpdateRuns_Stop.json
@@ -32,7 +32,10 @@
                 "groups": [
                   {
                     "name": "group-a",
-                    "maxConcurrency": "5"
+                    "maxConcurrency": "5",
+                    "memberSelector": {
+                      "byLabel": "tier=frontend"
+                    }
                   }
                 ],
                 "afterStageWaitInSeconds": 3600
diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2026-05-01-preview/examples/UpdateStrategies_CreateOrUpdate.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2026-05-01-preview/examples/UpdateStrategies_CreateOrUpdate.json
@@ -18,6 +18,9 @@
                 {
                   "name": "group-a",
                   "maxConcurrency": "5",
+                  "memberSelector": {
+                    "byLabel": "tier=frontend"
+                  },
                   "beforeGates": [
                     {
                       "displayName": "gate before group-a",
@@ -84,6 +87,9 @@
                   {
                     "name": "group-a",
                     "maxConcurrency": "5",
+                    "memberSelector": {
+                      "byLabel": "tier=frontend"
+                    },
                     "beforeGates": [
                       {
                         "displayName": "gate before group-a",
@@ -150,6 +156,9 @@
                   {
                     "name": "group-a",
                     "maxConcurrency": "5",
+                    "memberSelector": {
+                      "byLabel": "tier=frontend"
+                    },
                     "beforeGates": [
                       {
                         "displayName": "gate before group-a",
diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2026-05-01-preview/examples/UpdateStrategies_Get.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2026-05-01-preview/examples/UpdateStrategies_Get.json
@@ -33,6 +33,9 @@
                   {
                     "name": "group-a",
                     "maxConcurrency": "5",
+                    "memberSelector": {
+                      "byLabel": "tier=frontend"
+                    },
                     "beforeGates": [
                       {
                         "displayName": "gate before group-a",
diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2026-05-01-preview/examples/UpdateStrategies_ListByFleet.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2026-05-01-preview/examples/UpdateStrategies_ListByFleet.json
@@ -34,6 +34,9 @@
                       {
                         "name": "group-a",
                         "maxConcurrency": "5",
+                        "memberSelector": {
+                          "byLabel": "tier=frontend"
+                        },
                         "beforeGates": [
                           {
                             "displayName": "gate before group-a",
diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2026-05-01-preview/fleets.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2026-05-01-preview/fleets.json
@@ -5795,6 +5795,14 @@
           "description": "The max number of upgrades that can run concurrently in this specific group.\nActs as a ceiling (and not a quota) for the number of concurrent upgrades within the group you want to tolerate at a time.\nActual concurrency may be lower depending on stage-level concurrency limits or individual member conditions.\nGroup maxConcurrency has a min value of \"1\". The max value is min(number of clusters in the group, the stage maxConcurrency).\nIf no value is provided, defaults to 1.\nAccepts either:\n    • A fixed count, e.g. \"3\"\n    • A percentage, e.g. \"25%\" (range 1–100). Percentage is of the number of clusters in the group. \n      Fractional results are rounded down. A minimum of 1 upgrade is enforced.\nExamples:\n    • \"3\" --> up to 3 members from this group upgrade at once.\n    • \"100%\" --> “all at once”, up to all members for this group upgrade at the same time.\n    • \"25%\" --> up to 25% of the members in the group will be upgraded at the same time.",
           "pattern": "^(?:([1-9]\\d*)|([1-9]\\d?|100)%)$"
         },
+        "memberSelector": {
+          "$ref": "#/definitions/MemberSelector",
+          "description": "Select the members of the group.\n  * If specified, label-based selection will override group name based selection.\n  * If not specified, group name based selection will be used.",
+          "x-ms-mutability": [
+            "read",
+            "create"
+          ]
+        },
         "beforeGates": {
           "type": "array",
           "description": "A list of Gates that will be created before this Group is executed.",
@@ -6140,7 +6148,7 @@
         },
         "memberSelector": {
           "$ref": "#/definitions/MemberSelector",
-          "description": "Select the members of the stage.\n  * Only key/value pairs with the `=` operator are accepted in the label selector.\n  * If empty or not specified, no Fleet members will be selected for the stage.\nSetting both `memberSelector` and `groups` is invalid.",
+          "description": "Select the members of the stage.\n  * If specified without UpdateGroup, one implicit group containing the selected members will be created.\n  * If specified with UpdateGroup, members will be pre-filtered before group-level selection logic is applied.\n  * If not specified, group-level selection logic will be used.",
           "x-ms-mutability": [
             "read",
             "create"
diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/update/common.tsp b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/update/common.tsp
@@ -36,9 +36,9 @@ model UpdateStage {
 
   @doc("""
     Select the members of the stage.
-      * Only key/value pairs with the `=` operator are accepted in the label selector.
-      * If empty or not specified, no Fleet members will be selected for the stage.
-    Setting both `memberSelector` and `groups` is invalid.
+      * If specified without UpdateGroup, one implicit group containing the selected members will be created.
+      * If specified with UpdateGroup, members will be pre-filtered before group-level selection logic is applied.
+      * If not specified, group-level selection logic will be used.
     """)
   @visibility(Lifecycle.Read, Lifecycle.Create)
   @added(Versions.v2026_05_01_preview)
@@ -156,6 +156,15 @@ model UpdateGroup {
   @added(Versions.v2026_02_01_preview)
   maxConcurrency?: string;
 
+  @doc("""
+    Select the members of the group.
+      * If specified, label-based selection will override group name based selection.
+      * If not specified, group name based selection will be used.
+    """)
+  @visibility(Lifecycle.Read, Lifecycle.Create)
+  @added(Versions.v2026_05_01_preview)
+  memberSelector?: MemberSelector;
+
   @doc("A list of Gates that will be created before this Group is executed.")
   @added(Versions.v2025_04_01_preview)
   @identifiers(#[])

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,9 @@`
`19`	`19`	`{`
`20`	`20`	`"name": "group-a",`
`21`	`21`	`"maxConcurrency": "2",`
	`22`	`+ "memberSelector": {`
	`23`	`+ "byLabel": "tier=frontend"`
	`24`	`+ },`
`22`	`25`	`"beforeGates": [`
`23`	`26`	`{`
`24`	`27`	`"displayName": "gate before group-a",`
`@@ -106,6 +109,9 @@`
`106`	`109`	`{`
`107`	`110`	`"name": "group-a",`
`108`	`111`	`"maxConcurrency": "2",`
	`112`	`+ "memberSelector": {`
	`113`	`+ "byLabel": "tier=frontend"`
	`114`	`+ },`
`109`	`115`	`"beforeGates": [`
`110`	`116`	`{`
`111`	`117`	`"displayName": "gate before group-a",`
`@@ -286,6 +292,9 @@`
`286`	`292`	`{`
`287`	`293`	`"name": "group-a",`
`288`	`294`	`"maxConcurrency": "2",`
	`295`	`+ "memberSelector": {`
	`296`	`+ "byLabel": "tier=frontend"`
	`297`	`+ },`
`289`	`298`	`"beforeGates": [`
`290`	`299`	`{`
`291`	`300`	`"displayName": "gate before group-a",`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,9 @@`
`33`	`33`	`{`
`34`	`34`	`"name": "group-a",`
`35`	`35`	`"maxConcurrency": "2",`
	`36`	`+ "memberSelector": {`
	`37`	`+ "byLabel": "tier=frontend"`
	`38`	`+ },`
`36`	`39`	`"beforeGates": [`
`37`	`40`	`{`
`38`	`41`	`"displayName": "gate before group-a",`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,9 @@`
`34`	`34`	`{`
`35`	`35`	`"name": "group-a",`
`36`	`36`	`"maxConcurrency": "2",`
	`37`	`+ "memberSelector": {`
	`38`	`+ "byLabel": "tier=frontend"`
	`39`	`+ },`
`37`	`40`	`"beforeGates": [`
`38`	`41`	`{`
`39`	`42`	`"displayName": "gate before group-a",`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,10 @@`
`32`	`32`	`"groups": [`
`33`	`33`	`{`
`34`	`34`	`"name": "group-a",`
`35`		`- "maxConcurrency": "5"`
	`35`	`+ "maxConcurrency": "5",`
	`36`	`+ "memberSelector": {`
	`37`	`+ "byLabel": "tier=frontend"`
	`38`	`+ }`
`36`	`39`	`}`
`37`	`40`	`],`
`38`	`41`	`"afterStageWaitInSeconds": 3600`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,9 @@`
`18`	`18`	`{`
`19`	`19`	`"name": "group-a",`
`20`	`20`	`"maxConcurrency": "5",`
	`21`	`+ "memberSelector": {`
	`22`	`+ "byLabel": "tier=frontend"`
	`23`	`+ },`
`21`	`24`	`"beforeGates": [`
`22`	`25`	`{`
`23`	`26`	`"displayName": "gate before group-a",`
`@@ -84,6 +87,9 @@`
`84`	`87`	`{`
`85`	`88`	`"name": "group-a",`
`86`	`89`	`"maxConcurrency": "5",`
	`90`	`+ "memberSelector": {`
	`91`	`+ "byLabel": "tier=frontend"`
	`92`	`+ },`
`87`	`93`	`"beforeGates": [`
`88`	`94`	`{`
`89`	`95`	`"displayName": "gate before group-a",`
`@@ -150,6 +156,9 @@`
`150`	`156`	`{`
`151`	`157`	`"name": "group-a",`
`152`	`158`	`"maxConcurrency": "5",`
	`159`	`+ "memberSelector": {`
	`160`	`+ "byLabel": "tier=frontend"`
	`161`	`+ },`
`153`	`162`	`"beforeGates": [`
`154`	`163`	`{`
`155`	`164`	`"displayName": "gate before group-a",`