Merge pull request #213629 from Nickomang/release-ignite-aks-container-marketplace-2

Added screenshots, note on SP creation to transactable containers

Author: tamarakhader

articles/marketplace/azure-container-plan-technical-configuration-kubernetes.md

@@ -17,7 +17,7 @@ For more, see [Prepare Azure Kubernetes technical assets](azure-container-techni
 
 ## Setting cluster extension type name
 
-Cluster extensions enable an Azure Resource Manager driven experience for your application. The following limitations apply when setting the cluster extension type name value:
+[Cluster extensions][cluster-extensions] enable an Azure Resource Manager driven experience for your application. The following limitations apply when setting the cluster extension type name value:
 
 - You must provide the cluster extension type name in the format of 'PublisherName.ApplicationName'.
 
@@ -41,4 +41,7 @@ Select *Add CNAB Bundle* to select the payload reference like so:
 ## Next steps
 
 - To **Co-sell with Microsoft** (optional), select it in the left-nav menu. For details, see [Co-sell partner engagement](/partner-center/co-sell-overview?context=/azure/marketplace/context/context).
-- If you're not setting up either of these or you've finished, it's time to [Review and publish your offer](review-publish-offer.md).
+- If you're not setting up either of these or you've finished, it's time to [Review and publish your offer](review-publish-offer.md).
+
+<!-- LINKS -->
+[cluster-extensions]: ../aks/cluster-extensions.md

articles/marketplace/azure-container-technical-assets-kubernetes.md

@@ -27,6 +27,7 @@ In addition to your solution domain, your engineering team should have knowledge
 - Working knowledge of [JSON](https://www.json.org/)
 - Working knowledge of [Helm](https://www.helm.sh)
 - Working knowledge of [createUiDefinition][createuidefinition]
+- Working knowledge of [Azure Resource Manager (ARM) templates][arm-template-overview]
 
 ## Prerequisites
 
@@ -66,8 +67,13 @@ As part of the publishing process, Microsoft will deep copy your CNAB from your
 
 Microsoft has created a first-party application responsible for handling this process with an `id` of `32597670-3e15-4def-8851-614ff48c1efa`. To begin, create a service principal based off of the application:
 
+
 # [Linux](#tab/linux)
 
+> [!NOTE]
+> If your account doesn't have permission to create a service principal, `az ad sp create` will return an error message containing "Insufficient privileges to complete the operation". Contact your Azure Active Directory admin to create a service principal.
+
+
 ```azurecli-interactive
 az login
 az ad sp create --id 32597670-3e15-4def-8851-614ff48c1efa
@@ -90,7 +96,9 @@ Your output should look similar to the following:
 ...
 ```
 
-Finally, create a role assignment to grant the service principal the ability to pull from your registry using the values you obtained earlier:
+Next, create a role assignment to grant the service principal the ability to pull from your registry using the values you obtained earlier:
+
+[!INCLUDE [Azure role assignment prerequisites](../../includes/role-based-access-control/prerequisites-role-assignments.md)]
 
 ```azurecli-interactive
 az role assignment create --assignee <sp-id> --scope <registry-id> --role acrpull
@@ -110,6 +118,9 @@ az provider show -n Microsoft.PartnerCenterIngestion --subscription <subscriptio
 
 # [Windows](#tab/windows)
 
+> [!NOTE]
+> If your account doesn't have permission to create a service principal, `New-AzADServicePrincipal` will return an error message containing "Insufficient privileges to complete the operation". Contact your Azure Active Directory admin to create a service principal.
+
 ```powershell-interactive
 Connect-AzAccount
 New-AzADServicePrincipal -ApplicationId 32597670-3e15-4def-8851-614ff48c1efa
@@ -140,6 +151,8 @@ Your output should look similar to the following:
 
 Next, create a role assignment to grant the service principal the ability to pull from your registry:
 
+[!INCLUDE [Azure role assignment prerequisites](../../includes/role-based-access-control/prerequisites-role-assignments.md)]
+
 ```powershell-interactive
 New-AzRoleAssignment -ObjectId <sp-id> -Role acrpull -Scope <registry-id>
 ```
@@ -178,20 +191,28 @@ Ensure the Helm chart adheres to the following rules:
 
 - All image names and references are parameterized and represented in `values.yaml` as global.azure.images references. Update `deployment.yaml` to point these images. This ensures the image block can be updated and referenced by Azure Marketplace's ACR.
 
-    :::image type="content" source="./media/azure-container/billing-identifier.png" alt-text="A screenshot of a properly formatted values.yaml file is shown. It resembles the sample values.yaml file linked from this article.":::
+    :::image type="content" source="./media/azure-container/image-references.png" alt-text="A screenshot of a properly formatted deployment.yaml file is shown. The parameterized image references are shown, resembling the content in the sample deployment.yaml file linked in this article.":::
 
 - If you have any subcharts, extract the content under charts and update each of your dependent image references to point to the images included in the main chart's `values.yaml`.
 
 - Images must use digests instead of tags. This ensures CNAB building is deterministic.
+    
+    :::image type="content" source="./media/azure-container/billing-identifier.png" alt-text="A screenshot of a properly formatted values.yaml file is shown. The images are using digests. The content resembles the sample values.yaml file linked in this article.":::
 
 ### Make updates based on your billing model
 
 After reviewing the billing models available, select one appropriate for your use case and complete the following steps:
 
 - Add a billing identifier label and cpu cores request to your `deployment.yaml` file.
 
+    :::image type="content" source="./media/azure-container/billing-identifier-label.png" alt-text="A screenshot of a properly formatted billing identifier label in a deployment.yaml file. The content resembles the sample depoyment.yaml file linked in this article":::
+
+    :::image type="content" source="./media/azure-container/resources.png" alt-text="A screenshot of CPU resource requests in a deployment.yaml file. The content resembles the sample depoyment.yaml file linked in this article.":::
+
 - Add a billing identifier value for `global.azure.billingidentifier` in `values.yaml`.
 
+    :::image type="content" source="./media/azure-container/billing-identifier-value.png" alt-text="A screenshot of a properly formatted values.yaml file, showing the global > azure > billingIdentifier field.":::
+
 Note that at deployment time, the cluster extensions feature will replace the billing identifier value with the extension type name you provide while setting up plan details.
 
 For examples configured to deploy the [Azure Voting App][azure-voting-app], see the following:
@@ -316,7 +337,7 @@ For an example of how to integrate `container-package-app` into an Azure Pipelin
 
 [cnab]: https://cnab.io/
 [cluster-extensions]: ../aks/cluster-extensions.md
-[azure-voting-app]: https://github.com/Azure-Samples/azure-voting-app-redis
+[azure-voting-app]: https://github.com/Azure-Samples/kubernetes-offer-samples/tree/main/samples/k8s-offer-azure-vote/azure-vote
 [createuidefinition]: ../azure-resource-manager/managed-applications/create-uidefinition-overview.md
 [sandbox-environment]: https://ms.portal.azure.com/#view/Microsoft_Azure_CreateUIDef/SandboxBlade
 [arm-template-overview]: ../azure-resource-manager/templates/overview.md