minor fixes

Author: ib-steffen

deploy/infrabox/templates/metrics/service.yaml

@@ -3,6 +3,7 @@ kind: Service
 apiVersion: v1
 metadata:
   name: infrabox-metrics
+  namespace: {{ template "system_namespace" . }}
   labels:
     app: infrabox-metrics
 spec:

deploy/infrabox/templates/prometheus/metrics.yaml

@@ -3,6 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: infrabox-metrics
+  namespace: {{ template "system_namespace" . }}
   labels:
     app: infrabox
 spec:

deploy/infrabox/templates/prometheus/prometheus.yaml

@@ -3,6 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: Prometheus
 metadata:
   name: infrabox
+  namespace: {{ template "system_namespace" . }}
 spec:
   serviceAccountName: infrabox
   serviceMonitorSelector:

deploy/infrabox/templates/prometheus/service.yaml

@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: prometheus
+  namespace: {{ template "system_namespace" . }}
 spec:
   ports:
   - name: web

src/job/infrabox_job/job.py

@@ -193,6 +193,7 @@ def _get_file_from_api_server(self, url, path):
                         if chunk:
                             f.write(chunk)
 
+                return
             except Exception as e:
                 message = str(e)
                 self.console.collect('Failed to download file (%s), retrying' % message, show=True)

src/job/job.py

@@ -250,6 +250,7 @@ def get_source(self):
             raise Exception('Unknown project type')
 
         c.execute(['chmod', '-R', 'a+rwX', self.mount_repo_dir])
+        c.execute(['ls', '-alh', self.mount_repo_dir], show=True)
 
     def main_create_jobs(self):
         c = self.console
@@ -755,6 +756,11 @@ def logout_docker_registry(self):
         c = self.console
         c.execute(['docker', 'logout', get_registry_name()], show=False)
 
+    def run_docker_pull(self, image_name):
+        c = self.console
+        cmd = ['docker', 'pull', image_name]
+        c.execute(cmd, show=True, show_cmd=False)
+
     def run_docker_container(self, image_name):
         c = self.console
         collector = StatsCollector()
@@ -871,7 +877,7 @@ def build_docker_image(self, image_name, cache_image, target=None):
 
         try:
             c.header("Build image", show=True)
-            self.get_cached_image(cache_image)
+            cache_from = self.get_cached_image(cache_image)
             docker_file = os.path.normpath(os.path.join(self._get_build_context_current_job(),
                                                         self.job['dockerfile']))
 
@@ -892,7 +898,7 @@ def build_docker_image(self, image_name, cache_image, target=None):
 
             if target:
                 cmd += ['--target', target]
-            else:
+            elif cache_from:
                 cmd += ['--cache-from', cache_image]
 
             cwd = self._get_build_context_current_job()
@@ -910,6 +916,10 @@ def run_job_docker_image(self, c):
             self._login_source_registries()
             self.run_docker_container(image_name)
             self._logout_source_registries()
+        else:
+            self._login_source_registries()
+            self.run_docker_pull(image_name)
+            self._logout_source_registries()
 
         self.deploy_images(image_name)
         c.header("Finalize", show=True)
@@ -988,13 +998,14 @@ def get_cached_image(self, image_name_latest):
 
         if not self.job['definition'].get('cache', {}).get('image', False):
             c.collect("Not pulling cached image, because cache.image has been set to false", show=True)
-            return
+            return False
 
         c.collect("Get cached image %s" % image_name_latest, show=True)
 
         self.login_docker_registry()
         c.execute(['docker', 'pull', image_name_latest], show=True, ignore_error=True)
         self.logout_docker_registry()
+        return True
 
     def cache_docker_image(self, image_name_build, image_name_latest):
         c = self.console