use separate subnet for soaking/perf (#178)

Author: wyTrivail

terraform/ec2/main.tf

@@ -65,6 +65,9 @@ locals {
 
   # get ecr login domain
   ecr_login_domain = split("/", data.aws_ecr_repository.sample_app.repository_url)[0]
+
+  # get instance subnet, use separate subnet for soaking and performance test as it takes more instances and some times eat up all the available ip address in the subnet
+  instance_subnet = var.testing_type == "e2e" ? tolist(module.basic_components.aoc_public_subnet_ids)[1] : tolist(module.basic_components.aoc_public_subnet_ids)[0]
 }
 
 
@@ -73,7 +76,7 @@ locals {
 resource "aws_instance" "sidecar" {
   ami                         = data.aws_ami.suse.id
   instance_type               = "m5.2xlarge"
-  subnet_id                   = tolist(module.basic_components.aoc_public_subnet_ids)[0]
+  subnet_id                   = local.instance_subnet
   vpc_security_group_ids      = [module.basic_components.aoc_security_group_id]
   associate_public_ip_address = true
   iam_instance_profile        = module.common.aoc_iam_role_name
@@ -88,7 +91,7 @@ resource "aws_instance" "sidecar" {
 resource "aws_instance" "aoc" {
   ami                         = local.ami_id
   instance_type               = local.instance_type
-  subnet_id                   = tolist(module.basic_components.aoc_public_subnet_ids)[0]
+  subnet_id                   = local.instance_subnet
   vpc_security_group_ids      = [module.basic_components.aoc_security_group_id]
   associate_public_ip_address = true
   iam_instance_profile        = module.common.aoc_iam_role_name

terraform/ec2/variables.tf

@@ -91,7 +91,7 @@ variable "install_package_local_path" {
 }
 
 variable "testing_type" {
-  default = ""
+  default = "e2e"
 }
 
 # flag used by canary test to run EC2 tests in canary mode

terraform/ec2_setup/main.tf

@@ -70,4 +70,6 @@ module "ec2_setup" {
   soaking_metric_namespace = var.soaking_metric_namespace
 
   debug = var.debug
+
+  testing_type = var.testing_type
 }

terraform/ec2_setup/variables.tf

@@ -67,3 +67,7 @@ variable "install_package_source" {
 variable "install_package_local_path" {
   default = "../../../aws-otel-collector/build/packages/linux/amd64/aws-otel-collector.rpm"
 }
+
+variable "testing_type" {
+  default = "e2e"
+}

terraform/performance/main.tf

@@ -43,6 +43,8 @@ module "ec2_setup" {
   soaking_metric_namespace = var.performance_metric_namespace
 
   debug = var.debug
+
+  testing_type = "perf"
 }
 
 locals{

terraform/soaking/main.tf

@@ -44,6 +44,7 @@ module "ec2_setup" {
   debug = var.debug
   negative_soaking = var.negative_soaking
 
+  testing_type = "soaking"
 }
 
 locals {

terraform/templates/defaults/soaking_docker_compose.tpl

@@ -10,6 +10,7 @@ services:
         limits:
           memory: 4G
   ot-metric-emitter:
+    privileged: true
     image: ${sample_app_image}
     command: ["${data_mode}", "-r=${rate}", "-u=${grpc_endpoint}", "-d=${data_type}"]
     environment:

terraform/templates/defaults/soaking_docker_compose_pull_mode.tpl

@@ -10,6 +10,7 @@ services:
         limits:
           memory: 1G
   ot-metric-emitter:
+    privileged: true
     image: ${sample_app_image}
     command: []
     ports: