Merge pull request #2 from jlord31/dev

v1
jlord31 · Sep 1, 2022 · 7824920 · 7824920
2 parents 56ce562 + 9a55e72
commit 7824920
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 16 deletions.
diff --git a/docker-compose-build.yaml b/docker-compose-build.yaml
@@ -3,15 +3,15 @@ services:
   reverseproxy:
     build:
       context: ./udagram-reverseproxy
-    image: reverseproxy
+    image: reverseproxy:latest
   backend_user:
     build:
       context: ./udagram-api-user
-    image: udagram-api-user
+    image: udagram-api-user:latest
   backend_feed:
     build:
       context: ./udagram-api-feed
-    image: udagram-api-feed
+    image: udagram-api-feed:latest
   frontend:
     build:
       context: ./udagram-frontend

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -1,36 +1,36 @@
 version: "3"
 services:
   reverseproxy:
-      image: reverseproxy
+      image: reverseproxy:latest
       ports:
           - 8080:8080
       restart: always
       depends_on:
         - backend-user
         - backend-feed
   backend-user:
-    image: udagram-api-user
+    image: udagram-api-user:latest
     environment:
       POSTGRES_USERNAME: $POSTGRES_USERNAME
-      POSTGRES_PASSWORD: $POSTGRES_PASSWORD 
-      POSTGRES_DB: $POSTGRES_DB 
+      POSTGRES_PASSWORD: $POSTGRES_PASSWORD
+      POSTGRES_DB: $POSTGRES_DB
       POSTGRES_HOST: $POSTGRES_HOST
-      AWS_REGION: $AWS_REGION 
-      AWS_PROFILE: $AWS_PROFILE 
+      AWS_REGION: $AWS_REGION
+      AWS_PROFILE: $AWS_PROFILE
       AWS_BUCKET: $AWS_BUCKET
       JWT_SECRET: $JWT_SECRET
       URL: "http://localhost:8100"
   backend-feed:
-    image: udagram-api-feed
+    image: udagram-api-feed:latest
     volumes:
       - $HOME/.aws:/root/.aws
     environment:
       POSTGRES_USERNAME: $POSTGRES_USERNAME
-      POSTGRES_PASSWORD: $POSTGRES_PASSWORD 
+      POSTGRES_PASSWORD: $POSTGRES_PASSWORD
       POSTGRES_DB: $POSTGRES_DB
       POSTGRES_HOST: $POSTGRES_HOST
       AWS_REGION: $AWS_REGION
-      AWS_PROFILE: $AWS_PROFILE 
+      AWS_PROFILE: $AWS_PROFILE
       AWS_BUCKET: $AWS_BUCKET
       JWT_SECRET: $JWT_SECRET
       URL: "http://localhost:8100"

diff --git a/udagram-api-feed/backend-feed-deployment.yaml b/udagram-api-feed/backend-feed-deployment.yaml
@@ -16,9 +16,16 @@ spec:
     spec:
       containers:
       - name: docker-kubernates
-        image: jlord31/udagram-api-feed
+        image: jlord31/udagram-api-feed:v1
         ports:
         - containerPort: 8080
+        resources:
+          requests:
+            memory: "150Mi"
+          limits:
+            memory: "300Mi"
+        command: ["stress"]
+        args: ["--vm", "1", "--vm-bytes", "250M", "--vm-hang", "1"]
         env:
           - name: AWS_USER
             valueFrom:

diff --git a/udagram-api-user/backend-user-deployment.yaml b/udagram-api-user/backend-user-deployment.yaml
@@ -16,9 +16,16 @@ spec:
     spec:
       containers:
       - name: docker-kubernates
-        image: jlord31/udagram-user-feed
+        image: jlord31/udagram-api-user:v1
         ports:
         - containerPort: 8080
+        resources:
+          requests:
+            memory: "150Mi"
+          limits:
+            memory: "300Mi"
+        command: ["stress"]
+        args: ["--vm", "1", "--vm-bytes", "250M", "--vm-hang", "1"]
         env:
           - name: AWS_USER
             valueFrom:

diff --git a/udagram-frontend/frontend-deployment.yaml b/udagram-frontend/frontend-deployment.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
       - name: docker-kubernates
-        image: jlord31/udagram-frontend
+        image: jlord31/udagram-frontend:v1
         ports:
         - containerPort: 8100
         env:

diff --git a/udagram-reverseproxy/reverseproxy-deployment.yaml b/udagram-reverseproxy/reverseproxy-deployment.yaml
@@ -16,9 +16,16 @@ spec:
     spec:
       containers:
       - name: docker-kubernates
-        image: jlord31/reverseproxy
+        image: jlord31/reverseproxy:v1
         ports:
         - containerPort: 8080
+        resources:
+          requests:
+            memory: "150Mi"
+          limits:
+            memory: "300Mi"
+        command: ["stress"]
+        args: ["--vm", "1", "--vm-bytes", "250M", "--vm-hang", "1"]
         env:
           - name: AWS_USER
             valueFrom: