Rename RayCluster folder to Ray since the group is Ray (#275)

ray-project · May 28, 2022 · 80f19eb · 80f19eb
1 parent e0de2bd
commit 80f19eb
Show file tree

Hide file tree

Showing 33 changed files with 44 additions and 44 deletions.
diff --git a/apiserver/pkg/manager/resource_manager.go b/apiserver/pkg/manager/resource_manager.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/ray-project/kuberay/apiserver/pkg/util"
 	api "github.com/ray-project/kuberay/proto/go_client"
-	"github.com/ray-project/kuberay/ray-operator/apis/raycluster/v1alpha1"
+	"github.com/ray-project/kuberay/ray-operator/apis/ray/v1alpha1"
 	rayiov1alpha1 "github.com/ray-project/kuberay/ray-operator/pkg/client/clientset/versioned/typed/raycluster/v1alpha1"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/apiserver/pkg/model/converter.go b/apiserver/pkg/model/converter.go
@@ -6,7 +6,7 @@ import (
 	"github.com/golang/protobuf/ptypes/timestamp"
 	"github.com/ray-project/kuberay/apiserver/pkg/util"
 	api "github.com/ray-project/kuberay/proto/go_client"
-	"github.com/ray-project/kuberay/ray-operator/apis/raycluster/v1alpha1"
+	"github.com/ray-project/kuberay/ray-operator/apis/ray/v1alpha1"
 	v1 "k8s.io/api/core/v1"
 )
 

diff --git a/apiserver/pkg/util/cluster.go b/apiserver/pkg/util/cluster.go
@@ -6,7 +6,7 @@ import (
 	"strconv"
 
 	api "github.com/ray-project/kuberay/proto/go_client"
-	rayclusterapi "github.com/ray-project/kuberay/ray-operator/apis/raycluster/v1alpha1"
+	rayclusterapi "github.com/ray-project/kuberay/ray-operator/apis/ray/v1alpha1"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/ray-operator/apis/raycluster/v1alpha1/doc.go → ray-operator/apis/ray/v1alpha1/doc.go b/ray-operator/apis/raycluster/v1alpha1/doc.go → ray-operator/apis/ray/v1alpha1/doc.go
diff --git a/.../raycluster/v1alpha1/groupversion_info.go → ...or/apis/ray/v1alpha1/groupversion_info.go b/.../raycluster/v1alpha1/groupversion_info.go → ...or/apis/ray/v1alpha1/groupversion_info.go
diff --git a/...s/raycluster/v1alpha1/raycluster_types.go → ...tor/apis/ray/v1alpha1/raycluster_types.go b/...s/raycluster/v1alpha1/raycluster_types.go → ...tor/apis/ray/v1alpha1/raycluster_types.go
diff --git a/...cluster/v1alpha1/raycluster_types_test.go → ...pis/ray/v1alpha1/raycluster_types_test.go b/...cluster/v1alpha1/raycluster_types_test.go → ...pis/ray/v1alpha1/raycluster_types_test.go
diff --git a/...ator/apis/raycluster/v1alpha1/register.go → ray-operator/apis/ray/v1alpha1/register.go b/...ator/apis/raycluster/v1alpha1/register.go → ray-operator/apis/ray/v1alpha1/register.go
diff --git a/...cluster/v1alpha1/zz_generated.deepcopy.go → ...pis/ray/v1alpha1/zz_generated.deepcopy.go b/...cluster/v1alpha1/zz_generated.deepcopy.go → ...pis/ray/v1alpha1/zz_generated.deepcopy.go
diff --git a/...controllers/raycluster/common/constant.go → ...erator/controllers/ray/common/constant.go b/...controllers/raycluster/common/constant.go → ...erator/controllers/ray/common/constant.go
diff --git a/.../controllers/raycluster/common/ingress.go → ...perator/controllers/ray/common/ingress.go b/.../controllers/raycluster/common/ingress.go → ...perator/controllers/ray/common/ingress.go
@@ -3,9 +3,9 @@ package common
 import (
 	"fmt"
 
-	"github.com/ray-project/kuberay/ray-operator/controllers/raycluster/utils"
+	"github.com/ray-project/kuberay/ray-operator/controllers/ray/utils"
 
-	rayiov1alpha1 "github.com/ray-project/kuberay/ray-operator/apis/raycluster/v1alpha1"
+	rayiov1alpha1 "github.com/ray-project/kuberay/ray-operator/apis/ray/v1alpha1"
 	"github.com/sirupsen/logrus"
 	networkingv1 "k8s.io/api/networking/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/...rollers/raycluster/common/ingress_test.go → ...or/controllers/ray/common/ingress_test.go b/...rollers/raycluster/common/ingress_test.go → ...or/controllers/ray/common/ingress_test.go
@@ -4,9 +4,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/ray-project/kuberay/ray-operator/controllers/raycluster/utils"
+	"github.com/ray-project/kuberay/ray-operator/controllers/ray/utils"
 
-	rayiov1alpha1 "github.com/ray-project/kuberay/ray-operator/apis/raycluster/v1alpha1"
+	rayiov1alpha1 "github.com/ray-project/kuberay/ray-operator/apis/ray/v1alpha1"
 
 	"github.com/stretchr/testify/assert"
 

diff --git a/.../controllers/raycluster/common/metrics.go → ...perator/controllers/ray/common/metrics.go b/.../controllers/raycluster/common/metrics.go → ...perator/controllers/ray/common/metrics.go
diff --git a/...ator/controllers/raycluster/common/pod.go → ray-operator/controllers/ray/common/pod.go b/...ator/controllers/raycluster/common/pod.go → ray-operator/controllers/ray/common/pod.go
@@ -6,9 +6,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/ray-project/kuberay/ray-operator/controllers/raycluster/utils"
+	"github.com/ray-project/kuberay/ray-operator/controllers/ray/utils"
 
-	rayiov1alpha1 "github.com/ray-project/kuberay/ray-operator/apis/raycluster/v1alpha1"
+	rayiov1alpha1 "github.com/ray-project/kuberay/ray-operator/apis/ray/v1alpha1"
 	"k8s.io/apimachinery/pkg/api/resource"
 
 	logf "sigs.k8s.io/controller-runtime/pkg/log"

diff --git a/...controllers/raycluster/common/pod_test.go → ...erator/controllers/ray/common/pod_test.go b/...controllers/raycluster/common/pod_test.go → ...erator/controllers/ray/common/pod_test.go
@@ -7,12 +7,12 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ray-project/kuberay/ray-operator/controllers/raycluster/utils"
+	"github.com/ray-project/kuberay/ray-operator/controllers/ray/utils"
 
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 
-	rayiov1alpha1 "github.com/ray-project/kuberay/ray-operator/apis/raycluster/v1alpha1"
+	rayiov1alpha1 "github.com/ray-project/kuberay/ray-operator/apis/ray/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/utils/pointer"
 )

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

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

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

diff --git a/...llers/raycluster/raycluster_controller.go → .../controllers/ray/raycluster_controller.go b/...llers/raycluster/raycluster_controller.go → .../controllers/ray/raycluster_controller.go
@@ -1,18 +1,18 @@
-package raycluster
+package ray
 
 import (
 	"context"
 	"fmt"
 	"strings"
 	"time"
 
-	"github.com/ray-project/kuberay/ray-operator/controllers/raycluster/common"
-	"github.com/ray-project/kuberay/ray-operator/controllers/raycluster/utils"
+	"github.com/ray-project/kuberay/ray-operator/controllers/ray/common"
+	"github.com/ray-project/kuberay/ray-operator/controllers/ray/utils"
 
 	rbacv1 "k8s.io/api/rbac/v1"
 
-	rayiov1alpha1 "github.com/ray-project/kuberay/ray-operator/apis/raycluster/v1alpha1"
-	_ "github.com/ray-project/kuberay/ray-operator/controllers/raycluster/common"
+	rayiov1alpha1 "github.com/ray-project/kuberay/ray-operator/apis/ray/v1alpha1"
+	_ "github.com/ray-project/kuberay/ray-operator/controllers/ray/common"
 	"k8s.io/client-go/tools/record"
 
 	"github.com/go-logr/logr"

diff --git a/...luster/raycluster_controller_fake_test.go → ...rs/ray/raycluster_controller_fake_test.go b/...luster/raycluster_controller_fake_test.go → ...rs/ray/raycluster_controller_fake_test.go
@@ -13,16 +13,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package raycluster
+package ray
 
 import (
 	"context"
 	"testing"
 
-	"github.com/ray-project/kuberay/ray-operator/controllers/raycluster/common"
+	"github.com/ray-project/kuberay/ray-operator/controllers/ray/common"
 
 	. "github.com/onsi/ginkgo"
-	rayiov1alpha1 "github.com/ray-project/kuberay/ray-operator/apis/raycluster/v1alpha1"
+	rayiov1alpha1 "github.com/ray-project/kuberay/ray-operator/apis/ray/v1alpha1"
 	"github.com/ray-project/kuberay/ray-operator/pkg/client/clientset/versioned/scheme"
 	"github.com/stretchr/testify/assert"
 	"k8s.io/apimachinery/pkg/api/errors"

diff --git a/.../raycluster/raycluster_controller_test.go → ...rollers/ray/raycluster_controller_test.go b/.../raycluster/raycluster_controller_test.go → ...rollers/ray/raycluster_controller_test.go
@@ -13,20 +13,20 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package raycluster
+package ray
 
 import (
 	"context"
 	"fmt"
 	"reflect"
 	"time"
 
-	"github.com/ray-project/kuberay/ray-operator/controllers/raycluster/common"
-	"github.com/ray-project/kuberay/ray-operator/controllers/raycluster/utils"
+	"github.com/ray-project/kuberay/ray-operator/controllers/ray/common"
+	"github.com/ray-project/kuberay/ray-operator/controllers/ray/utils"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	rayiov1alpha1 "github.com/ray-project/kuberay/ray-operator/apis/raycluster/v1alpha1"
+	rayiov1alpha1 "github.com/ray-project/kuberay/ray-operator/apis/ray/v1alpha1"
 
 	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/api/core/v1"

diff --git a/...ator/controllers/raycluster/suite_test.go → ray-operator/controllers/ray/suite_test.go b/...ator/controllers/raycluster/suite_test.go → ray-operator/controllers/ray/suite_test.go
@@ -13,13 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package raycluster
+package ray
 
 import (
 	"path/filepath"
 	"testing"
 
-	rayiov1alpha1 "github.com/ray-project/kuberay/ray-operator/apis/raycluster/v1alpha1"
+	rayiov1alpha1 "github.com/ray-project/kuberay/ray-operator/apis/ray/v1alpha1"
 	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 
 	. "github.com/onsi/ginkgo"

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

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

diff --git a/ray-operator/main.go b/ray-operator/main.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/ray-project/kuberay/ray-operator/controllers/raycluster"
+	"github.com/ray-project/kuberay/ray-operator/controllers/ray"
 
 	"go.uber.org/zap/zapcore"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
@@ -16,7 +16,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	rayiov1alpha1 "github.com/ray-project/kuberay/ray-operator/apis/raycluster/v1alpha1"
+	rayiov1alpha1 "github.com/ray-project/kuberay/ray-operator/apis/ray/v1alpha1"
 	// +kubebuilder:scaffold:imports
 )
 
@@ -52,7 +52,7 @@ func main() {
 		"watch-namespace",
 		"",
 		"Watch custom resources in the namespace, ignore other namespaces. If empty, all namespaces will be watched.")
-	flag.BoolVar(&raycluster.PrioritizeWorkersToDelete, "prioritize-workers-to-delete", false,
+	flag.BoolVar(&ray.PrioritizeWorkersToDelete, "prioritize-workers-to-delete", false,
 		"Temporary feature flag - to be deleted after testing")
 	opts := zap.Options{
 		Development: true,
@@ -85,7 +85,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	if err = raycluster.NewReconciler(mgr).SetupWithManager(mgr, reconcileConcurrency); err != nil {
+	if err = ray.NewReconciler(mgr).SetupWithManager(mgr, reconcileConcurrency); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "RayCluster")
 		os.Exit(1)
 	}

diff --git a/ray-operator/pkg/client/clientset/versioned/fake/register.go b/ray-operator/pkg/client/clientset/versioned/fake/register.go
diff --git a/ray-operator/pkg/client/clientset/versioned/scheme/register.go b/ray-operator/pkg/client/clientset/versioned/scheme/register.go
diff --git a/...operator/pkg/client/clientset/versioned/typed/raycluster/v1alpha1/fake/fake_raycluster.go b/...operator/pkg/client/clientset/versioned/typed/raycluster/v1alpha1/fake/fake_raycluster.go
diff --git a/ray-operator/pkg/client/clientset/versioned/typed/raycluster/v1alpha1/raycluster.go b/ray-operator/pkg/client/clientset/versioned/typed/raycluster/v1alpha1/raycluster.go
diff --git a/ray-operator/pkg/client/clientset/versioned/typed/raycluster/v1alpha1/raycluster_client.go b/ray-operator/pkg/client/clientset/versioned/typed/raycluster/v1alpha1/raycluster_client.go
diff --git a/ray-operator/pkg/client/informers/externalversions/generic.go b/ray-operator/pkg/client/informers/externalversions/generic.go
diff --git a/ray-operator/pkg/client/informers/externalversions/raycluster/v1alpha1/raycluster.go b/ray-operator/pkg/client/informers/externalversions/raycluster/v1alpha1/raycluster.go
diff --git a/ray-operator/pkg/client/listers/raycluster/v1alpha1/raycluster.go b/ray-operator/pkg/client/listers/raycluster/v1alpha1/raycluster.go