From 26f19d98743f140099a7b84539f3b9a5df7bfc57 Mon Sep 17 00:00:00 2001 From: Peter Buckley Date: Thu, 24 Oct 2024 20:51:27 -0400 Subject: [PATCH 1/3] some changes for my project name so it is a different one from Daniel --- platform/terraform/provider.tf | 23 ++++++++++++----------- terraform/remote-state/terraform.tfvars | 2 +- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/platform/terraform/provider.tf b/platform/terraform/provider.tf index 5c70da4..528e378 100644 --- a/platform/terraform/provider.tf +++ b/platform/terraform/provider.tf @@ -1,10 +1,10 @@ terraform { backend "s3" { - bucket = "pk01-dev-tfstate-clkzr2z66gw7" - key = "terraform.tfstate" + bucket = "pbtf01-dev-tfstate-robz82sou3y3" + key = "pbtofu.tfstate" region = "us-east-1" encrypt = true - dynamodb_table = "pk01-dev-tfstate-lock" + dynamodb_table = "pbtf01-dev-tfstate-lock" } required_providers { buildkite = { @@ -15,14 +15,14 @@ terraform { source = "hashicorp/aws" version = "~> 5.50.0" } - # tls = { - # source = "hashicorp/tls" - # version = "~> 4.0.5" - # } - # random = { - # source = "hashicorp/random" - # version = "3.6.1" - # } + tls = { + source = "hashicorp/tls" + version = "~> 4.0.5" + } + random = { + source = "hashicorp/random" + version = "3.6.1" + } } required_version = ">= 1.8.3" } @@ -34,4 +34,5 @@ provider "buildkite" { provider "aws" { # Must set the `AWS_PROFILE` environment variable + # and `AWS_REGION` env var, too, profile ain't enough } diff --git a/terraform/remote-state/terraform.tfvars b/terraform/remote-state/terraform.tfvars index a334779..db08d7a 100644 --- a/terraform/remote-state/terraform.tfvars +++ b/terraform/remote-state/terraform.tfvars @@ -1,3 +1,3 @@ -project = "pk01" +project = "pbtf01" environment = "dev" aws_region = "us-east-1" From afc465b3fd3b4758f4cdfd5c054e5419a2a19924 Mon Sep 17 00:00:00 2001 From: Peter Buckley Date: Thu, 24 Oct 2024 21:07:32 -0400 Subject: [PATCH 2/3] three car clusters but wrong color ugh --- platform/clusters.yaml | 70 ++++++++++++------------------------------ 1 file changed, 19 insertions(+), 51 deletions(-) diff --git a/platform/clusters.yaml b/platform/clusters.yaml index 54f05bb..81cfd54 100644 --- a/platform/clusters.yaml +++ b/platform/clusters.yaml @@ -12,22 +12,17 @@ defaults: description: "green" allowed_ip_addresses: - 0.0.0.0/0 - # clusters.tokens.allowed_ip_addresses: - # - 0.0.0.0/0 - # clusters.queues: - # - key: new - # description: "The new queue!" clusters: - - key: avocado - name: "Avocado" - description: "A nutrient-dense fruit high in healthy fats and fiber." - emoji: ":avocado:" + - key: yellow + name: "Yellow Cars Only" + description: "A cluster for yellow cars." + emoji: ":car-yellow:" color: "#A2CFA5" default_queue: build queues: - key: build - description: "The build queue for the Avocado cluster." + description: "The build queue for the yellow car cluster." agents: - type: elastic-ci-stack token_key: blue @@ -43,33 +38,19 @@ clusters: description: "The restricted queue for the Avocado cluster." - key: special description: "The special queue for the Avocado cluster." - # - key: corn - # name: "Corn" - # description: "A staple grain rich in fiber and vitamins." - # emoji: ":corn:" - # color: "#FFE79B" - # default_queue: build - # queues: - # # [] - # - key: build - # description: "The build queue for the Corn cluster." - # - key: restricted - # description: "The restricted queue for the Corn cluster." - # - key: special - # description: "The special queue for the Corn cluster." - - key: dumpling - name: "Dumpling" - description: "A delicious food item often filled with meat or vegetables." - emoji: ":dumpling:" + - key: blue + name: "Blue Cars Only" + description: "A cluster for blue cars." + emoji: ":car-blue:" color: "#F5E6CC" default_queue: build queues: - key: build - description: "The build queue for the Dumpling cluster." + description: "The build queue for the blue car cluster." - key: restricted - description: "The restricted queue for the Dumpling cluster." + description: "The restricted queue for the blue car cluster." - key: special - description: "The special queue for the Dumpling cluster." + description: "The special queue for the blue car cluster." tokens: - key: blue description: "blue" @@ -79,29 +60,16 @@ clusters: description: "green" allowed_ip_addresses: - 0.0.0.0/0 - - key: eggplant - name: "Eggplant" - description: "A versatile vegetable rich in antioxidants and vitamins." - emoji: ":eggplant:" + - key: black + name: "Black Cars Only" + description: "A cluster for black cars." + emoji: ":car-black:" color: "#B565A7" default_queue: build queues: - key: build - description: "The build queue for the Eggplant cluster." + description: "The build queue for the black car cluster." - key: restricted - description: "The restricted queue for the Eggplant cluster." + description: "The restricted queue for the black car cluster." - key: special - description: "The special queue for the Eggplant cluster." - - key: shrimp - name: "Shrimp" - description: "A high-protein seafood rich in omega-3 fatty acids." - emoji: ":fried_shrimp:" - color: "#FFA07A" - default_queue: build - queues: - - key: build - description: "The build queue for the Shrimp cluster." - - key: restricted - description: "The restricted queue for the Shrimp cluster." - - key: special - description: "The special queue for the Shrimp cluster." + description: "The special queue for the black car cluster." From d3dbd0d9d0ab888c2dad10ab4e155c323b646f98 Mon Sep 17 00:00:00 2001 From: Peter Buckley Date: Mon, 28 Oct 2024 09:14:59 -0400 Subject: [PATCH 3/3] removing the word "only" and cleaning up some leftover food references and fixing the colors for dark mode --- platform/clusters.yaml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/platform/clusters.yaml b/platform/clusters.yaml index 81cfd54..b590474 100644 --- a/platform/clusters.yaml +++ b/platform/clusters.yaml @@ -15,14 +15,27 @@ defaults: clusters: - key: yellow - name: "Yellow Cars Only" + name: "Yellow Cars" description: "A cluster for yellow cars." emoji: ":car-yellow:" - color: "#A2CFA5" + color: "#000000" default_queue: build queues: - key: build description: "The build queue for the yellow car cluster." + - key: restricted + description: "The restricted queue for the yellow car cluster." + - key: special + description: "The special queue for the yellow car cluster." + - key: blue + name: "Blue Cars" + description: "A cluster for blue cars." + emoji: ":car-blue:" + color: "#000000" + default_queue: build + queues: + - key: build + description: "The build queue for the blue car cluster." agents: - type: elastic-ci-stack token_key: blue @@ -34,19 +47,6 @@ clusters: min_size: 0 max_size: 5 root_volume_size: 50 - - key: restricted - description: "The restricted queue for the Avocado cluster." - - key: special - description: "The special queue for the Avocado cluster." - - key: blue - name: "Blue Cars Only" - description: "A cluster for blue cars." - emoji: ":car-blue:" - color: "#F5E6CC" - default_queue: build - queues: - - key: build - description: "The build queue for the blue car cluster." - key: restricted description: "The restricted queue for the blue car cluster." - key: special @@ -61,10 +61,10 @@ clusters: allowed_ip_addresses: - 0.0.0.0/0 - key: black - name: "Black Cars Only" + name: "Black Cars" description: "A cluster for black cars." emoji: ":car-black:" - color: "#B565A7" + color: "#000000" default_queue: build queues: - key: build