Merge pull request #44 from nginxinc/NLB-5516

arpith-f5 · web-flow · commit b417bd5f98af · 2024-09-17T14:48:33.000-07:00
Change sku from standard_monthly to standardv2_monthly
diff --git a/arm-templates/deployments/create-or-update/azdeploy.json b/arm-templates/deployments/create-or-update/azdeploy.json
@@ -18,7 +18,7 @@
         },
         "sku": {
             "type": "string",
-            "defaultValue": "standard_Monthly",
+            "defaultValue": "standardv2_Monthly",
             "metadata": {
                 "description": "SKU of NGINX deployment"
             }
diff --git a/arm-templates/deployments/create-or-update/azdeploy.parameters.json b/arm-templates/deployments/create-or-update/azdeploy.parameters.json
@@ -11,7 +11,7 @@
             "type": "string"
         },
         "sku": {
-            "value": "standard_Monthly",
+            "value": "standardv2_Monthly",
             "type": "string"
         },
         "publicIPName": {
diff --git a/arm-templates/deployments/create-or-update/main.bicep b/arm-templates/deployments/create-or-update/main.bicep
@@ -5,7 +5,7 @@ param location string = resourceGroup().location
 param nginxDeploymentName string = 'myDeployment'
 
 @description('SKU of NGINX deployment')
-param sku string = 'standard_Monthly'
+param sku string = 'standardv2_Monthly'
 
 @description('Name of public IP')
 param publicIPName string = 'myPublicIP'
diff --git a/arm-templates/deployments/with-diagnostic-setting-logging/azdeploy.json b/arm-templates/deployments/with-diagnostic-setting-logging/azdeploy.json
@@ -18,7 +18,7 @@
         },
         "sku": {
             "type": "string",
-            "defaultValue": "standard_Monthly",
+            "defaultValue": "standardv2_Monthly",
             "metadata": {
                 "description": "SKU of NGINX deployment"
             }
diff --git a/arm-templates/deployments/with-diagnostic-setting-logging/azdeploy.parameters.json b/arm-templates/deployments/with-diagnostic-setting-logging/azdeploy.parameters.json
@@ -11,7 +11,7 @@
             "type": "string"
         },
         "sku": {
-            "value": "standard_Monthly",
+            "value": "standardv2_Monthly",
             "type": "string"
         },
         "publicIPName": {
diff --git a/arm-templates/deployments/with-diagnostic-setting-logging/main.bicep b/arm-templates/deployments/with-diagnostic-setting-logging/main.bicep
@@ -5,7 +5,7 @@ param location string = resourceGroup().location
 param nginxDeploymentName string = 'myDeployment'
 
 @description('SKU of NGINX deployment')
-param sku string = 'standard_Monthly'
+param sku string = 'standardv2_Monthly'
 
 @description('Name of public IP')
 param publicIPName string = 'myPublicIP'
diff --git a/arm-templates/deployments/with-private-ip/azdeploy.json b/arm-templates/deployments/with-private-ip/azdeploy.json
@@ -18,7 +18,7 @@
         },
         "sku": {
             "type": "string",
-            "defaultValue": "standard_Monthly",
+            "defaultValue": "standardv2_Monthly",
             "metadata": {
                 "description": "SKU of NGINX deployment"
             }
diff --git a/arm-templates/deployments/with-private-ip/azdeploy.parameters.json b/arm-templates/deployments/with-private-ip/azdeploy.parameters.json
@@ -11,7 +11,7 @@
             "type": "string"
         },
         "sku": {
-            "value": "standard_Monthly",
+            "value": "standardv2_Monthly",
             "type": "string"
         },
         "subnetName": {
diff --git a/arm-templates/deployments/with-private-ip/main.bicep b/arm-templates/deployments/with-private-ip/main.bicep
@@ -5,7 +5,7 @@ param location string = resourceGroup().location
 param nginxDeploymentName string = 'myDeployment'
 
 @description('SKU of NGINX deployment')
-param sku string = 'standard_Monthly'
+param sku string = 'standardv2_Monthly'
 
 @description('Private IP address located on subnet delegated to NGINX deployment')
 param privateIPAddress string
diff --git a/arm-templates/deployments/with-userassigned-identity/azdeploy.json b/arm-templates/deployments/with-userassigned-identity/azdeploy.json
@@ -18,7 +18,7 @@
         },
         "sku": {
             "type": "string",
-            "defaultValue": "standard_Monthly",
+            "defaultValue": "standardv2_Monthly",
             "metadata": {
                 "description": "SKU of NGINX deployment"
             }
diff --git a/arm-templates/deployments/with-userassigned-identity/azdeploy.parameters.json b/arm-templates/deployments/with-userassigned-identity/azdeploy.parameters.json
@@ -11,7 +11,7 @@
             "type": "string"
         },
         "sku": {
-            "value": "standard_Monthly",
+            "value": "standardv2_Monthly",
             "type": "string"
         },
         "publicIPName": {
diff --git a/arm-templates/deployments/with-userassigned-identity/main.bicep b/arm-templates/deployments/with-userassigned-identity/main.bicep
@@ -5,7 +5,7 @@ param location string = resourceGroup().location
 param nginxDeploymentName string = 'myDeployment'
 
 @description('SKU of NGINX deployment')
-param sku string = 'standard_Monthly'
+param sku string = 'standardv2_Monthly'
 
 @description('Name of public IP')
 param publicIPName string = 'myPublicIP'
diff --git a/sdk/python/deployments/create_or_update.py b/sdk/python/deployments/create_or_update.py
@@ -35,7 +35,7 @@ def main():
         GROUP_NAME,
         DEPLOYMENT_NAME,
         {
-            "sku": {"name": "standard_Monthly"},
+            "sku": {"name": "standardv2_Monthly"},
             "tags": {"myKey": "myValue"},
             "location": LOCATION,
             "identity": {
@@ -61,7 +61,7 @@ def main():
         GROUP_NAME,
         DEPLOYMENT_NAME,
         {
-            "sku": {"name": "standard_Monthly"},
+            "sku": {"name": "standardv2_Monthly"},
             "tags": {"myNewTag": "myNewValue"},
             "location": LOCATION,
             "properties": {
diff --git a/sdk/python/deployments/with_diagnostic_setting_logging.py b/sdk/python/deployments/with_diagnostic_setting_logging.py
@@ -58,7 +58,7 @@ def main():
         GROUP_NAME,
         DEPLOYMENT_NAME,
         {
-            "sku": {"name": "standard_Monthly"},
+            "sku": {"name": "standardv2_Monthly"},
             "tags": {"myKey": "myValue"},
             "location": LOCATION,
             "identity": {
diff --git a/sdk/python/deployments/with_diagnostics.py b/sdk/python/deployments/with_diagnostics.py
@@ -66,7 +66,7 @@ def main():
         GROUP_NAME,
         DEPLOYMENT_NAME,
         {
-            "sku": {"name": "standard_Monthly"},
+            "sku": {"name": "standardv2_Monthly"},
             "tags": {"myKey": "myValue"},
             "location": LOCATION,
             "identity": {
diff --git a/sdk/python/deployments/with_private_ip.py b/sdk/python/deployments/with_private_ip.py
@@ -42,7 +42,7 @@ def main():
         GROUP_NAME,
         DEPLOYMENT_NAME,
         {
-            "sku": {"name": "standard_Monthly"},
+            "sku": {"name": "standardv2_Monthly"},
             "tags": {"myKey": "myValue"},
             "location": LOCATION,
             "identity": {
@@ -68,7 +68,7 @@ def main():
         GROUP_NAME,
         DEPLOYMENT_NAME,
         {
-            "sku": {"name": "standard_Monthly"},
+            "sku": {"name": "standardv2_Monthly"},
             "tags": {"myNewTag": "myNewValue"},
             "location": LOCATION,
             "properties": {
diff --git a/terraform/certificates/variables.tf b/terraform/certificates/variables.tf
@@ -10,7 +10,7 @@ variable "name" {
 
 variable "sku" {
   description = "SKU of NGINXaaS deployment."
-  default     = "standard_Monthly"
+  default     = "standardv2_Monthly"
 }
 
 variable "tags" {
diff --git a/terraform/configurations/variables.tf b/terraform/configurations/variables.tf
@@ -10,7 +10,7 @@ variable "name" {
 
 variable "sku" {
   description = "SKU of NGINXaaS deployment."
-  default     = "standard_Monthly"
+  default     = "standardv2_Monthly"
 }
 
 variable "tags" {
diff --git a/terraform/deployments/create-or-update/variables.tf b/terraform/deployments/create-or-update/variables.tf
@@ -10,7 +10,7 @@ variable "name" {
 
 variable "sku" {
   description = "SKU of NGINXaaS deployment."
-  default     = "standard_Monthly"
+  default     = "standardv2_Monthly"
 }
 
 variable "tags" {
diff --git a/terraform/deployments/read/variables.tf b/terraform/deployments/read/variables.tf
@@ -15,7 +15,7 @@ variable "cert_name" {
 
 variable "sku" {
   description = "SKU of NGINXaaS deployment."
-  default     = "standard_Monthly"
+  default     = "standardv2_Monthly"
 }
 
 variable "tags" {
diff --git a/terraform/deployments/with-autoscale/variables.tf b/terraform/deployments/with-autoscale/variables.tf
@@ -10,7 +10,7 @@ variable "name" {
 
 variable "sku" {
   description = "SKU of NGINXaaS deployment."
-  default     = "standard_Monthly"
+  default     = "standardv2_Monthly"
 }
 
 variable "tags" {
diff --git a/terraform/deployments/with-diagnostic-setting-logging/variables.tf b/terraform/deployments/with-diagnostic-setting-logging/variables.tf
@@ -15,7 +15,7 @@ variable "storage_account_name" {
 
 variable "sku" {
   description = "SKU of NGINXaaS deployment."
-  default     = "standard_Monthly"
+  default     = "standardv2_Monthly"
 }
 
 variable "tags" {

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`},`
`19`	`19`	`"sku": {`
`20`	`20`	`"type": "string",`
`21`		`- "defaultValue": "standard_Monthly",`
	`21`	`+ "defaultValue": "standardv2_Monthly",`
`22`	`22`	`"metadata": {`
`23`	`23`	`"description": "SKU of NGINX deployment"`
`24`	`24`	`}`