Skip to content

Commit e586ca2

Browse files
authored
Merge pull request #273578 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 0e5361e + e49ed24 commit e586ca2

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

articles/aks/api-server-vnet-integration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ az group create -l <location> -n <resource-group>
207207
208208
## Convert an existing AKS cluster to API Server VNet Integration
209209
210-
You can convert existing public/private AKS clusters to API Server VNet Integration clusters by supplying an API server subnet that meets the requirements listed earlier. These requirements include: in the same VNet as the cluster nodes, permissions granted for the AKS cluster identity, and size of at least */28*. Converting your cluster is a one-way migration. Clusters can't have API Server VNet Integration disabled after it's been enabled.
210+
You can convert existing public/private AKS clusters to API Server VNet Integration clusters by supplying an API server subnet that meets the requirements listed earlier. These requirements include: in the same VNet as the cluster nodes, permissions granted for the AKS cluster identity, not used by other resources like private endpoint, and size of at least */28*. Converting your cluster is a one-way migration. Clusters can't have API Server VNet Integration disabled after it's been enabled.
211211
212212
This upgrade performs a node-image version upgrade on all node pools and restarts all workloads while they undergo a rolling image upgrade.
213213

articles/aks/azure-cni-overlay.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Like Azure CNI Overlay, Kubenet assigns IP addresses to pods from an address spa
3737
|------------------------------|--------------------------------------------------------------|-------------------------------------------------------------------------------|
3838
| Cluster scale | 5000 nodes and 250 pods/node | 400 nodes and 250 pods/node |
3939
| Network configuration | Simple - no extra configurations required for pod networking | Complex - requires route tables and UDRs on cluster subnet for pod networking |
40-
| Pod connectivity performance | Performance on par with VMs in a VNet | Extra hop adds minor latency |
40+
| Pod connectivity performance | Performance on par with VMs in a VNet | Extra hop adds latency |
4141
| Kubernetes Network Policies | Azure Network Policies, Calico, Cilium | Calico |
4242
| OS platforms supported | Linux and Windows Server 2022, 2019 | Linux only |
4343

articles/cost-management-billing/automate/understand-usage-details-fields.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ MPA accounts have all MCA terms, in addition to the MPA terms, as described in t
8686
| PlanName | EA, pay-as-you-go | Marketplace plan name. |
8787
| PreviousInvoiceId | MCA | Reference to an original invoice if the line item is a refund. |
8888
| PricingCurrency | MCA | Currency used when rating based on negotiated prices. |
89-
| PricingModel | All | Identifier that indicates how the meter is priced. (Values: `On Demand`, `Reservation`, and `Spot`) |
89+
| PricingModel | All | Identifier that indicates how the meter is priced. (Values: `OnDemand`, `Reservation`, `Spot` and `SavingsPlan`) |
9090
| Product | All | Name of the product. |
9191
| ProductId¹ | MCA | Unique identifier for the product. |
9292
| ProductOrderId | All | Unique identifier for the product order. |

0 commit comments

Comments
 (0)