Merge pull request #62 from d4rkstar/main

feat: preload runtimes only default apache

Author: sciabarracom

deploy/nuvolaris-permissions/whisk-crd.yaml

@@ -85,7 +85,16 @@ spec:
                       type: boolean
                     slim:
                       description: boolean flag to enable/disable nuvolaris slim mode. Defaulted to false
-                      type: boolean                                                                                                                                         
+                      type: boolean
+                    preload:
+                      description: used to preload some default actions in the nuvolaris namespace. Defaulted to false
+                      type: object
+                      properties:
+                        only-apache:
+                          description: boolean flag to preload only the apache openserverless actions
+                          type: boolean
+                      required:
+                      - only-apache                                                                                                                                       
                   required:
                   - password    
                 components:

nuvolaris/runtimes_preloader.py

@@ -25,10 +25,11 @@
 
 def create(owner=None):
     logging.info(f"*** configuring runtime preloader")
+    only_apache = cfg.get("nuvolaris.preloader.only_apache", defval=True)
 
     runtimes_as_json = util.get_runtimes_json_from_config_map()
-    data=rutil.parse_runtimes(json.loads(runtimes_as_json))
-
+    data=rutil.parse_runtimes(json.loads(runtimes_as_json), only_apache)
+    
     kust = kus.patchTemplates("runtimes", ["runtimes-job-container-attach.yaml"], data)
     spec = kus.kustom_list("runtimes", kust, templates=[], data=data)
 
@@ -42,8 +43,6 @@ def create(owner=None):
     logging.info("*** configured runtime preloader")
     return res
 
-
-
 def delete_by_owner():
     spec = kus.build("runtimes")
     res = kube.delete(spec)

nuvolaris/runtimes_util.py

@@ -21,7 +21,7 @@
 import nuvolaris.config as cfg
 import nuvolaris.util as util
 
-def find_default_container(containers: list, container_name, runtime_list):
+def find_default_container(containers: list, container_name, runtime_list, only_apache=True):
     """ Scans for the inner runtime list and add an entry into the containers for the default one if any
     :param containers, the global containers array
     :param container_name, the name that will be assigned for the containers preloader
@@ -30,26 +30,28 @@ def find_default_container(containers: list, container_name, runtime_list):
     for runtime in runtime_list:        
         if runtime['default']:
             img = runtime['image']
-            container = {
-                "name": container_name,
-                "image": f"{img['prefix']}/{img['name']}:{img['tag']}"
-                }
-            containers.append(container)    
+            is_apache = img['prefix'] == 'apache'
+            if not only_apache or is_apache:
+                container = {
+                    "name": container_name,
+                    "image": f"{img['prefix']}/{img['name']}:{img['tag']}"
+                    }
+                containers.append(container)    
 
-def parse_runtimes(runtimes_as_json):
+def parse_runtimes(runtimes_as_json, only_apache=True):
     """ parse an openwhisk runtimes json and returns a stuitable data structure to customize the preloader jon
     :param runtimes_as_json a runtime json typically extracted from a config map
     >>> import nuvolaris.testutil as tutil
     >>> runtimes_as_json = tutil.load_sample_runtimes()
     >>> data = parse_runtimes(runtimes_as_json)
-    >>> len(data['containers']) == 8
+    >>> len(data['containers']) == 5
     True
     """
     data = {}
     containers = list()
 
     for name in runtimes_as_json["runtimes"]:        
-        find_default_container(containers, name, runtimes_as_json["runtimes"][name])
+        find_default_container(containers, name, runtimes_as_json["runtimes"][name], only_apache)
 
     data['containers']=containers
     return data

nuvolaris/testutil.py

@@ -17,7 +17,6 @@
 #
 import yaml
 import re
-import flatdict
 import json
 import time
 import os

tests/kind/runtimes_preloader_test.ipy

@@ -0,0 +1,44 @@
+import nuvolaris.config as cfg
+import nuvolaris.runtimes_preloader as preloader
+import nuvolaris.util as util
+import nuvolaris.runtimes_util as rutil
+import nuvolaris.testutil as tu
+import nuvolaris.kube as kube
+import json
+
+def cleanup():
+    try:
+        get_ipython().system("kubectl -n nuvolaris delete all --all")
+        get_ipython().system("kubectl -n nuvolaris delete pvc --all")
+    except NameError:
+        import subprocess
+        subprocess.run(["kubectl", "-n", "nuvolaris", "delete", "all", "--all"], check=True)
+        subprocess.run(["kubectl", "-n", "nuvolaris", "delete", "pvc", "--all"], check=True)
+
+
+cleanup()
+
+# Test with Apache runtimes
+assert(cfg.configure(tu.load_sample_config()))
+assert(preloader.create())
+
+# Wait for the job to complete
+while not kube.wait("job.batch/preload-runtimes", "condition=complete"): pass
+
+runtimes_as_json = util.get_runtimes_json_from_config_map()
+data=rutil.parse_runtimes(json.loads(runtimes_as_json))
+
+assert(len(data['containers']) > 0), "Expected one or more containers in the preloader data"
+for container in data['containers']:
+    print(f"Container: {container['name']}, Image: {container['image']}")
+    assert('name' in container), "Expected 'name' in container"
+    assert('image' in container), "Expected 'image' in container"
+
+count_apache = sum(1 for container in data['containers'] if container['image'].startswith('apache/'))
+count_non_apache = len(data['containers']) - count_apache
+
+assert(count_apache > 0), "Expected at least one Apache runtime in the preloader data"
+assert(count_non_apache == 0), "Expected no non-Apache runtimes in the preloader data"
+
+assert(preloader.delete())
+cleanup()

tests/kind/whisk-slim.yaml

@@ -60,9 +60,11 @@ spec:
     provisioner: auto #rancher.io/local-path
     ingressclass: auto #nginx
     ingresslb: auto #ingress-nginx/ingress-nginx-controller
-    slim: True
-    affinity: true 
-    tolerations: true
+    slim: true
+    affinity: false 
+    tolerations: false
+    preload:
+      only-apache: true
   couchdb:
     host: couchdb
     port: 5984