fix(k8s): fix run command

Author: Keerthan Mala

Vagrantfile

@@ -12,6 +12,11 @@ end
 CLOUD_CONFIG_PATH = File.join(File.dirname(__FILE__), "contrib", "coreos", "user-data")
 CONFIG = File.join(File.dirname(__FILE__), "config.rb")
 
+user_data = File.read(CLOUD_CONFIG_PATH)
+new_userdata = user_data.gsub("--iface=eth0", "--iface=eth1")
+
+File.open(CLOUD_CONFIG_PATH, "w") {|file| file.puts new_userdata }
+
 # Defaults for config options defined in CONFIG
 $num_instances = 1
 $instance_name_prefix = "deis"

contrib/coreos/user-data.example

@@ -159,9 +159,6 @@ write_files:
   - path: /etc/deis-release
     content: |
       DEIS_RELEASE=v1.8.0
-  - path: /etc/k8environment
-    content: |
-      K8S_VERSION=v0.21.0
   - path: /etc/motd
     content: " \e[31m* *    \e[34m*   \e[32m*****    \e[39mddddd   eeeeeee iiiiiii   ssss\n\e[31m*   *  \e[34m* *  \e[32m*   *     \e[39md   d   e    e    i     s    s\n \e[31m* *  \e[34m***** \e[32m*****     \e[39md    d  e         i    s\n\e[32m*****  \e[31m* *    \e[34m*       \e[39md     d e         i     s\n\e[32m*   * \e[31m*   *  \e[34m* *      \e[39md     d eee       i      sss\n\e[32m*****  \e[31m* *  \e[34m*****     \e[39md     d e         i         s\n  \e[34m*   \e[32m*****  \e[31m* *      \e[39md    d  e         i          s\n \e[34m* *  \e[32m*   * \e[31m*   *     \e[39md   d   e    e    i    s    s\n\e[34m***** \e[32m*****  \e[31m* *     \e[39mddddd   eeeeeee iiiiiii  ssss\n\n\e[39mWelcome to Deis\t\t\tPowered by Core\e[38;5;45mO\e[38;5;206mS\e[39m\n"
   - path: /etc/profile.d/nse-function.sh

controller/api/models.py

@@ -179,14 +179,14 @@ def __str__(self):
     def url(self):
         return self.id + '.' + settings.DEIS_DOMAIN
 
-    def _get_job_id(self,container_type):
+    def _get_job_id(self, container_type):
         app = self.id
         release = self.release_set.latest()
         version = "v{}".format(release.version)
         job_id = "{app}_{version}.{container_type}".format(**locals())
         return job_id
 
-    def _get_command(self,container_type):
+    def _get_command(self, container_type):
         try:
             # if this is not procfile-based app, ensure they cannot break out
             # and run arbitrary commands on the host
@@ -294,9 +294,9 @@ def scale(self, user, structure):  # noqa
                 diff -= 1
 
         if changed:
-            if "scale" in dir(self._scheduler) :
-                self._scale_containers(scale_types,to_remove)
-            else :
+            if "scale" in dir(self._scheduler):
+                self._scale_containers(scale_types, to_remove)
+            else:
                 if to_add:
                     self._start_containers(to_add)
                 if to_remove:
@@ -310,9 +310,9 @@ def scale(self, user, structure):  # noqa
         self.save()
         return changed
 
-    def _scale_containers(self,scale_types,to_remove) :
+    def _scale_containers(self, scale_types, to_remove):
         release = self.release_set.latest()
-        for scale_type in scale_types :
+        for scale_type in scale_types:
             image = release.image
             version = "v{}".format(release.version)
             kwargs = {'memory': release.config.memory,
@@ -389,16 +389,15 @@ def deploy(self, user, release):
         existing = self.container_set.exclude(type='run')
         new = []
         scale_types = set()
-        old_name = ''
         for e in existing:
             n = e.clone(release)
             n.save()
             new.append(n)
             scale_types.add(e.type)
 
-        if new and "deploy" in dir(self._scheduler) :
-            self._deploy_app(scale_types,release,existing)
-        else :
+        if new and "deploy" in dir(self._scheduler):
+            self._deploy_app(scale_types, release, existing)
+        else:
             self._start_containers(new)
 
             # destroy old containers
@@ -409,16 +408,16 @@ def deploy(self, user, release):
         if self.structure == {} and release.build is not None:
             self._default_scale(user, release)
 
-    def _deploy_app(self,scale_types,release,existing) :
-        for scale_type in scale_types :
+    def _deploy_app(self, scale_types, release, existing):
+        for scale_type in scale_types:
             image = release.image
             version = "v{}".format(release.version)
             kwargs = {'memory': release.config.memory,
                       'cpu': release.config.cpu,
                       'tags': release.config.tags,
                       'aname': self.id,
                       'num': 0,
-                      'version':version}
+                      'version': version}
             job_id = self._get_job_id(scale_type)
             command = self._get_command(scale_type)
             try: