Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-aadroles-protected-actions-preview

Author: rolyon

articles/aks/TOC.yml

@@ -205,7 +205,7 @@
           href: cluster-container-registry-integration.md
         - name: Use Vertical Pod Autoscaler
           href: vertical-pod-autoscaler.md
-        - name: Metrics Server VPA Throttling
+        - name: Configure Metrics Server VPA
           href: use-metrics-server-vertical-pod-autoscaler.md
         - name: Scale an AKS cluster
           href: scale-cluster.md

articles/aks/use-metrics-server-vertical-pod-autoscaler.md

@@ -2,7 +2,7 @@
 title: Configure Metrics Server VPA in Azure Kubernetes Service (AKS)
 description: Learn how to vertically autoscale your Metrics Server pods on an Azure Kubernetes Service (AKS) cluster.
 ms.topic: article
-ms.date: 03/21/2023
+ms.date: 03/27/2023
 ---
 
 # Configure Metrics Server VPA in Azure Kubernetes Service (AKS)
@@ -24,22 +24,22 @@ To update the coefficient values, create a ConfigMap in the overlay *kube-system
 1. Create a ConfigMap file named *metrics-server-config.yaml* and copy in the following manifest.
 
     ```yml
-    apiVersion: v1 
-    kind: ConfigMap 
-    metadata: 
-      name: metrics-server-config 
-      namespace: kube-system 
-      labels: 
-        kubernetes.io/cluster-service: "true" 
-        addonmanager.kubernetes.io/mode: EnsureExists 
-    data: 
-      NannyConfiguration: |- 
-        apiVersion: nannyconfig/v1alpha1 
-        kind: NannyConfiguration 
-        baseCPU: 100m 
-        cpuPerNode: 1m 
-        baseMemory: 100Mi 
-        memoryPerNode: 8Mi 
+    apiVersion: v1
+    kind: ConfigMap
+    metadata:
+      name: metrics-server-config
+      namespace: kube-system
+      labels:
+        kubernetes.io/cluster-service: "true"
+        addonmanager.kubernetes.io/mode: EnsureExists
+    data:
+      NannyConfiguration: |-
+        apiVersion: nannyconfig/v1alpha1
+        kind: NannyConfiguration
+        baseCPU: 100m
+        cpuPerNode: 1m
+        baseMemory: 100Mi
+        memoryPerNode: 8Mi
     ```
 
     In the ConfigMap example, the resource limit and request are changed to the following:
@@ -89,22 +89,22 @@ If you would like to bypass VPA for Metrics Server and manually control its reso
 1. Create a ConfigMap file named *metrics-server-config.yaml* and copy in the following manifest.
 
     ```yml
-    apiVersion: v1 
-    kind: ConfigMap 
-    metadata: 
-      name: metrics-server-config 
-      namespace: kube-system 
-      labels: 
-        kubernetes.io/cluster-service: "true" 
-        addonmanager.kubernetes.io/mode: EnsureExists 
-    data: 
-      NannyConfiguration: |- 
-        apiVersion: nannyconfig/v1alpha1 
-        kind: NannyConfiguration 
-        baseCPU: 100m 
-        cpuPerNode: 0m 
-        baseMemory: 100Mi 
-        memoryPerNode: 0Mi 
+    apiVersion: v1
+    kind: ConfigMap
+    metadata:
+      name: metrics-server-config
+      namespace: kube-system
+      labels:
+        kubernetes.io/cluster-service: "true"
+        addonmanager.kubernetes.io/mode: EnsureExists
+    data:
+      NannyConfiguration: |-
+        apiVersion: nannyconfig/v1alpha1
+        kind: NannyConfiguration
+        baseCPU: 100m
+        cpuPerNode: 0m
+        baseMemory: 100Mi
+        memoryPerNode: 0Mi
     ```
 
    In this ConfigMap example, it changes the resource limit and request to the following:
@@ -126,7 +126,7 @@ If you would like to bypass VPA for Metrics Server and manually control its reso
     kubectl -n kube-system delete po metrics-server-pod-name
     ```
 
-4. To verify the updated resources took affect, run the following command to review the Metrics Server VPA log.
+4. To verify the updated resources took effect, run the following command to review the Metrics Server VPA log.
 
     ```bash
     kubectl -n kube-system logs metrics-server-pod-name -c metrics-server-vpa
@@ -150,22 +150,22 @@ If you would like to bypass VPA for Metrics Server and manually control its reso
 1. If you use the following configmap, the Metrics Server VPA customizations aren't applied. You need add a unit for `baseCPU`.
 
     ```yml
-    apiVersion: v1 
-     kind: ConfigMap 
-     metadata: 
-       name: metrics-server-config 
-       namespace: kube-system 
-       labels: 
-         kubernetes.io/cluster-service: "true" 
-         addonmanager.kubernetes.io/mode: EnsureExists 
-     data: 
-       NannyConfiguration: |- 
-         apiVersion: nannyconfig/v1alpha1 
-         kind: NannyConfiguration 
-         baseCPU: 100 
-         cpuPerNode: 1m 
-         baseMemory: 100Mi 
-         memoryPerNode: 8Mi 
+    apiVersion: v1
+    kind: ConfigMap
+    metadata:
+      name: metrics-server-config
+      namespace: kube-system
+      labels:
+        kubernetes.io/cluster-service: "true"
+        addonmanager.kubernetes.io/mode: EnsureExists
+    data:
+      NannyConfiguration: |-
+        apiVersion: nannyconfig/v1alpha1
+        kind: NannyConfiguration
+        baseCPU: 100
+        cpuPerNode: 1m
+        baseMemory: 100Mi
+        memoryPerNode: 8Mi
     ```
 
    The following example output resembles the results showing the updated throttling settings aren't applied.
@@ -200,4 +200,4 @@ Metrics Server is a component in the core metrics pipeline. For more information
 [metrics-server-api-design]: https://github.com/kubernetes/design-proposals-archive/blob/main/instrumentation/resource-metrics-api.md
 
 <!--- INTERNAL LINKS --->
-[horizontal-pod-autoscaler]: concepts-scale.md#horizontal-pod-autoscaler
+[horizontal-pod-autoscaler]: concepts-scale.md#horizontal-pod-autoscaler

articles/azure-functions/create-first-function-cli-node.md

@@ -29,7 +29,7 @@ Before you begin, you must have the following:
 ::: zone-end
 
 ::: zone pivot="nodejs-model-v4" 
-+ The [Azure Functions Core Tools](./functions-run-local.md#v2) version v4.0.5085 or above
++ The [Azure Functions Core Tools](./functions-run-local.md#v2) version v4.0.5095 or above
 ::: zone-end
 
 + One of the following tools for creating Azure resources:
@@ -57,7 +57,7 @@ Verify your prerequisites, which depend on whether you are using Azure CLI or Az
 ::: zone-end
 
 ::: zone pivot="nodejs-model-v4" 
-+ In a terminal or command window, run `func --version` to check that the Azure Functions Core Tools are version v4.0.4915 or above.
++ In a terminal or command window, run `func --version` to check that the Azure Functions Core Tools are version v4.0.5095 or above.
 ::: zone-end
 
 + Run `az --version` to check that the Azure CLI version is 2.4 or later.
@@ -71,7 +71,7 @@ Verify your prerequisites, which depend on whether you are using Azure CLI or Az
 ::: zone-end
 
 ::: zone pivot="nodejs-model-v4" 
-+ In a terminal or command window, run `func --version` to check that the Azure Functions Core Tools are version v4.0.4915 or above.
++ In a terminal or command window, run `func --version` to check that the Azure Functions Core Tools are version v4.0.5095 or above.
 ::: zone-end
 
 + Run `(Get-Module -ListAvailable Az).Version` and verify version 5.0 or later.

articles/azure-functions/create-first-function-cli-typescript.md

@@ -28,7 +28,7 @@ Before you begin, you must have the following:
 + The [Azure Functions Core Tools](./functions-run-local.md#v2) version 4.x.
 ::: zone-end
 ::: zone pivot="nodejs-model-v4" 
-+ The [Azure Functions Core Tools](./functions-run-local.md#v2) version v4.0.5085 or above
++ The [Azure Functions Core Tools](./functions-run-local.md#v2) version v4.0.5095 or above
 ::: zone-end
 
 + One of the following tools for creating Azure resources:
@@ -58,7 +58,7 @@ Verify your prerequisites, which depend on whether you're using Azure CLI or Azu
 ::: zone-end
 
 ::: zone pivot="nodejs-model-v4" 
-+ In a terminal or command window, run `func --version` to check that the Azure Functions Core Tools are version v4.0.4915 or above.
++ In a terminal or command window, run `func --version` to check that the Azure Functions Core Tools are version v4.0.5095 or above.
 ::: zone-end
 
 + Run `az --version` to check that the Azure CLI version is 2.4 or later.
@@ -72,7 +72,7 @@ Verify your prerequisites, which depend on whether you're using Azure CLI or Azu
 ::: zone-end
 
 ::: zone pivot="nodejs-model-v4" 
-+ In a terminal or command window, run `func --version` to check that the Azure Functions Core Tools are version v4.0.4915 or above.
++ In a terminal or command window, run `func --version` to check that the Azure Functions Core Tools are version v4.0.5095 or above.
 ::: zone-end
 
 + Run `(Get-Module -ListAvailable Az).Version` and verify version 5.0 or later.

articles/azure-functions/create-first-function-vs-code-typescript.md

@@ -41,7 +41,7 @@ Before you get started, make sure you have the following requirements in place:
 + [Azure Functions Core Tools 4.x](functions-run-local.md#install-the-azure-functions-core-tools).
 ::: zone-end
 ::: zone pivot="nodejs-model-v4" 
-+ [Azure Functions Core Tools v4.0.5085 or above](functions-run-local.md#install-the-azure-functions-core-tools).
++ [Azure Functions Core Tools v4.0.5095 or above](functions-run-local.md#install-the-azure-functions-core-tools).
 ::: zone-end
 
 ## <a name="create-an-azure-functions-project"></a>Create your local project

articles/azure-functions/durable/quickstart-js-vscode.md

@@ -37,7 +37,7 @@ To complete this tutorial:
 * Make sure you have the latest version of the [Azure Functions Core Tools](../functions-run-local.md).
 ::: zone-end
 ::: zone pivot="nodejs-model-v4"
-* Make sure you have [Azure Functions Core Tools](../functions-run-local.md) version `v4.0.5085` or above.
+* Make sure you have [Azure Functions Core Tools](../functions-run-local.md) version `v4.0.5095` or above.
 ::: zone-end
 
 * Durable Functions require an Azure storage account. You need an Azure subscription.

articles/azure-functions/durable/quickstart-ts-vscode.md

@@ -37,7 +37,7 @@ To complete this tutorial:
 * Make sure you have the latest version of the [Azure Functions Core Tools](../functions-run-local.md).
 ::: zone-end
 ::: zone pivot="nodejs-model-v4"
-* Make sure you have [Azure Functions Core Tools](../functions-run-local.md) version `v4.0.5085` or above.
+* Make sure you have [Azure Functions Core Tools](../functions-run-local.md) version `v4.0.5095` or above.
 ::: zone-end
 
 * Durable Functions require an Azure storage account. You need an Azure subscription.

articles/azure-functions/functions-node-upgrade-v4.md

@@ -23,11 +23,11 @@ Version 4 was designed with the following goals in mind:
 
 Version 4 of the Node.js programming model requires the following minimum versions:
 
-- [`@azure/functions`](https://www.npmjs.com/package/@azure/functions) npm package v4.0.0-alpha.8+
+- [`@azure/functions`](https://www.npmjs.com/package/@azure/functions) npm package v4.0.0-alpha.9+
 - [Node.js](https://nodejs.org/en/download/releases/) v18+
 - [TypeScript](https://www.typescriptlang.org/) v4+
 - [Azure Functions Runtime](./functions-versions.md) v4.16+
-- [Azure Functions Core Tools](./functions-run-local.md) v4.0.4915+ (if running locally)
+- [Azure Functions Core Tools](./functions-run-local.md) v4.0.5095+ (if running locally)
 
 ## Enable v4 programming model
 

articles/azure-functions/functions-reference-node.md

@@ -31,7 +31,7 @@ The following table shows each version of the Node.js programming model along wi
 
 | [Programming Model Version](https://www.npmjs.com/package/@azure/functions?activeTab=versions) | Support Level | [Functions Runtime Version](./functions-versions.md) | [Node.js Version](https://github.com/nodejs/release#release-schedule) | Description |
 | ---- | ---- | --- | --- | --- |
-| 4.x | Preview | 4.x | 18.x | Supports a flexible file structure and code-centric approach to triggers and bindings. |
+| 4.x | Preview | 4.16+ | 18.x | Supports a flexible file structure and code-centric approach to triggers and bindings. |
 | 3.x | GA | 4.x | 18.x, 16.x, 14.x | Requires a specific file structure with your triggers and bindings declared in a "function.json" file |
 | 2.x | GA (EOL) | 3.x | 14.x, 12.x, 10.x | Reached end of life (EOL) on December 13, 2022. See [Functions Versions](./functions-versions.md) for more info. |
 | 1.x | GA (EOL) | 2.x | 10.x, 8.x | Reached end of life (EOL) on December 13, 2022. See [Functions Versions](./functions-versions.md) for more info. |

includes/functions-requirements-visual-studio-code-node-v4.md

@@ -14,4 +14,4 @@ ms.author: jiayma
 
 + The [Azure Functions extension v1.10.4](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-azurefunctions) or above for Visual Studio Code.
 
-+ [Azure Functions Core Tools v4.0.5085 or above](../articles/azure-functions/functions-run-local.md#install-the-azure-functions-core-tools).
++ [Azure Functions Core Tools v4.0.5095 or above](../articles/azure-functions/functions-run-local.md#install-the-azure-functions-core-tools).