added feedback from Atchut and Ramya

Nickomang · Nickomang · commit 31bf20ff8e3c · 2022-10-02T12:25:39.000-07:00
diff --git a/articles/aks/deploy-marketplace.md b/articles/aks/deploy-marketplace.md
@@ -6,7 +6,7 @@ ms.author: nickoman
 ms.service: container-service
 ms.topic: how-to
 ms.date: 09/30/2022
-ms.custom: devx-track-azurecli, ignite-fall-2022
+ms.custom: devx-track-azurecli, ignite-fall-2022, references_regions
 ---
 
 # How to deploy a Container offer from Azure Marketplace (preview)
@@ -22,9 +22,23 @@ Included among these solutions are Kubernetes application-based Container offers
 
 [!INCLUDE [preview features callout](./includes/preview/preview-callout.md)]
 
+> [!NOTE]
+> This feature is currently only supported in the following regions:
+>
+> - West Central US
+> - West Europe
+> - East US.
+
 ## Register feature flags
 
-You must have registered the `Microsoft.KubernetesConfiguration/extensions` and `Microsoft.ContainerService/managedClusters` feature flags on your subscription. The following command will register both:
+You must have registered the `Microsoft.KubernetesConfiguration/extensions` and `Microsoft.ContainerService/managedClusters` feature flags on your subscription. To begin, register the relevant providers using the `az provider register` command:
+
+```azurecli-interactive
+az provider register --namespace Microsoft.KubernetesConfiguration --wait
+az provider register --namespace Microsoft.ContainerService --wait
+```
+
+The following command will register both feature flags:
 
 ```azurecli-interactive
 az feature register --name extensions --namespace Microsoft.KubernetesConfiguration
@@ -38,14 +52,13 @@ az feature list -o table --query "[?contains(name, 'Microsoft.KubernetesConfigur
 az feature list -o table --query "[?contains(name, 'Microsoft.ContainerService/managedClusters')].{Name:name,State:properties.state}"
 ```
 
-Once ready, refresh the registration of the `Microsoft.KubernetesConfiguration` and `Microsoft.ContainerService`   resource providers by using the `az provider register` command:
+Once ready, refresh the registration of the `Microsoft.KubernetesConfiguration` and `Microsoft.ContainerService`   resource providers:
 
 ```azurecli-interactive
-az provider register --namespace Microsoft.KubernetesConfiguration
-az provider register --namespace Microsoft.ContainerService
+az provider register --namespace Microsoft.KubernetesConfiguration --wait
+az provider register --namespace Microsoft.ContainerService --wait
 ```
 
-
 ## Browse offers
 
 - Begin by visiting the Azure portal and searching for *"Marketplace"* in the top search bar.
@@ -55,7 +68,6 @@ az provider register --namespace Microsoft.ContainerService
 - > [!IMPORTANT]
   > The *Azure Containers* category includes both Kubernetes applications and standalone container images. This walkthrough is Kubernetes application-specific. If you find the steps to deploy an offer differ in some way, you are most likely trying to deploy a container image-based offer instead of a Kubernetes-application based offer.
 
-
 - Once you've decided on an application, click on the offer.
 
     :::image type="content" source="./media/deploy-marketplace/browse-marketplace-inline.png" alt-text="Screenshot of the Azure portal Marketplace offer page. The product type filter, set to Azure Containers, is highlighted and several offers are shown." lightbox="./media/deploy-marketplace/browse-marketplace-full.png":::
@@ -94,14 +106,6 @@ Purchasing an offer from the Azure Marketplace creates a new instance of the ext
 az k8s-extension show --name <extension-name> --cluster-name <clusterName> --resource-group <resourceGroupName> --cluster-type managedClusters
 ```
 
-### Updating an offer
-
-An offer can be updated by using the REST API or Azure CLI. For example:
-c
-```azurecli-interactive
-az k8s-extension update --name <extension-name> --extension-type <extension-type> --scope <scope> --cluster-name <clusterName> --resource-group <resourceGroupName> --cluster-type managedClusters
-```
-
 ### Removing an offer
 
 A purchased Azure Container offer plan can be deleted by deleting the extension instance on the cluster. For example:
@@ -112,7 +116,7 @@ az k8s-extension delete --name <extension-name> --cluster-name <clusterName> --r
 
 ## Monitor billing and usage information
 
-To monitor billing and usage information for the offer you've deployed, visit Cost Management > Cost Analysis in your cluster resource's page in the Azure portal. You can see a breakdown of cost for the plan you've selected under "Product".
+To monitor billing and usage information for the offer you've deployed, visit Cost Management > Cost Analysis in your cluster's resource group's page in the Azure portal. You can see a breakdown of cost for the plan you've selected under "Product".
 
 :::image type="content" source="./media/deploy-marketplace/billing-inline.png" alt-text="Screenshot of the Azure portal page for the resource group. Billing information is shown broken down by offer plan." lightbox="./media/deploy-marketplace/billing-full.png":::
 
diff --git a/articles/marketplace/azure-container-plan-availability.md b/articles/marketplace/azure-container-plan-availability.md
@@ -46,8 +46,7 @@ For a custom priced plan, Microsoft will charge the customer for their hourly us
 
 - Free: Set the hourly price at 0 and your container offer is sold as equivalent to a free offer.
 - Per core: Your Azure Container offer is listed with pricing based on the critical CPU cores used. You provide the price for one CPU core and we’ll increment the pricing based on the size of the hardware used by your application for the critical cores you’ve tagged in your application as the ones that should generate usage.
-- Per every core in cluster: Your Azure Container offer is listed with pricing based on the CPU cores used. You provide the price for one CPU core and we’ll increment the pricing based on the size of the hardware used by your application.
-
+- Per every core in cluster: Your Azure Container offer is listed with pricing based on the total number of CPU cores in the cluster. You provide the price for one CPU core and we’ll increment the pricing based on the size of the hardware in the cluster.
 
 ## Plan visibility
 
diff --git a/articles/marketplace/azure-container-plan-technical-configuration-kubernetes.md b/articles/marketplace/azure-container-plan-technical-configuration-kubernetes.md
@@ -25,6 +25,8 @@ Cluster extensions enable an Azure Resource Manager driven experience for your a
 
 - You cannot modify this value once the plan is published to *Preview*.
 
+- The maximum allowed length is 50 characters.
+
 ## Selecting CNAB bundle
 
 Your payload must be hosted in a private Azure Container Registry (ACR). Use this page to provide reference information for your Cloud Native Application Bundle (CNAB) bundle inside your Azure Container Registry. After you submit the offer for publishing, your bundle is copied to Azure Marketplace in a specific public container registry. All requests from Azure users to use your offer are served from the Azure Marketplace public container registry, not your private container registry. 
diff --git a/articles/marketplace/azure-container-technical-assets-kubernetes.md b/articles/marketplace/azure-container-technical-assets-kubernetes.md
@@ -23,24 +23,30 @@ In addition to your solution domain, your engineering team should have knowledge
 
 - Basic understanding of [Azure Services](https://azure.microsoft.com/services/)
 - How to [design and architect Azure applications](https://azure.microsoft.com/solutions/architecture/)
-- Working knowledge of [Azure Virtual Machines](https://azure.microsoft.com/services/virtual-machines/), [Azure Storage](https://azure.microsoft.com/services/?filter=storage), and [Azure Networking](https://azure.microsoft.com/services/?filter=networking)
 - Working knowledge of [Azure Resource Manager](https://azure.microsoft.com/features/resource-manager/)
-- Working Knowledge of [JSON](https://www.json.org/).
-- Working Knowledge of [Helm](https://www.helm.sh)
+- Working knowledge of [JSON](https://www.json.org/)
+- Working knowledge of [Helm](https://www.helm.sh)
+- Working knowledge of [createUiDefinition][createuidefinition]
 
 ## Prerequisites
 
 - Your application must be Helm chart-based.
 
+- All the image references and digest details must be included in the chart. No additional charts or images can be downloaded at runtime.
+
 - You must have an active publishing tenant or access to a publishing tenant and Partner Center account.
 
-- You must have created an Azure Container Registry (ACR) to which you'll upload the CNAB, and give permission to Microsoft’s first party app ID to access your ACR. For more information, see [create an Azure Container Registry][create-acr].
+- You must have created an Azure Container Registry (ACR) to which you'll upload the Cloud Native Application Bundle (CNAB), and give permission to Microsoft’s first party app ID to access your ACR. For more information, see [create an Azure Container Registry][create-acr].
 
 - Install the latest version of the Azure CLI.
 
+- The application must be deployable to Linux environment.
+
+- If running the CNAB packaging tool manually, you will need docker installed on your local machine.
+
 ## Limitations
 
-- Container Marketplace supports only AMD64 images.
+- Container Marketplace supports only Linux platform-based AMD64 images.
 - Managed AKS only.
 - Single containers are not supported.
 - Linked Azure Resource Manager templates are not supported.
@@ -63,16 +69,28 @@ Microsoft has created a first-party application responsible for handling this pr
 # [Linux](#tab/linux)
 
 ```azurecli-interactive
+az login
 az ad sp create --id 32597670-3e15-4def-8851-614ff48c1efa
 ```
 
-Make note of the service principal's ID. Next, obtain your registry's full ID:
+Make note of the service principal's ID to use in the following steps.
+
+Next, obtain your registry's full ID:
 
 ```azurecli-interactive
 az acr show --name <registry-name> --query "id" --output tsv
 ```
 
-Finally, create a role assignment to grant the service principal the ability to pull from your registry:
+Your output should look similar to the following:
+
+```bash
+...
+},
+"id": "/subscriptions/ffffffff-ff6d-ff22-77ff-ffffffffffff/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myregistry",
+...
+```
+
+Finally, create a role assignment to grant the service principal the ability to pull from your registry using the values you obtained earlier:
 
 ```azurecli-interactive
 az role assignment create --assignee <sp-id> --scope <registry-id> --role acrpull
@@ -81,8 +99,7 @@ az role assignment create --assignee <sp-id> --scope <registry-id> --role acrpul
 Finally, register the `Microsoft.PartnerCenterIngestion` resource provider on the same subscription used to create the Azure Container Registry:
 
 ```azurecli
-az login
-az provider register --namespace Microsoft.PartnerCenterIngestion --subscription <subscription-id>
+az provider register --namespace Microsoft.PartnerCenterIngestion --subscription <subscription-id> --wait
 ```
 
 Monitor the registration and confirm it has completed before proceeding:
@@ -94,21 +111,33 @@ az provider show -n Microsoft.PartnerCenterIngestion --subscription <subscriptio
 # [Windows](#tab/windows)
 
 ```powershell-interactive
+Connect-AzAccount
 New-AzADServicePrincipal -ApplicationId 32597670-3e15-4def-8851-614ff48c1efa
 ```
 
 Obtain the service principal's ID:
 
 ```powershell-interactive
-Get-AzADServicePrincipal -SearchString Container
+Get-AzADServicePrincipal -SearchString "Container Marketplace Package App"
 ```
 
-Make note of the service principal's ID. Next, obtain your registry's full ID:
+Make note of the service principal's ID to use in the following steps. 
+
+Next, obtain your registry's full ID:
 
 ```powershell-interactive
 Get-AzContainerRegistry -ResourceGroupName <resource-group> -Name <registry-name>
 ```
 
+Your output should look similar to the following:
+
+```bash
+...
+},
+"id": "/subscriptions/ffffffff-ff6d-ff22-77ff-ffffffffffff/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myregistry",
+...
+```
+
 Next, create a role assignment to grant the service principal the ability to pull from your registry:
 
 ```powershell-interactive
@@ -139,7 +168,7 @@ Each CNAB will be composed of the following artifacts:
 
 - CreateUiDefinition
 
-- ARM Template (optional)
+- ARM Template
 
 - Manifest file
 
@@ -178,23 +207,17 @@ A createUiDefinition is a JSON file that defines the user interface elements for
 
 After creating the createUiDefinition.json file for your application, you need to test the user experience. To simplify testing, use a [sandbox environment][sandbox-environment] that loads your file in the portal. The sandbox presents your user interface in the current, full-screen portal experience. The sandbox is the recommended way to preview the user interface.
 
-### Create the Azure Resource Manager (ARM) template (optional)
+### Create the Azure Resource Manager (ARM) template
 
 An [ARM template][arm-template-overview] defines the Azure resources to deploy. You will be deploying a cluster extension resource for the Azure Marketplace application. Optionally, you can choose to deploy an AKS cluster.
 
-If the ARM template does not exist in the CNAB bundle, a default ARM template will be created that deploys the cluster extension on an existing AKS cluster with the following expected parameters:
-
-- `clusterResourceName`
-
-- `extensionResourceName`
-
-If you do include an ARM template, we currently only allow the following resource types:
+We currently only allow the following resource types:
 
 - `Microsoft.ContainerService/managedClusters`
 
 - `Microsoft.KubernetesConfiguration/extensions`
 
-For example, see this [sample ARM template][arm-template-sample] designed to take results from the sample UI definition linked above and pass parameters into your application.
+For example, see this [sample ARM template][arm-template-sample] designed to take results from the sample UI definition linked above and pass parameters into your application.
 
 ### Create the manifest file
 
@@ -213,15 +236,17 @@ The fields used in the manifest are as follows:
 |uiDefinition|String|Local path where a JSON file that describes an Azure portal Create experience can be found|
 |registryServer|String|The ACR where the final CNAB bundle should be pushed|
 |extensionRegistrationParameters|Collection|Specification for the extension registration parameters. Include at least `defaultScope` and `billingIdentifier` as parameters.|
-|defaultScope|String|The default scope for your extension installation. Accepted values are `cluster` or `namespace`.|
+|defaultScope|String|The default scope for your extension installation. Accepted values are `cluster` or `namespace`. If `cluster` scope is set, then only one extension instance is allowed per cluster. If `namespace` scope is selected, then only one instance is allowed per namespace. As a Kubernetes cluster can have multiple namespaces, multiple instances of extension can exist.|
 |namespace|String|(Optional) Specify the namespace the extension will install into. This property is required when `defaultScope` is set to `cluster`. For namespace naming restrictions, see [Namespaces and DNS][namespaces-and-dns].|
 
-For an sample configured for the voting app, see the following [manifest file example][manifest-sample].
+For a sample configured for the voting app, see the following [manifest file example][manifest-sample].
 
 ### Structure your application
 
 Place the createUiDefinition, ARM template, and manifest file beside your application's Helm chart.
 
+For an example of a properly structured directory, see [the sample repository][kubernetes-offer-sample-structure].
+
 ## Use the container packaging tool
 
 Once you've added all the required artifacts, run the packaging tool `container-package-app`.
@@ -296,6 +321,7 @@ For an example of how to integrate `container-package-app` into an Azure Pipelin
 [namespaces-and-dns]: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/#namespaces-and-dns
 [create-acr]: ../container-registry/container-registry-get-started-azure-cli.md
 [kubernetes-offer-samples]: https://github.com/Azure-Samples/kubernetes-offer-samples
+[kubernetes-offer-sample-structure]: https://github.com/Azure-Samples/kubernetes-offer-samples/tree/main/samples
 [values-sample]: https://github.com/Azure-Samples/kubernetes-offer-samples/blob/main/samples/azure-vote/values.yaml
 [deployment-sample]: https://github.com/Azure-Samples/kubernetes-offer-samples/blob/main/samples/azure-vote/templates/deployments.yaml
 [ui-sample]: https://github.com/Azure-Samples/kubernetes-offer-samples/blob/main/samples/createUIDefinition.json
diff --git a/articles/marketplace/marketplace-containers.md b/articles/marketplace/marketplace-containers.md
@@ -42,7 +42,7 @@ If you're publishing Kubernetes apps, these are the available licensing options
 | Free | List your offer to customers for free. |
 | BYOL | The Bring Your Own Licensing option lets your customers bring existing software licenses to Azure.\* |
 | Per core | List your Azure Container offer with pricing based on the critical CPU cores used. You provide the price for one CPU core and we’ll increment the pricing based on the size of the hardware used by your application for the critical cores you’ve tagged in your application as the ones that should generate usage. |
-| Per every core in cluster | List your Azure Container offer with pricing based on the CPU cores used. You provide the price for one CPU core and we’ll increment the pricing based on the size of the hardware used by your application. |
+| Per every core in cluster | List your Azure Container offer with pricing based on the total number of CPU cores in the cluster. You provide the price for one CPU core and we’ll increment the pricing based on the size of the hardware in the cluster.|
 
 \* As the publisher, you support all aspects of the software license transaction, including (but not limited to) order, fulfillment, metering, billing, invoicing, payment, and collection.
 
@@ -126,7 +126,7 @@ For a Kubernetes application-based offer, the following requirements apply:
 | Requirement | Details |  
 |:--- |:--- |  
 | Billing and metering | Support one of the PerCore, PerEveryCoreInCluster, or BYOL billing models. |
-| Artifacts packaged as a Cloud Native Application Bundle (CNAB) | The Helm chart, manifest, createUiDefinition.json, and optional Azure Resource Manager template must be packaged as a CNAB. For more information, see [prepare technical assets][azure-kubernetes-technical-assets]. |
+| Artifacts packaged as a Cloud Native Application Bundle (CNAB) | The Helm chart, manifest, createUiDefinition.json, and Azure Resource Manager template must be packaged as a CNAB. For more information, see [prepare technical assets][azure-kubernetes-technical-assets]. |
 | Hosting in an Azure Container Registry repository | The CNAB must be hosted in an Azure Container Registry repository. For more information about working with Azure Container Registry, see [Quickstart: Create a private container registry by using the Azure portal](../container-registry/container-registry-get-started-portal.md).<br><br> |
 
 ## Next steps
