Skip to content

Commit aa81246

Browse files
authored
Merge pull request #214740 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 1be0360 + a841b64 commit aa81246

File tree

5 files changed

+13
-6
lines changed

5 files changed

+13
-6
lines changed

articles/aks/csi-secrets-store-identity-access.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Azure AD workload identity (preview) is supported on both Windows and Linux clus
4343
az account set --subscription $subscriptionID
4444
az identity create --name $UAMI --resource-group $resourceGroupName
4545
export USER_ASSIGNED_CLIENT_ID="$(az identity show -g $resourceGroupName --name $UAMI --query 'clientId' -o tsv)"
46-
export IDENTITY_TENANT=$(az aks show --name $clusterName --resource-group $RG --query aadProfile.tenantId -o tsv)
46+
export IDENTITY_TENANT=$(az aks show --name $clusterName --resource-group $resourceGroupName --query aadProfile.tenantId -o tsv)
4747
```
4848
4949
2. You need to set an access policy that grants the workload identity permission to access the Key Vault secrets, access keys, and certificates. The rights are assigned using the `az keyvault set-policy` command shown below.
@@ -88,7 +88,7 @@ Azure AD workload identity (preview) is supported on both Windows and Linux clus
8888
8989
```bash
9090
export federatedIdentityName="aksfederatedidentity" # can be changed as needed
91-
az identity federated-credential create --name $federatedIdentityName --identity-name $UAMI --resource-group $RG --issuer ${AKS_OIDC_ISSUER} --subject system:serviceaccount:${serviceAccountNamespace}:${serviceAccountName}
91+
az identity federated-credential create --name $federatedIdentityName --identity-name $UAMI --resource-group $resourceGroupName --issuer ${AKS_OIDC_ISSUER} --subject system:serviceaccount:${serviceAccountNamespace}:${serviceAccountName}
9292
```
9393
5. Deploy a `SecretProviderClass` by using the following YAML script, noticing that the variables will be interpolated:
9494

articles/azure-arc/data/uninstall-azure-arc-data-controller.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,9 @@ kubectl delete crd dags.sql.arcdata.microsoft.com
158158
kubectl delete crd exporttasks.tasks.arcdata.microsoft.com
159159
kubectl delete crd monitors.arcdata.microsoft.com
160160
kubectl delete crd activedirectoryconnectors.arcdata.microsoft.com
161-
161+
kubectl delete crd failovergroups.sql.arcdata.microsoft.com
162+
kubectl delete crd kafkas.arcdata.microsoft.com
163+
kubectl delete crd otelcollectors.arcdata.microsoft.com
162164

163165
## Delete Cluster roles and Cluster role bindings
164166
kubectl delete clusterrole arcdataservices-extension

articles/deployment-environments/configure-catalog-item.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ Provide a new catalog item to your development team as follows:
5858
```
5959
name: WebApp
6060
version: 1.0.0
61+
summary: Azure Web App Environment
6162
description: Deploys an Azure Web App without a data store
6263
runner: ARM
6364
templatePath: azuredeploy.json

articles/spring-apps/connect-managed-identity-to-azure-sql.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,6 @@ spring.datasource.url=jdbc:sqlserver://$AZ_DATABASE_NAME.database.windows.net:14
6363

6464
Configure your app deployed to Azure Spring to connect to an SQL Database with a system-assigned managed identity using the `az spring connection create` command, as shown in the following example.
6565

66-
> [!NOTE]
67-
> This command requires you to run the latest [edge build of Azure CLI](https://github.com/Azure/azure-cli/blob/dev/doc/try_new_features_before_release.md). [Download and install the edge builds](https://github.com/Azure/azure-cli#edge-builds) for your platform.
68-
6966
```azurecli-interactive
7067
az spring connection create sql \
7168
--resource-group $SPRING_APP_RESOURCE_GROUP \

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,13 @@ RHEL 8.0 |N/A | No EUS is available from Red Hat
164164

165165
The latest RHEL for SAP images will be connected to the Update Services for SAP Solutions subscriptions (E4S). For more information about E4S, see the Red Hat [documentation](https://access.redhat.com/support/policy/updates/errata#Update_Services_for_SAP_Solutions).
166166

167+
>[!NOTE]
168+
> Customers looking to update OS connected to E4S repositories to the latest version can enforce the latest available EUS minor-release in /etc/yum/vars/releasever file without switching to non-EUS.
169+
>
170+
> For information on RedHat EUS availability, see [Red Hat Enterprise Linux life cycle](https://access.redhat.com/support/policy/updates/errata).
171+
>
172+
> For steps on how to enforce a minor version refer, [RedHat KB#4251981](https://access.redhat.com/solutions/4251981). Steps outlined in this RedHat KB also apply to RHEL8.* versions.
173+
167174
#### RHEL images with E4S
168175

169176
Images from the following offers created after December 2019 are connected to E4S repositories:

0 commit comments

Comments
 (0)