Skip to content

Commit 90a3280

Browse files
authored
Merge pull request #5 from infraspecdev/set-defaults
Set defaults
2 parents 0d69e4d + be6ffe2 commit 90a3280

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ module "records" {
110110
version = "~> 2.0"
111111

112112
zone_name = var.hosted_zone
113-
create = var.create_gitlab_domain
113+
create = var.create_gitlab_route53_record
114114
records = [
115115
{
116116
name = var.gitlab_domain
@@ -126,7 +126,7 @@ module "records" {
126126
module "acm" {
127127
source = "terraform-aws-modules/acm/aws"
128128
version = "~> 4.0"
129-
create_certificate = var.create_gitlab_domain
129+
create_certificate = var.create_acm_certificate
130130
domain_name = var.gitlab_fqdn
131131
zone_id = data.aws_route53_zone.zone.zone_id
132132

variables.tf

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,13 @@ variable "private_subnet_id" {
2828

2929
variable "volume_type" {
3030
type = string
31+
default = "gp3"
3132
description = "Root EBS volume type for Gitlab instance."
3233
}
3334

3435
variable "volume_size" {
3536
type = number
37+
default = 100
3638
description = "Size of root EBS volume for Gitlab instance."
3739
}
3840

@@ -47,8 +49,9 @@ variable "public_subnet_ids" {
4749
description = "List of public subnet Ids for Gitlab load balancer."
4850
}
4951

50-
variable "create_gitlab_domain" {
52+
variable "create_gitlab_route53_record" {
5153
type = bool
54+
default = true
5255
description = "Whether to create a domain in Route53 for your Gitlab."
5356
}
5457
variable "gitlab_fqdn" {
@@ -68,6 +71,7 @@ variable "hosted_zone" {
6871

6972
variable "create_acm_certificate" {
7073
type = bool
74+
default = true
7175
description = "Whether to create SSL certificate for the Gitlab domain. If false, yo need to provide a valid AMC certificate arn in acm_certificate_arn variable."
7276
}
7377

@@ -97,11 +101,13 @@ variable "healthcheck_interval" {
97101

98102
variable "healthcheck_matcher" {
99103
type = string
104+
default = "200"
100105
description = "Response codes to use when checking for a healthy responses from a target."
101106
}
102107

103108
variable "healthcheck_path" {
104109
type = string
110+
default = "/-/readiness"
105111
description = "Destination for the health check request."
106112
}
107113

@@ -154,16 +160,19 @@ variable "gitlab_pg_subnet_ids" {
154160

155161
variable "gitlab_pg_allocated_storage" {
156162
type = number
163+
default = 100
157164
description = "Gitlab RDS Postgres allocated storage"
158165
}
159166

160167
variable "gitlab_pg_storage_type" {
161168
type = string
169+
default = "gp3"
162170
description = "Storage type for Gitlab RDS Postgres"
163171
}
164172

165173
variable "gitlab_pg_db_name" {
166174
type = string
175+
default = "gitlabhq-production"
167176
description = "Postgres DB name for Gitlab"
168177
}
169178

@@ -175,11 +184,13 @@ variable "gitlab_pg_port" {
175184

176185
variable "gitlab_pg_engine_version" {
177186
type = string
187+
default = "12.11"
178188
description = "Postgres engine version"
179189
}
180190

181191
variable "gitlab_pg_db_instance_class" {
182192
type = string
193+
default = "db.m5.large"
183194
description = "Postgres RDS instance class"
184195
}
185196

@@ -196,11 +207,13 @@ variable "gitlab_pg_password" {
196207

197208
variable "gitlab_pg_publicly_accessible" {
198209
type = bool
210+
default = false
199211
description = "Allow Gitlab RDS publicly accessible"
200212
}
201213

202214
variable "gitlab_redis_node_type" {
203215
type = string
216+
default = "cache.t3.medium"
204217
description = "Instance class for Gitlab Redis"
205218
}
206219

@@ -224,6 +237,7 @@ variable "gitlab_redis_parameter_group_name" {
224237

225238
variable "gitlab_redis_engine_version" {
226239
type = string
240+
default = "7.0"
227241
description = "Redis engine version for Gitlab Redis"
228242
}
229243

0 commit comments

Comments
 (0)