Skip to content

Commit

Permalink
tier -> plan
Browse files Browse the repository at this point in the history
  • Loading branch information
Netyyyy committed Dec 2, 2024
1 parent 4390bf4 commit 6b60985
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 19 deletions.
12 changes: 6 additions & 6 deletions azure-spring-apps-enterprise/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ Install the Azure Spring Apps extension for the Azure CLI using the following co
az extension add --name spring
```
Note - `spring` CLI extension `1.14.0` or later is a pre-requisite to enable the
latest Enterprise tier functionality to configure VMware Tanzu Components. Use the following
command to remove previous versions and install the latest Enterprise tier extension:
latest Enterprise plan functionality to configure VMware Tanzu Components. Use the following
command to remove previous versions and install the latest Enterprise plan extension:

If the extension is already installed, update it with the following command

Expand Down Expand Up @@ -191,7 +191,7 @@ export SUBSCRIPTION=subscription-id # replace it with your subsc
export RESOURCE_GROUP=resource-group-name # existing resource group or one that will be created in next steps
export SPRING_APPS_SERVICE=azure-spring-apps-name # name of the service that will be created in the next steps
export LOG_ANALYTICS_WORKSPACE=log-analytics-name # existing workspace or one that will be created in next steps
export REGION=region-name # choose a region with Enterprise tier support
export REGION=region-name # choose a region with Enterprise plan support
```

The REGION value should be one of available regions for Azure Spring Apps (e.g. eastus). Please visit [here](https://azure.microsoft.com/explore/global-infrastructure/products-by-region) for all available regions for Azure Spring Apps.
Expand Down Expand Up @@ -234,9 +234,9 @@ az group create --name ${RESOURCE_GROUP} \
--location ${REGION}
```

Accept the legal terms and privacy statements for the Enterprise tier.
Accept the legal terms and privacy statements for the Enterprise plan.

> Note: This step is necessary only if your subscription has never been used to create an Enterprise tier instance of Azure Spring Apps.
> Note: This step is necessary only if your subscription has never been used to create an Enterprise plan instance of Azure Spring Apps.
```shell
az provider register --namespace Microsoft.SaaS
Expand Down Expand Up @@ -1922,7 +1922,7 @@ cd apps/acme-assist
## Next Steps
In this quickstart, you've deployed polyglot applications to Azure Spring Apps using Azure CLI.
You also configured VMware Tanzu components in the enterprise tier. To learn more about
You also configured VMware Tanzu components in the enterprise plan. To learn more about
Azure Spring Apps or VMware Tanzu components, go to:
* [Azure Spring Apps](https://azure.microsoft.com/services/spring-apps/)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ Azure 上に Java アプリケーションをデプロイするため、Azure
az extension add --name spring
```

ご注意: - 最新のエンタープライズ Tier の機能を有効にし VMware Tanzu コンポーネントを構成するためには、`spring` という名の CLI 拡張バージョン '1.14.0' 以降が必須です。次のコマンドを使用して、以前のバージョンを削除し、最新の Enterprise Tier 拡張機能をインストールしてください。
ご注意: - 最新のエンタープライズ Plan の機能を有効にし VMware Tanzu コンポーネントを構成するためには、`spring` という名の CLI 拡張バージョン '1.14.0' 以降が必須です。次のコマンドを使用して、以前のバージョンを削除し、最新の Enterprise Plan 拡張機能をインストールしてください。

```shell
az extension update --name spring
Expand Down Expand Up @@ -172,7 +172,7 @@ export SUBSCRIPTION=subscription-id # replace it with your subsc
export RESOURCE_GROUP=resource-group-name # existing resource group or one that will be created in next steps
export SPRING_APPS_SERVICE=azure-spring-apps-name # name of the service that will be created in the next steps
export LOG_ANALYTICS_WORKSPACE=log-analytics-name # existing workspace or one that will be created in next steps
export REGION=region-name # choose a region with Enterprise tier support
export REGION=region-name # choose a region with Enterprise Plan support
```

REGION の値は、Azure Spring Apps が利用可能なリージョン (eastus など) を設定する必要があります。Azure Spring アプリで利用可能なすべてのリージョンについては、[こちら](https://azure.microsoft.com/explore/global-infrastructure/products-by-region/)を参照してください。
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ export SUBSCRIPTION='subscription-id' # replace it with your sub
export RESOURCE_GROUP='resource-group-name' # existing resource group or one that will be created in next steps
export SPRING_APPS_SERVICE='azure-spring-apps-name' # name of the service that will be created in the next steps
export LOG_ANALYTICS_WORKSPACE='log-analytics-name' # existing workspace or one that will be created in next steps
export REGION='region-name' # choose a region with Enterprise tier support
export REGION='region-name' # choose a region with Enterprise plan support

export CART_SERVICE_APP='cart-service'
export IDENTITY_SERVICE_APP='identity-service'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
## Next Steps
In this quickstart, you've deployed polyglot applications to Azure Spring Apps using Azure CLI.
You also configured VMware Tanzu components in the enterprise tier. To learn more about
You also configured VMware Tanzu components in the enterprise plan. To learn more about
Azure Spring Apps or VMware Tanzu components, go to:
* [Azure Spring Apps](https://azure.microsoft.com/products/spring-apps/)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ Login to the Azure CLI and choose your active subscription. In the terminal of V
./scripts/1.2-cli-login.sh
```

Accept the legal terms and privacy statements for the Enterprise tier.
Accept the legal terms and privacy statements for the Enterprise plan.

> Note: This step is necessary only if your subscription has never been used to create an Enterprise tier instance of Azure Spring Apps.
> Note: This step is necessary only if your subscription has never been used to create an Enterprise plan instance of Azure Spring Apps.
```shell
./scripts/1.3-accept-license.sh
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export REGION=<CHANGE-ME> # choose a region with Enterprise tier support
export REGION=<CHANGE-ME> # choose a region with Enterprise plan support
export SUBSCRIPTION_ID=<CHANGE-ME> # Subscription ID
export RESOURCE_GROUP=rg-<SUBSCRIPTION-NAME> # replace SUBSCRIPTION-NAME with your subscription name in Azure portal
export SPRING_APPS_SERVICE=asae-<SUBSCRIPTION-NAME> # replace SUBSCRIPTION-NAME with your subscription name in Azure portal
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export REGION=centralus # choose a region with Enterprise tier support
export REGION=centralus # choose a region with Enterprise plan support
export SUBSCRIPTION_ID=c4a30c8e-eb68-47c8-87a6-c6ec0e7fc5dd # Subscription ID
export RESOURCE_GROUP=rg-murthy # replace SUBSCRIPTION-NAME with your subscription name in Azure portal
export SPRING_APPS_SERVICE=asae-murthy # replace SUBSCRIPTION-NAME with your subscription name in Azure portal
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export SUBSCRIPTION=asae-student01 # replace it with your subsc
export RESOURCE_GROUP=asae-student01 # existing resource group or one that will be created in the next steps
export SPRING_APPS_SERVICE=asae-student01 # existing spring apps service name or one that will be created in the next steps
export LOG_ANALYTICS_WORKSPACE=asae-student01 # existing workspace or one that will be created in next steps
export REGION=westeurope # choose a region with Enterprise tier support
export REGION=westeurope # choose a region with Enterprise plan support
```

* Save the file, by right clicking in editor and saving. Quit the file, by right clicking in editor and quiting, e.g.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@ az account list -o table
az account set --subscription ${SUBSCRIPTION}
```

Accept the legal terms and privacy statements for the Enterprise tier.
Accept the legal terms and privacy statements for the Enterprise plan.

> Note: This step is necessary only if your subscription has never been used to create an Enterprise tier instance of Azure Spring Apps.
> Note: This step is necessary only if your subscription has never been used to create an Enterprise plan instance of Azure Spring Apps.

```shell
az provider register --namespace Microsoft.SaaS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ export SUBSCRIPTION=CHANGE-ME # replace it with your subscriptio
export RESOURCE_GROUP=acme-fitness-rg # existing resource group or one that will be created in next steps
export SPRING_APPS_SERVICE=acme-fitness # name of the service that will be created in the next steps
export LOG_ANALYTICS_WORKSPACE=acme-fitness-la-CHANGE-ME # existing workspace or one that will be created in next steps
export REGION=centralus # choose a region with Enterprise tier support
export REGION=centralus # choose a region with Enterprise plan support

export CART_SERVICE_APP="cart-service"
export IDENTITY_SERVICE_APP="identity-service"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ export SUBSCRIPTION=c4a30c8e-eb68-47c8-87a6-c6ec0e7fc5dd # repla
export RESOURCE_GROUP=acme-fitness-12-rg # existing resource group or one that will be created in next steps
export SPRING_APPS_SERVICE=acme-fitness-12 # name of the service that will be created in the next steps
export LOG_ANALYTICS_WORKSPACE=acme-fitness-12-la-caak # existing workspace or one that will be created in next steps
export REGION=centralus # choose a region with Enterprise tier support
export REGION=centralus # choose a region with Enterprise plan support

export CART_SERVICE_APP="cart-service"
export IDENTITY_SERVICE_APP="identity-service"
Expand Down

0 comments on commit 6b60985

Please sign in to comment.