Skip to content

Commit 4baf500

Browse files
committed
Add Ingress domain for sdk e2e test
1 parent 1351512 commit 4baf500

File tree

3 files changed

+41
-1
lines changed

3 files changed

+41
-1
lines changed

Diff for: .github/actions/kind/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ runs:
4747
echo "KinD cluster:"
4848
kubectl cluster-info
4949
kubectl describe nodes
50-
50+
5151
- name: Install Ingress controller
5252
shell: bash
5353
run: |

Diff for: test/e2e/mnist_raycluster_sdk.py

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
max_memory=1,
2020
num_gpus=0,
2121
instascale=False,
22+
ingress_domain="ray-dashboard-mnist-test.com",
2223
))
2324

2425
cluster.up()

Diff for: test/e2e/mnist_raycluster_sdk_test.go

+39
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@ package e2e
1919
import (
2020
"testing"
2121

22+
"github.com/onsi/gomega"
2223
. "github.com/onsi/gomega"
2324
. "github.com/project-codeflare/codeflare-common/support"
2425
mcadv1beta1 "github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/apis/controller/v1beta1"
2526
rayv1 "github.com/ray-project/kuberay/ray-operator/apis/ray/v1"
2627

2728
batchv1 "k8s.io/api/batch/v1"
2829
corev1 "k8s.io/api/core/v1"
30+
networkingv1 "k8s.io/api/networking/v1"
2931
rbacv1 "k8s.io/api/rbac/v1"
3032
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3133
)
@@ -138,6 +140,43 @@ func TestMNISTRayClusterSDK(t *testing.T) {
138140
_, err = test.Client().Core().RbacV1().RoleBindings(namespace.Name).Create(test.Ctx(), roleBinding, metav1.CreateOptions{})
139141
test.Expect(err).NotTo(HaveOccurred())
140142

143+
ingress := &networkingv1.Ingress{
144+
ObjectMeta: metav1.ObjectMeta{
145+
Name: "ray-ingress",
146+
Namespace: namespace.Name,
147+
},
148+
Spec: networkingv1.IngressSpec{
149+
Rules: []networkingv1.IngressRule{
150+
{
151+
Host: "ray-dashboard-mnist-test.com",
152+
IngressRuleValue: networkingv1.IngressRuleValue{
153+
HTTP: &networkingv1.HTTPIngressRuleValue{
154+
Paths: []networkingv1.HTTPIngressPath{
155+
{
156+
PathType: func(s networkingv1.PathType) *networkingv1.PathType { return &s }(networkingv1.PathTypePrefix),
157+
Path: "/",
158+
Backend: networkingv1.IngressBackend{
159+
Service: &networkingv1.IngressServiceBackend{
160+
Name: "raycluster-head-svc",
161+
Port: networkingv1.ServiceBackendPort{
162+
Number: 80,
163+
},
164+
},
165+
},
166+
},
167+
},
168+
},
169+
},
170+
},
171+
},
172+
},
173+
}
174+
175+
// Create the Ingress
176+
createdIngress, err := test.Client().Core().NetworkingV1().Ingresses(namespace.Name).Create(test.Ctx(), ingress, metav1.CreateOptions{})
177+
test.Expect(err).NotTo(gomega.HaveOccurred())
178+
test.T().Logf("Created Ingress %s/%s successfully", createdIngress.Namespace, createdIngress.Name)
179+
141180
job := &batchv1.Job{
142181
TypeMeta: metav1.TypeMeta{
143182
APIVersion: batchv1.SchemeGroupVersion.String(),

0 commit comments

Comments
 (0)