From 49b7c6cd9bdb1647cc4d042c52100ca9ed2e6ad7 Mon Sep 17 00:00:00 2001 From: Vaclav Jirovsky <141634028+vjirovsky-pure@users.noreply.github.com> Date: Mon, 19 Aug 2024 17:15:37 +0200 Subject: [PATCH] added support for SKU V10MP2R2 (#7) --- 02-cbs.bicepparam.example | 4 ++-- e2e-demo-params.sh.example | 4 ++-- script-modules/common.sh | 2 +- templates/cbs-managed-app.bicep | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/02-cbs.bicepparam.example b/02-cbs.bicepparam.example index 43eff14..2465301 100644 --- a/02-cbs.bicepparam.example +++ b/02-cbs.bicepparam.example @@ -8,7 +8,7 @@ param resourceName = 'my-resource-name' param alertRecipients = 'my-email-address@contoso.dev' param arrayName = 'my-array-name' param licenseKey = 'CBS-TRIAL-LICENSE' -param cbsModelSku = 'V20MUR1' +param cbsModelSku = 'V10MP2R2' param orgDomain = 'myorgdomain.dev' // replace with resource ID of the managed identity (e.g. from output of 01-deploy-prerequisities.sh) param managedUserIdentityId = '/subscriptions/<---MY SUBSCRITION ID--->/resourceGroups/<---RG NAME--->/providers/Microsoft.ManagedIdentity/userAssignedIdentities/<---NAME OF USER MANAGED IDENTITY --->' @@ -16,4 +16,4 @@ param managedUserIdentityId = '/subscriptions/<---MY SUBSCRITION ID--->/resource param vnetName = 'my-vnet-name' param availabilityZone = 1 // replace with an identity (user or group) within tenant, who would approve the JIT requests to manage CBS app resources. -param jitApprovers = [{displayName:'my-cloud-ops-group',id:'<---OBJECT ID OF USER OR GROUP--->',type:'<--- 'group' OR 'user'--->'}] \ No newline at end of file +param jitApprovers = [{displayName:'my-cloud-ops-group',id:'<---OBJECT ID OF USER OR GROUP--->',type:'<--- 'group' OR 'user'--->'}] diff --git a/e2e-demo-params.sh.example b/e2e-demo-params.sh.example index a4c6b52..8ac606d 100644 --- a/e2e-demo-params.sh.example +++ b/e2e-demo-params.sh.example @@ -38,7 +38,7 @@ arrayName="${resourceGroupName}-cbs" # the value 'CBS-TRIAL-LICENSE' is for 40-days trial license licenseKey='CBS-TRIAL-LICENSE' -# CBS array SKUs options: 'V10MUR1', 'V20MUR1', 'V20MP2R2' +# CBS array SKUs options: 'V10MUR1', 'V10MP2R2', 'V20MUR1', 'V20MP2R2' cbsModelSku='V20MP2R2' orgDomain='trialbicep.purestorage' @@ -52,4 +52,4 @@ pureManagementUser='pureuser' pureManagementPassword='pureuser' # test VM resource name -virtualMachineName='test-win-vm' \ No newline at end of file +virtualMachineName='test-win-vm' diff --git a/script-modules/common.sh b/script-modules/common.sh index 3215205..28833f0 100644 --- a/script-modules/common.sh +++ b/script-modules/common.sh @@ -1,6 +1,6 @@ #!/bin/bash -CLI_VERSION='1.0.5' +CLI_VERSION='1.0.6' # terminal colors diff --git a/templates/cbs-managed-app.bicep b/templates/cbs-managed-app.bicep index 9382e04..7e581ce 100644 --- a/templates/cbs-managed-app.bicep +++ b/templates/cbs-managed-app.bicep @@ -33,7 +33,7 @@ param alertRecipients string @description('CBS array name in Purity') param arrayName string -@allowed(['V10MUR1', 'V20MUR1', 'V20MP2R2']) +@allowed(['V10MUR1', 'V10MP2R2', 'V20MUR1', 'V20MP2R2']) param cbsModelSku string @allowed([1,2,3])