Skip to content

Commit ccac82d

Browse files
authored
Merge pull request #197906 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 666d2c8 + 8d2d5c0 commit ccac82d

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

articles/container-registry/container-registry-helm-repos.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,19 +65,16 @@ The following resources are needed for the scenario in this article:
6565
- **A Kubernetes cluster** where you will install a Helm chart. If needed, create an AKS cluster [using the Azure CLI][./learn/quick-kubernetes-deploy-cli], [using Azure PowerShell][./learn/quick-kubernetes-deploy-powershell], or [using the Azure portal][./learn/quick-kubernetes-deploy-portal].
6666
- **Azure CLI version 2.0.71 or later** - Run `az --version` to find the version. If you need to install or upgrade, see [Install Azure CLI][azure-cli-install].
6767

68-
## Enable OCI support
68+
## Set up Helm client
6969

7070
Use the `helm version` command to verify that you have installed Helm 3:
7171

7272
```console
7373
helm version
7474
```
7575

76-
Set the following environment variable to enable OCI support in the Helm 3 client. Currently, this support is experimental and subject to change.
77-
78-
```console
79-
export HELM_EXPERIMENTAL_OCI=1
80-
```
76+
> [!NOTE]
77+
> The version indicated must be at least 3.8.0, as OCI support in earlier versions was experimental.
8178
8279
Set the following environment variables for the target registry. The ACR_NAME is the registry resource name. If the ACR registry url is myregistry.azurecr.io, set the ACR_NAME to myregistry
8380

articles/service-fabric/service-fabric-cluster-capacity.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,10 @@ The capacity needs of your cluster will be determined by your specific workload
154154

155155
**For production workloads, the recommended VM size (SKU) is [Standard D2_V2](../virtual-machines/dv2-dsv2-series.md) (or equivalent) with a minimum of 50 GB of local SSD, 2 cores, and 4 GiB of memory.** A minimum of 50 GB local SSD is recommended, however some workloads (such as those running Windows containers) will require larger disks. When choosing other [VM sizes](../virtual-machines/sizes-general.md) for production workloads, keep in mind the following constraints:
156156

157-
- Partial core VM sizes like Standard A0 are not supported.
157+
- Partial / single core VM sizes like Standard A0 are not supported.
158158
- *A-series* VM sizes are not supported for performance reasons.
159159
- Low-priority VMs are not supported.
160+
- [B-Series Burstable SKU's](https://docs.microsoft.com/azure/virtual-machines/sizes-b-series-burstable) are not supported.
160161

161162
#### Primary node type
162163

0 commit comments

Comments
 (0)