Merge branch 'main' of https://github.com/Azure/kaito into Ishaan/mig…

…rate-self-hosted-e2e
kaito-project · Nov 7, 2024 · 742130a · 742130a
2 parents 40ba32c + e886346
commit 742130a
Show file tree

Hide file tree

Showing 18 changed files with 10 additions and 9 deletions.
diff --git a/cmd/workspace/main.go b/cmd/workspace/main.go
@@ -21,8 +21,8 @@ import (
 	"sigs.k8s.io/karpenter/pkg/apis/v1beta1"
 
 	"github.com/aws/karpenter-core/pkg/apis/v1alpha5"
-	"github.com/kaito-project/kaito/pkg/controllers"
 	"github.com/kaito-project/kaito/pkg/webhooks"
+	"github.com/kaito-project/kaito/pkg/workspace/controllers"
 	"k8s.io/klog/v2"
 	"knative.dev/pkg/injection/sharedmain"
 	"knative.dev/pkg/webhook"

diff --git a/pkg/controllers/workspace_controller.go → ...space/controllers/workspace_controller.go b/pkg/controllers/workspace_controller.go → ...space/controllers/workspace_controller.go
@@ -26,11 +26,11 @@ import (
 	"github.com/aws/karpenter-core/pkg/apis/v1alpha5"
 	"github.com/go-logr/logr"
 	kaitov1alpha1 "github.com/kaito-project/kaito/api/v1alpha1"
-	"github.com/kaito-project/kaito/pkg/inference"
 	"github.com/kaito-project/kaito/pkg/machine"
 	"github.com/kaito-project/kaito/pkg/resources"
 	"github.com/kaito-project/kaito/pkg/utils"
 	"github.com/kaito-project/kaito/pkg/utils/plugin"
+	"github.com/kaito-project/kaito/pkg/workspace/inference"
 	"github.com/samber/lo"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"

diff --git a/pkg/controllers/workspace_controller_test.go → .../controllers/workspace_controller_test.go b/pkg/controllers/workspace_controller_test.go → .../controllers/workspace_controller_test.go
diff --git a/pkg/controllers/workspace_gc_finalizer.go → ...ace/controllers/workspace_gc_finalizer.go b/pkg/controllers/workspace_gc_finalizer.go → ...ace/controllers/workspace_gc_finalizer.go
diff --git a/...ontrollers/workspace_gc_finalizer_test.go → ...ontrollers/workspace_gc_finalizer_test.go b/...ontrollers/workspace_gc_finalizer_test.go → ...ontrollers/workspace_gc_finalizer_test.go
diff --git a/pkg/controllers/workspace_status.go → ...workspace/controllers/workspace_status.go b/pkg/controllers/workspace_status.go → ...workspace/controllers/workspace_status.go
diff --git a/pkg/controllers/workspace_status_test.go → ...pace/controllers/workspace_status_test.go b/pkg/controllers/workspace_status_test.go → ...pace/controllers/workspace_status_test.go
diff --git a/pkg/inference/preset-inference-types.go → ...space/inference/preset-inference-types.go b/pkg/inference/preset-inference-types.go → ...space/inference/preset-inference-types.go
diff --git a/pkg/inference/preset-inferences.go → pkg/workspace/inference/preset-inferences.go b/pkg/inference/preset-inferences.go → pkg/workspace/inference/preset-inferences.go
diff --git a/pkg/inference/preset-inferences_test.go → ...space/inference/preset-inferences_test.go b/pkg/inference/preset-inferences_test.go → ...space/inference/preset-inferences_test.go
diff --git a/pkg/inference/template_inference.go → ...workspace/inference/template_inference.go b/pkg/inference/template_inference.go → ...workspace/inference/template_inference.go
diff --git a/pkg/inference/template_inference_test.go → ...pace/inference/template_inference_test.go b/pkg/inference/template_inference_test.go → ...pace/inference/template_inference_test.go
diff --git a/presets/models/falcon/model.go b/presets/models/falcon/model.go
@@ -3,13 +3,14 @@
 package falcon
 
 import (
-	"github.com/kaito-project/kaito/pkg/tuning"
 	"time"
 
+	"github.com/kaito-project/kaito/pkg/tuning"
+
 	kaitov1alpha1 "github.com/kaito-project/kaito/api/v1alpha1"
-	"github.com/kaito-project/kaito/pkg/inference"
 	"github.com/kaito-project/kaito/pkg/model"
 	"github.com/kaito-project/kaito/pkg/utils/plugin"
+	"github.com/kaito-project/kaito/pkg/workspace/inference"
 )
 
 func init() {

diff --git a/presets/models/llama2/model.go b/presets/models/llama2/model.go
@@ -6,9 +6,9 @@ import (
 	"time"
 
 	kaitov1alpha1 "github.com/kaito-project/kaito/api/v1alpha1"
-	"github.com/kaito-project/kaito/pkg/inference"
 	"github.com/kaito-project/kaito/pkg/model"
 	"github.com/kaito-project/kaito/pkg/utils/plugin"
+	"github.com/kaito-project/kaito/pkg/workspace/inference"
 )
 
 func init() {

diff --git a/presets/models/llama2chat/model.go b/presets/models/llama2chat/model.go
@@ -6,9 +6,9 @@ import (
 	"time"
 
 	kaitov1alpha1 "github.com/kaito-project/kaito/api/v1alpha1"
-	"github.com/kaito-project/kaito/pkg/inference"
 	"github.com/kaito-project/kaito/pkg/model"
 	"github.com/kaito-project/kaito/pkg/utils/plugin"
+	"github.com/kaito-project/kaito/pkg/workspace/inference"
 )
 
 func init() {

diff --git a/presets/models/mistral/model.go b/presets/models/mistral/model.go
@@ -6,9 +6,9 @@ import (
 	"time"
 
 	kaitov1alpha1 "github.com/kaito-project/kaito/api/v1alpha1"
-	"github.com/kaito-project/kaito/pkg/inference"
 	"github.com/kaito-project/kaito/pkg/model"
 	"github.com/kaito-project/kaito/pkg/utils/plugin"
+	"github.com/kaito-project/kaito/pkg/workspace/inference"
 )
 
 func init() {

diff --git a/presets/models/phi2/model.go b/presets/models/phi2/model.go
@@ -6,9 +6,9 @@ import (
 	"time"
 
 	kaitov1alpha1 "github.com/kaito-project/kaito/api/v1alpha1"
-	"github.com/kaito-project/kaito/pkg/inference"
 	"github.com/kaito-project/kaito/pkg/model"
 	"github.com/kaito-project/kaito/pkg/utils/plugin"
+	"github.com/kaito-project/kaito/pkg/workspace/inference"
 )
 
 func init() {

diff --git a/presets/models/phi3/model.go b/presets/models/phi3/model.go
@@ -6,9 +6,9 @@ import (
 	"time"
 
 	kaitov1alpha1 "github.com/kaito-project/kaito/api/v1alpha1"
-	"github.com/kaito-project/kaito/pkg/inference"
 	"github.com/kaito-project/kaito/pkg/model"
 	"github.com/kaito-project/kaito/pkg/utils/plugin"
+	"github.com/kaito-project/kaito/pkg/workspace/inference"
 )
 
 func init() {