Skip to content

Commit 6d87fce

Browse files
authored
Merge pull request #229995 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 fa6af2b + 58da8c3 commit 6d87fce

File tree

3 files changed

+5
-15
lines changed

3 files changed

+5
-15
lines changed

articles/aks/azure-cni-overlay.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ The following are additional factors to consider when planning pods IP address s
5959

6060
## Network security groups
6161

62-
Pod to pod traffic with Azure CNI Overlay is not encapsulated and subnet [network security group][nsgs] rules are applied. If the subnet NSG contains deny rules that would impact the pod CIDR traffic, make sure the following rules are in place to ensure proper cluster functionality (in addition to all [AKS egress requirements][aks-egress]):
62+
Pod to pod traffic with Azure CNI Overlay is not encapsulated and subnet [network security group][nsg] rules are applied. If the subnet NSG contains deny rules that would impact the pod CIDR traffic, make sure the following rules are in place to ensure proper cluster functionality (in addition to all [AKS egress requirements][aks-egress]):
6363

6464
* Traffic from the node CIDR to the node CIDR on all ports and protocols
6565
* Traffic from the node CIDR to the pod CIDR on all ports and protocols (required for service traffic routing)
@@ -172,4 +172,4 @@ To learn how to utilize AKS with your own Container Network Interface (CNI) plug
172172
[az-feature-show]: /cli/azure/feature#az-feature-show
173173
[aks-egress]: limit-egress-traffic.md
174174
[aks-network-policies]: use-network-policies.md
175-
[nsg]: /azure/virtual-network/network-security-groups-overview
175+
[nsg]: ../virtual-network/network-security-groups-overview.md

articles/mysql/quickstart-create-mysql-server-database-using-bicep.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: 'Quickstart: Create an Azure DB for MySQL - Bicep'
2+
title: 'Quickstart: Create an Azure Database for MySQL - Bicep'
33
description: In this Quickstart, learn how to create an Azure Database for MySQL server with virtual network integration using Bicep.
44
author: rothja
55
ms.author: jroth

articles/virtual-machines/workloads/redhat/redhat-rhui.md

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -235,19 +235,9 @@ southeastasia - 20.24.186.80
235235

236236
### Update expired RHUI client certificate on a VM
237237

238-
If you are using an older RHEL VM image, for example, RHEL 7.4 (image URN: `RedHat:RHEL:7.4:7.4.2018010506`), you will experience connectivity issues to RHUI due to a now-expired TLS/SSL client certificate. The error you see may look like _"SSL peer rejected your certificate as expired"_ or _"Error: Cannot retrieve repository metadata (repomd.xml) for repository: ... Please verify its path and try again"_. To overcome this problem, please update the RHUI client package on the VM using the following command:
238+
If you experience RHUI certificate issues from your Azure RHEL PAYG VM, reference the [troubleshooting guidance for RHUI certificate issues in Azure](/troubleshoot/azure/virtual-machines/troubleshoot-linux-rhui-certificate-issues).
239239

240-
```bash
241-
sudo yum update -y --disablerepo='*' --enablerepo='*microsoft*'
242-
```
243-
244-
Alternatively, running `sudo yum update` may also update the client certificate package (depending on your RHEL version), despite "expired SSL certificate" errors you will see for other repositories. If this update is successful, normal connectivity to other RHUI repositories should be restored, so you will be able to run `sudo yum update` successfully.
245-
246-
If you run into a 404 error while running a `yum update`, try the following to refresh your yum cache:
247-
```bash
248-
sudo yum clean all;
249-
sudo yum makecache
250-
```
240+
251241

252242
### Troubleshoot connection problems to Azure RHUI
253243
If you experience problems connecting to Azure RHUI from your Azure RHEL PAYG VM, follow these steps:

0 commit comments

Comments
 (0)