Merge remote-tracking branch 'upstream/main' into rhoai-3.0

Author: moulalis

examples/hpo-raytune/notebook/raytune-oai-MR-gRPC-demo.ipynb

@@ -42,7 +42,7 @@
    },
    "outputs": [],
    "source": [
-    "# Create and configure our cluster object (and appwrapper)\n",
+    "# Create and configure our cluster object\n",
     "# NOTE: If running outside of RHOAI notebooks, add the following line to the cluster configuration:\n",
     "# namespace=\"rhods-notebooks\"\n",
     "cluster_name='terrestrial-raytest'\n",

examples/hpo-raytune/notebook/raytune-oai-demo-mlmd.ipynb

@@ -42,7 +42,7 @@
    },
    "outputs": [],
    "source": [
-    "# Create and configure our cluster object (and appwrapper)\n",
+    "# Create and configure our cluster object\n",
     "# NOTE: If running outside of RHOAI notebooks, add the following line to the cluster configuration:\n",
     "# namespace=\"rhods-notebooks\"\n",
     "cluster_name='terrestrial-raytest'\n",

examples/hpo-raytune/notebook/raytune-oai-demo.ipynb

@@ -43,7 +43,7 @@
    },
    "outputs": [],
    "source": [
-    "# Create and configure our cluster object (and appwrapper)\n",
+    "# Create and configure our cluster object\n",
     "# NOTE: If running outside of RHOAI notebooks, add the following line to the cluster configuration:\n",
     "# namespace=\"rhods-notebooks\"\n",
     "cluster_name=\"terrestrial-raytest\"\n",

go.mod

@@ -8,7 +8,6 @@ require (
 	github.com/onsi/gomega v1.32.0
 	github.com/openshift/api v0.0.0-20230718161610-2a3e8b481cec
 	github.com/openshift/client-go v0.0.0-20230718165156-6014fb98e86a
-	github.com/project-codeflare/appwrapper v0.8.0
 	github.com/prometheus/client_golang v1.20.4
 	github.com/prometheus/common v0.57.0
 	github.com/ray-project/kuberay/ray-operator v1.1.1

go.sum

@@ -121,8 +121,6 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/project-codeflare/appwrapper v0.8.0 h1:vWHNtXUtHutN2EzYb6rryLdESnb8iDXsCokXOuNYXvg=
-github.com/project-codeflare/appwrapper v0.8.0/go.mod h1:FMQ2lI3fz6LakUVXgN1FTdpsc3BBkNIZZgtMmM9J5UM=
 github.com/prometheus/client_golang v1.20.4 h1:Tgh3Yr67PaOv/uTqloMsCEdeuFTatm5zIq5+qNN23vI=
 github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
 github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=

tests/odh/resources/mnist_ray_mini.ipynb

@@ -71,7 +71,7 @@
    },
    "outputs": [],
    "source": [
-    "# Create our cluster and submit appwrapper\n",
+    "# Create our cluster\n",
     "cluster = Cluster(\n",
     "    ClusterConfiguration(\n",
     "        namespace=namespace,\n",

tests/odh/support.go

@@ -23,12 +23,9 @@ import (
 
 	gonanoid "github.com/matoous/go-nanoid/v2"
 	gomega "github.com/onsi/gomega"
-	awv1beta2 "github.com/project-codeflare/appwrapper/api/v1beta2"
 	rayv1 "github.com/ray-project/kuberay/ray-operator/apis/ray/v1"
 
 	v1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
 
 	"github.com/opendatahub-io/distributed-workloads/tests/common/support"
 )
@@ -87,72 +84,3 @@ func uniqueSuffix(prefix string) string {
 	suffix := gonanoid.MustGenerate("1234567890abcdef", 4)
 	return prefix + "-" + suffix
 }
-
-func newAppWrapperWithRayCluster(awName string, rcName string, namespace string) *awv1beta2.AppWrapper {
-	return &awv1beta2.AppWrapper{
-		TypeMeta: metav1.TypeMeta{
-			APIVersion: "workload.codeflare.dev/v1beta2",
-			Kind:       "AppWrapper",
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      awName,
-			Namespace: namespace,
-		},
-		Spec: awv1beta2.AppWrapperSpec{
-			Components: []awv1beta2.AppWrapperComponent{
-				{
-					Template: runtime.RawExtension{
-						Object: &rayv1.RayCluster{
-							TypeMeta: metav1.TypeMeta{
-								APIVersion: "ray.io/v1",
-								Kind:       "RayCluster",
-							},
-							ObjectMeta: metav1.ObjectMeta{
-								Name:      rcName,
-								Namespace: namespace,
-							},
-							Spec: rayv1.RayClusterSpec{
-								HeadGroupSpec: rayv1.HeadGroupSpec{
-									RayStartParams: map[string]string{},
-									Template: v1.PodTemplateSpec{
-										Spec: v1.PodSpec{
-											Containers: []v1.Container{
-												{
-													Name:  "ray-head",
-													Image: "rayproject/ray:latest",
-													Ports: []v1.ContainerPort{
-														{
-															Name:          "redis",
-															ContainerPort: 6379,
-														},
-													},
-												},
-											},
-										},
-									},
-								},
-								WorkerGroupSpecs: []rayv1.WorkerGroupSpec{
-									{
-										GroupName:      "workers",
-										Replicas:       support.Ptr(int32(1)),
-										RayStartParams: map[string]string{},
-										Template: v1.PodTemplateSpec{
-											Spec: v1.PodSpec{
-												Containers: []v1.Container{
-													{
-														Name:  "ray-worker",
-														Image: "rayproject/ray:latest",
-													},
-												},
-											},
-										},
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-	}
-}