Merge pull request #4 from jlord31/dev

v1
jlord31 · Sep 1, 2022 · 999d6f0 · 999d6f0
2 parents f66980d + 4b90f61
commit 999d6f0
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 59 deletions.
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -19,7 +19,7 @@ services:
       AWS_PROFILE: $AWS_PROFILE
       AWS_BUCKET: $AWS_BUCKET
       JWT_SECRET: $JWT_SECRET
-      URL: "http://localhost:8100"
+      URL: "http://localhost:8080"
   backend-feed:
     image: udagram-api-feed:latest
     volumes:
@@ -33,7 +33,7 @@ services:
       AWS_PROFILE: $AWS_PROFILE
       AWS_BUCKET: $AWS_BUCKET
       JWT_SECRET: $JWT_SECRET
-      URL: "http://localhost:8100"
+      URL: "http://localhost:8080"
   frontend:
     image: udagram-frontend:local
     ports:

diff --git a/udagram-api-feed/backend-feed-deployment.yaml b/udagram-api-feed/backend-feed-deployment.yaml
@@ -15,7 +15,7 @@ spec:
         app: udagram-api-feed
     spec:
       containers:
-      - name: udagram-api-feed
+      - name: backend-feed
         image: jlord31/udagram-api-feed:v1
         ports:
         - containerPort: 8080

diff --git a/udagram-api-user/backend-user-deployment.yaml b/udagram-api-user/backend-user-deployment.yaml
@@ -15,7 +15,7 @@ spec:
         app: udagram-user-feed
     spec:
       containers:
-      - name: udagram-user-feed
+      - name: backend-user
         image: jlord31/udagram-api-user:v1
         ports:
         - containerPort: 8080

diff --git a/udagram-frontend/frontend-deployment.yaml b/udagram-frontend/frontend-deployment.yaml
@@ -19,54 +19,4 @@ spec:
         image: jlord31/udagram-frontend:v1
         ports:
         - containerPort: 8100
-        env:
-          - name: credentials
-            valueFrom:
-              secretKeyRef:
-                name: aws-secret
-                key: credentials
-          - name: POSTGRES_USERNAME
-            valueFrom:
-              secretKeyRef:
-                name: env-secret
-                key: POSTGRES_USERNAME
-          - name: POSTGRES_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: env-secret
-                key: POSTGRES_PASSWORD
-          - name: POSTGRES_HOST
-            valueFrom:
-              configMapKeyRef:
-                name: env-configmap
-                key: POSTGRES_HOST
-          - name: POSTGRES_DB
-            valueFrom:
-              configMapKeyRef:
-                name: env-configmap
-                key: POSTGRES_DB
-          - name: AWS_BUCKET
-            valueFrom:
-              configMapKeyRef:
-                name: env-configmap
-                key: AWS_BUCKET
-          - name: AWS_REGION
-            valueFrom:
-              configMapKeyRef:
-                name: env-configmap
-                key: AWS_REGION
-          - name: AWS_PROFILE
-            valueFrom:
-              configMapKeyRef:
-                name: env-configmap
-                key: AWS_PROFILE
-          - name: JWT_SECRET
-            valueFrom:
-              configMapKeyRef:
-                name: env-configmap
-                key: JWT_SECRET
-          - name: URL
-            valueFrom:
-              configMapKeyRef:
-                name: env-configmap
-                key: URL
+
diff --git a/udagram-reverseproxy/nginx.conf b/udagram-reverseproxy/nginx.conf
@@ -1,4 +1,4 @@
-worker_processes 1;  
+worker_processes 1;
 events { worker_connections 1024; }
 error_log /dev/stdout debug;
 http {
@@ -13,14 +13,14 @@ http {
  proxy_set_header   X-Real-IP $remote_addr;
  proxy_set_header   X-NginX-Proxy true;
  proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header   X-Forwarded-Host $server_name;    
+ proxy_set_header   X-Forwarded-Host $server_name;
  server {
      listen 8080;
      location /api/v0/feed {
          proxy_pass         http://feed;
      }
      location /api/v0/users {
          proxy_pass         http://user;
-     }            
+     }
  }
 }
diff --git a/udagram-reverseproxy/reverseproxy-deployment.yaml b/udagram-reverseproxy/reverseproxy-deployment.yaml
@@ -15,7 +15,7 @@ spec:
         app: udagram-reverseproxy
     spec:
       containers:
-      - name: udagram-reverseproxy
+      - name: reverseproxy
         image: jlord31/reverseproxy:v1
         ports:
         - containerPort: 8080