Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

azure_nginx_deployment: Use the standardv2_Monthly SKU #27395

Merged
merged 4 commits into from
Sep 19, 2024
Merged

azure_nginx_deployment: Use the standardv2_Monthly SKU #27395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6c12292
Document new SKU on NGINXaaS
puneetsarna Aug 21, 2024
ab90090
Change NGINXaaS SKU to standardv2_Monthly
puneetsarna Sep 14, 2024
420ae0d
Drop possible SKU value fron NGINXaaS datasource
puneetsarna Sep 14, 2024
7538a1f
Update docs with new NGINXaaS SKU
puneetsarna Sep 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/services/nginx/nginx_certificate_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ resource "azurerm_user_assigned_identity" "test" {
resource "azurerm_nginx_deployment" "test" {
name = "acctest-%[1]d"
resource_group_name = azurerm_resource_group.test.name
sku = "standard_Monthly"
sku = "standardv2_Monthly"
capacity = 10
location = azurerm_resource_group.test.location
diagnose_support_enabled = false
Expand Down
2 changes: 1 addition & 1 deletion internal/services/nginx/nginx_configuration_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ resource "azurerm_subnet" "test" {
resource "azurerm_nginx_deployment" "test" {
name = "acctest-%[1]d"
resource_group_name = azurerm_resource_group.test.name
sku = "standard_Monthly"
sku = "standardv2_Monthly"
capacity = 10
location = azurerm_resource_group.test.location

Expand Down
12 changes: 6 additions & 6 deletions internal/services/nginx/nginx_deployment_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ func (a DeploymentResource) basic(data acceptance.TestData) string {
resource "azurerm_nginx_deployment" "test" {
name = "acctest-%[2]d"
resource_group_name = azurerm_resource_group.test.name
sku = "standard_Monthly"
sku = "standardv2_Monthly"
location = azurerm_resource_group.test.location
diagnose_support_enabled = false
automatic_upgrade_channel = "stable"
Expand Down Expand Up @@ -138,7 +138,7 @@ func (a DeploymentResource) basicAutoscaling(data acceptance.TestData) string {
resource "azurerm_nginx_deployment" "test" {
name = "acctest-%[2]d"
resource_group_name = azurerm_resource_group.test.name
sku = "standard_Monthly"
sku = "standardv2_Monthly"
location = azurerm_resource_group.test.location
diagnose_support_enabled = false
automatic_upgrade_channel = "stable"
Expand Down Expand Up @@ -181,7 +181,7 @@ func (a DeploymentResource) basicAutoscaling_update(data acceptance.TestData) st
resource "azurerm_nginx_deployment" "test" {
name = "acctest-%[2]d"
resource_group_name = azurerm_resource_group.test.name
sku = "standard_Monthly"
sku = "standardv2_Monthly"
location = azurerm_resource_group.test.location
diagnose_support_enabled = false
automatic_upgrade_channel = "stable"
Expand Down Expand Up @@ -224,7 +224,7 @@ func (a DeploymentResource) update(data acceptance.TestData) string {
resource "azurerm_nginx_deployment" "test" {
name = "acctest-%[2]d"
resource_group_name = azurerm_resource_group.test.name
sku = "standard_Monthly"
sku = "standardv2_Monthly"
location = azurerm_resource_group.test.location
diagnose_support_enabled = false

Expand Down Expand Up @@ -256,7 +256,7 @@ func (a DeploymentResource) systemAssignedIdentity(data acceptance.TestData) str
resource "azurerm_nginx_deployment" "test" {
name = "acctest-%[2]d"
resource_group_name = azurerm_resource_group.test.name
sku = "standard_Monthly"
sku = "standardv2_Monthly"
location = azurerm_resource_group.test.location

identity {
Expand Down Expand Up @@ -293,7 +293,7 @@ resource "azurerm_user_assigned_identity" "test" {
resource "azurerm_nginx_deployment" "test" {
name = "acctest-%[2]d"
resource_group_name = azurerm_resource_group.test.name
sku = "standard_Monthly"
sku = "standardv2_Monthly"
location = azurerm_resource_group.test.location

identity {
Expand Down
2 changes: 1 addition & 1 deletion website/docs/d/nginx_deployment.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ In addition to the Arguments listed above - the following Attributes are exporte

* `nginx_version` - NGINX version of the Deployment.

* `sku` - The NGINX Deployment SKU. Possible values include `standard_Monthly`.
* `sku` - The NGINX Deployment SKU.

* `automatic_upgrade_channel` - The automatic upgrade channel for this NGINX deployment.

Expand Down
4 changes: 2 additions & 2 deletions website/docs/r/nginx_deployment.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ resource "azurerm_subnet" "example" {
resource "azurerm_nginx_deployment" "example" {
name = "example-nginx"
resource_group_name = azurerm_resource_group.example.name
sku = "standard_Monthly"
sku = "standardv2_Monthly"
location = azurerm_resource_group.example.location
managed_resource_group = "example"
diagnose_support_enabled = true
Expand Down Expand Up @@ -86,7 +86,7 @@ The following arguments are supported:

* `location` - (Required) The Azure Region where the NGINX Deployment should exist. Changing this forces a new NGINX Deployment to be created.

* `sku` - (Required) Specifies the NGINX Deployment SKU. Possible values are `standard_Monthly` and `basic_Monthly`. Changing this forces a new resource to be created.
* `sku` - (Required) Specifies the NGINX Deployment SKU. Possible values are `standardv2_Monthly`, `basic_Monthly`. Changing this forces a new resource to be created.

-> **NOTE:** If you are setting the `sku` to `basic_Monthly`, you cannot specify a `capacity` or `auto_scale_profile`; basic plans do not support scaling. Other `sku`s require either `capacity` or `auto_scale_profile`. If you're using `basic_Monthly` with deployments created before v4.0, you may need to use [Terraform's `ignore_changes` functionality](https://www.terraform.io/language/meta-arguments/lifecycle#ignore_changes) to ignore changes to the `capacity` field.

Expand Down
Loading