[Fleet] 2024-02-02-preview resolve conflicts (#27760)

* resolve conflicts * resolve conflicts * resolve conflicts * updated package-lock
Azure · Feb 13, 2024 · dc15daf · dc15daf
1 parent 764a782
commit dc15daf
Show file tree

Hide file tree

Showing 2 changed files with 108 additions and 101 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/specification/containerservice/Fleet.Management/update/run.tsp b/specification/containerservice/Fleet.Management/update/run.tsp
@@ -35,8 +35,9 @@ model UpdateRun is ProxyResource<UpdateRunProperties> {
 }
 
 @doc("The provisioning state of the UpdateRun resource.")
-enum UpdateRunProvisioningState {
-  ...ResourceProvisioningState,
+union UpdateRunProvisioningState {
+  string,
+  ResourceProvisioningState,
 }
 
 scalar FleetUpdateStrategyResourceId
@@ -105,12 +106,14 @@ model NodeImageSelection {
 
 @doc("The node image upgrade type.")
 @added(Versions.v2023_06_15_preview)
-enum NodeImageSelectionType {
+union NodeImageSelectionType {
+  string,
+
   @doc("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.")
-  Latest,
+  "Latest",
 
   @doc("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'.")
-  Consistent,
+  "Consistent",
 }
 
 scalar KubernetesVersion extends string;
@@ -125,41 +128,45 @@ model ManagedClusterUpgradeSpec {
 }
 
 @doc("The type of upgrade to perform when targeting ManagedClusters.")
-enum ManagedClusterUpgradeType {
+union ManagedClusterUpgradeType {
+  string,
+
   @doc("Full upgrades the control plane and all agent pools of the target ManagedClusters. Requires the ManagedClusterUpgradeSpec.KubernetesVersion property to be set.")
-  Full,
+  "Full",
 
   @doc("NodeImageOnly upgrades only the node images of the target ManagedClusters. Requires the ManagedClusterUpgradeSpec.KubernetesVersion property to NOT be set.")
-  NodeImageOnly,
+  "NodeImageOnly",
 
   @doc("ControlPlaneOnly upgrades only targets the KubernetesVersion of the ManagedClusters and will not be applied to the AgentPool. Requires the ManagedClusterUpgradeSpec.KubernetesVersion property to be set.")
   @added(Versions.v2024_02_02_preview)
-  ControlPlaneOnly,
+  "ControlPlaneOnly",
 }
 
 @doc("The state of the UpdateRun, UpdateStage, UpdateGroup, or MemberUpdate.")
-enum UpdateState {
+union UpdateState {
+  string,
+
   @doc("The state of an UpdateRun/UpdateStage/UpdateGroup/MemberUpdate that has not been started.")
-  NotStarted,
+  "NotStarted",
 
   @doc("The state of an UpdateRun/UpdateStage/UpdateGroup/MemberUpdate that is running.")
-  Running,
+  "Running",
 
   @doc("The state of an UpdateRun/UpdateStage/UpdateGroup/MemberUpdate that is being stopped.")
-  Stopping,
+  "Stopping",
 
   @doc("The state of an UpdateRun/UpdateStage/UpdateGroup/MemberUpdate that has stopped.")
-  Stopped,
+  "Stopped",
 
   @added(Versions.v2023_06_15_preview)
   @doc("The state of an UpdateRun/UpdateStage/UpdateGroup/MemberUpdate that has been skipped.")
-  Skipped,
+  "Skipped",
 
   @doc("The state of an UpdateRun/UpdateStage/UpdateGroup/MemberUpdate that has failed.")
-  Failed,
+  "Failed",
 
   @doc("The state of an UpdateRun/UpdateStage/UpdateGroup/MemberUpdate that has completed.")
-  Completed,
+  "Completed",
 }
 
 @doc("The status for an operation or group of operations.")