case #18

DickChesterwood · May 16, 2018 · 7f830e9 · 7f830e9
1 parent 3cded05
commit 7f830e9
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 49 deletions.
diff --git a/k8s-fleetman-webapp-angular/Dockerfile b/k8s-fleetman-webapp-angular/Dockerfile
@@ -0,0 +1,9 @@
+FROM nginx:1.14.0-alpine
+
+MAINTAINER Richard Chesterwood "richard@inceptiontraining.co.uk"
+
+RUN rm -rf /usr/share/nginx/html/*
+
+COPY /dist /usr/share/nginx/html
+
+CMD ["nginx", "-g", "daemon off;"]`
diff --git a/k8s-fleetman-webapp-angular/src/app/app.module.ts b/k8s-fleetman-webapp-angular/src/app/app.module.ts
@@ -20,7 +20,7 @@ import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
 
 const stompConfig: StompConfig = {
   // Which server?
-  url: 'ws://localhost:8080/updates',
+  url: 'ws://192.168.99.100:30030/updates',
   headers: {
   },
   // How often to heartbeat?

diff --git a/k8s-manifests/docker-compose.yaml b/k8s-manifests/docker-compose.yaml
diff --git a/k8s-manifests/replica-set.yaml b/k8s-manifests/replica-set.yaml
@@ -1,12 +1,10 @@
 apiVersion: apps/v1
 kind: ReplicaSet
 metadata:
-  name: queue-replicaset
+  name: queue
   labels:
     app: queue
 spec:
-  # this replicas value is default
-  # modify it according to your case
   replicas: 1
   selector:
     matchLabels:
@@ -18,14 +16,14 @@ spec:
     spec:
       containers:
       - name: fleetman-queue
-        image: richardchesterwood/k8s-fleetman-queue
+        image: richardchesterwood/k8s-fleetman-queue:release1
         ports:
         - containerPort: 8161
 ---
 apiVersion: apps/v1
 kind: ReplicaSet
 metadata:
-  name: simulator-replicaset
+  name: simulator
   labels:
     app: simulator
 spec:
@@ -40,12 +38,12 @@ spec:
     spec:
       containers:
       - name: fleetman-position-simulator
-        image: richardchesterwood/k8s-fleetman-position-simulator
+        image: richardchesterwood/k8s-fleetman-position-simulator:release1
 ---
 apiVersion: apps/v1
 kind: ReplicaSet
 metadata:
-  name: tracker-replicaset
+  name: tracker
   labels:
     app: tracker
 spec:
@@ -60,12 +58,32 @@ spec:
     spec:
       containers:
       - name: fleetman-position-tracker
-        image: richardchesterwood/k8s-fleetman-position-tracker
+        image: richardchesterwood/k8s-fleetman-position-tracker:release1
 ---
 apiVersion: apps/v1
 kind: ReplicaSet
 metadata:
-  name: webapp-replicaset
+  name: api-gateway
+  labels:
+    app: api-gateway
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: api-gateway
+  template:
+    metadata:
+      labels:
+        app: api-gateway
+    spec:
+      containers:
+      - name: fleetman-api-gateway
+        image: richardchesterwood/k8s-fleetman-api-gateway:release1
+---
+apiVersion: apps/v1
+kind: ReplicaSet
+metadata:
+  name: webapp
   labels:
     app: webapp
 spec:
@@ -80,5 +98,5 @@ spec:
     spec:
       containers:
       - name: fleetman-webapp
-        image: richardchesterwood/k8s-fleetman-webapp
- 
+        image: richardchesterwood/k8s-fleetman-webapp-angular:release1
+
diff --git a/k8s-manifests/service.yaml b/k8s-manifests/service.yaml
@@ -30,13 +30,27 @@ spec:
 ---
 kind: Service
 apiVersion: v1
+metadata:
+  name: fleetman-api-gateway
+spec:
+  selector:
+    app: api-gateway
+  ports:
+  - name: http
+    port: 8080
+    nodePort: 30000
+  type: NodePort
+---
+kind: Service
+apiVersion: v1
 metadata:
   name: fleetman-webapp
 spec:
   selector:
     app: webapp
   ports:
   - name: http
-    port: 8080
-    nodePort: 30030
+    port: 80
+    nodePort: 30040
   type: NodePort
+