update preview API to follow GA api - use one forceupgrade boolean in… (

#25099) * update preview API to follow GA api - use one forceupgrade boolean instead of multiple overrides * update msg --------- Co-authored-by: Wenjun Gao <wenjungao@microsoft.com>
Azure · Aug 3, 2023 · 288bcc1 · 288bcc1
1 parent 870eba0
commit 288bcc1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 33 deletions.
diff --git a/...ontainerService/aks/preview/2023-07-02-preview/examples/ManagedClustersCreate_Update.json b/...ontainerService/aks/preview/2023-07-02-preview/examples/ManagedClustersCreate_Update.json
@@ -55,9 +55,7 @@
         },
         "upgradeSettings": {
           "overrideSettings": {
-            "controlPlaneOverrides": [
-              "IgnoreKubernetesDeprecations"
-            ],
+            "forceUpgrade": true,
             "until": "2022-11-01T13:00:00Z"
           }
         },
@@ -184,9 +182,7 @@
           },
           "upgradeSettings": {
             "overrideSettings": {
-              "controlPlaneOverrides": [
-                "IgnoreKubernetesDeprecations"
-              ],
+              "forceUpgrade": false,
               "until": "2022-11-01T13:00:00Z"
             }
           },

diff --git a/...icrosoft.ContainerService/aks/preview/2023-07-02-preview/examples/ManagedClustersGet.json b/...icrosoft.ContainerService/aks/preview/2023-07-02-preview/examples/ManagedClustersGet.json
@@ -101,9 +101,7 @@
           },
           "upgradeSettings": {
             "overrideSettings": {
-              "controlPlaneOverrides": [
-                "IgnoreKubernetesDeprecations"
-              ],
+              "forceUpgrade": true,
               "until": "2022-11-01T13:00:00Z"
             }
           }

diff --git a/...ce-manager/Microsoft.ContainerService/aks/preview/2023-07-02-preview/managedClusters.json b/...ce-manager/Microsoft.ContainerService/aks/preview/2023-07-02-preview/managedClusters.json
@@ -5513,33 +5513,12 @@
       },
       "description": "Auto upgrade profile for a managed cluster."
     },
-    "ControlPlaneUpgradeOverride": {
-      "type": "string",
-      "enum": [
-        "IgnoreKubernetesDeprecations"
-      ],
-      "x-ms-enum": {
-        "name": "ControlPlaneUpgradeOverride",
-        "modelAsString": true,
-        "values": [
-          {
-            "value": "IgnoreKubernetesDeprecations",
-            "description": "Upgrade the cluster control plane version without checking for recent Kubernetes deprecations usage."
-          }
-        ]
-      },
-      "description": "The list of control plane upgrade override settings."
-    },
     "UpgradeOverrideSettings": {
       "type": "object",
       "properties": {
-        "controlPlaneOverrides": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/ControlPlaneUpgradeOverride"
-          },
-          "x-ms-identifiers": [],
-          "description": "List of upgrade overrides when upgrading a cluster's control plane."
+        "forceUpgrade": {
+          "type": "boolean",
+          "description": "Whether to force upgrade the cluster. Note that this option instructs upgrade operation to bypass upgrade protections such as checking for deprecated API usage. Enable this option only with caution."
         },
         "until": {
           "type": "string",