ref(scheduler): move image pull policy settings from scheduler to App model and remove SLUG_RUNNER_IMAGE_PULL_POLICY (#1053)

Removes the last of django.settings from scheduler main line code (not tests)

IMAGE_PULL_POLICY is now the only thing used and can be set per app, SLUG_RUNNER_IMAGE_PULL_POLICY has been removed

Author: helgi

rootfs/api/models/app.py

@@ -417,6 +417,9 @@ def _scale_pods(self, scale_types):
         # get application level pod termination grace period
         pod_termination_grace_period_seconds = release.config.values.get('KUBERNETES_POD_TERMINATION_GRACE_PERIOD_SECONDS', settings.KUBERNETES_POD_TERMINATION_GRACE_PERIOD_SECONDS)  # noqa
 
+        # set the image pull policy that is associated with the application container
+        image_pull_policy = release.config.values.get('IMAGE_PULL_POLICY', settings.IMAGE_PULL_POLICY)  # noqa
+
         # create image pull secret if needed
         image_pull_secret_name = self.image_pull_secret(self.id, registry, image)
 
@@ -450,8 +453,14 @@ def _scale_pods(self, scale_types):
                 'deploy_timeout': deploy_timeout,
                 'pod_termination_grace_period_seconds': pod_termination_grace_period_seconds,
                 'image_pull_secret_name': image_pull_secret_name,
+                'image_pull_policy': image_pull_policy
             }
 
+            # Check if it is a slug builder image.
+            if release.build.type == 'buildpack':
+                # overwrite image so slugrunner image is used in the container
+                image = settings.SLUGRUNNER_IMAGE
+
             # gather all proc types to be deployed
             tasks.append(
                 functools.partial(
@@ -512,6 +521,9 @@ def deploy(self, release, force_deploy=False, rollback_on_failure=True):  # noqa
         # get application level pod termination grace period
         pod_termination_grace_period_seconds = release.config.values.get('KUBERNETES_POD_TERMINATION_GRACE_PERIOD_SECONDS', settings.KUBERNETES_POD_TERMINATION_GRACE_PERIOD_SECONDS)  # noqa
 
+        # set the image pull policy that is associated with the application container
+        image_pull_policy = release.config.values.get('IMAGE_PULL_POLICY', settings.IMAGE_PULL_POLICY)  # noqa
+
         # create image pull secret if needed
         image_pull_secret_name = self.image_pull_secret(self.id, registry, image)
 
@@ -549,6 +561,7 @@ def deploy(self, release, force_deploy=False, rollback_on_failure=True):  # noqa
                 'release_summary': release.summary,
                 'pod_termination_grace_period_seconds': pod_termination_grace_period_seconds,
                 'image_pull_secret_name': image_pull_secret_name,
+                'image_pull_policy': image_pull_policy
             }
 
         # Sort deploys so routable comes first
@@ -561,6 +574,10 @@ def deploy(self, release, force_deploy=False, rollback_on_failure=True):  # noqa
             # create the application config in k8s (secret in this case) for all deploy objects
             self._scheduler.set_application_config(self.id, envs, version)
 
+            if release.build.type == 'buildpack':
+                # overwrite image so slugrunner image is used in the container
+                image = settings.SLUGRUNNER_IMAGE
+
             # gather all proc types to be deployed
             tasks = [
                 functools.partial(
@@ -778,6 +795,9 @@ def pod_name(size=5, chars=string.ascii_lowercase + string.digits):
         # get application level pod termination grace period
         pod_termination_grace_period_seconds = release.config.values.get('KUBERNETES_POD_TERMINATION_GRACE_PERIOD_SECONDS', settings.KUBERNETES_POD_TERMINATION_GRACE_PERIOD_SECONDS)  # noqa
 
+        # set the image pull policy that is associated with the application container
+        image_pull_policy = release.config.values.get('IMAGE_PULL_POLICY', settings.IMAGE_PULL_POLICY)  # noqa
+
         # create image pull secret if needed
         image_pull_secret_name = self.image_pull_secret(self.id, registry, image)
 
@@ -795,8 +815,14 @@ def pod_name(size=5, chars=string.ascii_lowercase + string.digits):
             'deploy_timeout': deploy_timeout,
             'pod_termination_grace_period_seconds': pod_termination_grace_period_seconds,
             'image_pull_secret_name': image_pull_secret_name,
+            'image_pull_policy': image_pull_policy
         }
 
+        # Check if it is a slug builder image.
+        if release.build.type == 'buildpack':
+            # overwrite image so slugrunner image is used in the container
+            image = settings.SLUGRUNNER_IMAGE
+
         try:
             exit_code, output = self._scheduler.run(
                 self.id,

rootfs/api/settings/production.py

@@ -254,7 +254,6 @@
 
 # k8s image policies
 SLUGRUNNER_IMAGE = os.environ.get('SLUGRUNNER_IMAGE_NAME', 'quay.io/deisci/slugrunner:canary')  # 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

rootfs/scheduler/resources/pod.py

@@ -3,7 +3,6 @@
 import os
 import time
 
-from django.conf import settings
 from scheduler.exceptions import KubeException, KubeHTTPException
 from scheduler.resources import Resource
 from scheduler.states import PodState
@@ -110,9 +109,6 @@ def manifest(self, namespace, name, image, **kwargs):
         # How long until a pod is forcefully terminated. 30 is kubernetes default
         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.IMAGE_PULL_POLICY
-
         # Check if it is a slug builder image.
         if build_type == "buildpack":
             # only buildpack apps need access to object storage
@@ -137,11 +133,6 @@ def manifest(self, namespace, name, image, **kwargs):
                 'readOnly': True
             }]
 
-            # overwrite image so slugrunner image is used in the container
-            image = settings.SLUGRUNNER_IMAGE
-            # slugrunner pull policy
-            kwargs['image_pull_policy'] = settings.SLUG_RUNNER_IMAGE_PULL_POLICY
-
         # create the base container
         container = {}