Skip to content

Commit a737d28

Browse files
committed
remove registry setup completely
1 parent c655f3a commit a737d28

File tree

6 files changed

+0
-37
lines changed

6 files changed

+0
-37
lines changed

README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ module "gitlab" {
3535
public_subnet_id = var.public_subnet_id
3636
dns_name = var.dns_name
3737
domain_name = var.domain_name
38-
registry_domain_name = var.registry_domain_name
3938
zone_id = var.zone_id
4039
ssh_key_name = var.ssh_key_name
4140
gitlab_application_ami = var.gitlab_ami
@@ -65,7 +64,6 @@ module "gitlab" {
6564
| gitlab_backup_s3_bucket_name | Name of Gitlab Backup S3 bucket | `string`| "" | yes |
6665
| dns_name | Domain name for which the certificate should be issued | `string`| "" | yes |
6766
| domain_name | ALB record53 entry domain name | `string`| "" | yes |
68-
| registry_domain_name | ALB record53 entry registry domain name | `string`| "" | yes |
6967
| public_subnet_id | List of public subnet IDs to attach | `list` | `<list>` | yes |
7068
| private_subnet_id | List of private subnet IDs to attach | `list` | `<list>` | yes |
7169
| vpc_id | Id of the VPC Gitlab will be provisioned in | `string`| "" | yes |
@@ -108,6 +106,5 @@ module "gitlab" {
108106
| acm_cert_arn | ACM Certificate ARN |
109107
| route53_cert_validation | ALB Route53 FQDN |
110108
| route53_gitlab_alb | Route53 FQDN for gitlab instance |
111-
| route53_gitlab_registry_alb | Route53 FQDN for registry |
112109
| bastion_public_eip | EIP Address of Bastion Instance |
113110
| gitlab_private_ip | Private IP Address of Gitlab Instance |

examples/single-node/main.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ module "gitlab" {
1515
public_subnet_id = var.public_subnet_id
1616
dns_name = var.dns_name
1717
domain_name = var.domain_name
18-
registry_domain_name = var.registry_domain_name
1918
zone_id = var.zone_id
2019
ssh_key_name = var.ssh_key_name
2120
gitlab_application_ami = var.gitlab_ami

examples/single-node/variables.tf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ variable "dns_name" {
2121
variable "domain_name" {
2222
}
2323

24-
variable "registry_domain_name" {
25-
}
26-
2724
variable "zone_id" {
2825
}
2926

module/single-node-omnibus/alb.tf

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,6 @@ resource "aws_lb_listener" "gitlab_alb_https_listener" {
3737
}
3838
}
3939

40-
41-
resource "aws_lb_listener" "gitlab_registry_alb_https_listener" {
42-
load_balancer_arn = aws_lb.gitlab_alb.arn
43-
port = 4000
44-
protocol = "HTTPS"
45-
ssl_policy = "ELBSecurityPolicy-2016-08"
46-
certificate_arn = aws_acm_certificate.gitlab_cert.arn
47-
default_action {
48-
target_group_arn = aws_lb_target_group.gitlab_alb_tg.arn
49-
type = "forward"
50-
}
51-
}
52-
5340
resource "aws_lb_target_group_attachment" "gitlab_alb_tg_attachment" {
5441
target_group_arn = aws_lb_target_group.gitlab_alb_tg.arn
5542
target_id = aws_instance.gitlab_application.id

module/single-node-omnibus/rt53.tf

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,4 @@ resource "aws_route53_record" "alb_dns" {
2121
zone_id = aws_lb.gitlab_alb.zone_id
2222
evaluate_target_health = false
2323
}
24-
}
25-
26-
resource "aws_route53_record" "reg_alb_dns" {
27-
zone_id = var.zone_id
28-
name = var.registry_domain_name
29-
type = "A"
30-
alias {
31-
name = aws_lb.gitlab_alb.dns_name
32-
zone_id = aws_lb.gitlab_alb.zone_id
33-
evaluate_target_health = false
34-
}
3524
}

module/single-node-omnibus/variables.tf

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,6 @@ variable "domain_name" {
7575
default = ""
7676
}
7777

78-
variable "registry_domain_name" {
79-
type = string
80-
description = "ALB record53 entry registry domain name"
81-
default = ""
82-
}
83-
8478
variable "public_subnet_id" {
8579
type = list
8680
description = "A list of public subnet IDs to attach"

0 commit comments

Comments
 (0)