Reorganize api folder for code generation (ray-project#91)

* Re-organize api folder * Change references to api objects
lowang-bh · Nov 2, 2021 · a5da1d1 · a5da1d1
1 parent d70c9f5
commit a5da1d1
Show file tree

Hide file tree

Showing 13 changed files with 10 additions and 9 deletions.
diff --git a/...perator/api/v1alpha1/groupversion_info.go → .../raycluster/v1alpha1/groupversion_info.go b/...perator/api/v1alpha1/groupversion_info.go → .../raycluster/v1alpha1/groupversion_info.go
diff --git a/...operator/api/v1alpha1/raycluster_types.go → ...i/raycluster/v1alpha1/raycluster_types.go b/...operator/api/v1alpha1/raycluster_types.go → ...i/raycluster/v1alpha1/raycluster_types.go
diff --git a/...tor/api/v1alpha1/raycluster_types_test.go → ...cluster/v1alpha1/raycluster_types_test.go b/...tor/api/v1alpha1/raycluster_types_test.go → ...cluster/v1alpha1/raycluster_types_test.go
diff --git a/...tor/api/v1alpha1/zz_generated.deepcopy.go → ...cluster/v1alpha1/zz_generated.deepcopy.go b/...tor/api/v1alpha1/zz_generated.deepcopy.go → ...cluster/v1alpha1/zz_generated.deepcopy.go
diff --git a/ray-operator/controllers/common/pod.go b/ray-operator/controllers/common/pod.go
@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"strings"
 
-	rayiov1alpha1 "github.com/ray-project/kuberay/ray-operator/api/v1alpha1"
+	rayiov1alpha1 "github.com/ray-project/kuberay/ray-operator/api/raycluster/v1alpha1"
 	"github.com/ray-project/kuberay/ray-operator/controllers/utils"
 
 	"k8s.io/apimachinery/pkg/api/resource"

diff --git a/ray-operator/controllers/common/pod_test.go b/ray-operator/controllers/common/pod_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	rayiov1alpha1 "github.com/ray-project/kuberay/ray-operator/api/v1alpha1"
+	rayiov1alpha1 "github.com/ray-project/kuberay/ray-operator/api/raycluster/v1alpha1"
 	"github.com/ray-project/kuberay/ray-operator/controllers/utils"
 
 	corev1 "k8s.io/api/core/v1"

diff --git a/ray-operator/controllers/common/service.go b/ray-operator/controllers/common/service.go
@@ -1,7 +1,7 @@
 package common
 
 import (
-	rayiov1alpha1 "github.com/ray-project/kuberay/ray-operator/api/v1alpha1"
+	rayiov1alpha1 "github.com/ray-project/kuberay/ray-operator/api/raycluster/v1alpha1"
 	"github.com/ray-project/kuberay/ray-operator/controllers/utils"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/ray-operator/controllers/common/service_test.go b/ray-operator/controllers/common/service_test.go
@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	rayiov1alpha1 "github.com/ray-project/kuberay/ray-operator/api/v1alpha1"
+	rayiov1alpha1 "github.com/ray-project/kuberay/ray-operator/api/raycluster/v1alpha1"
 
 	"github.com/stretchr/testify/assert"
 

diff --git a/ray-operator/controllers/raycluster_controller.go b/ray-operator/controllers/raycluster_controller.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	rayiov1alpha1 "github.com/ray-project/kuberay/ray-operator/api/v1alpha1"
+	rayiov1alpha1 "github.com/ray-project/kuberay/ray-operator/api/raycluster/v1alpha1"
 	"github.com/ray-project/kuberay/ray-operator/controllers/common"
 	_ "github.com/ray-project/kuberay/ray-operator/controllers/common"
 	"github.com/ray-project/kuberay/ray-operator/controllers/utils"

diff --git a/ray-operator/controllers/raycluster_controller_test.go b/ray-operator/controllers/raycluster_controller_test.go
@@ -21,7 +21,7 @@ import (
 	"reflect"
 	"time"
 
-	rayiov1alpha1 "github.com/ray-project/kuberay/ray-operator/api/v1alpha1"
+	rayiov1alpha1 "github.com/ray-project/kuberay/ray-operator/api/raycluster/v1alpha1"
 	"github.com/ray-project/kuberay/ray-operator/controllers/common"
 	"github.com/ray-project/kuberay/ray-operator/controllers/utils"
 

diff --git a/ray-operator/controllers/suite_test.go b/ray-operator/controllers/suite_test.go
@@ -19,7 +19,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	rayiov1alpha1 "github.com/ray-project/kuberay/ray-operator/api/v1alpha1"
+	rayiov1alpha1 "github.com/ray-project/kuberay/ray-operator/api/raycluster/v1alpha1"
 	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 
 	. "github.com/onsi/ginkgo"

diff --git a/ray-operator/controllers/utils/util.go b/ray-operator/controllers/utils/util.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"unicode"
 
-	rayiov1alpha1 "github.com/ray-project/kuberay/ray-operator/api/v1alpha1"
+	rayiov1alpha1 "github.com/ray-project/kuberay/ray-operator/api/raycluster/v1alpha1"
 	"github.com/sirupsen/logrus"
 
 	corev1 "k8s.io/api/core/v1"

diff --git a/ray-operator/main.go b/ray-operator/main.go
@@ -14,7 +14,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	rayiov1alpha1 "github.com/ray-project/kuberay/ray-operator/api/v1alpha1"
+	rayiov1alpha1 "github.com/ray-project/kuberay/ray-operator/api/raycluster/v1alpha1"
 	// +kubebuilder:scaffold:imports
 )