From 8d0f72c57c9b5a8cdec261c99d81c2559933ab84 Mon Sep 17 00:00:00 2001 From: Kai Siren Date: Fri, 31 May 2024 22:47:32 -0700 Subject: [PATCH] checkpoint-kai-1717220852 --- infrastructure/application/.terraform.lock.hcl | 3 +++ infrastructure/application/state.tf | 3 ++- infrastructure/deployment.yml | 6 +++++- infrastructure/foundation/main.tf | 2 +- infrastructure/ingress.yml | 4 ++-- infrastructure/ingress/.terraform.lock.hcl | 3 +++ infrastructure/ingress/state.tf | 3 ++- tasks.py | 2 +- 8 files changed, 19 insertions(+), 7 deletions(-) diff --git a/infrastructure/application/.terraform.lock.hcl b/infrastructure/application/.terraform.lock.hcl index 3761530..c3bba94 100644 --- a/infrastructure/application/.terraform.lock.hcl +++ b/infrastructure/application/.terraform.lock.hcl @@ -4,6 +4,7 @@ provider "registry.terraform.io/hashicorp/aws" { version = "5.26.0" hashes = [ + "h1:McIRw8larBNW5TeXxyiWd8fD55oj1szEbMOuSQOSDBs=", "h1:N6Iu1W6tvozB4RsClM9aHPuZhrKD6GCUAjlnl8THcLs=", "zh:11a4062491e574c8e96b6bc7ced67b5e9338ccfa068223fc9042f9e1e7eda47a", "zh:4331f85aeb22223ab656d04b48337a033f44f02f685c8def604c4f8f4687d10f", @@ -26,6 +27,7 @@ provider "registry.terraform.io/hashicorp/aws" { provider "registry.terraform.io/hashicorp/google" { version = "5.7.0" hashes = [ + "h1:dGrS2F0C3frYTdaYvev6fZDWAGBE6O7Q4DhfO/0P7r8=", "h1:rCBKZinpkHWlZzXLE+iBcQNi5Q6KYqFRDIw0gX3OfLA=", "zh:0c0cf15cc034d5f92cc1cd5ee4615012553a674b69ee1802e46c4b87f1c339aa", "zh:28e64a798320866c4dc84c323b66eef94ec98043dba016cf01d6adbe2dc85de4", @@ -45,6 +47,7 @@ provider "registry.terraform.io/hashicorp/google" { provider "registry.terraform.io/hashicorp/kubernetes" { version = "2.23.0" hashes = [ + "h1:arTzD0XG/DswGCAx9JEttkSKe9RyyFW9W7UWcXF13dU=", "h1:cMs2scNCSgQhGamomGT5Ag4i8ms/mql1AR7NJc2hmbA=", "zh:10488a12525ed674359585f83e3ee5e74818b5c98e033798351678b21b2f7d89", "zh:1102ba5ca1a595f880e67102bbf999cc8b60203272a078a5b1e896d173f3f34b", diff --git a/infrastructure/application/state.tf b/infrastructure/application/state.tf index 16cccdb..c8f9afc 100644 --- a/infrastructure/application/state.tf +++ b/infrastructure/application/state.tf @@ -29,7 +29,8 @@ provider "kubernetes" { provider "aws" { # AWS doesn't have the same regions as GCP, and also doesn't format then in the same way. # That said, this isn't a huge issue because we are only using AWS for DNS. - region = "us-east-1" + region = "us-east-1" + profile = "coilysiren" } data "terraform_remote_state" "foundation" { diff --git a/infrastructure/deployment.yml b/infrastructure/deployment.yml index 287e849..cbbec58 100644 --- a/infrastructure/deployment.yml +++ b/infrastructure/deployment.yml @@ -29,10 +29,14 @@ items: app: application spec: containers: - - image: us-central1-docker.pkg.dev/dotted-hope-405813/repository/gke-test-3:certs-add8cea-kai + - image: us-central1-docker.pkg.dev/gke-test-5/repository/gke-test-5:main-27e69ef-kai name: application ports: - containerPort: 8080 + resources: + requests: + cpu: "0.1" + memory: 256Mi kind: List metadata: resourceVersion: "" diff --git a/infrastructure/foundation/main.tf b/infrastructure/foundation/main.tf index d1c4a71..3113ddf 100644 --- a/infrastructure/foundation/main.tf +++ b/infrastructure/foundation/main.tf @@ -147,7 +147,7 @@ module "gke" { node_pools = [ { name = "primary" - machine_type = "e2-small" + machine_type = "e2-medium" min_count = 1 max_count = 1 auto_repair = true diff --git a/infrastructure/ingress.yml b/infrastructure/ingress.yml index 13c2626..5f07bc3 100644 --- a/infrastructure/ingress.yml +++ b/infrastructure/ingress.yml @@ -17,7 +17,7 @@ items: number: 80 tls: - hosts: - - gke-test-3.coilysiren.me + - gke-test-5.coilysiren.me secretName: web-ssl - apiVersion: cert-manager.io/v1 kind: Issuer @@ -47,4 +47,4 @@ items: - gke-test-3.coilysiren.me kind: List metadata: - resourceVersion: "" + resourceVersion: '' diff --git a/infrastructure/ingress/.terraform.lock.hcl b/infrastructure/ingress/.terraform.lock.hcl index 3761530..c3bba94 100644 --- a/infrastructure/ingress/.terraform.lock.hcl +++ b/infrastructure/ingress/.terraform.lock.hcl @@ -4,6 +4,7 @@ provider "registry.terraform.io/hashicorp/aws" { version = "5.26.0" hashes = [ + "h1:McIRw8larBNW5TeXxyiWd8fD55oj1szEbMOuSQOSDBs=", "h1:N6Iu1W6tvozB4RsClM9aHPuZhrKD6GCUAjlnl8THcLs=", "zh:11a4062491e574c8e96b6bc7ced67b5e9338ccfa068223fc9042f9e1e7eda47a", "zh:4331f85aeb22223ab656d04b48337a033f44f02f685c8def604c4f8f4687d10f", @@ -26,6 +27,7 @@ provider "registry.terraform.io/hashicorp/aws" { provider "registry.terraform.io/hashicorp/google" { version = "5.7.0" hashes = [ + "h1:dGrS2F0C3frYTdaYvev6fZDWAGBE6O7Q4DhfO/0P7r8=", "h1:rCBKZinpkHWlZzXLE+iBcQNi5Q6KYqFRDIw0gX3OfLA=", "zh:0c0cf15cc034d5f92cc1cd5ee4615012553a674b69ee1802e46c4b87f1c339aa", "zh:28e64a798320866c4dc84c323b66eef94ec98043dba016cf01d6adbe2dc85de4", @@ -45,6 +47,7 @@ provider "registry.terraform.io/hashicorp/google" { provider "registry.terraform.io/hashicorp/kubernetes" { version = "2.23.0" hashes = [ + "h1:arTzD0XG/DswGCAx9JEttkSKe9RyyFW9W7UWcXF13dU=", "h1:cMs2scNCSgQhGamomGT5Ag4i8ms/mql1AR7NJc2hmbA=", "zh:10488a12525ed674359585f83e3ee5e74818b5c98e033798351678b21b2f7d89", "zh:1102ba5ca1a595f880e67102bbf999cc8b60203272a078a5b1e896d173f3f34b", diff --git a/infrastructure/ingress/state.tf b/infrastructure/ingress/state.tf index 5c4653e..c7a11bd 100644 --- a/infrastructure/ingress/state.tf +++ b/infrastructure/ingress/state.tf @@ -29,7 +29,8 @@ provider "kubernetes" { provider "aws" { # AWS doesn't have the same regions as GCP, and also doesn't format then in the same way. # That said, this isn't a huge issue because we are only using AWS for DNS. - region = "us-east-1" + region = "us-east-1" + profile = "coilysiren" } data "terraform_remote_state" "foundation" { diff --git a/tasks.py b/tasks.py index 01a5fc4..330337e 100644 --- a/tasks.py +++ b/tasks.py @@ -144,7 +144,7 @@ def build(ctx: [invoke.Context, Context]): ctx = Context(ctx) # build docker image - ctx.run(f"BUILDKIT_PROGRESS=plain docker build --tag {ctx.name}:{ctx.version} . --target base") + ctx.run(f"BUILDKIT_PROGRESS=plain docker build --platform linux/amd64 --tag {ctx.name}:{ctx.version} . --target base") @invoke.task