Skip to content

Commit

Permalink
attempt fixing quota issues (#3652) (#6612)
Browse files Browse the repository at this point in the history
Signed-off-by: Modular Magician <magic-modules@google.com>
  • Loading branch information
modular-magician committed Jun 16, 2020
1 parent 4b93678 commit bdf7ef3
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 33 deletions.
3 changes: 3 additions & 0 deletions .changelog/3652.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:none

```
6 changes: 1 addition & 5 deletions google/resource_compute_node_group_generated_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,10 @@ func TestAccComputeNodeGroup_nodeGroupBasicExample(t *testing.T) {

func testAccComputeNodeGroup_nodeGroupBasicExample(context map[string]interface{}) string {
return Nprintf(`
data "google_compute_node_types" "central1a" {
zone = "us-central1-a"
}
resource "google_compute_node_template" "soletenant-tmpl" {
name = "tf-test-soletenant-tmpl%{random_suffix}"
region = "us-central1"
node_type = data.google_compute_node_types.central1a.names[0]
node_type = "n1-node-96-624"
}
resource "google_compute_node_group" "nodes" {
Expand Down
8 changes: 2 additions & 6 deletions google/resource_compute_node_group_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,20 +86,16 @@ func testAccCheckComputeNodeGroupCreationTimeBefore(prevTimeCreated *time.Time)

func testAccComputeNodeGroup_updateNodeTemplate(groupName, tmplPrefix, tmplToUse string) string {
return fmt.Sprintf(`
data "google_compute_node_types" "central1a" {
zone = "us-central1-a"
}
resource "google_compute_node_template" "tmpl1" {
name = "%s-first"
region = "us-central1"
node_type = data.google_compute_node_types.central1a.names[0]
node_type = "n1-node-96-624"
}
resource "google_compute_node_template" "tmpl2" {
name = "%s-second"
region = "us-central1"
node_type = data.google_compute_node_types.central1a.names[0]
node_type = "n1-node-96-624"
}
resource "google_compute_node_group" "nodes" {
Expand Down
6 changes: 1 addition & 5 deletions google/resource_compute_node_template_generated_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,10 @@ func TestAccComputeNodeTemplate_nodeTemplateBasicExample(t *testing.T) {

func testAccComputeNodeTemplate_nodeTemplateBasicExample(context map[string]interface{}) string {
return Nprintf(`
data "google_compute_node_types" "central1a" {
zone = "us-central1-a"
}
resource "google_compute_node_template" "template" {
name = "tf-test-soletenant-tmpl%{random_suffix}"
region = "us-central1"
node_type = data.google_compute_node_types.central1a.names[0]
node_type = "n1-node-96-624"
}
`, context)
}
Expand Down
13 changes: 2 additions & 11 deletions website/docs/r/compute_node_group.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,10 @@ Terraform to delete and recreate the node group.


```hcl
data "google_compute_node_types" "central1a" {
zone = "us-central1-a"
}
resource "google_compute_node_template" "soletenant-tmpl" {
name = "soletenant-tmpl"
region = "us-central1"
node_type = data.google_compute_node_types.central1a.names[0]
node_type = "n1-node-96-624"
}
resource "google_compute_node_group" "nodes" {
Expand All @@ -73,16 +69,11 @@ resource "google_compute_node_group" "nodes" {


```hcl
data "google_compute_node_types" "central1a" {
provider = google-beta
zone = "us-central1-a"
}
resource "google_compute_node_template" "soletenant-tmpl" {
provider = google-beta
name = "soletenant-tmpl"
region = "us-central1"
node_type = data.google_compute_node_types.central1a.names[0]
node_type = "n1-node-96-624"
}
resource "google_compute_node_group" "nodes" {
Expand Down
8 changes: 2 additions & 6 deletions website/docs/r/compute_node_template.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,10 @@ To get more information about NodeTemplate, see:


```hcl
data "google_compute_node_types" "central1a" {
zone = "us-central1-a"
}
resource "google_compute_node_template" "template" {
name = "soletenant-tmpl"
region = "us-central1"
node_type = data.google_compute_node_types.central1a.names[0]
node_type = "n1-node-96-624"
}
```
<div class = "oics-button" style="float: right; margin: 0 0 -15px">
Expand All @@ -76,7 +72,7 @@ resource "google_compute_node_template" "template" {
name = "soletenant-with-licenses"
region = "us-central1"
node_type = data.google_compute_node_types.central1a.names[0]
node_type = "n1-node-96-624"
node_affinity_labels = {
foo = "baz"
Expand Down

0 comments on commit bdf7ef3

Please sign in to comment.