Merge pull request #3 from jlord31/dev

v1
jlord31 · Sep 1, 2022 · f66980d · f66980d
2 parents 7824920 + 6ac1893
commit f66980d
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 37 deletions.
diff --git a/aws-secret.yaml b/aws-secret.yaml
@@ -4,6 +4,6 @@ metadata:
   name: aws-secret
 type: Opaque
 data:
-  AWS_USER: YXdzX2FjY2Vzc19rZXlfaWQgPSBBS0lBVDZQM0JOV0JQWEVBMkpGTQphd3Nfc2VjcmV0X2FjY2Vzc19rZXkgPSA1bFFjV2d6eTBvUlhBS1FKbWpZTEVlQTNyUnllSXhselphVnpkTENnCg==
+  credentials: YXdzX2FjY2Vzc19rZXlfaWQgPSBBS0lBMldUMjZFQUpUVDVPT1ZQVQphd3Nfc2VjcmV0X2FjY2Vzc19rZXkgPSBHUXZMMnhYZzhzcWcyS0VubkxpYWxiTFkvUzFEYUV5VXZLNjVTcEhmCg==
   # aws_access_key_id: YXdzX2FjY2Vzc19rZXlfaWQgPSBBS0lBVDZQM0JOV0JQWEVBMkpGTQphd3Nfc2VjcmV0X2FjY2Vz
   # aws_secret_access_key: c19rZXkgPSA1bFFjV2d6eTBvUlhBS1FKbWpZTEVlQTNyUnllSXhselphVnpkTENnCg==
diff --git a/env-configmap.yaml b/env-configmap.yaml
@@ -5,9 +5,9 @@ metadata:
   labels:
     app: env-configmap
 data:
-  POSTGRES_HOST: micro-database-2.cuxfohxmwd2x.us-east-1.rds.amazonaws.com
+  POSTGRES_HOST: postgres.c9kmmfueozsw.us-east-1.rds.amazonaws.com
   POSTGRES_DB: postgres
-  AWS_BUCKET: project3-271646289282-dev
+  AWS_BUCKET: my-735770976275-bucket
   AWS_REGION: us-east-1
   AWS_PROFILE: default
   JWT_SECRET: testing

diff --git a/env-secret.yaml b/env-secret.yaml
@@ -6,4 +6,4 @@ metadata:
 type: Opaque
 data:
   POSTGRES_USERNAME: postgres
-  POSTGRES_PASSWORD: joey1234
+  POSTGRES_PASSWORD: data1234
diff --git a/udagram-api-feed/backend-feed-deployment.yaml b/udagram-api-feed/backend-feed-deployment.yaml
@@ -15,23 +15,16 @@ spec:
         app: udagram-api-feed
     spec:
       containers:
-      - name: docker-kubernates
+      - name: 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
+          - name: credentials
             valueFrom:
               secretKeyRef:
                 name: aws-secret
-                key: AWS_USER
+                key: credentials
           - name: POSTGRES_USERNAME
             valueFrom:
               secretKeyRef:

diff --git a/udagram-api-user/backend-user-deployment.yaml b/udagram-api-user/backend-user-deployment.yaml
@@ -15,23 +15,16 @@ spec:
         app: udagram-user-feed
     spec:
       containers:
-      - name: docker-kubernates
+      - name: 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
+          - name: credentials
             valueFrom:
               secretKeyRef:
                 name: aws-secret
-                key: AWS_USER
+                key: credentials
           - name: POSTGRES_USERNAME
             valueFrom:
               secretKeyRef:

diff --git a/udagram-frontend/frontend-deployment.yaml b/udagram-frontend/frontend-deployment.yaml
@@ -15,16 +15,16 @@ spec:
         app: udagram-frontend
     spec:
       containers:
-      - name: docker-kubernates
+      - name: udagram-frontend
         image: jlord31/udagram-frontend:v1
         ports:
         - containerPort: 8100
         env:
-          - name: AWS_USER
+          - name: credentials
             valueFrom:
               secretKeyRef:
                 name: aws-secret
-                key: AWS_USER
+                key: credentials
           - name: POSTGRES_USERNAME
             valueFrom:
               secretKeyRef:

diff --git a/udagram-reverseproxy/reverseproxy-deployment.yaml b/udagram-reverseproxy/reverseproxy-deployment.yaml
@@ -15,23 +15,16 @@ spec:
         app: udagram-reverseproxy
     spec:
       containers:
-      - name: docker-kubernates
+      - name: udagram-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
+          - name: credentials
             valueFrom:
               secretKeyRef:
                 name: aws-secret
-                key: AWS_USER
+                key: credentials
           - name: POSTGRES_USERNAME
             valueFrom:
               secretKeyRef: