Skip to content

Commit 50486ea

Browse files
author
Phill Gibson
committed
fixed merge blocking issues
1 parent d5a9868 commit 50486ea

File tree

4 files changed

+22
-2
lines changed

4 files changed

+22
-2
lines changed

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46503,6 +46503,16 @@
4650346503
"redirect_url": "/azure/aks/open-service-mesh-deploy-addon-az-cli",
4650446504
"redirect_document_id": false
4650546505
},
46506+
{
46507+
"source_path_from_root": "articles/aks/open-service-mesh-customize-add-on-experience.md",
46508+
"redirect_url": "/azure/aks/open-service-mesh-deploy-binary",
46509+
"redirect_document_id": false
46510+
},
46511+
{
46512+
"source_path_from_root": "/articles/aks/open-service-mesh-disable-add-on.md",
46513+
"redirect_url": "/azure/aks/open-service-mesh-deploy-addon-az-cli",
46514+
"redirect_document_id": false
46515+
},
4650646516
{
4650746517
"source_path_from_root": "/articles/iot-dps/quick-create-device-symmetric-key-csharp.md",
4650846518
"redirect_url": "/azure/iot-dps/quick-create-simulated-device-symm-key",

articles/aks/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,8 @@
386386
href: open-service-mesh-deploy-new-application.md
387387
- name: Manage an existing application deployment
388388
href: open-service-mesh-deploy-existing-application.md
389+
- name: Using Azure Application Gateway Ingress
390+
href: open-service-mesh-azure-application-gateway-ingress.md
389391
- name: Using Kubernetes Nginx Ingress Controller
390392
href: open-service-mesh-nginx-ingress.md
391393
- name: Configure observability using Prometheus, Grafana, and Jaeger

articles/aks/open-service-mesh-deploy-addon-az-cli.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ For an existing AKS cluster scenario, you will enable the OSM add-on to an exist
5757
To enable the AKS OSM add-on, you will need to run the `az aks enable-addons --addons` command passing the parameter `open-service-mesh`
5858

5959
> [!NOTE]
60-
> For the OSM add-on deployment to succeed, only one OSM mesh instance should be deployed on your cluster. If you have other OSM mesh instances on your cluster, please uninstall them before running the `enable-addons` command.
60+
> For the OSM add-on deployment to succeed, only one OSM mesh instance should be deployed on your cluster. If you have other OSM mesh instances on your cluster, please uninstall them before running the `enable-addons` command.
6161
6262
```azurecli-interactive
6363
az aks enable-addons --addons open-service-mesh -g <my-osm-aks-cluster-rg> -n <my-osm-aks-cluster-name>
@@ -162,6 +162,14 @@ Notice the **enablePermissiveTrafficPolicyMode** is configured to **true**. Perm
162162
kubectl patch meshconfig osm-mesh-config -n kube-system -p '{"spec":{"traffic":{"enablePermissiveTrafficPolicyMode":true}}}' --type=merge
163163
```
164164

165+
## Disable Open Service Mesh (OSM) add-on for your AKS cluster
166+
167+
To disable the OSM add-on, run the following command:
168+
169+
```azurecli-interactive
170+
az aks disable-addons -n <AKS-cluster-name> -g <AKS-resource-group-name> -a open-service-mesh
171+
```
172+
165173
<!-- Links -->
166174
<!-- Internal -->
167175

articles/aks/open-service-mesh-nginx-ingress.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ service/bookwarehouse created
169169
deployment.apps/bookwarehouse created
170170
```
171171

172-
## Update the Bookbuyer Service
172+
## Update the Bookbuyer service
173173

174174
Update the `bookbuyer` service to the correct inbound port configuration with the following service manifest.
175175

0 commit comments

Comments
 (0)