update endpoint and yaml

api/app/elastic.js

@@ -2,8 +2,7 @@ const items = require('../test/items.json')
 
 const elasticsearch = require('elasticsearch')
 const client = new elasticsearch.Client({
-    // hosts: ['http://elasticsearch-loadbalancer:80'],
-    hosts: ['http://localhost:9200'],
+    hosts: [`${process.env.ES_HOST || `http://localhost:9200`}`],
     maxRetries: 20,
     requestTimeout: 3000
 })
@@ -94,8 +93,10 @@ const importData = async () => {
     }, (err, response) => {
         if (err) {
             console.log("Failed Bulk operation", err)
+            return {}
         } else {
             console.log("Successfully imported, total items: ", bulk.length)
+            return {}
         }
     })
 }

api/app/redis.js

@@ -2,7 +2,7 @@ const items = require('../test/items.json')
 
 const redis = require("redis")
 const client = redis.createClient({
-    // host: `redis-master`,
+    host: process.env.REDIS_HOST,
     port: 6379,
     retry_strategy: function (options) {
         if (options.error && options.error.code === 'ECONNREFUSED') {

api/index.js

@@ -1,7 +1,5 @@
 const redis = require('./app/redis')
-redis.importData()
 const elastic = require('./app/elastic')
-elastic.importData()
 
 const express = require('express')
 const app = express()
@@ -16,10 +14,10 @@ app.use((req, res, next) => {
   next()
 })
 
-app.get('/upload', (req, res) => {
+app.post('/upload', (req, res) => {
   redis.importData()
   elastic.importData()
-  console.log('Redis and Elastic data uploaded')
+  res.end('Files uploaded')
 })
 
 app.get('/items', (req, res) => {

app/Dockerfile

@@ -1,13 +1,18 @@
-FROM node
+
+FROM node:8-alpine
 
-WORKDIR /usr/src/app
+RUN apk update \
+ && apk upgrade \
+ && apk add bash curl
 
-COPY package*.json ./
+ADD . /kuma-demo-app-fe
+WORKDIR /kuma-demo-app-fe
 
-RUN npm install
+RUN echo Node `node --version` \
+  && echo NPM `npm --version`
 
-COPY . .
+RUN npm install -g yarn
 
-EXPOSE 8080
+RUN yarn
 
-CMD [ "npm", "run", "serve" ]
+CMD yarn serve --mode ci

loggly/Dockerfile

@@ -0,0 +1,4 @@
+FROM docker.elastic.co/logstash/logstash:7.4.0
+
+RUN curl -s -o /usr/share/logstash/logstash-core/lib/log\
+stash/outputs/loggly.rb https://raw.githubusercontent.com/psquickitjayant/logstash-output-loggly/master/lib/logstash/outputs/loggly.rb

marketplace.yaml

@@ -197,8 +197,13 @@ spec:
         app: marketplace-api
     spec:
       containers:
-      - image: docker.io/kvn0218/marketplace-api:latest
+      - image: docker.io/kvn0218/marketplace-api:test
         name: marketplace-api
+        env:
+        - name: ES_HOST
+          value: "http://elasticsearch-loadbalancer:80"
+        - name: REDIS_HOST
+          value: "redis-master"
         imagePullPolicy: Always
         ports:
         - containerPort: 3001