bugfix_重新启用调度器 (#48)

bugitt · Nov 28, 2023 · 56078a6 · 56078a6
1 parent cfa61a7
commit 56078a6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/cloudapi-web/src/main/kotlin/cn/edu/buaa/scs/kube/KubeModule.kt b/cloudapi-web/src/main/kotlin/cn/edu/buaa/scs/kube/KubeModule.kt
@@ -1,5 +1,6 @@
 package cn.edu.buaa.scs.kube
 
+import cn.edu.buaa.scs.image.ImageBuildRoutine
 import cn.edu.buaa.scs.utils.getConfigString
 import cn.edu.buaa.scs.utils.logger
 import com.fasterxml.jackson.module.kotlin.kotlinModule
@@ -33,7 +34,7 @@ fun Application.kubeModule() {
     Serialization.jsonMapper().registerModules(kotlinModule(), KtormModule())
 
     logger("kube")().info { "connected to official kubernetes apiserver successfully: ${kubeClient.kubernetesVersion.gitVersion}" }
-//    registerVirtualMachineOperator()
-//
-//    ImageBuildRoutine.run()
+    registerVirtualMachineOperator()
+
+    ImageBuildRoutine.run()
 }
diff --git a/cloudapi-web/src/main/kotlin/cn/edu/buaa/scs/kube/crd/v1alpha1/VirtualMachine.kt b/cloudapi-web/src/main/kotlin/cn/edu/buaa/scs/kube/crd/v1alpha1/VirtualMachine.kt
@@ -132,10 +132,14 @@ class VirtualMachineReconciler(val client: KubernetesClient) : Reconciler<Virtua
         val vmClient = newVMClient(vm.spec.platform)
         if (vm.spec.deleted) {
             val exist = runBlocking {
-                if (vmClient.getVM(vm.status.uuid).isSuccess) {
-                    vmClient.deleteVM(vm.status.uuid).getOrThrow()
-                    true
-                } else {
+                try {
+                    if (vmClient.getVM(vm.status.uuid).isSuccess) {
+                        vmClient.deleteVM(vm.status.uuid).getOrThrow()
+                        true
+                    } else {
+                        false
+                    }
+                } catch (e: NullPointerException) {
                     false
                 }
             }