Manually applying various updates from upstream to the fork

sdarwin · sdarwin · commit 35d904560725 · 2023-06-22T23:26:43.000Z
diff --git a/README-CPP.md b/README-CPP.md
@@ -0,0 +1,45 @@
+
+## CPPAlliance fork of terraform-aws-github-runner  
+
+Customizations have been made in various separate directories that do not conflict with philips to facilitate rebasing or keeping up to date with the upstream repository.  
+
+scripts/  
+  packerimages.sh: A script to rebuild the AMI images with packer.  
+  removeami.sh: A script to find and remove old AMIs and their associated snapshots.  
+
+images/ :  The packer images are kept in subdirectories ending in -cppal. 
+
+examples/multi-runner-cppal/ : The main terraform directory. This is where "terraform apply" is run.  
+examples/multi-runner-cppal/templates/runner-configs : Runner configs are maintained in this dir.  
+
+## Upgrading the repository fork  
+
+Rebase from main.  
+
+Check files and manually apply any updates from main:  
+
+examples/multi-runner/  
+examples/multi-runner/templates/runner-configs/  
+images/ubuntu-jammy/  
+
+Update the lambdas:  
+```
+cd examples/lambdas-download-cppal  
+terraform apply  
+```
+
+The typical procedure to make small updates:  
+```
+cd examples/multi-runner-cppal/
+terraform apply  
+```
+
+During a major upgrade, the least error-prone method may be to rebuild the cloud from scratch:  
+```
+cd examples/multi-runner-cppal/
+terraform destroy  
+terraform apply  
+
+terraform output -raw webhook_secret  
+```
+
diff --git a/examples/lambdas-download-cppal/.terraform.lock.hcl b/examples/lambdas-download-cppal/.terraform.lock.hcl
diff --git a/examples/lambdas-download-cppal/README-CPP.md b/examples/lambdas-download-cppal/README-CPP.md
@@ -0,0 +1,5 @@
+
+terraform init -upgrade
+terraform init
+# terraform apply -var=module_version=v3.3.0
+terraform apply -var=module_version=v3.4.2
diff --git a/examples/multi-runner-cppal/.terraform.lock.hcl b/examples/multi-runner-cppal/.terraform.lock.hcl
diff --git a/examples/multi-runner-cppal/additional.tf b/examples/multi-runner-cppal/additional.tf
@@ -1,23 +1,21 @@
 
 data "aws_route_table" "gha_public_rt" {
-  vpc_id        = module.vpc.vpc_id
+  vpc_id        = module.base.vpc.vpc_id
   tags		= {
-    Name        = "vpc-gha-public"
-    Environment = "gha"
+    Name        = "gha-vpc-public"
   }
 }
 
 data "aws_route_table" "gha_private_rt" {
-  vpc_id        = module.vpc.vpc_id
+  vpc_id        = module.base.vpc.vpc_id
   tags		= {
-    Name        = "vpc-gha-private"
-    Environment = "gha"
+    Name        = "gha-vpc-private"
   }
 }
 
 resource "aws_vpc_peering_connection" "peering1" {
   peer_vpc_id   = var.aws_default_vpc
-  vpc_id        = module.vpc.vpc_id
+  vpc_id        = module.base.vpc.vpc_id
   auto_accept   = true
 }
 
diff --git a/examples/multi-runner-cppal/main.tf b/examples/multi-runner-cppal/main.tf
@@ -10,6 +10,13 @@ resource "random_id" "random" {
   byte_length = 20
 }
 
+module "base" {
+  source = "../base"
+
+  prefix     = local.environment
+  aws_region = local.aws_region
+}
+
 module "multi-runner" {
   source              = "../../modules/multi-runner"
   multi_runner_config = local.multi_runner_config
@@ -38,8 +45,8 @@ module "multi-runner" {
   #  }
   aws_region                        = local.aws_region
   key_name                          = "cppalliance-us-west-2-kp"
-  vpc_id                            = module.vpc.vpc_id
-  subnet_ids                        = module.vpc.private_subnets
+  vpc_id                            = module.base.vpc.vpc_id
+  subnet_ids                        = module.base.vpc.private_subnets
   runners_scale_up_lambda_timeout   = 60
   runners_scale_down_lambda_timeout = 60
   prefix                            = local.environment
diff --git a/examples/multi-runner-cppal/templates/runner-configs/ubuntu-bionic-arm64.yaml b/examples/multi-runner-cppal/templates/runner-configs/ubuntu-bionic-arm64.yaml
@@ -18,6 +18,7 @@ runner_config:
   runner_run_as: ubuntu
   runner_name_prefix: ubuntu-1804-arm64_
   enable_ssm_on_runners: true
+  credit_specification: standard
   instance_types:
     - t4g.large
     - c6g.large
diff --git a/examples/multi-runner-cppal/templates/runner-configs/ubuntu-bionic.yaml b/examples/multi-runner-cppal/templates/runner-configs/ubuntu-bionic.yaml
@@ -18,6 +18,7 @@ runner_config:
   runner_run_as: ubuntu
   runner_name_prefix: ubuntu-1804-x64_
   enable_ssm_on_runners: true
+  credit_specification: standard
   instance_types:
     - m5ad.large
     - m5a.large
diff --git a/examples/multi-runner-cppal/templates/runner-configs/ubuntu-focal-arm64.yaml b/examples/multi-runner-cppal/templates/runner-configs/ubuntu-focal-arm64.yaml
@@ -18,6 +18,7 @@ runner_config:
   runner_run_as: ubuntu
   runner_name_prefix: ubuntu-2004-arm64_
   enable_ssm_on_runners: true
+  credit_specification: standard
   instance_types:
     - t4g.large
     - c6g.large
diff --git a/examples/multi-runner-cppal/templates/runner-configs/ubuntu-focal.yaml b/examples/multi-runner-cppal/templates/runner-configs/ubuntu-focal.yaml
@@ -18,6 +18,7 @@ runner_config:
   runner_run_as: ubuntu
   runner_name_prefix: ubuntu-2004-x64_
   enable_ssm_on_runners: true
+  credit_specification: standard
   instance_types:
     - m5ad.large
     - m5a.large
diff --git a/examples/multi-runner-cppal/templates/runner-configs/ubuntu-jammy-arm64.yaml b/examples/multi-runner-cppal/templates/runner-configs/ubuntu-jammy-arm64.yaml
@@ -19,6 +19,7 @@ runner_config:
   runner_run_as: ubuntu
   runner_name_prefix: ubuntu-2204-arm64_
   enable_ssm_on_runners: true
+  credit_specification: standard
   instance_types:
     - t4g.large
     - c6g.large
diff --git a/examples/multi-runner-cppal/templates/runner-configs/ubuntu-jammy.yaml b/examples/multi-runner-cppal/templates/runner-configs/ubuntu-jammy.yaml
@@ -19,6 +19,7 @@ runner_config:
   runner_run_as: ubuntu
   runner_name_prefix: ubuntu-2204-x64_
   enable_ssm_on_runners: true
+  credit_specification: standard
   instance_types:
     - m5ad.large
     - m5a.large
diff --git a/examples/multi-runner-cppal/templates/runner-configs/windows-2019.yaml b/examples/multi-runner-cppal/templates/runner-configs/windows-2019.yaml
@@ -15,6 +15,7 @@ runner_config:
   runner_extra_labels: "windows-2019-aws"
   runner_name_prefix: windows-2019-x64_
   enable_ssm_on_runners: true
+  credit_specification: standard
   instance_types:
     - m5.large
     - c5.large
diff --git a/examples/multi-runner-cppal/templates/runner-configs/windows-2022.yaml b/examples/multi-runner-cppal/templates/runner-configs/windows-2022.yaml
@@ -16,6 +16,7 @@ runner_config:
   runner_extra_labels: "windows-latest-aws,windows-2022-aws"
   runner_name_prefix: windows-2022-x64_
   enable_ssm_on_runners: true
+  credit_specification: standard
   instance_types:
     - m5.large
     - c5.large
diff --git a/examples/multi-runner-cppal/versions.tf b/examples/multi-runner-cppal/versions.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = "~> 5.2"
     }
     local = {
       source  = "hashicorp/local"
diff --git a/examples/multi-runner-cppal/vpc.tf b/examples/multi-runner-cppal/vpc.tf
diff --git a/images/ubuntu-bionic-arm64-cppal/github_agent.ubuntu.pkr.hcl b/images/ubuntu-bionic-arm64-cppal/github_agent.ubuntu.pkr.hcl
@@ -194,4 +194,8 @@ build {
     ]
   }
 
+  post-processor "manifest" {
+    output     = "manifest.json"
+    strip_path = true
+  }
 }
diff --git a/images/ubuntu-bionic-cppal/github_agent.ubuntu.pkr.hcl b/images/ubuntu-bionic-cppal/github_agent.ubuntu.pkr.hcl
@@ -194,4 +194,9 @@ build {
     ]
   }
 
+  post-processor "manifest" {
+    output     = "manifest.json"
+    strip_path = true
+  }
+
 }
diff --git a/images/ubuntu-focal-arm64-cppal/github_agent.ubuntu.pkr.hcl b/images/ubuntu-focal-arm64-cppal/github_agent.ubuntu.pkr.hcl
@@ -194,4 +194,9 @@ build {
     ]
   }
 
+  post-processor "manifest" {
+    output     = "manifest.json"
+    strip_path = true
+  }
+
 }
diff --git a/images/ubuntu-focal-cppal/github_agent.ubuntu.pkr.hcl b/images/ubuntu-focal-cppal/github_agent.ubuntu.pkr.hcl
@@ -194,4 +194,9 @@ build {
     ]
   }
 
+  post-processor "manifest" {
+    output     = "manifest.json"
+    strip_path = true
+  }
+
 }
diff --git a/images/ubuntu-jammy-arm64-cppal/github_agent.ubuntu.pkr.hcl b/images/ubuntu-jammy-arm64-cppal/github_agent.ubuntu.pkr.hcl
diff --git a/images/ubuntu-jammy-cppal/github_agent.ubuntu.pkr.hcl b/images/ubuntu-jammy-cppal/github_agent.ubuntu.pkr.hcl
diff --git a/images/windows-2019-cppal/github_agent.windows.pkr.hcl b/images/windows-2019-cppal/github_agent.windows.pkr.hcl
diff --git a/images/windows-2022-cppal/github_agent.windows.pkr.hcl b/images/windows-2022-cppal/github_agent.windows.pkr.hcl

Original file line number	Diff line number	Diff line change
`@@ -1,23 +1,21 @@`
`1`	`1`
`2`	`2`	`data "aws_route_table" "gha_public_rt" {`
`3`		`- vpc_id = module.vpc.vpc_id`
	`3`	`+ vpc_id = module.base.vpc.vpc_id`
`4`	`4`	`tags = {`
`5`		`- Name = "vpc-gha-public"`
`6`		`- Environment = "gha"`
	`5`	`+ Name = "gha-vpc-public"`
`7`	`6`	`}`
`8`	`7`	`}`
`9`	`8`
`10`	`9`	`data "aws_route_table" "gha_private_rt" {`
`11`		`- vpc_id = module.vpc.vpc_id`
	`10`	`+ vpc_id = module.base.vpc.vpc_id`
`12`	`11`	`tags = {`
`13`		`- Name = "vpc-gha-private"`
`14`		`- Environment = "gha"`
	`12`	`+ Name = "gha-vpc-private"`
`15`	`13`	`}`
`16`	`14`	`}`
`17`	`15`
`18`	`16`	`resource "aws_vpc_peering_connection" "peering1" {`
`19`	`17`	`peer_vpc_id = var.aws_default_vpc`
`20`		`- vpc_id = module.vpc.vpc_id`
	`18`	`+ vpc_id = module.base.vpc.vpc_id`
`21`	`19`	`auto_accept = true`
`22`	`20`	`}`
`23`	`21`