Skip to content

Commit

Permalink
Merge pull request #316 from lgmorand/staging
Browse files Browse the repository at this point in the history
some cleaning
  • Loading branch information
lgmorand authored Dec 24, 2023
2 parents d63073d + 10d3736 commit 8dcb681
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion data/en/items/bc_dr.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
"url": "https://docs.microsoft.com/azure/aks/operator-best-practices-multi-region#use-azure-traffic-manager-to-route-traffic"
},
{
"title": "Cross-region load balancer (Preview)",
"title": "Cross-region load balancer",
"url": "https://learn.microsoft.com/en-us/azure/load-balancer/cross-region-overview"
}
],
Expand Down
6 changes: 5 additions & 1 deletion data/en/items/networking.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"title": "Choose the best CNI network plugin for your requirements (Azure CNI recommended)",
"priority": "Medium",
"guid": "a0f61565-9de5-458f-a372-49c831112dbd",
"description": "For integration with existing virtual networks or on-premises networks, use Azure CNI networking in AKS. This network model also allows greater separation of resources and controls in an enterprise environment but be aware of the impact on the network topology/IP ranges. In the future, you'll be able to use the CNI overlay model which gives more control and takes the benefits of both approachs.",
"description": "For integration with existing virtual networks or on-premises networks, use Azure CNI networking in AKS. This network model also allows greater separation of resources and controls in an enterprise environment but be aware of the impact on the network topology/IP ranges. You can now use the CNI overlay model which gives more control and takes the benefits of both approachs.",
"detail": "While Kubenet is the default Kubernetes network plugin, the Container Networking Interface (CNI) is a vendor-neutral protocol that lets the container runtime make requests to a network provider. The Azure CNI assigns IP addresses to pods and nodes, and provides IP address management (IPAM) features as you connect to existing Azure virtual networks. Each node and pod resource receives an IP address in the Azure virtual network, and no additional routing is needed to communicate with other resources or services.",
"documentation": [
{
Expand Down Expand Up @@ -66,6 +66,10 @@
"guid": "b3808b9f-a1cf-4204-ad01-3a923ce474db",
"description": "To distribute HTTP or HTTPS traffic to your applications, use ingress resources and controllers. Ingress controllers provide additional features over a regular Azure load balancer, and can be managed as native Kubernetes resources.",
"documentation": [
{
"title": "Application routing add-on for Azure Kubernetes Service (AKS)",
"url": "https://aka.ms/aks/docs/app-routing"
},
{
"title": "Distribute ingress traffic",
"url": "https://docs.microsoft.com/azure/aks/operator-best-practices-network#distribute-ingress-traffic"
Expand Down
2 changes: 1 addition & 1 deletion data/en/items/operations.json
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@
"description": "ContainerLogV2 schema improves the data related to the container logs (such as namespace, pod name, container name, etc.) and allows you to query the logs using these fields",
"documentation": [
{
"title": "Enable the ContainerLogV2 schema (preview)",
"title": "Enable the ContainerLogV2 schema",
"url": "https://learn.microsoft.com/en-gb/azure/azure-monitor/containers/container-insights-logging-v2"
}
],
Expand Down

0 comments on commit 8dcb681

Please sign in to comment.