Skip to content

Commit a381594

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into product-page-edit
2 parents 554f90c + 64c6713 commit a381594

File tree

6 files changed

+49
-42
lines changed

6 files changed

+49
-42
lines changed

articles/aks/availability-zones.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ kubectl describe nodes | grep -e "Name:" -e "topology.kubernetes.io/zone"
100100

101101
The following example output shows the three nodes distributed across the specified region and availability zones, such as *eastus2-1* for the first availability zone and *eastus2-2* for the second availability zone:
102102

103-
```console
103+
```output
104104
Name: aks-nodepool1-28993262-vmss000000
105105
topology.kubernetes.io/zone=eastus2-1
106106
Name: aks-nodepool1-28993262-vmss000001
@@ -113,13 +113,13 @@ As you add more nodes to an agent pool, the Azure platform automatically distrib
113113

114114
With Kubernetes versions 1.17.0 and later, AKS uses the newer label `topology.kubernetes.io/zone` and the deprecated `failure-domain.beta.kubernetes.io/zone`. You can get the same result from running the `kubelet describe nodes` command in the previous step, by running the following script:
115115

116-
```console
116+
```bash
117117
kubectl get nodes -o custom-columns=NAME:'{.metadata.name}',REGION:'{.metadata.labels.topology\.kubernetes\.io/region}',ZONE:'{metadata.labels.topology\.kubernetes\.io/zone}'
118118
```
119119

120120
The following example resembles the output with more verbose details:
121121

122-
```console
122+
```output
123123
NAME REGION ZONE
124124
aks-nodepool1-34917322-vmss000000 eastus eastus-1
125125
aks-nodepool1-34917322-vmss000001 eastus eastus-2
@@ -139,7 +139,7 @@ az aks scale \
139139

140140
When the scale operation completes after a few minutes, run the command `kubectl describe nodes | grep -e "Name:" -e "topology.kubernetes.io/zone"` in a Bash shell. The following output resembles the results:
141141

142-
```console
142+
```output
143143
Name: aks-nodepool1-28993262-vmss000000
144144
topology.kubernetes.io/zone=eastus2-1
145145
Name: aks-nodepool1-28993262-vmss000001
@@ -161,7 +161,7 @@ kubectl scale deployment nginx --replicas=3
161161

162162
By viewing nodes where your pods are running, you see pods are running on the nodes corresponding to three different availability zones. For example, with the command `kubectl describe pod | grep -e "^Name:" -e "^Node:"` in a Bash shell, you see the following example output:
163163

164-
```console
164+
```output
165165
Name: nginx-6db489d4b7-ktdwg
166166
Node: aks-nodepool1-28993262-vmss000000/10.240.0.4
167167
Name: nginx-6db489d4b7-v7zvj

articles/aks/upgrade-windows-2019-2022.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Once you update the nodeSelector on the YAML file, you should also update the co
5858
5959
If you have an application deployed already, follow the recommended steps to deploy a new node pool with Windows Server 2022 nodes. Once deployed, your environment will show Windows Server 2019 and 2022 nodes, with the workloads running on the 2019 nodes:
6060
61-
```console
61+
```bash
6262
kubectl get nodes -o wide
6363
```
6464
This command shows all nodes on your AKS cluster with extra details on the output:
@@ -76,7 +76,7 @@ akswspool000002 Ready agent 5h37m v1.23.8 10.240.0.
7676

7777
With the Windows Server 2022 node pool deployed and the YAML file configured, you can now deploy the new version of the YAML:
7878

79-
```console
79+
```bash
8080
kubectl apply -f <filename>
8181
```
8282

@@ -88,7 +88,7 @@ service/sample unchanged
8888
```
8989
At this point, AKS starts the process of terminating the existing pods and deploying new pods to the Windows Server 2022 nodes. You can check the status of your deployment by running:
9090

91-
```console
91+
```bash
9292
kubectl get pods -o wide
9393
```
9494
This command returns the status of the pods on the default namespace. You might need to change the command above to list the pods on specific namespaces.
@@ -104,4 +104,4 @@ sample-7794bfcc4c-sh78c 1/1 Running 0 2m49s 10.240.0.228 ak
104104

105105
If you're using Group Managed Service Accounts (gMSA), update the Managed Identity configuration for the new node pool. gMSA uses a secret (user account and password) so the node on which the Windows pod is running can authenticate the container against Active Directory. To access that secret on Azure Key Vault, the node uses a Managed Identity that allows the node to access the resource. Since Managed Identities are configured per node pool, and the pod now resides on a new node pool, you need to update that configuration. Check out [Enable Group Managed Service Accounts (GMSA) for your Windows Server nodes on your Azure Kubernetes Service (AKS) cluster](./use-group-managed-service-accounts.md) for more information.
106106

107-
The same principle applies to Managed Identities used for any other pod/node pool when accessing other Azure resources. Any access provided via Managed Identity needs to be updated to reflect the new node pool. To view update and sign-in activities, see [How to view Managed Identity activity](../active-directory/managed-identities-azure-resources/how-to-view-managed-identity-activity.md).
107+
The same principle applies to Managed Identities used for any other pod/node pool when accessing other Azure resources. Any access provided via Managed Identity needs to be updated to reflect the new node pool. To view update and sign-in activities, see [How to view Managed Identity activity](../active-directory/managed-identities-azure-resources/how-to-view-managed-identity-activity.md).

articles/aks/use-multiple-node-pools.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ The ARM64 processor provides low power compute for your Kubernetes workloads. To
130130

131131
Use `az aks nodepool add` command to add an ARM64 node pool.
132132

133-
```azurecli
133+
```azurecli-interactive
134134
az aks nodepool add \
135135
--resource-group myResourceGroup \
136136
--cluster-name myAKSCluster \
@@ -145,7 +145,7 @@ Mariner is an open-source Linux distribution available as an AKS container host.
145145

146146
You can add a Mariner node pool into your existing cluster using the `az aks nodepool add` command and specifying `--os-sku mariner`.
147147

148-
```azurecli
148+
```azurecli-interactive
149149
az aks nodepool add \
150150
--resource-group myResourceGroup \
151151
--cluster-name myAKSCluster \
@@ -166,7 +166,7 @@ Use the following instructions to migrate your Ubuntu nodes to Mariner nodes.
166166
3. [Drain the existing Ubuntu nodes][drain-nodes].
167167
4. Remove the existing Ubuntu nodes using the `az aks delete` command.
168168

169-
```azurecli
169+
```azurecli-interactive
170170
az aks nodepool delete \
171171
--resource-group myResourceGroup \
172172
--cluster-name myAKSCluster \
@@ -317,7 +317,7 @@ az aks nodepool scale \
317317

318318
List the status of your node pools again using the [`az aks node pool list`][az-aks-nodepool-list] command. The following example shows that *mynodepool* is in the *Scaling* state with a new count of *5* nodes:
319319

320-
```azurecli
320+
```azurecli-interactive
321321
az aks nodepool list -g myResourceGroup --cluster-name myAKSCluster
322322
```
323323

@@ -369,7 +369,7 @@ az aks nodepool delete -g myResourceGroup --cluster-name myAKSCluster --name myn
369369

370370
The following example output from the [`az aks node pool list`][az-aks-nodepool-list] command shows that *mynodepool* is in the *Deleting* state:
371371

372-
```azurecli
372+
```azurecli-interactive
373373
az aks nodepool list -g myResourceGroup --cluster-name myAKSCluster
374374
```
375375

@@ -416,13 +416,13 @@ For more information on the capacity reservation groups, please refer to [Capaci
416416

417417
To install the aks-preview extension, run the following command:
418418

419-
```azurecli
419+
```azurecli-interactive
420420
az extension add --name aks-preview
421421
```
422422

423423
Run the following command to update to the latest version of the extension released:
424424

425-
```azurecli
425+
```azurecli-interactive
426426
az extension update --name aks-preview
427427
```
428428

@@ -490,7 +490,7 @@ az aks nodepool add \
490490

491491
The following example output from the [`az aks node pool list`][az-aks-nodepool-list] command shows that *gpunodepool* is *Creating* nodes with the specified *VmSize*:
492492

493-
```azurecli
493+
```azurecli-interactive
494494
az aks nodepool list -g myResourceGroup --cluster-name myAKSCluster
495495
```
496496

@@ -548,7 +548,7 @@ az aks nodepool add \
548548

549549
The following example output from the [`az aks nodepool list`][az-aks-nodepool-list] command shows that *taintnp* is *Creating* nodes with the specified *nodeTaints*:
550550

551-
```azurecli
551+
```azurecli-interactive
552552
az aks nodepool list -g myResourceGroup --cluster-name myAKSCluster
553553
```
554554

@@ -608,13 +608,13 @@ spec:
608608
609609
Schedule the pod using the `kubectl apply -f nginx-toleration.yaml` command:
610610

611-
```console
611+
```bash
612612
kubectl apply -f nginx-toleration.yaml
613613
```
614614

615615
It takes a few seconds to schedule the pod and pull the NGINX image. Use the [kubectl describe pod][kubectl-describe] command to view the pod status. The following condensed example output shows the *sku=gpu:NoSchedule* toleration is applied. In the events section, the scheduler has assigned the pod to the *aks-taintnp-28993262-vmss000000* node:
616616

617-
```console
617+
```bash
618618
kubectl describe pod mypod
619619
```
620620

articles/aks/use-wasi-node-pools.md

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ You must have the latest version of Azure CLI installed.
2323

2424
To install the aks-preview extension, run the following command:
2525

26-
```azurecli
26+
```azurecli-interactive
2727
az extension add --name aks-preview
2828
```
2929

3030
Run the following command to update to the latest version of the extension released:
3131

32-
```azurecli
32+
```azurecli-interactive
3333
az extension update --name aks-preview
3434
```
3535

@@ -85,31 +85,36 @@ az aks nodepool show -g myResourceGroup --cluster-name myAKSCluster -n mywasipoo
8585

8686
The following example output shows the *mywasipool* has the *workloadRuntime* type of *WasmWasi*.
8787

88+
```azurecli-interactive
89+
az aks nodepool show -g myResourceGroup --cluster-name myAKSCluster -n mywasipool --query workloadRuntime
90+
```
8891
```output
89-
$ az aks nodepool show -g myResourceGroup --cluster-name myAKSCluster -n mywasipool --query workloadRuntime
9092
"WasmWasi"
9193
```
9294

9395
Configure `kubectl` to connect to your Kubernetes cluster using the [az aks get-credentials][az-aks-get-credentials] command. The following command:
9496

95-
```azurecli
97+
```azurecli-interactive
9698
az aks get-credentials -n myakscluster -g myresourcegroup
9799
```
98100

99101
Use `kubectl get nodes` to display the nodes in your cluster.
100102

103+
```bash
104+
kubectl get nodes -o wide
105+
```
101106
```output
102-
$ kubectl get nodes -o wide
103107
NAME STATUS ROLES AGE VERSION INTERNAL-IP EXTERNAL-IP OS-IMAGE KERNEL-VERSION CONTAINER-RUNTIME
104108
aks-mywasipool-12456878-vmss000000 Ready agent 123m v1.23.12 <WASINODE_IP> <none> Ubuntu 22.04.1 LTS 5.15.0-1020-azure containerd://1.5.11+azure-2
105109
aks-nodepool1-12456878-vmss000000 Ready agent 133m v1.23.12 <NODE_IP> <none> Ubuntu 22.04.1 LTS 5.15.0-1020-azure containerd://1.5.11+azure-2
106110
```
107111

108112
Use `kubectl describe node` to show the labels on a node in the WASI node pool. The following example shows the details of *aks-mywasipool-12456878-vmss000000*.
109113

114+
```bash
115+
kubectl describe node aks-mywasipool-12456878-vmss000000
116+
```
110117
```output
111-
$ kubectl describe node aks-mywasipool-12456878-vmss000000
112-
113118
Name: aks-mywasipool-12456878-vmss000000
114119
Roles: agent
115120
Labels: agentpool=mywasipool
@@ -143,7 +148,7 @@ scheduling:
143148
144149
Use `kubectl` to create the `RuntimeClass` objects.
145150

146-
```azurecli-interactive
151+
```bash
147152
kubectl apply -f wasm-runtimeclass.yaml
148153
```
149154

@@ -198,14 +203,16 @@ spec:
198203

199204
Use `kubectl` to run your example deployment:
200205

201-
```azurecli-interactive
206+
```bash
202207
kubectl apply -f slight.yaml
203208
```
204209

205210
Use `kubectl get svc` to get the external IP address of the service.
206211

212+
```bash
213+
kubectl get svc
214+
```
207215
```output
208-
$ kubectl get svc
209216
NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE
210217
kubernetes ClusterIP 10.0.0.1 <none> 443/TCP 10m
211218
wasm-slight LoadBalancer 10.0.133.247 <EXTERNAL-IP> 80:30725/TCP 2m47s
@@ -214,7 +221,7 @@ wasm-slight LoadBalancer 10.0.133.247 <EXTERNAL-IP> 80:30725/TCP 2m47s
214221
Access the example application at `http://EXTERNAL-IP/hello`. The following example uses `curl`.
215222

216223
```output
217-
$ curl http://EXTERNAL-IP/hello
224+
curl http://EXTERNAL-IP/hello
218225
hello
219226
```
220227

@@ -225,7 +232,7 @@ hello
225232

226233
To remove the example deployment, use `kubectl delete`.
227234

228-
```azurecli-interactive
235+
```bash
229236
kubectl delete -f slight.yaml
230237
```
231238

articles/azure-app-configuration/use-feature-flags-dotnet-core.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ The Feature Management libraries also manage feature flag lifecycles behind the
2626

2727
The [Add feature flags to an ASP.NET Core app Quickstart](./quickstart-feature-flag-aspnet-core.md) shows a simple example of how to use feature flags in an ASP.NET Core application. This tutorial shows additional setup options and capabilities of the Feature Management libraries. You can use the sample app created in the quickstart to try out the sample code shown in this tutorial.
2828

29-
For the ASP.NET Core feature management API reference documentation, see [Microsoft.FeatureManagement Namespace](https://www.nuget.org/packages/Microsoft.FeatureManagement/).
29+
For the ASP.NET Core feature management API reference documentation, see [Microsoft.FeatureManagement Namespace](/dotnet/api/microsoft.featuremanagement).
3030

3131
In this tutorial, you will learn how to:
3232

@@ -40,7 +40,7 @@ To access the .NET Core feature manager, your app must have references to the `M
4040

4141
The .NET Core feature manager is configured from the framework's native configuration system. As a result, you can define your application's feature flag settings by using any configuration source that .NET Core supports, including the local *appsettings.json* file or environment variables.
4242

43-
By default, the feature manager retrieves feature flag configuration from the `"FeatureManagement"` section of the .NET Core configuration data. To use the default configuration location, call the AddFeatureManagement method of the **IServiceCollection** passed into the **ConfigureServices** method of the **Startup** class.
43+
By default, the feature manager retrieves feature flag configuration from the `"FeatureManagement"` section of the .NET Core configuration data. To use the default configuration location, call the [AddFeatureManagement](/dotnet/api/microsoft.featuremanagement.servicecollectionextensions.addfeaturemanagement) method of the **IServiceCollection** passed into the **ConfigureServices** method of the **Startup** class.
4444

4545

4646
```csharp
@@ -72,7 +72,7 @@ public class Startup
7272
```
7373

7474

75-
If you use filters in your feature flags, you must include the [Microsoft.FeatureManagement.FeatureFilters](/dotnet/api/microsoft.azure.management.storsimple8000series.models.featurefilter) namespace and add a call to AddFeatureFilters specifying the type name of the filter you want to use as the generic type of the method. For more information on using feature filters to dynamically enable and disable functionality, see [Enable staged rollout of features for targeted audiences](./howto-targetingfilter-aspnet-core.md).
75+
If you use filters in your feature flags, you must include the [Microsoft.FeatureManagement.FeatureFilters](/dotnet/api/microsoft.featuremanagement.featurefilters) namespace and add a call to [AddFeatureFilter](/dotnet/api/microsoft.featuremanagement.ifeaturemanagementbuilder.addfeaturefilter) specifying the type name of the filter you want to use as the generic type of the method. For more information on using feature filters to dynamically enable and disable functionality, see [Enable staged rollout of features for targeted audiences](./howto-targetingfilter-aspnet-core.md).
7676

7777
The following example shows how to use a built-in feature filter called `PercentageFilter`:
7878

@@ -217,7 +217,7 @@ By convention, the `FeatureManagement` section of this JSON document is used for
217217

218218
## Use dependency injection to access IFeatureManager
219219

220-
For some operations, such as manually checking feature flag values, you need to get an instance of IFeatureManager. In ASP.NET Core MVC, you can access the feature manager `IFeatureManager` through dependency injection. In the following example, an argument of type `IFeatureManager` is added to the signature of the constructor for a controller. The runtime automatically resolves the reference and provides an of the interface when calling the constructor. If you're using an application template in which the controller already has one or more dependency injection arguments in the constructor, such as `ILogger`, you can just add `IFeatureManager` as an additional argument:
220+
For some operations, such as manually checking feature flag values, you need to get an instance of [IFeatureManager](/dotnet/api/microsoft.featuremanagement.ifeaturemanager). In ASP.NET Core MVC, you can access the feature manager `IFeatureManager` through dependency injection. In the following example, an argument of type `IFeatureManager` is added to the signature of the constructor for a controller. The runtime automatically resolves the reference and provides an of the interface when calling the constructor. If you're using an application template in which the controller already has one or more dependency injection arguments in the constructor, such as `ILogger`, you can just add `IFeatureManager` as an additional argument:
221221

222222
### [.NET 5.x](#tab/core5x)
223223

@@ -321,7 +321,7 @@ public IActionResult Index()
321321
}
322322
```
323323

324-
When an MVC controller or action is blocked because the controlling feature flag is *off*, a registered IDisabledFeaturesHandler interface is called. The default `IDisabledFeaturesHandler` interface returns a 404 status code to the client with no response body.
324+
When an MVC controller or action is blocked because the controlling feature flag is *off*, a registered [IDisabledFeaturesHandler](/dotnet/api/microsoft.featuremanagement.mvc.idisabledfeatureshandler) interface is called. The default `IDisabledFeaturesHandler` interface returns a 404 status code to the client with no response body.
325325

326326
## MVC views
327327

@@ -396,5 +396,5 @@ app.UseForFeature(featureName, appBuilder => {
396396
In this tutorial, you learned how to implement feature flags in your ASP.NET Core application by using the `Microsoft.FeatureManagement` libraries. For more information about feature management support in ASP.NET Core and App Configuration, see the following resources:
397397

398398
* [ASP.NET Core feature flag sample code](./quickstart-feature-flag-aspnet-core.md)
399-
* [Microsoft.FeatureManagement documentation](https://www.nuget.org/packages/Microsoft.FeatureManagement/)
399+
* [Microsoft.FeatureManagement documentation](/dotnet/api/microsoft.featuremanagement)
400400
* [Manage feature flags](./manage-feature-flags.md)

articles/cognitive-services/Translator/containers/translator-how-to-install-container.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ The following table describes the minimum and recommended CPU cores and memory t
6868

6969
| Container | Minimum |Recommended | Language Pair |
7070
|-----------|---------|---------------|----------------------|
71-
| Translator connected |`2` cores, 2-GB memory |`4` cores, 8-GB memory | 4 |
71+
| Translator |`2` cores, 2-GB memory |`4` cores, 8-GB memory | 4 |
7272

7373
* Each core must be at least 2.6 gigahertz (GHz) or faster.
7474

@@ -92,9 +92,9 @@ Application for Gated Services**](https://aka.ms/csgate-translator) to request a
9292

9393
## Translator container image
9494

95-
The Translator container image can be found on the `mcr.microsoft.com` container registry syndicate. It resides within the `azure-cognitive-services/translator` repository and is named `text-translation`. The fully qualified container image name is `mcr.microsoft.com/azure-cognitive-services/translator/text-translation:1.0.019410001-amd64-preview`.
95+
The Translator container image can be found on the `mcr.microsoft.com` container registry syndicate. It resides within the `azure-cognitive-services/translator` repository and is named `text-translation`. The fully qualified container image name is `mcr.microsoft.com/azure-cognitive-services/translator/text-translation:latest`.
9696

97-
To use the latest version of the container, you can use the `latest` tag. You can also find a full list of [tags on the MCR](https://mcr.microsoft.com/product/azure-cognitive-services/translator/text-translation/tags).
97+
To use the latest version of the container, you can use the `latest` tag. You can find a full list of [tags on the MCR](https://mcr.microsoft.com/product/azure-cognitive-services/translator/text-translation/tags).
9898

9999
## Get container images with **docker commands**
100100

@@ -112,7 +112,7 @@ docker run --rm -it -p 5000:5000 --memory 12g --cpus 4 \
112112
-e eula=accept \
113113
-e billing={ENDPOINT_URI} \
114114
-e Languages=en,fr,es,ar,ru \
115-
mcr.microsoft.com/azure-cognitive-services/translator/text-translation:1.0.019410001-amd64-preview
115+
mcr.microsoft.com/azure-cognitive-services/translator/text-translation:latest
116116
```
117117

118118
The above command:

0 commit comments

Comments
 (0)