Merge pull request #1 from university-outreach-infrastructure-tf/remove-packages-registry-buckets

anarwal · web-flow · commit 0a1789f5a352 · 2019-07-30T10:41:32.000-04:00
remove registry and packages bucket
diff --git a/README.md b/README.md
@@ -40,8 +40,6 @@ module "gitlab" {
       gitlab_application_ami            = var.gitlab_ami
       gitlab_artifactory_s3_bucket_name = var.gitlab_artifactory_s3_bucket_name
       gitlab_lfs_s3_bucket_name         = var.gitlab_lfs_s3_bucket_name
-      gitlab_packages_s3_bucket_name    = var.gitlab_packages_s3_bucket_name
-      gitlab_registry_s3_bucket_name    = var.gitlab_registry_s3_bucket_name
       gitlab_backup_s3_bucket_name      = var.gitlab_backup_s3_bucket_name
       gitlab_kms_alias                  = var.gitlab_kms_alias
 }
@@ -59,8 +57,6 @@ module "gitlab" {
 | force_destroy_s3_bucket           | Boolean that indicates all objects should be deleted from the bucket so that the bucket can be destroyed without error.   | `bool`  | `false`            | no       |
 | gitlab_artifactory_s3_bucket_name | Name of Gitlab Artifactory S3 bucket                                                                                      | `string`| ""                 | yes      |
 | gitlab_lfs_s3_bucket_name         | Name of Gitlab LFS S3 bucket                                                                                              | `string`| ""                 | yes      |
-| gitlab_packages_s3_bucket_name    | Name of Gitlab Packages S3 bucket                                                                                         | `string`| ""                 | yes      |
-| gitlab_registry_s3_bucket_name    | Name of Gitlab Registry S3 bucket                                                                                         | `string`| ""                 | yes      |
 | gitlab_backup_s3_bucket_name      | Name of Gitlab Backup S3 bucket                                                                                           | `string`| ""                 | yes      |
 | dns_name                          | Domain name for which the certificate should be issued                                                                    | `string`| ""                 | yes      |
 | domain_name                       | ALB record53 entry domain name                                                                                            | `string`| ""                 | yes      |
@@ -86,10 +82,6 @@ module "gitlab" {
 | ----------------------------------| ----------------------------------------------| 
 | gitlab_artifactory_s3_bucket_id   | Gitlab artifactory S3 bucket Name             | 
 | gitlab_artifactory_s3_bucket_arn  | Gitlab artifactory S3 bucket ARN              | 
-| gitlab_registry_s3_bucket_id      | Gitlab registry S3 bucket Name                | 
-| gitlab_registry_s3_bucket_arn     | Gitlab registry S3 bucket ARN                 | 
-| gitlab_packages_s3_bucket_id      | Gitlab packages S3 bucket Name                |
-| gitlab_packages_s3_bucket_arn     | Gitlab packages S3 bucket ARN                 | 
 | gitlab_lfs_s3_bucket_id           | Gitlab LFS S3 bucket Name                     | 
 | gitlab_lfs_s3_bucket_arn          | Gitlab LFS S3 bucket ARN                      | 
 | s3_secret_key                     | S3 IAM User secret key                        | 
@@ -107,4 +99,4 @@ module "gitlab" {
 | route53_cert_validation           | ALB Route53 FQDN                              | 
 | route53_gitlab_alb                | Route53 FQDN for gitlab instance              | 
 | bastion_public_eip                | EIP Address of Bastion Instance               | 
-| gitlab_private_ip                 | Private IP Address of Gitlab Instance         | 
+| gitlab_private_ip                 | Private IP Address of Gitlab Instance         | 
diff --git a/examples/single-node/main.tf b/examples/single-node/main.tf
@@ -20,8 +20,6 @@ module "gitlab" {
   gitlab_application_ami            = var.gitlab_ami
   gitlab_artifactory_s3_bucket_name = var.gitlab_artifactory_s3_bucket_name
   gitlab_lfs_s3_bucket_name         = var.gitlab_lfs_s3_bucket_name
-  gitlab_packages_s3_bucket_name    = var.gitlab_packages_s3_bucket_name
-  gitlab_registry_s3_bucket_name    = var.gitlab_registry_s3_bucket_name
   gitlab_backup_s3_bucket_name      = var.gitlab_backup_s3_bucket_name
   gitlab_kms_alias                  = var.gitlab_kms_alias
 }
diff --git a/examples/single-node/outputs.tf b/examples/single-node/outputs.tf
@@ -6,22 +6,6 @@ output "gitlab_artifactory_s3_bucket_arn" {
   value = module.gitlab.gitlab_artifactory_s3_bucket_arn
 }
 
-output "gitlab_packages_s3_bucket_id" {
-  value = module.gitlab.gitlab_packages_s3_bucket_id
-}
-
-output "gitlab_packages_s3_bucket_arn" {
-  value = module.gitlab.gitlab_packages_s3_bucket_arn
-}
-
-output "gitlab_registry_s3_bucket_id" {
-  value = module.gitlab.gitlab_registry_s3_bucket_id
-}
-
-output "gitlab_registry_s3_bucket_arn" {
-  value = module.gitlab.gitlab_registry_s3_bucket_arn
-}
-
 output "gitlab_lfs_s3_bucket_id" {
   value = module.gitlab.gitlab_lfs_s3_bucket_id
 }
diff --git a/examples/single-node/variables.tf b/examples/single-node/variables.tf
@@ -36,12 +36,6 @@ variable "gitlab_artifactory_s3_bucket_name" {
 variable "gitlab_lfs_s3_bucket_name" {
 }
 
-variable "gitlab_packages_s3_bucket_name" {
-}
-
-variable "gitlab_registry_s3_bucket_name" {
-}
-
 variable "gitlab_backup_s3_bucket_name" {
 }
 
diff --git a/module/single-node-omnibus/alb.tf b/module/single-node-omnibus/alb.tf
@@ -5,14 +5,14 @@ resource "aws_lb" "gitlab_alb" {
   security_groups    = [aws_security_group.gitlab_alb.id]
   ip_address_type    = "ipv4"
   subnets            = var.public_subnet_id
-  tags               = {"Name" = format("%s-alb", module.gitlab_label.name), "Environment" = module.gitlab_label.stage}
+  tags               = {"Name" = format("%s-gitlab-alb", module.gitlab_label.name), "Environment" = module.gitlab_label.stage}
 }
 
 resource "aws_lb_target_group" "gitlab_alb_tg" {
   port                 = 443
   protocol             = "HTTPS"
   vpc_id               = var.vpc_id
-  tags                 = {"Name" = format("%s-alb-tg", module.gitlab_label.name), "Environment" = module.gitlab_label.stage}
+  tags                 = {"Name" = format("%s-gitlab-alb-tg", module.gitlab_label.name), "Environment" = module.gitlab_label.stage}
   health_check {
     port                = "traffic-port"
     protocol            = "HTTPS"
diff --git a/module/single-node-omnibus/ebs.tf b/module/single-node-omnibus/ebs.tf
@@ -5,7 +5,7 @@ resource "aws_ebs_volume" "gitlab_data" {
   type              = "gp2"
   availability_zone = data.aws_subnet.private_selected.availability_zone
   tags  = {
-      "Name" = format("%s-data-disk",module.gitlab_label.name),
+      "Name" = format("%s-gitlab-data-disk",module.gitlab_label.name),
       "Type" = "gitlab-data",
       "snapshot_policy" = format("%s-data daily snapshots", module.gitlab_label.name),
       "Snapshot"=  "true"
diff --git a/module/single-node-omnibus/ec2.tf b/module/single-node-omnibus/ec2.tf
@@ -7,6 +7,6 @@ resource "aws_instance" "gitlab_application" {
   user_data                   = data.template_cloudinit_config.config.rendered
   associate_public_ip_address = false
   monitoring                  = true
-  volume_tags                 = { "Name" = format("%s-instance-ebs", module.gitlab_label.name), "Environment" = module.gitlab_label.stage}
-  tags                        = { "Name" = format("%s-instance", module.gitlab_label.name), "Environment" = module.gitlab_label.stage}
+  volume_tags                 = { "Name" = format("%s-gitlab-instance-ebs", module.gitlab_label.name), "Environment" = module.gitlab_label.stage}
+  tags                        = { "Name" = format("%s-gitlab-instance", module.gitlab_label.name), "Environment" = module.gitlab_label.stage}
 }
diff --git a/module/single-node-omnibus/local-resources.tf b/module/single-node-omnibus/local-resources.tf
@@ -39,8 +39,6 @@ data "template_file" "gitlab_application_user_data" {
     s3_bucket_user_secret_key       = aws_iam_access_key.s3_access_key.secret
     artifactory_s3_bucket_name      = format("%s-%s",module.gitlab_label.id, var.gitlab_artifactory_s3_bucket_name)
     lfs_s3_bucket_name              = format("%s-%s",module.gitlab_label.id, var.gitlab_lfs_s3_bucket_name)
-    packages_s3_bucket_name         = format("%s-%s",module.gitlab_label.id, var.gitlab_packages_s3_bucket_name)
-    registry_s3_bucket_name         = format("%s-%s",module.gitlab_label.id, var.gitlab_registry_s3_bucket_name)
     backup_s3_bucket_name           = format("%s-%s",module.gitlab_label.id, var.gitlab_backup_s3_bucket_name)
     domain_name                     = var.domain_name
   }
diff --git a/module/single-node-omnibus/outputs.tf b/module/single-node-omnibus/outputs.tf
@@ -6,22 +6,6 @@ output "gitlab_artifactory_s3_bucket_arn" {
   value = aws_s3_bucket.gitlab_artifactory_s3_bucket.arn
 }
 
-output "gitlab_registry_s3_bucket_id" {
-  value = aws_s3_bucket.gitlab_registry_s3_bucket.id
-}
-
-output "gitlab_registry_s3_bucket_arn" {
-  value = aws_s3_bucket.gitlab_registry_s3_bucket.arn
-}
-
-output "gitlab_packages_s3_bucket_id" {
-  value = aws_s3_bucket.gitlab_packages_s3_bucket.id
-}
-
-output "gitlab_packages_s3_bucket_arn" {
-  value = aws_s3_bucket.gitlab_packages_s3_bucket.arn
-}
-
 output "gitlab_lfs_s3_bucket_id" {
   value = aws_s3_bucket.gitlab_lfs_s3_bucket.id
 }
diff --git a/module/single-node-omnibus/rt53.tf b/module/single-node-omnibus/rt53.tf
@@ -1,6 +1,3 @@
-# ---------------------------------------------------------------------------------------------------------------------
-# CREATE DNS A RECORDS IN ROUTE 53 FOR CERTIFICATE
-# ---------------------------------------------------------------------------------------------------------------------
 resource "aws_route53_record" "cert_validation" {
   name    = aws_acm_certificate.gitlab_cert.domain_validation_options.0.resource_record_name
   type    = aws_acm_certificate.gitlab_cert.domain_validation_options.0.resource_record_type
@@ -9,9 +6,6 @@ resource "aws_route53_record" "cert_validation" {
   ttl     = 300
 }
 
-# ---------------------------------------------------------------------------------------------------------------------
-# CREATE DNS A RECORDS IN ROUTE 53 POINTING AT THE LOAD BALANCER
-# ---------------------------------------------------------------------------------------------------------------------
 resource "aws_route53_record" "alb_dns" {
   zone_id = var.zone_id
   name    = var.domain_name
diff --git a/module/single-node-omnibus/s3.tf b/module/single-node-omnibus/s3.tf
@@ -1,6 +1,3 @@
-# ---------------------------------------------------------------------------------------------------------------------------------------------
-# Create Artifactory S3 bucket
-# ---------------------------------------------------------------------------------------------------------------------------------------------
 resource "aws_s3_bucket" "gitlab_artifactory_s3_bucket" {
   bucket        = format("%s-%s",module.gitlab_label.id, var.gitlab_artifactory_s3_bucket_name)
   acl           = "private"
@@ -21,9 +18,6 @@ resource "aws_s3_bucket" "gitlab_artifactory_s3_bucket" {
   tags = merge(module.gitlab_label.tags,  {"Bucket-Name" = format("%s-%s",module.gitlab_label.id, var.gitlab_artifactory_s3_bucket_name)})
 }
 
-# ---------------------------------------------------------------------------------------------------------------------------------------------
-# Create LFS S3 bucket
-# ---------------------------------------------------------------------------------------------------------------------------------------------
 resource "aws_s3_bucket" "gitlab_lfs_s3_bucket" {
   bucket        = format("%s-%s",module.gitlab_label.id, var.gitlab_lfs_s3_bucket_name)
   acl           = "private"
@@ -44,55 +38,6 @@ resource "aws_s3_bucket" "gitlab_lfs_s3_bucket" {
   tags = merge(module.gitlab_label.tags,  {"Bucket-Name" = format("%s-%s",module.gitlab_label.id, var.gitlab_lfs_s3_bucket_name)})
 }
 
-# ---------------------------------------------------------------------------------------------------------------------------------------------
-# Create Packages S3 bucket
-# ---------------------------------------------------------------------------------------------------------------------------------------------
-resource "aws_s3_bucket" "gitlab_packages_s3_bucket" {
-  bucket        = format("%s-%s",module.gitlab_label.id, var.gitlab_packages_s3_bucket_name)
-  acl           = "private"
-  force_destroy = var.force_destroy_s3_bucket
-
-  server_side_encryption_configuration {
-    rule {
-      apply_server_side_encryption_by_default {
-        sse_algorithm = "AES256"
-      }
-    }
-  }
-
-  versioning {
-    enabled = true
-  }
-
-  tags = merge(module.gitlab_label.tags,  {"Bucket-Name" = format("%s-%s",module.gitlab_label.id, var.gitlab_packages_s3_bucket_name)})
-}
-
-# ---------------------------------------------------------------------------------------------------------------------------------------------
-# Create Registry S3 bucket
-# ---------------------------------------------------------------------------------------------------------------------------------------------
-resource "aws_s3_bucket" "gitlab_registry_s3_bucket" {
-  bucket        = format("%s-%s",module.gitlab_label.id, var.gitlab_registry_s3_bucket_name)
-  acl           = "private"
-  force_destroy = var.force_destroy_s3_bucket
-
-  server_side_encryption_configuration {
-    rule {
-      apply_server_side_encryption_by_default {
-        sse_algorithm = "AES256"
-      }
-    }
-  }
-
-  versioning {
-    enabled = true
-  }
-
-  tags = merge(module.gitlab_label.tags,  {"Bucket-Name" = format("%s-%s",module.gitlab_label.id, var.gitlab_registry_s3_bucket_name)})
-}
-
-# ---------------------------------------------------------------------------------------------------------------------------------------------
-# Create Backup S3 bucket
-# ---------------------------------------------------------------------------------------------------------------------------------------------
 resource "aws_s3_bucket" "gitlab_backup_s3_bucket" {
   bucket        = format("%s-%s",module.gitlab_label.id, var.gitlab_backup_s3_bucket_name)
   acl           = "private"
diff --git a/module/single-node-omnibus/templates/gitlab_application_user_data.sh b/module/single-node-omnibus/templates/gitlab_application_user_data.sh
@@ -9,10 +9,7 @@ sudo mount ${git_data_disk} ${git_data_disk_mount_point}
 sudo mkdir -p /etc/gitlab/ssl
 sudo chmod -R 700 /etc/gitlab/ssl
 sudo openssl req -newkey rsa:2048 -nodes -keyout /etc/gitlab/ssl/gitlabssl.key -x509 -days 3650 -out /etc/gitlab/ssl/gitlabssl.crt -subj "/CN=${domain_name}"
-sudo openssl req -newkey rsa:2048 -nodes -keyout /etc/gitlab/ssl/registryssl.key -x509 -days 3650 -out /etc/gitlab/ssl/registryssl.crt -subj "/CN=${reg_domain_name}"
 sudo chmod 600 /etc/gitlab/ssl/gitlabssl.*
-sudo chmod 600 /etc/gitlab/ssl/registryssl.*
-
 
 cat > /etc/gitlab/gitlab.rb <<- EOM
 ####! External_Url
@@ -22,9 +19,6 @@ external_url 'https://${domain_name}'
 nginx['redirect_http_to_https'] = true
 nginx['ssl_certificate'] = '/etc/gitlab/ssl/gitlabssl.crt'
 nginx['ssl_certificate_key'] = '/etc/gitlab/ssl/gitlabssl.key'
-registry_nginx['redirect_http_to_https'] = true
-registry_nginx['ssl_certificate'] = '/etc/gitlab/ssl/registryssl.crt'
-registry_nginx['ssl_certificate_key'] = '/etc/gitlab/ssl/registryssl.key'
 ####! Job artifacts Object Store
 ####! Docs: https://docs.gitlab.com/ee/administration/job_artifacts.html#using-object-storage
 gitlab_rails['artifacts_enabled'] = true
@@ -37,18 +31,6 @@ gitlab_rails['lfs_enabled'] = true
 gitlab_rails['lfs_object_store_enabled'] = false
 gitlab_rails['lfs_object_store_remote_directory'] = '${lfs_s3_bucket_name}'
 gitlab_rails['lfs_object_store_connection'] = {'provider' => '${s3_bucket_provider}', 'region' => '${s3_bucket_region}', 'aws_access_key_id' => '${s3_bucket_user_access_key}','aws_secret_access_key' => '${s3_bucket_user_secret_key}'}
-####! Package repository
-####! Docs: https://docs.gitlab.com/ee/administration/maven_packages.md
-gitlab_rails['packages_enabled'] = true
-gitlab_rails['packages_object_store_enabled'] = true
-gitlab_rails['packages_object_store_remote_directory'] = '${packages_s3_bucket_name}'
-gitlab_rails['packages_object_store_direct_upload'] = false
-gitlab_rails['packages_object_store_background_upload'] = true
-gitlab_rails['packages_object_store_proxy_download'] = false
-gitlab_rails['packages_object_store_connection'] = {'provider' => '${s3_bucket_provider}', 'region' => '${s3_bucket_region}', 'aws_access_key_id' => '${s3_bucket_user_access_key}', 'aws_secret_access_key' => '${s3_bucket_user_secret_key}'}
-####! Container Registry settings
-####! Docs: https://docs.gitlab.com/ce/administration/container_registry.html
-registry['storage'] = {'s3' => {'accesskey' => '${s3_bucket_user_access_key}','secretkey' => '${s3_bucket_user_secret_key}','region' => '${s3_bucket_region}','bucket' => '${registry_s3_bucket_name}'}}
 ####! For setting up different data storing directory
 ####! Docs: https://docs.gitlab.com/omnibus/settings/configuration.html#storing-git-data-in-an-alternative-directory
 git_data_dirs({'default' => { 'path' => '${git_data_disk_mount_point}'}})
diff --git a/module/single-node-omnibus/templates/gitlab_application_user_data.tpl b/module/single-node-omnibus/templates/gitlab_application_user_data.tpl
@@ -27,18 +27,6 @@ write_files:
         gitlab_rails['lfs_object_store_enabled'] = false
         gitlab_rails['lfs_object_store_remote_directory'] = "${lfs_s3_bucket_name}"
         gitlab_rails['lfs_object_store_connection'] = {'provider' => '${s3_bucket_provider}', 'region' => '${s3_bucket_region}', 'aws_access_key_id' => '${s3_bucket_user_access_key}','aws_secret_access_key' => '${s3_bucket_user_secret_key}'}
-        ####! Package repository
-        ####! Docs: https://docs.gitlab.com/ee/administration/maven_packages.md
-        gitlab_rails['packages_enabled'] = true
-        gitlab_rails['packages_object_store_enabled'] = true
-        gitlab_rails['packages_object_store_remote_directory'] = "${packages_s3_bucket_name}"
-        gitlab_rails['packages_object_store_direct_upload'] = false
-        gitlab_rails['packages_object_store_background_upload'] = true
-        gitlab_rails['packages_object_store_proxy_download'] = false
-        gitlab_rails['packages_object_store_connection'] = {'provider' => '${s3_bucket_provider}', 'region' => '${s3_bucket_region}', 'aws_access_key_id' => '${s3_bucket_user_access_key}', 'aws_secret_access_key' => '${s3_bucket_user_secret_key}'}
-        ####! Container Registry settings
-        ####! Docs: https://docs.gitlab.com/ce/administration/container_registry.html
-        registry['storage'] = {'s3' => {'accesskey' => '${s3_bucket_user_access_key}','secretkey' => '${s3_bucket_user_secret_key}','region' => '${s3_bucket_region}','bucket' => '${registry_s3_bucket_name}'}}
         ####! For setting up different data storing directory
         ####! Docs: https://docs.gitlab.com/omnibus/settings/configuration.html#storing-git-data-in-an-alternative-directory
         git_data_dirs({'default' => { 'path' => '${git_data_disk_mount_point}'}})
diff --git a/module/single-node-omnibus/variables.tf b/module/single-node-omnibus/variables.tf
@@ -45,18 +45,6 @@ variable "gitlab_lfs_s3_bucket_name" {
   default     = ""
 }
 
-variable "gitlab_packages_s3_bucket_name" {
-  type        = string
-  description = "Name of Gitlab Packages S3 bucket"
-  default     = ""
-}
-
-variable "gitlab_registry_s3_bucket_name" {
-  type        = string
-  description = "Name of Gitlab Registry S3 bucket"
-  default     = ""
-}
-
 variable "gitlab_backup_s3_bucket_name" {
   type        = string
   description = "Name of Gitlab Backup S3 bucket"

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,6 @@ module "gitlab" {`
`20`	`20`	`gitlab_application_ami = var.gitlab_ami`
`21`	`21`	`gitlab_artifactory_s3_bucket_name = var.gitlab_artifactory_s3_bucket_name`
`22`	`22`	`gitlab_lfs_s3_bucket_name = var.gitlab_lfs_s3_bucket_name`
`23`		`- gitlab_packages_s3_bucket_name = var.gitlab_packages_s3_bucket_name`
`24`		`- gitlab_registry_s3_bucket_name = var.gitlab_registry_s3_bucket_name`
`25`	`23`	`gitlab_backup_s3_bucket_name = var.gitlab_backup_s3_bucket_name`
`26`	`24`	`gitlab_kms_alias = var.gitlab_kms_alias`
`27`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,12 +36,6 @@ variable "gitlab_artifactory_s3_bucket_name" {`
`36`	`36`	`variable "gitlab_lfs_s3_bucket_name" {`
`37`	`37`	`}`
`38`	`38`
`39`		`-variable "gitlab_packages_s3_bucket_name" {`
`40`		`-}`
`41`		`-`
`42`		`-variable "gitlab_registry_s3_bucket_name" {`
`43`		`-}`
`44`		`-`
`45`	`39`	`variable "gitlab_backup_s3_bucket_name" {`
`46`	`40`	`}`
`47`	`41`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@ resource "aws_instance" "gitlab_application" {`
`7`	`7`	`user_data = data.template_cloudinit_config.config.rendered`
`8`	`8`	`associate_public_ip_address = false`
`9`	`9`	`monitoring = true`
`10`		`- volume_tags = { "Name" = format("%s-instance-ebs", module.gitlab_label.name), "Environment" = module.gitlab_label.stage}`
`11`		`- tags = { "Name" = format("%s-instance", module.gitlab_label.name), "Environment" = module.gitlab_label.stage}`
	`10`	`+ volume_tags = { "Name" = format("%s-gitlab-instance-ebs", module.gitlab_label.name), "Environment" = module.gitlab_label.stage}`
	`11`	`+ tags = { "Name" = format("%s-gitlab-instance", module.gitlab_label.name), "Environment" = module.gitlab_label.stage}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,6 @@ data "template_file" "gitlab_application_user_data" {`
`39`	`39`	`s3_bucket_user_secret_key = aws_iam_access_key.s3_access_key.secret`
`40`	`40`	`artifactory_s3_bucket_name = format("%s-%s",module.gitlab_label.id, var.gitlab_artifactory_s3_bucket_name)`
`41`	`41`	`lfs_s3_bucket_name = format("%s-%s",module.gitlab_label.id, var.gitlab_lfs_s3_bucket_name)`
`42`		`- packages_s3_bucket_name = format("%s-%s",module.gitlab_label.id, var.gitlab_packages_s3_bucket_name)`
`43`		`- registry_s3_bucket_name = format("%s-%s",module.gitlab_label.id, var.gitlab_registry_s3_bucket_name)`
`44`	`42`	`backup_s3_bucket_name = format("%s-%s",module.gitlab_label.id, var.gitlab_backup_s3_bucket_name)`
`45`	`43`	`domain_name = var.domain_name`
`46`	`44`	`}`