Skip to content

Commit 79b81fc

Browse files
Remove output_only restriction on OnPremVersion field (#15311)
Co-authored-by: Chethan Gowda <chethangowda@google.com>
1 parent bc77dea commit 79b81fc

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

mmv1/products/gkeonprem/VmwareNodePool.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,4 +298,3 @@ properties:
298298
type: String
299299
description: |
300300
Anthos version for the node pool. Defaults to the user cluster version.
301-
output: true

mmv1/templates/terraform/examples/gkeonprem_vmware_node_pool_full.tf.tmpl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ resource "google_gkeonprem_vmware_cluster" "default-full" {
33
location = "us-west1"
44
admin_cluster_membership = "projects/870316890899/locations/global/memberships/gkeonprem-terraform-test"
55
description = "test cluster"
6-
on_prem_version = "1.13.1-gke.35"
6+
on_prem_version = "1.33.0-gke.35"
77
network_config {
88
service_address_cidr_blocks = ["10.96.0.0/12"]
99
pod_address_cidr_blocks = ["192.168.0.0/16"]
@@ -40,6 +40,7 @@ resource "google_gkeonprem_vmware_node_pool" "{{$.PrimaryResourceId}}" {
4040
name = "{{index $.Vars "name"}}"
4141
location = "us-west1"
4242
vmware_cluster = google_gkeonprem_vmware_cluster.default-full.name
43+
on_prem_version = "1.33.0-gke.35"
4344
annotations = {}
4445
config {
4546
cpus = 4

mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_vmware_node_pool_test.go

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"testing"
55

66
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
7+
"github.com/hashicorp/terraform-plugin-testing/plancheck"
78
"github.com/hashicorp/terraform-provider-google/google/acctest"
89
)
910

@@ -30,6 +31,11 @@ func TestAccGkeonpremVmwareNodePool_vmwareNodePoolUpdate(t *testing.T) {
3031
},
3132
{
3233
Config: testAccGkeonpremVmwareNodePool_vmwareNodePoolUpdate(context),
34+
ConfigPlanChecks: resource.ConfigPlanChecks{
35+
PreApply: []plancheck.PlanCheck{
36+
plancheck.ExpectResourceAction("google_gkeonprem_vmware_node_pool.nodepool", plancheck.ResourceActionUpdate),
37+
},
38+
},
3339
},
3440
{
3541
ResourceName: "google_gkeonprem_vmware_node_pool.nodepool",
@@ -49,7 +55,7 @@ func testAccGkeonpremVmwareNodePool_vmwareNodePoolUpdateStart(context map[string
4955
location = "us-west1"
5056
admin_cluster_membership = "projects/870316890899/locations/global/memberships/gkeonprem-terraform-test"
5157
description = "test cluster"
52-
on_prem_version = "1.13.1-gke.35"
58+
on_prem_version = "1.33.1-gke.35"
5359
annotations = {}
5460
network_config {
5561
service_address_cidr_blocks = ["10.96.0.0/12"]
@@ -89,6 +95,7 @@ func testAccGkeonpremVmwareNodePool_vmwareNodePoolUpdateStart(context map[string
8995
name = "tf-test-nodepool-%{random_suffix}"
9096
location = "us-west1"
9197
vmware_cluster = google_gkeonprem_vmware_cluster.cluster.name
98+
on_prem_version = "1.33.1-gke.35"
9299
annotations = {
93100
env = "test"
94101
}
@@ -134,7 +141,7 @@ func testAccGkeonpremVmwareNodePool_vmwareNodePoolUpdate(context map[string]inte
134141
location = "us-west1"
135142
admin_cluster_membership = "projects/870316890899/locations/global/memberships/gkeonprem-terraform-test"
136143
description = "test cluster"
137-
on_prem_version = "1.13.1-gke.35"
144+
on_prem_version = "1.33.1-gke.35"
138145
annotations = {}
139146
network_config {
140147
service_address_cidr_blocks = ["10.96.0.0/12"]

0 commit comments

Comments
 (0)