Skip to content

Commit 46e0996

Browse files
committed
terraform tests: Fix up node definitions
Changed in MaterializeInc/terraform-aws-materialize#89 Test failures seen in https://buildkite.com/materialize/nightly/builds/14261
1 parent 8319b48 commit 46e0996

File tree

3 files changed

+26
-17
lines changed

3 files changed

+26
-17
lines changed

test/terraform/aws-persistent/main.tf

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,14 @@ module "materialize_infrastructure" {
6363

6464
# EKS Configuration
6565
cluster_version = "1.31"
66-
node_group_instance_types = ["r8g.2xlarge"]
67-
node_group_desired_size = 2
68-
node_group_min_size = 1
69-
node_group_max_size = 3
70-
node_group_capacity_type = "ON_DEMAND"
66+
system_node_group_instance_types = ["r8g.2xlarge"]
67+
system_node_group_desired_size = 2
68+
system_node_group_min_size = 1
69+
system_node_group_max_size = 3
70+
materialize_node_group_instance_types = ["r8g.2xlarge"]
71+
materialize_node_group_desired_size = 2
72+
materialize_node_group_min_size = 1
73+
materialize_node_group_max_size = 3
7174

7275
# Storage Configuration
7376
bucket_force_destroy = true

test/terraform/aws-temporary/main.tf

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,14 @@ module "materialize_infrastructure" {
9191

9292
# EKS Configuration
9393
cluster_version = "1.32"
94-
node_group_instance_types = ["r7gd.2xlarge"]
95-
node_group_desired_size = 2
96-
node_group_min_size = 1
97-
node_group_max_size = 3
98-
node_group_capacity_type = "ON_DEMAND"
94+
system_node_group_instance_types = ["r8g.2xlarge"]
95+
system_node_group_desired_size = 2
96+
system_node_group_min_size = 1
97+
system_node_group_max_size = 3
98+
materialize_node_group_instance_types = ["r8g.2xlarge"]
99+
materialize_node_group_desired_size = 2
100+
materialize_node_group_min_size = 1
101+
materialize_node_group_max_size = 3
99102

100103
# Storage Configuration
101104
bucket_force_destroy = true

test/terraform/aws-upgrade/main.tf

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ module "materialize_infrastructure" {
6262
# Basic settings
6363
# The namespace and environment variables are used to construct the names of the resources
6464
# e.g. ${namespace}-${environment}-eks and etc.
65-
namespace = "aws-upgrade"
65+
namespace = "aws-up"
6666
environment = "dev"
6767

6868
install_materialize_operator = true
@@ -99,11 +99,14 @@ module "materialize_infrastructure" {
9999

100100
# EKS Configuration
101101
cluster_version = "1.32"
102-
node_group_instance_types = ["r7gd.2xlarge"]
103-
node_group_desired_size = 2
104-
node_group_min_size = 1
105-
node_group_max_size = 3
106-
node_group_capacity_type = "ON_DEMAND"
102+
system_node_group_instance_types = ["r8g.2xlarge"]
103+
system_node_group_desired_size = 2
104+
system_node_group_min_size = 1
105+
system_node_group_max_size = 3
106+
materialize_node_group_instance_types = ["r8g.2xlarge"]
107+
materialize_node_group_desired_size = 2
108+
materialize_node_group_min_size = 1
109+
materialize_node_group_max_size = 3
107110

108111
# Storage Configuration
109112
bucket_force_destroy = true
@@ -129,7 +132,7 @@ module "materialize_infrastructure" {
129132
# Tags
130133
tags = {
131134
Environment = "dev"
132-
Project = "aws-upgrade"
135+
Project = "aws-up"
133136
Terraform = "true"
134137
}
135138
}

0 commit comments

Comments
 (0)