Merge pull request #219 from mdr-engineering/feature/ftd_MSOCI-1449_GHEToGovCLoud

Updates to Fix GHE

prod/aws-us-gov/mdr-prod-c2/account.hcl

@@ -146,7 +146,7 @@ locals {
     "splunk-hf"      = "m5a.xlarge",
     "splunk-sh"      = "m5a.4xlarge",
     "qcompliance"    = "c5a.8xlarge", # legacy: c4.8xlarge
-    "github"         = "c5a.4xlarge", # legacy: c4.4xlarge in prod, c5.2xlarge in test
+    "github"         = "c5.4xlarge", # legacy: c4.4xlarge in prod, c5.2xlarge in test
     "github-backup"  = "t3a.medium", # legacy: t2.medium
   }
 

prod/env.hcl

@@ -29,6 +29,7 @@ locals {
                              ],
     "vpc-public"           = [ "10.40.24.0/22",    # Public sites (github, ghe-backup, jira, ...) 
                                "10.80.101.250/32", # legacy jira
+                               "10.80.101.78/32",  # legacy github
                              ],
     "vpc-scanners"         = [ "10.40.12.0/22",
                                "10.80.1.44/32",  # Legacy Qualys #1

test/aws-us-gov/mdr-test-c2/account.hcl

@@ -150,7 +150,7 @@ locals {
     "splunk-hf"      = "t3a.small", # legacy: t2.medium
     "splunk-sh"      = "t3a.small", # legacy: ? not sure
     "qcompliance"    = "t3a.small", # legacy: ? not sure
-    "github"         = "c5a.2xlarge", # legacy: c4.4xlarge in prod, c5.2xlarge in test
+    "github"         = "c5.2xlarge", # legacy: c4.4xlarge in prod, c5.2xlarge in test
     "github-backup"  = "t3a.medium", # legacy: t2.micro
   }
 

test/env.hcl

@@ -30,6 +30,7 @@ locals {
                              ],
     "vpc-public"           = [ "10.20.24.0/22",    # Public sites (github, ghe-backup, jira, ...) 
                                "10.96.101.193/32", # legacy jira
+                               "10.96.101.217/32", # legacy github
                              ],
     "vpc-scanners"         = [ "10.20.12.0/22" ],  # Qualys, etc.
     "vpc-system-services"  = [ "10.16.0.0/22",     # Internal services such as dns, mailrelay, etc.