Add SPI configurations for the standalone mode (#5476)

* Add SPI configurations for the standalone mode * Remove disabling scheduler
apache · Apr 16, 2024 · 7863e27 · 7863e27
1 parent c11fa85
commit 7863e27
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 114 deletions.
diff --git a/.github/workflows/4-standalone.yaml b/.github/workflows/4-standalone.yaml
@@ -65,8 +65,6 @@ jobs:
           sudo rm -rf "$AGENT_TOOLSDIRECTORY"
       - name: Check free space
         run: df -h
-      - name: Disable the scheduler
-        run: "./tools/github/disable-scheduler.sh"
       - id: tests
         name: Run Tests
         run: "./tools/github/run${{ env.TEST_SUITE }}Tests.sh"

diff --git a/core/standalone/src/main/resources/standalone-kcf.conf b/core/standalone/src/main/resources/standalone-kcf.conf
@@ -21,6 +21,11 @@ whisk {
   spi {
     ContainerFactoryProvider = "org.apache.openwhisk.core.containerpool.kubernetes.KubernetesContainerFactoryProvider"
     LogStoreProvider = "org.apache.openwhisk.core.containerpool.logging.DockerToActivationLogStoreProvider"
+    LoadBalancerProvider = "org.apache.openwhisk.core.loadBalancer.LeanBalancer"
+    EntitlementSpiProvider = "org.apache.openwhisk.core.entitlement.LocalEntitlementProvider"
+    InvokerProvider = "org.apache.openwhisk.core.invoker.InvokerReactive"
+    InvokerServerProvider = "org.apache.openwhisk.core.invoker.DefaultInvokerServer"
+    DurationCheckerProvider = "org.apache.openwhisk.core.scheduler.queue.NoopDurationCheckerProvider"
   }
   kubernetes {
     timeouts {

diff --git a/core/standalone/src/main/resources/standalone.conf b/core/standalone/src/main/resources/standalone.conf
@@ -41,6 +41,10 @@ whisk {
     # and does not require root user access
     LogStoreProvider = "org.apache.openwhisk.core.containerpool.docker.DockerCliLogStoreProvider"
     ContainerFactoryProvider = "org.apache.openwhisk.core.containerpool.docker.StandaloneDockerContainerFactoryProvider"
+    EntitlementSpiProvider = "org.apache.openwhisk.core.entitlement.LocalEntitlementProvider"
+    InvokerProvider = "org.apache.openwhisk.core.invoker.InvokerReactive"
+    InvokerServerProvider = "org.apache.openwhisk.core.invoker.DefaultInvokerServer"
+    DurationCheckerProvider = "org.apache.openwhisk.core.scheduler.queue.NoopDurationCheckerProvider"
   }
 
   info {

diff --git a/tools/github/disable-scheduler.sh b/tools/github/disable-scheduler.sh