check in recent changes

:quit

Author: batchus

eksbedrock/bedrockrag/Dockerfile

@@ -13,4 +13,4 @@ RUN pip3 install -r requirements.txt
 
 EXPOSE 8080
 
-ENTRYPOINT [“python3”, “bedrockrag.py”]
+ENTRYPOINT ["python3", "bedrockrag.py"]

eksbedrock/kubernetes/ingress/bedrockragconfigmap.yaml

@@ -7,8 +7,8 @@ data:
   prompt: "what is fsxontap"
   bedrock_model_id: "anthropic.claude-3-sonnet-20240229-v1:0"
   metadata: "NA"
-  memory_window: 10
-  AWS_Region: "us-east-2"
+  memory_window: "10"
+  AWS_Region: "us-east-1"
   session_id: "1"
   aoss_host: "aoss_host_name"
 

eksbedrock/kubernetes/ingress/bedrockragdeployment.yaml

@@ -13,9 +13,11 @@ spec:
       labels:
         app: bedrockrag
     spec:
+      imagePullSecrets:
+        - name: ecr-secret
       containers:
         - name: bedrockrag
-          image: 689069515280.dkr.ecr.us-east-2.amazonaws.com/bedrockragrepo:latest
+          image: 575481363195.dkr.ecr.us-east-1.amazonaws.com/bedrockragrepo:latest
           ports:
             - name: http
               containerPort: 8080
@@ -28,4 +30,4 @@ spec:
               cpu: 100m
             limits:
               memory: 128Mi
-              cpu: 100m
+              cpu: 100m

eksbedrock/terraform/ecr.tf

@@ -33,23 +33,23 @@ provider "docker" {
 
 # build docker image
 resource "docker_image" "chatbot-image" {
-  name = "${aws_ecr_repository.chatbot.repository_url}:latest"
+  name = "${aws_ecr_repository.bedrockragrepo.repository_url}:latest"
   platform = "linux/amd64"
   build {
     context = "../chatapp"
-    tag = ["${aws_ecr_repository.chatbot.repository_url}:latest"]
+    tag = ["${aws_ecr_repository.bedrockragrepo.repository_url}:latest"]
     platform = "linux/amd64"
     no_cache = true
   }
 }
 
 # build docker image
 resource "docker_image" "bedrockrag-image" {
-  name = "${aws_ecr_repository.chatbot.repository_url}:latest"
+  name = "${aws_ecr_repository.bedrockragrepo.repository_url}:latest"
   platform = "linux/amd64"
   build {
     context = "../bedrockrag"
-    tag = ["${aws_ecr_repository.chatbot.repository_url}:latest"]
+    tag = ["${aws_ecr_repository.bedrockragrepo.repository_url}:latest"]
     platform = "linux/amd64"
     no_cache = true
   }

eksbedrock/terraform/locals.tf

@@ -1,6 +1,6 @@
 locals {
   env         = "staging"
-  region      = "us-east-2"
+  region      = "us-east-1"
   eks_name    = "eksbedrock"
   eks_version = "1.31"
 }

eksbedrock/terraform/output.tf

@@ -1,4 +1,4 @@
 output "aoss_host" {
-  value = aws_opensearchserverless_collection.fsxnragvector.collection_endpoint
+  value = aws_opensearchserverless_collection.eksbedrock.collection_endpoint
 }
 

eksbedrock/terraform/providers.tf

@@ -5,10 +5,4 @@ provider "aws" {
 terraform {
   required_version = ">= 1.0"
 
-  required_providers {
-    aws = {
-      source  = "hashicorp/aws"
-      version = "~> 5.49"
-    }
-  }
 }

eksbedrock/terraform/variables.tf

@@ -4,7 +4,7 @@ variable "vpc_cidr" {
   description = "default CIDR range of the VPC"
 }
 variable "aws_region" {
-  default = "us-east-2"
+  default = "us-east-1"
   description = "aws region"
 }
 

eksbedrock/terraform/vpc.tf

@@ -1,12 +1,4 @@
 
-provider "aws" {
-  region = var.aws_region
-
-  default_tags {
-    tags = local.tags
-  }
-}
-
 locals {
   tags = {
     project = "eksbedrock"
@@ -18,7 +10,7 @@ data "aws_availability_zones" "available" {
   state = "available"
 
   filter {
-    name   = "group-name"
+    name   = "region-name"
     values = [var.aws_region]
   }
 }