Skip to content

Commit bb81354

Browse files
authored
Merge pull request #186835 from zr-msft/zr-aks-osm-addon-refactor-agic-nginx
aks-addon/osm: remove agic and nginx ingress pages
2 parents fd20c87 + 95a5af9 commit bb81354

File tree

5 files changed

+19
-779
lines changed

5 files changed

+19
-779
lines changed

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40772,6 +40772,11 @@
4077240772
"redirect_url": "/azure/aks/",
4077340773
"redirect_document_id": false
4077440774
},
40775+
{
40776+
"source_path": "articles/aks/open-service-mesh-azure-application-gateway-ingress.md",
40777+
"redirect_url": "/azure/aks/open-service-mesh-about",
40778+
"redirect_document_id": false
40779+
},
4077540780
{
4077640781
"source_path": "articles/aks/open-service-mesh-ip-port-exclusion.md",
4077740782
"redirect_url": "/azure/aks/open-service-mesh-about",
@@ -40782,6 +40787,11 @@
4078240787
"redirect_url": "/azure/aks/open-service-mesh-about",
4078340788
"redirect_document_id": false
4078440789
},
40790+
{
40791+
"source_path": "articles/aks/open-service-mesh-nginx-ingress.md",
40792+
"redirect_url": "/azure/aks/open-service-mesh-about",
40793+
"redirect_document_id": false
40794+
},
4078540795
{
4078640796
"source_path": "articles/aks/open-service-mesh-deploy-existing-application.md",
4078740797
"redirect_url": "/azure/aks/open-service-mesh-about",

articles/aks/TOC.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -446,10 +446,6 @@
446446
href: open-service-mesh-ip-port-exclusion.md
447447
- name: Configure Azure Monitor
448448
href: open-service-mesh-azure-monitor.md
449-
- name: Integrate with Azure Application Gateway Ingress
450-
href: open-service-mesh-azure-application-gateway-ingress.md
451-
- name: Integrate with NGINX Ingress Controller
452-
href: open-service-mesh-nginx-ingress.md
453449
- name: Troubleshoot Open Service Mesh
454450
href: open-service-mesh-troubleshoot.md
455451
- name: Uninstall the Open Service Mesh AKS add-on

articles/aks/open-service-mesh-about.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ OSM provides the following capabilities and features:
3232
- Define and execute fine grained access control policies for services.
3333
- Monitor and debug services using observability and insights into application metrics.
3434
- Integrate with external certificate management.
35+
- Integrates with existing ingress solutions such as the [Azure Gateway Ingress Controller][agic], [NGINX][nginx], and [Contour][contour]. For more details on how ingress works with OSM, see [Using Ingress to manage external access to services within the cluster][osm-ingress]. For an example on integrating OSM with Contour for ingress, see [Ingress with Contour][osm-contour]. For an example on integrating OSM with ingress controllers that use the `networking.k8s.io/v1` API, such as NGINX, see [Ingress with Kubernetes Nginx Ingress Controller][osm-nginx].
3536

3637
## Example scenarios
3738

@@ -61,3 +62,11 @@ After enabling the OSM add-on using the [Azure CLI][osm-azure-cli] or a [Bicep t
6162
[osm-bicep]: open-service-mesh-deploy-addon-bicep.md
6263
[osm-deploy-sample-app]: https://release-v1-0.docs.openservicemesh.io/docs/getting_started/install_apps/
6364
[osm-onboard-app]: https://release-v1-0.docs.openservicemesh.io/docs/guides/app_onboarding/
65+
[ip-tables-redirection]: https://docs.openservicemesh.io/docs/guides/traffic_management/iptables_redirection/
66+
[global-exclusion]: https://docs.openservicemesh.io/docs/guides/traffic_management/iptables_redirection/#global-outbound-ip-range-exclusions
67+
[agic]: ../application-gateway/ingress-controller-overview.md
68+
[nginx]: https://github.com/kubernetes/ingress-nginx
69+
[contour]: https://projectcontour.io/
70+
[osm-ingress]: https://release-v1-0.docs.openservicemesh.io/docs/guides/traffic_management/ingress/
71+
[osm-contour]: https://release-v1-0.docs.openservicemesh.io/docs/demos/ingress_contour
72+
[osm-nginx]: https://release-v1-0.docs.openservicemesh.io/docs/demos/ingress_k8s_nginx

0 commit comments

Comments
 (0)