Skip to content

Commit bba29d5

Browse files
authored
Merge pull request #270601 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 5492ba2 + aeb783c commit bba29d5

File tree

6 files changed

+45
-18
lines changed

6 files changed

+45
-18
lines changed

articles/app-service/manage-custom-dns-buy-domain.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ If launched from an app's **Custom domains** page, the App Service domain wizard
136136

137137
## Renew the domain
138138

139-
The App Service domain you bought is valid for one year from the time of purchase. You can configure to renew your domain automatically, which will charge your payment method when your domain renews the following year. You can also manually renew your domain name up to 90 days ahead of domain expiration.
139+
The App Service domain you bought is valid for one year from the time of purchase. You can configure to renew your domain automatically, or you can also manually renew your domain name up to 90 days ahead of domain expiration. Upon successful auto or manual renewal, you will be billed for the cost of the domain and your domain expiration will be extended for another year.
140140

141141
> [!NOTE]
142142
> For .nl domains, you can only manually renew the domain starting 90 days ahead of domain expiration and up to the 20th of the month before the expiration date. You will not be able to renew the domain after this period even if the domain has not yet expired.

articles/azure-monitor/app/java-standalone-sampling-overrides.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Sampling overrides (preview) - Azure Monitor Application Insights for Java
2+
title: Sampling overrides - Azure Monitor Application Insights for Java
33
description: Learn to configure sampling overrides in Azure Monitor Application Insights for Java.
44
ms.topic: conceptual
55
ms.date: 11/15/2023
@@ -8,7 +8,7 @@ ms.custom: devx-track-java, devx-track-extended-java
88
ms.reviewer: mmcc
99
---
1010

11-
# Sampling overrides (preview) - Azure Monitor Application Insights for Java
11+
# Sampling overrides - Azure Monitor Application Insights for Java
1212

1313
> [!NOTE]
1414
> The sampling overrides feature is in GA, starting from 3.5.0.

articles/backup/blob-backup-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ You won't incur any management charges or instance fee when using operational ba
102102

103103
- Retention of data because of [Soft delete for blobs](../storage/blobs/soft-delete-blob-overview.md), [Change feed support in Azure Blob Storage](../storage/blobs/storage-blob-change-feed.md), and [Blob versioning](../storage/blobs/versioning-overview.md).
104104

105-
# [Vaukted backup (preview)](#tab/vaulted-backup)
105+
# [Vaulted backup (preview)](#tab/vaulted-backup)
106106

107107
You won't incur backup storage charges or instance fees during the preview. However, you'll incur the source side cost, [associated with Object replication](../storage/blobs/object-replication-overview.md#billing), on the backed-up source account.
108108

articles/container-registry/container-registry-geo-replication.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.date: 10/31/2023
1010
---
1111
# Geo-replication in Azure Container Registry
1212

13-
Companies that want a local presence, or a hot backup, choose to run services from multiple Azure regions. As a best practice, placing a container registry in each region where images are run allows network-close operations, enabling fast, reliable image layer transfers. Geo-replication enables an Azure container registry to function as a single registry, serving multiple regions with multi-primary regional registries.
13+
Companies that want a local presence or a hot backup choose to run services from multiple Azure regions. As a best practice, placing a container registry in each region where images are run allows network-close operations, enabling fast, reliable image layer transfers. Geo-replication enables an Azure container registry to function as a single registry, serving multiple regions with multi-primary regional registries.
1414

1515
A geo-replicated registry provides the following benefits:
1616

@@ -21,22 +21,22 @@ A geo-replicated registry provides the following benefits:
2121
* Registry resilience if a regional outage occurs
2222

2323
> [!NOTE]
24-
> * If you need to maintain copies of container images in more than one Azure container registry, Azure Container Registry also supports [image import](container-registry-import-images.md). For example, in a DevOps workflow, you can import an image from a development registry to a production registry, without needing to use Docker commands.
24+
> * If you need to maintain copies of container images in more than one Azure container registry, Azure Container Registry also supports [image import](container-registry-import-images.md). For example, in a DevOps workflow, you can import an image from a development registry to a production registry without needing to use Docker commands.
2525
> * If you want to move a registry to a different Azure region, instead of geo-replicating the registry, see [Manually move a container registry to another region](manual-regional-move.md).
2626
2727
## Prerequisites
2828

29-
* The user requires following permissions (at registry level) to create/delete replications:
29+
* The user requires the following permissions (at the registry level) to create/delete replications:
3030

3131
| Permission | Description |
3232
|---|---|
3333
| Microsoft.ContainerRegistry/registries/write | Create a replication |
3434
| Microsoft.ContainerRegistry/registries/replications/write | Delete a replication |
3535

3636
## Example use case
37-
Contoso runs a public presence website located across the US, Canada, and Europe. To serve these markets with local and network-close content, Contoso runs [Azure Kubernetes Service](../aks/index.yml) (AKS) clusters in West US, East US, Canada Central, and West Europe. The website application, deployed as a Docker image, utilizes the same code and image across all regions. Content, local to that region, is retrieved from a database, which is provisioned uniquely in each region. Each regional deployment has its unique configuration for resources like the local database.
37+
Contoso runs a public presence website located across the US, Canada, and Europe. To serve these markets with local and network-close content, Contoso runs [Azure Kubernetes Service](../aks/index.yml) (AKS) clusters in West US, East US, Canada Central, and West Europe. The website application, deployed as a Docker image, utilizes the same code and image across all regions. Content local to that region is retrieved from a database, which is provisioned uniquely in each region. Each regional deployment has its unique configuration for resources like the local database.
3838

39-
The development team is located in Seattle WA, utilizing the West US data center.
39+
The development team is located in Seattle, WA, and utilizes the West US data center.
4040

4141
![Pushing to multiple registries](media/container-registry-geo-replication/before-geo-replicate.png)<br />*Pushing to multiple registries*
4242

@@ -59,11 +59,11 @@ Typical challenges of multiple registries include:
5959

6060
![Pulling from a geo-replicated registry](media/container-registry-geo-replication/after-geo-replicate-pull.png)
6161

62-
The geo-replication feature of Azure Container Registry has following benefits:
62+
The geo-replication feature of Azure Container Registry has the following benefits:
6363

6464
* Manage a single registry across all regions: `contoso.azurecr.io`
6565
* Manage a single configuration of image deployments as all regions use the same image URL: `contoso.azurecr.io/public/products/web:1.2`
66-
* Push to a single registry, while ACR automatically manages the geo-replication. ACR only replicates unique layers, reducing data transfer across regions.
66+
* Push to a single registry while ACR automatically manages the geo-replication. ACR only replicates unique layers, reducing data transfer across regions.
6767
* Configure regional [webhooks](container-registry-webhook.md) to notify you of events in specific replicas.
6868
* Provide a highly available registry that is resilient to regional outages.
6969

@@ -102,7 +102,7 @@ ACR begins syncing images across the configured replicas. Once complete, the por
102102
## Considerations for using a geo-replicated registry
103103

104104
* Each region in a geo-replicated registry is independent once set-up. Azure Container Registry SLAs apply to each geo-replicated region.
105-
* For every push or pull image operations on a geo-replicated registry, Azure Traffic Manager in the background sends a request to the registry closest location in the region to maintain network latency.
105+
* For every push or pull image operation on a geo-replicated registry, Azure Traffic Manager in the background sends a request to the registry's closest location in the region to maintain network latency.
106106
* After you push an image or tag update to the closest region, it takes some time for Azure Container Registry to replicate the manifests and layers to the remaining regions you opted into. Larger images take longer to replicate than smaller ones. Images and tags are synchronized across the replication regions with an eventual consistency model.
107107
* To manage workflows that depend on push updates to a geo-replicated registry, we recommend that you configure [webhooks](container-registry-webhook.md) to respond to the push events. You can set up regional webhooks within a geo-replicated registry to track push events as they complete across the geo-replicated regions.
108108
* To serve blobs representing content layers, Azure Container Registry uses data endpoints. You can enable [dedicated data endpoints](container-registry-firewall-access-rules.md#enable-dedicated-data-endpoints) for your registry in each of your registry's geo-replicated regions. These endpoints allow configuration of tightly scoped firewall access rules. For troubleshooting purposes, you can optionally [disable routing to a replication](#temporarily-disable-routing-to-replication) while maintaining replicated data.
@@ -112,7 +112,7 @@ ACR begins syncing images across the configured replicas. Once complete, the por
112112

113113
* For high availability and resiliency, we recommend creating a registry in a region that supports enabling [zone redundancy](zone-redundancy.md). Enabling zone redundancy in each replica region is also recommended.
114114
* If an outage occurs in the registry's home region (the region where it was created) or one of its replica regions, a geo-replicated registry remains available for data plane operations such as pushing or pulling container images.
115-
* If the registry's home region becomes unavailable, you may be unable to carry out registry management operations including configuring network rules, enabling availability zones, and managing replicas.
115+
* If the registry's home region becomes unavailable, you may be unable to carry out registry management operations, including configuring network rules, enabling availability zones, and managing replicas.
116116
* To plan for high availability of a geo-replicated registry encrypted with a [customer-managed key](tutorial-enable-customer-managed-keys.md) stored in an Azure key vault, review the guidance for key vault [failover and redundancy](../key-vault/general/disaster-recovery-guidance.md).
117117

118118
## Delete a replica
@@ -121,8 +121,8 @@ After you've configured a replica for your registry, you can delete it at any ti
121121

122122
To delete a replica in the Azure portal:
123123

124-
1. Navigate to your Azure Container Registry, and select **Replications**.
125-
1. Select the name of a replica, and select **Delete**. Confirm that you want to delete the replica.
124+
1. Navigate to your Azure Container Registry and select **Replications**.
125+
1. Select the name of a replica and select **Delete**. Confirm that you want to delete the replica.
126126

127127
To use the Azure CLI to delete a replica of *myregistry* in the East US region:
128128

@@ -134,7 +134,7 @@ az acr replication delete --name eastus --registry myregistry
134134

135135
Geo-replication is a feature of the [Premium service tier](container-registry-skus.md) of Azure Container Registry. When you replicate a registry to your desired regions, you incur Premium registry fees for each region.
136136

137-
In the preceding example, Contoso consolidated two registries down to one, adding replicas to East US, Canada Central, and West Europe. Contoso would pay four times Premium per month, with no additional configuration or management. Each region now pulls their images locally, improving performance, reliability without network egress fees from West US to Canada and East US.
137+
In the preceding example, Contoso consolidated two registries down to one, adding replicas to East US, Canada Central, and West Europe. Contoso would pay four times Premium per month, with no additional configuration or management. Each region now pulls their images locally, improving performance and reliability without network egress fees from the West US to Canada and the East US.
138138

139139
## Troubleshoot push operations with geo-replicated registries
140140

@@ -170,7 +170,7 @@ az acr replication update --name westus \
170170

171171
## Creating replication for a Private Endpoint enabled registry
172172

173-
When creating a new registry replication for the primary registry enabled with Private Endpoint, we recommend validating User Identity has valid Private Endpoint creation permissions. Otherwise, the operation gets stuck in the provisioning state while creating the replication.
173+
When creating a new registry replication for the primary registry enabled with Private Endpoint, we recommend validating that the User Identity has valid Private Endpoint creation permissions. Otherwise, the operation gets stuck in the provisioning state while creating the replication.
174174

175175
Follow the below steps if you got stuck in the provisioning state while creating the registry replication:
176176

articles/openshift/howto-infrastructure-nodes.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -358,4 +358,31 @@ Use this procedure for any additional ingress controllers you may have in the cl
358358
grafana-599d4b948c-btlp2 3/3 Running 0 2m48s 10.131.4.10 cz-cluster-hsmtw-infra-aro-machinesets-eastus-1-vr56r <none> <none>
359359
kube-state-metrics-574c5bfdd7-f7fjk 3/3 Running 0 2m49s 10.131.4.8 cz-cluster-hsmtw-infra-aro-machinesets-eastus-1-vr56r <none> <none>
360360
```
361+
362+
### DNS
363+
364+
1. Allow the DNS pods to run on the infrastructure nodes.
365+
366+
```
367+
oc edit dns.operator/default
368+
```
369+
370+
```
371+
apiVersion: operator.openshift.io/v1
372+
kind: DNS
373+
metadata:
374+
name: default
375+
spec:
376+
nodePlacement:
377+
tolerations:
378+
- operator: Exists
379+
```
361380
381+
1. Verify that DNS pods are scheduled onto all infra nodes.
382+
383+
```
384+
oc get ds/dns-default -n openshift-dns
385+
NAME DESIRED CURRENT READY UP-TO-DATE AVAILABLE NODE SELECTOR AGE
386+
dns-default 7 7 7 7 7 kubernetes.io/os=linux 35d
387+
```
388+

articles/virtual-machine-scale-sets/virtual-machine-scale-sets-use-availability-zones.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ A regional Virtual Machine Scale Set is when the zone assignment isn't explicitl
4242
In the rare case of a full zonal outage, any or all instances within the scale set may be impacted.
4343

4444
### Fault domains and availability zones
45-
A fault domain a fault isolation group within an availability zone or datacenter of hardware nodes that share the same power, networking, cooling, and platform maintenance schedule. VM instances that are on different fault domains are not likely to be impacted by the same planned or unplanned outage. You can specify how instances are spread across fault domains within a region or zone.
45+
A fault domain is a fault isolation group within an availability zone or datacenter of hardware nodes that share the same power, networking, cooling, and platform maintenance schedule. VM instances that are on different fault domains are not likely to be impacted by the same planned or unplanned outage. You can specify how instances are spread across fault domains within a region or zone.
4646

4747
- Max spreading (platformFaultDomainCount = 1)
4848
- Static fixed spreading (platformFaultDomainCount = 5)

0 commit comments

Comments
 (0)