DEMO-18 Added a car image for each manufacturer

app_server/src/main/java/com/supercars/Car.java

@@ -31,7 +31,8 @@ public class Car {
     private float rating;
 
     public String getPhoto() {
-        return photo;
+        // do this as a hack, there is only 1 car photo per manufacturer DEMO-18
+        return Integer.toString(getManufacturerId());
     }
 
     public void setPhoto(String photo) {

app_server/src/main/java/com/supercars/dataloader/CarDataLoader.java

@@ -109,6 +109,7 @@ public List<Car> getCarsByManufacturer(int manufacturerId) {
                 car.setDescription(resultSet.getString("DESCRIPTION"));
                 car.setPrice(resultSet.getInt("PRICE"));
                 car.setPhoto(resultSet.getString("PHOTO"));
+                car.setManufacturerId(manufacturerId);
                 cars.add(car);
             }
             resultSet.close();

app_server/src/main/webapp/angular/cars.html

@@ -7,7 +7,7 @@
 <table>
     <tr class="grey" ng-repeat="car in cars"> 
         <td> 
-            <p><img src="images/manufacturers/{{manufacturer.logo}} "></p>
+            <p><img width="150" height="100" src="images/cars/{{car.photo}}.jpg "></p>
         </td>
         <td>
             <p class="link" ng-click="carLink(car.carId)"/>{{car.model}}&nbsp;{{car.name}}&nbsp;{{car.summary}}</p>

kubernetes/cars_app-staging.yaml

@@ -44,7 +44,7 @@ spec:
     spec:
       containers:
       - name: app-server
-        image:  tombatchelor/cars:2.4-leak
+        image:  tombatchelor/cars:2.5-leak
         imagePullPolicy: Always
         ports:
         - name: cars-app-port

kubernetes/cars_app.yaml

@@ -45,7 +45,7 @@ spec:
     spec:
       containers:
       - name: app-server
-        image:  tombatchelor/cars:2.4-leak
+        image:  tombatchelor/cars:2.5-leak
         imagePullPolicy: Always
         ports:
         - name: cars-app-port
@@ -258,86 +258,6 @@ spec:
                   key: bucket.name
           restartPolicy: OnFailure
 ---
-apiVersion: batch/v1beta1
-kind: CronJob
-metadata:
-  name: 2leak
-spec:
-  schedule: "0 0,4,8,12,16,20 * * *"
-  jobTemplate:
-    spec:
-      template:
-        spec:
-          serviceAccountName: marshaller
-          containers:
-          - name: 2leak
-            imagePullPolicy: Always
-            image: tombatchelor/demo_marshaller:2.5
-            env:
-            - name: NEW_YAML
-              value: 2_leak
-          restartPolicy: OnFailure
----
-apiVersion: batch/v1beta1
-kind: CronJob
-metadata:
-  name: 4leak
-spec:
-  schedule: "0 1,5,9,13,17,21 * * *"
-  jobTemplate:
-    spec:
-      template:
-        spec:
-          serviceAccountName: marshaller
-          containers:
-          - name: 4leak
-            imagePullPolicy: Always
-            image: tombatchelor/demo_marshaller:2.5
-            env:
-            - name: NEW_YAML
-              value: 4_leak
-          restartPolicy: OnFailure
----
-apiVersion: batch/v1beta1
-kind: CronJob
-metadata:
-  name: 4noleak
-spec:
-  schedule: "0 2,6,10,14,18,22 * * *"
-  jobTemplate:
-    spec:
-      template:
-        spec:
-          serviceAccountName: marshaller
-          containers:
-          - name: 4noleak
-            imagePullPolicy: Always
-            image: tombatchelor/demo_marshaller:2.5
-            env:
-            - name: NEW_YAML
-              value: 4_no_leak
-          restartPolicy: OnFailure
----
-apiVersion: batch/v1beta1
-kind: CronJob
-metadata:
-  name: 2noleak
-spec:
-  schedule: "0 3,7,11,15,19,23 * * *"
-  jobTemplate:
-    spec:
-      template:
-        spec:
-          serviceAccountName: marshaller
-          containers:
-          - name: 2noleak
-            imagePullPolicy: Always
-            image: tombatchelor/demo_marshaller:2.5
-            env:
-            - name: NEW_YAML
-              value: 2_no_leak
-          restartPolicy: OnFailure
----
 apiVersion: v1
 kind: Service
 metadata:

kubernetes/cron_jobs.yaml

@@ -0,0 +1,79 @@
+apiVersion: batch/v1beta1
+kind: CronJob
+metadata:
+  name: 2leak
+spec:
+  schedule: "0 0,4,8,12,16,20 * * *"
+  jobTemplate:
+    spec:
+      template:
+        spec:
+          serviceAccountName: marshaller
+          containers:
+          - name: 2leak
+            imagePullPolicy: Always
+            image: tombatchelor/demo_marshaller:2.5
+            env:
+            - name: NEW_YAML
+              value: 2_leak
+          restartPolicy: OnFailure
+---
+apiVersion: batch/v1beta1
+kind: CronJob
+metadata:
+  name: 4leak
+spec:
+  schedule: "0 1,5,9,13,17,21 * * *"
+  jobTemplate:
+    spec:
+      template:
+        spec:
+          serviceAccountName: marshaller
+          containers:
+          - name: 4leak
+            imagePullPolicy: Always
+            image: tombatchelor/demo_marshaller:2.5
+            env:
+            - name: NEW_YAML
+              value: 4_leak
+          restartPolicy: OnFailure
+---
+apiVersion: batch/v1beta1
+kind: CronJob
+metadata:
+  name: 4noleak
+spec:
+  schedule: "0 2,6,10,14,18,22 * * *"
+  jobTemplate:
+    spec:
+      template:
+        spec:
+          serviceAccountName: marshaller
+          containers:
+          - name: 4noleak
+            imagePullPolicy: Always
+            image: tombatchelor/demo_marshaller:2.5
+            env:
+            - name: NEW_YAML
+              value: 4_no_leak
+          restartPolicy: OnFailure
+---
+apiVersion: batch/v1beta1
+kind: CronJob
+metadata:
+  name: 2noleak
+spec:
+  schedule: "0 3,7,11,15,19,23 * * *"
+  jobTemplate:
+    spec:
+      template:
+        spec:
+          serviceAccountName: marshaller
+          containers:
+          - name: 2noleak
+            imagePullPolicy: Always
+            image: tombatchelor/demo_marshaller:2.5
+            env:
+            - name: NEW_YAML
+              value: 2_no_leak
+          restartPolicy: OnFailure