fix(scheduler): run pod container name did not match how app containers are done

Fixes #748
Replaces #749

Author: helgi

rootfs/scheduler/__init__.py

@@ -36,7 +36,7 @@
   "spec": {
     "containers": [
       {
-        "name": "$id",
+        "name": "$containername",
         "image": "$image",
         "env": [
         {
@@ -99,7 +99,7 @@
   "spec": {
     "containers": [
       {
-        "name": "$id",
+        "name": "$containername",
         "image": "$image",
         "env": []
       }
@@ -537,9 +537,11 @@ def run(self, namespace, name, image, entrypoint, command, **kwargs):
             name, image, entrypoint, command)
         )
 
+        app_type = 'run'
         POD = POD_TEMPLATE
         l = {
             'id': name,
+            'containername': namespace + '-' + app_type,
             'app': namespace,
             'appversion': kwargs.get('version'),
             'type': 'run',
@@ -588,7 +590,7 @@ def run(self, namespace, name, image, entrypoint, command, **kwargs):
 
         labels = {
             'app': namespace,
-            'type': 'run',
+            'type': app_type,
             'version': kwargs.get('version'),
             'heritage': 'deis',
         }