Latest changes

Author: basil1987

coit-backend1/Dockerfile

@@ -1,6 +1,6 @@
 FROM openjdk:8-jdk-alpine
 # Environment Variable that defines the endpoint of sentiment-analysis python api.
 ENV SA_LOGIC_API_URL http://localhost:5000
-ADD target/sentiment-analysis-web-0.0.2-SNAPSHOT.jar /
 EXPOSE 8080
 CMD ["java", "-jar", "sentiment-analysis-web-0.0.2-SNAPSHOT.jar", "--sa.logic.api.url=${SA_LOGIC_API_URL}"]
+ADD target/sentiment-analysis-web-0.0.2-SNAPSHOT.jar /

coit-backend1/Dockerfile-multistage

@@ -6,6 +6,6 @@ RUN mvn install
 FROM openjdk:8-jdk-alpine
 # Environment Variable that defines the endpoint of sentiment-analysis python api.
 ENV SA_LOGIC_API_URL http://localhost:5000
-COPY --from=build /usr/app/target/sentiment-analysis-web-0.0.2-SNAPSHOT.jar /
 EXPOSE 8080
 CMD ["java", "-jar", "sentiment-analysis-web-0.0.2-SNAPSHOT.jar", "--sa.logic.api.url=${SA_LOGIC_API_URL}"]
+COPY --from=build /usr/app/target/sentiment-analysis-web-0.0.2-SNAPSHOT.jar /

coit-backend2/Dockerfile

@@ -1,8 +1,8 @@
 FROM python:3.6-slim
-COPY sa /app
 WORKDIR /app
-RUN pip3 install -r requirements.txt && \
-    python3 -m textblob.download_corpora
 EXPOSE 5000
 ENTRYPOINT ["python3"]
 CMD ["sentiment_analysis.py"]
+COPY sa /app
+RUN pip3 install -r requirements.txt && \
+    python3 -m textblob.download_corpora

coit-backend2/sa/sentiment_analysis.py

@@ -13,6 +13,5 @@ def analyse_sentiment():
         polarity=polarity
     )
 
-
 if __name__ == '__main__':
     app.run(host='0.0.0.0', port=5000)

coit-frontend/Dockerfile-multistage

@@ -1,7 +1,8 @@
 FROM node:16.13.1 AS build
 WORKDIR /usr/app
-COPY . /usr/app
+COPY package.json /usr/app
 RUN npm install
+COPY . /usr/app
 RUN npm run build
 
 FROM nginx

coit-frontend/src/App.js

@@ -20,7 +20,7 @@ class App extends Component {
     };
 
     analyzeSentence() {
-        fetch('http://13.127.201.84:8080/sentiment', {
+        fetch('http://127.0.0.1:4600/sentiment', {
             method: 'POST',
             headers: {
                 'Content-Type': 'application/json'
@@ -46,7 +46,7 @@ class App extends Component {
             <MuiThemeProvider>
                 <div className="centerize">
                     <Paper zDepth={1} className="content">
-                        <h2>Enter a Message</h2>
+                        <h2>Enter a Message!!!</h2>
                         <TextField ref={ref => this.textField = ref} onKeyUp={this.onEnterPress.bind(this)}
                                    hintText="Type your sentence."/>
                         <RaisedButton  label="Send" style={style} onClick={this.analyzeSentence.bind(this)}/>

resource-manifests/coit-backend1-deployment.yaml

@@ -21,7 +21,7 @@ spec:
         app: coit-backend1
     spec:
       containers:
-      - image: coitlearning/coit-backend1:v3
+      - image: coitlearning/coit-backend1:latest
         imagePullPolicy: IfNotPresent
         name: coit-backend1
         env:

resource-manifests/coit-backend1/coit-backend1-deployment.yaml

@@ -21,7 +21,7 @@ spec:
         app: coit-backend2
     spec:
       containers:
-        - image: coitlearning/coit-backend2:v3
+        - image: coitlearning/coit-backend2:latest
           imagePullPolicy: IfNotPresent
           name: coit-backend2
           ports:

resource-manifests/coit-backend2-deployment.yaml

@@ -8,7 +8,7 @@ spec:
   selector:
     matchLabels:
       app: coit-frontend
-  replicas: 2                                             # 2
+  replicas: 1                                             # 2
   minReadySeconds: 15
   strategy:
     type: RollingUpdate                                   # 3
@@ -20,16 +20,16 @@ spec:
       labels:
         app: coit-frontend                                  # 6
     spec:
-      volumes:
-        - name: frontend-data
-          persistentVolumeClaim:
-            claimName: store-persistent-volume-claim
       containers:
-        - image: coitlearning/coit-frontend:v7.0.0
+        - image: asia.gcr.io/devops-learning-347802/coit-frontend:1.0.0
           imagePullPolicy: IfNotPresent                         # 7
           name: coit-frontend
+          resources:
+            requests:
+              memory: "512Mi"
+              cpu: "250m"
+            limits:
+              memory: "1024Mi"
+              cpu: "500m"
           ports:
             - containerPort: 80
-          volumeMounts:
-            - mountPath: /app
-              name: frontend-data

resource-manifests/coit-backend2/coit-backend2-deployment.yaml

@@ -0,0 +1,13 @@
+apiVersion: autoscaling/v1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: coit-frontend
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: coit-frontend
+  minReplicas: 1
+  maxReplicas: 10
+  targetCPUUtilizationPercentage: 50
+

resource-manifests/coit-backend2/service-coit-backend2.yaml

@@ -20,9 +20,21 @@ spec:
       labels:
         app: coit-frontend                                  # 6
     spec:
+      volumes:
+        - name: nginx-root
+          persistentVolumeClaim:
+            claimName: coit-frontend
+        - name: datastore
+          persistentVolumeClaim:
+            claimName: coit-frontend-fast
       containers:
-        - image: coitlearning/coit-frontend:v1
+        - image: asia.gcr.io/devops-learning-347802/coit-frontend:1.0.0
           imagePullPolicy: IfNotPresent                         # 7
           name: coit-frontend
           ports:
             - containerPort: 80
+          volumeMounts:
+            - mountPath: /usr/share/nginx/html
+              name: nginx-root
+            - mountPath: /var/lib/sql
+              name: datastore

resource-manifests/coit-frontend-deployment.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: coit-frontend-fast
+spec:
+  accessModes:
+    - ReadWriteOnce
+  volumeMode: Filesystem
+  resources:
+    requests:
+      storage: 8Gi
+  storageClassName: standard-fast

resource-manifests/coit-frontend/service-coit-frontend-lb.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: coit-frontend
+spec:
+  accessModes:
+    - ReadWriteOnce
+  volumeMode: Filesystem
+  resources:
+    requests:
+      storage: 8Gi
+  storageClassName: standard

resource-manifests/hpa-coit-frontend.yaml

@@ -0,0 +1,10 @@
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+  name: standard-fast
+parameters:
+  type: pd-ssd
+provisioner: kubernetes.io/gce-pd
+reclaimPolicy: Delete
+volumeBindingMode: Immediate
+allowVolumeExpansion: true

resource-manifests/coit-frontend/coit-frontend-deployment.yaml resource-manifests/pvc/coit-frontend-deployment.yaml

@@ -3,6 +3,7 @@ kind: Service              # 1
 metadata:
   name: coit-frontend-lb
 spec:
+  type: LoadBalancer
   ports:
   - port: 80               # 3
     protocol: TCP          # 4

resource-manifests/pvc/fast-pvc.yaml

@@ -15,20 +15,20 @@ build:
         gitCommit:
           variant: AbbrevCommitSha
   artifacts:
-  - image: coit-backend1
+  - image: asia.gcr.io/devops-learning-347802/coit-backend1
     context: coit-backend1
     docker:
       dockerfile: Dockerfile-multistage
-  - image: coit-backend2
+  - image: asia.gcr.io/devops-learning-347802/coit-backend2
     context: coit-backend2
     docker:
       dockerfile: Dockerfile
-  - image: coit-frontend
+  - image: asia.gcr.io/devops-learning-347802/coit-frontend
     context: coit-frontend
     docker:
       dockerfile: Dockerfile-multistage
   local:
-    push: false
+    push: true
 deploy:
   kubectl:
     manifests: