update some stuff.

vallard · Jan 2, 2023 · 893fcba · 893fcba
1 parent 974d6a7
commit 893fcba
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 6 deletions.
diff --git a/02/terragrunt/live/stage-mon/backend.tf b/02/terragrunt/live/stage-mon/backend.tf
@@ -0,0 +1,9 @@
+# Generated by Terragrunt. Sig: nIlQXj57tbuaRZEa
+terraform {
+  backend "s3" {
+    bucket  = "k8sclass-tf-state"
+    encrypt = true
+    key     = "stage-mon/./terraform.tfstate"
+    region  = "us-west-2"
+  }
+}
diff --git a/02/terragrunt/live/stage-mon/provider.tf b/02/terragrunt/live/stage-mon/provider.tf
@@ -0,0 +1,7 @@
+# Generated by Terragrunt. Sig: nIlQXj57tbuaRZEa
+provider "aws" {
+  region  = "us-west-2"
+  assume_role {
+    role_arn = local.iam_state.eks_dude_role.arn
+  }
+}
diff --git a/02/terragrunt/live/stage-mon/state.tf b/02/terragrunt/live/stage-mon/state.tf
@@ -0,0 +1,9 @@
+# Generated by Terragrunt. Sig: nIlQXj57tbuaRZEa
+data "terraform_remote_state" "iam" {
+  backend = "s3"
+  config = {
+    region = "us-west-2"
+    bucket = "k8sclass-tf-state"
+    key    = "iam/terraform.tfstate"
+  }
+}
diff --git a/02/terragrunt/live/stage/eks/terragrunt.hcl b/02/terragrunt/live/stage/eks/terragrunt.hcl
@@ -19,5 +19,5 @@ inputs = {
   k8s_version = 1.22
   min_nodes = 1
   desired_nodes = 3
-  max_nodes = 6
+  max_nodes = 7
 }
diff --git a/03/ngx.yaml b/03/ngx.yaml
@@ -10,7 +10,7 @@ metadata:
   name: ngx
   namespace: default
 spec:
-  replicas: 5
+  replicas: 1
   selector:
     matchLabels:
       run: ngx

diff --git a/06/dynamo-example/Makefile b/06/dynamo-example/Makefile
@@ -2,6 +2,10 @@
 
 all: build push 
 
+
+dev: 
+	docker run -v ${PWD}/app:/app -d -p 8011:80 vallard/eks-dynamo 
+
 build:
 	docker build -t vallard/eks-dynamo .
 

diff --git a/06/dynamo-example/terraform/dynamo.tf b/06/dynamo-example/terraform/dynamo.tf
@@ -32,6 +32,11 @@ resource "aws_dynamodb_table_item" "dynamoUsers" {
   "id": {"S": "12345"},
   "email" : {"S": "[email protected]" },
   "name" : {"S": "Mal" }
+},
+{
+  "id": {"S": "45"},
+  "email" : {"S": "[email protected]" },
+  "name" : {"S": "QueenOfmean" }
 }
 EOF
 }
diff --git a/app-api/app-api.yaml b/app-api/app-api.yaml
@@ -30,11 +30,11 @@ spec:
     creationPolicy: Owner
   data:
     - remoteRef:
-        key: sample-app-secret
+        key: super_slack_secrets
         property: SLACK_TOKEN
       secretKey: SLACK_TOKEN
     - remoteRef: 
-        key: sample-app-secret
+        key: super_slack_secrets
         property: SLACK_CHANNEL
       secretKey: SLACK_CHANNEL
     - remoteRef: 

diff --git a/app-api/docker-compose.yaml b/app-api/docker-compose.yaml
@@ -16,7 +16,7 @@ services:
       - K8S_DB_PORT=3306
       - K8S_DB_DATABASE=k8sdb
       - SLACK_TOKEN=${SLACK_TOKEN}
-      - SLACK_CHANNEL=${SLACK_CHANNEL}
+      - SLACK_CHANNEL=C03NPPVGR3R
     volumes:
       - ./:/code/
 

diff --git a/m04/slack-notifier.yaml b/m04/slack-notifier.yaml
@@ -14,4 +14,4 @@ data:
         type: slack
         uid: QwYpzLaGz
         secure_settings:
-          url: <put in your slack webhook here>
+          url: https://hooks.slack.com/services/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
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,10 @@ @@
     all: build push
+    dev:
+    	docker run -v ${PWD}/app:/app -d -p 8011:80 vallard/eks-dynamo
     build:
     	docker build -t vallard/eks-dynamo .
@@ Expand Down @@