Merge pull request #1025 from kmala/fix

fix(imagepullpolicy): Use correct environment variable for image pull policy

Author: kmala

rootfs/api/settings/production.py

@@ -254,8 +254,8 @@
 
 # k8s image policies
 SLUGRUNNER_IMAGE = os.environ.get('SLUGRUNNER_IMAGE_NAME', 'quay.io/deisci/slugrunner:canary')  # noqa
-SLUG_BUILDER_IMAGE_PULL_POLICY = os.environ.get('SLUG_BUILDER_IMAGE_PULL_POLICY', "Always")  # noqa
-DOCKER_BUILDER_IMAGE_PULL_POLICY = os.environ.get('DOCKER_BUILDER_IMAGE_PULL_POLICY', "Always")  # noqa
+SLUG_RUNNER_IMAGE_PULL_POLICY = os.environ.get('SLUG_RUNNER_IMAGE_PULL_POLICY', "IfNotPresent")  # noqa
+IMAGE_PULL_POLICY = os.environ.get('IMAGE_PULL_POLICY', "IfNotPresent")  # noqa
 
 # Define a global default on how many pods to bring up and then
 # take down sequentially during a deploy

rootfs/scheduler/resources/pod.py

@@ -111,7 +111,7 @@ def manifest(self, namespace, name, image, **kwargs):
         spec['terminationGracePeriodSeconds'] = kwargs.get('pod_termination_grace_period_seconds', 30)  # noqa
 
         # set the image pull policy that is associated with the application container
-        kwargs['image_pull_policy'] = settings.DOCKER_BUILDER_IMAGE_PULL_POLICY
+        kwargs['image_pull_policy'] = settings.IMAGE_PULL_POLICY
 
         # Check if it is a slug builder image.
         if build_type == "buildpack":
@@ -140,7 +140,7 @@ def manifest(self, namespace, name, image, **kwargs):
             # overwrite image so slugrunner image is used in the container
             image = settings.SLUGRUNNER_IMAGE
             # slugrunner pull policy
-            kwargs['image_pull_policy'] = settings.SLUG_BUILDER_IMAGE_PULL_POLICY
+            kwargs['image_pull_policy'] = settings.SLUG_RUNNER_IMAGE_PULL_POLICY
 
         # create the base container
         container = {}