case #23 gruelling day!

k8s-fleetman-webapp-angular/.dockerignore

@@ -0,0 +1 @@
+/node_modules

k8s-fleetman-webapp-angular/src/app/app.module.ts

@@ -1,13 +1,12 @@
 
 import { BrowserModule } from '@angular/platform-browser';
-import { NgModule } from '@angular/core';
+import { NgModule, Inject } from '@angular/core';
 
 import { AppComponent } from './app.component';
 import { VehiclesComponent } from './vehicles/vehicles.component';
 import { VehicleService } from './vehicle.service';
 
 import { HttpClientInMemoryWebApiModule } from 'angular-in-memory-web-api';
-import { InMemoryDataService }  from './in-memory-data.service';
 import { HttpClientModule }    from '@angular/common/http';
 import { MapComponent } from './map/map.component';
 
@@ -18,22 +17,25 @@ import { HeaderComponent } from './header/header.component';
 
 import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
 
+import { DOCUMENT } from '@angular/platform-browser';
+
 const stompConfig: StompConfig = {
-  // Which server?
-  url: 'ws://192.168.99.100:30030/updates',
-  headers: {
-  },
-  // How often to heartbeat?
-  // Interval in milliseconds, set to 0 to disable
-  heartbeat_in: 0, // Typical value 0 - disabled
-  heartbeat_out: 20000, // Typical value 20000 - every 20 seconds
-  // Wait in milliseconds before attempting auto reconnect
-  // Set to 0 to disable
-  // Typical value 5000 (5 seconds)
-  reconnect_delay: 5000,
-
-  // Will log diagnostics on console
-  debug: false
+     // Which server?
+     // url: "ws://" + window.location.hostname + ":30030/updates",
+     url: "ws://" + window.location.hostname + ":8080/updates",
+     headers: {
+     },
+     // How often to heartbeat?
+     // Interval in milliseconds, set to 0 to disable
+     heartbeat_in: 0, // Typical value 0 - disabled
+     heartbeat_out: 20000, // Typical value 20000 - every 20 seconds
+     // Wait in milliseconds before attempting auto reconnect
+     // Set to 0 to disable
+     // Typical value 5000 (5 seconds)
+     reconnect_delay: 5000,
+
+     // Will log diagnostics on console
+     debug: true
 };
 
 @NgModule({
@@ -47,9 +49,6 @@ const stompConfig: StompConfig = {
     BrowserModule,
     HttpClientModule,
     LeafletModule.forRoot(),
-    HttpClientInMemoryWebApiModule.forRoot(
-      InMemoryDataService, { dataEncapsulation: false }
-    ),
     NgbModule.forRoot()
   ],
   providers: [VehicleService,
@@ -60,4 +59,5 @@ const stompConfig: StompConfig = {
               }],
   bootstrap: [AppComponent]
 })
-export class AppModule { }
+export class AppModule {
+}

k8s-manifests/replica-set.yaml

@@ -99,4 +99,4 @@ spec:
       containers:
       - name: fleetman-webapp
         image: richardchesterwood/k8s-fleetman-webapp-angular:release1
-
+        imagePullPolicy: Always     

k8s-manifests/service.yaml

@@ -38,7 +38,7 @@ spec:
   ports:
   - name: http
     port: 8080
-    nodePort: 30000
+    nodePort: 30030
   type: NodePort
 ---
 kind: Service