Skip to content

Commit

Permalink
Convert MNIST PyTorch test case to go
Browse files Browse the repository at this point in the history
  • Loading branch information
sutaakar committed Sep 5, 2023
1 parent 647e79b commit 2f7ab98
Show file tree
Hide file tree
Showing 5 changed files with 503 additions and 3 deletions.
4 changes: 3 additions & 1 deletion tests/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ require (
github.com/onsi/gomega v1.27.10
github.com/openshift/api v0.0.0-20230718161610-2a3e8b481cec
github.com/project-codeflare/codeflare-operator v0.2.2
github.com/project-codeflare/multi-cluster-app-dispatcher v1.34.0
github.com/ray-project/kuberay/ray-operator v0.0.0-20230830082034-e7fbf7d73576
k8s.io/api v0.27.2
k8s.io/apimachinery v0.27.2
Expand All @@ -30,7 +31,6 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/openshift/client-go v0.0.0-20230718165156-6014fb98e86a // indirect
github.com/project-codeflare/multi-cluster-app-dispatcher v1.34.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/testify v1.8.4 // indirect
golang.org/x/net v0.12.0 // indirect
Expand All @@ -54,4 +54,6 @@ require (
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace github.com/project-codeflare/codeflare-operator => /home/ksuta/src/github.com/project-codeflare/codeflare-operator

go 1.19
2 changes: 0 additions & 2 deletions tests/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,6 @@ github.com/openshift/client-go v0.0.0-20230718165156-6014fb98e86a h1:ZKewwwEIURD
github.com/openshift/client-go v0.0.0-20230718165156-6014fb98e86a/go.mod h1:EjhPQjEm8HM3GThz5ywNGLEec1P1IjTn08kwzdvupvA=
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/codeflare-operator v0.2.2 h1:7Vf1Hv+q0muzEGbTzPBdKjXOd903NbMu1bsdL02PCr0=
github.com/project-codeflare/codeflare-operator v0.2.2/go.mod h1:2oYGL1iF92OzEhw+FRd7S4kFAEF9dZZnDCJLsuYZ4r0=
github.com/project-codeflare/multi-cluster-app-dispatcher v1.34.0 h1:4J3vW+vuCBHyocd3huZy3FJhOw5acaBHFLYwutkTE/E=
github.com/project-codeflare/multi-cluster-app-dispatcher v1.34.0/go.mod h1:gtTl8Tsl+X+bGhqVudLoveINR6IkN+sVvH0J+VZIP40=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
Expand Down
242 changes: 242 additions & 0 deletions tests/integration/mcad_pytorch_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,242 @@
/*
Copyright 2023.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package integration

import (
"bytes"
"html/template"
"os/exec"
"strings"
"testing"

. "github.com/onsi/gomega"
support "github.com/project-codeflare/codeflare-operator/test/support"
mcadv1beta1 "github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/apis/controller/v1beta1"

authenticationv1 "k8s.io/api/authentication/v1"
corev1 "k8s.io/api/core/v1"
rbacv1 "k8s.io/api/rbac/v1"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/yaml"
)

var notebookResource = schema.GroupVersionResource{Group: "kubeflow.org", Version: "v1", Resource: "notebooks"}

type NotebookProps struct {
IngressDomain string
OpenShiftApiUrl string
KubernetesBearerToken string
Namespace string
OpenDataHubNamespace string
CodeFlareImageStreamTag string
JobType string
NotebookPVC string
}

func TestMnistPyTorchMCAD(t *testing.T) {
test := support.With(t)
test.T().Parallel()

// Create a namespace
namespace := test.NewTestNamespace()

// Test configuration
config := &corev1.ConfigMap{
TypeMeta: metav1.TypeMeta{
APIVersion: corev1.SchemeGroupVersion.String(),
Kind: "ConfigMap",
},
ObjectMeta: metav1.ObjectMeta{
Name: "notebooks-mcad",
},
BinaryData: map[string][]byte{
// MNIST MCAD Notebook
"mnist_mcad_mini.ipynb": ReadFile(test, "resources/mnist_mcad_mini.ipynb"),
},
Immutable: support.Ptr(true),
}
config, err := test.Client().Core().CoreV1().ConfigMaps(namespace.Name).Create(test.Ctx(), config, metav1.CreateOptions{})
test.Expect(err).NotTo(HaveOccurred())
test.T().Logf("Created ConfigMap %s/%s successfully", config.Namespace, config.Name)

// Create PVC for Notebook
notebookPVC := &corev1.PersistentVolumeClaim{
TypeMeta: metav1.TypeMeta{
APIVersion: corev1.SchemeGroupVersion.String(),
Kind: "PersistentVolumeClaim",
},
ObjectMeta: metav1.ObjectMeta{
Name: "jupyterhub-nb-kube-3aadmin-pvc",
},
Spec: corev1.PersistentVolumeClaimSpec{
AccessModes: []corev1.PersistentVolumeAccessMode{
corev1.ReadWriteOnce,
},
Resources: corev1.ResourceRequirements{
Requests: corev1.ResourceList{
corev1.ResourceStorage: resource.MustParse("10Gi"),
},
},
},
}
notebookPVC, err = test.Client().Core().CoreV1().PersistentVolumeClaims(namespace.Name).Create(test.Ctx(), notebookPVC, metav1.CreateOptions{})
test.Expect(err).NotTo(HaveOccurred())
test.T().Logf("Created PersistentVolumeClaim %s/%s successfully", notebookPVC.Namespace, notebookPVC.Name)

// Read the Notebook CR from resources and perform replacements for custom values using go template
token := createTestMnistPyTorchMCADRBAC(test, namespace)
notebookProps := NotebookProps{
IngressDomain: getIngressDomain(test),
OpenShiftApiUrl: getOpenShiftApiUrl(test),
KubernetesBearerToken: token,
Namespace: namespace.Name,
OpenDataHubNamespace: GetOpenDataHubNamespace(),
CodeFlareImageStreamTag: getCodeFlareImageStreamTag(test),
JobType: "mcad",
NotebookPVC: "jupyterhub-nb-kube-3aadmin-pvc",
}
notebookTemplate := string(ReadFile(test, "resources/custom-nb-small.yaml"))
parsedNotebookTemplate, err := template.New("notebook").Parse(notebookTemplate)
test.Expect(err).NotTo(HaveOccurred())

// Filter template and store results to the buffer
notebookBuffer := new(bytes.Buffer)
err = parsedNotebookTemplate.Execute(notebookBuffer, notebookProps)
test.Expect(err).NotTo(HaveOccurred())

// Create Notebook CR
notebookCR := &unstructured.Unstructured{}
err = yaml.NewYAMLOrJSONDecoder(notebookBuffer, 8192).Decode(notebookCR)
test.Expect(err).NotTo(HaveOccurred())
_, err = test.Client().Dynamic().Resource(notebookResource).Namespace(namespace.Name).Create(test.Ctx(), notebookCR, metav1.CreateOptions{})
test.Expect(err).NotTo(HaveOccurred())

// Make sure the AppWrapper is created and running
test.Eventually(support.AppWrappers(test, namespace), support.TestTimeoutLong).
Should(
And(
HaveLen(1),
ContainElement(WithTransform(support.AppWrapperName, HavePrefix("mnistjob"))),
ContainElement(WithTransform(support.AppWrapperState, Equal(mcadv1beta1.AppWrapperStateActive))),
),
)

// Make sure the AppWrapper finishes and is deleted
test.Eventually(support.AppWrappers(test, namespace), support.TestTimeoutLong).
Should(HaveLen(0))
}

func getIngressDomain(test support.Test) string {
domain, err := executeCommand("oc", "get", "ingresses.config/cluster", "-o", "jsonpath={.spec.domain}")
test.T().Logf("Domain %s", domain)
test.Expect(err).NotTo(HaveOccurred())
return domain
}

func getOpenShiftApiUrl(test support.Test) string {
openShiftApiUrl, err := executeCommand("oc", "whoami", "--show-server=true")
openShiftApiDomain := strings.TrimPrefix(openShiftApiUrl, "https://")
test.T().Logf("Domain %s", openShiftApiDomain)
test.Expect(err).NotTo(HaveOccurred())
return openShiftApiDomain
}

func executeCommand(name string, arg ...string) (string, error) {
outputBytes, err := exec.Command(name, arg...).CombinedOutput()
return string(outputBytes), err
}

func getCodeFlareImageStreamTag(test support.Test) string {
cfis, err := test.Client().Image().ImageV1().ImageStreams(GetOpenDataHubNamespace()).Get(test.Ctx(), "codeflare-notebook", metav1.GetOptions{})
test.Expect(err).NotTo(HaveOccurred())
test.Expect(cfis.Spec.Tags).To(HaveLen(1))
return cfis.Spec.Tags[0].Name
}

func createTestMnistPyTorchMCADRBAC(test support.Test, namespace *corev1.Namespace) (token string) {
serviceAccount := &corev1.ServiceAccount{
TypeMeta: metav1.TypeMeta{
APIVersion: corev1.SchemeGroupVersion.String(),
Kind: "ServiceAccount",
},
ObjectMeta: metav1.ObjectMeta{
Name: "mcad-test-user",
Namespace: namespace.Name,
},
}
serviceAccount, err := test.Client().Core().CoreV1().ServiceAccounts(namespace.Name).Create(test.Ctx(), serviceAccount, metav1.CreateOptions{})
test.Expect(err).NotTo(HaveOccurred())

role := &rbacv1.Role{
TypeMeta: metav1.TypeMeta{
APIVersion: rbacv1.SchemeGroupVersion.String(),
Kind: "Role",
},
ObjectMeta: metav1.ObjectMeta{
Name: "mcad-test-role",
Namespace: namespace.Name,
},
Rules: []rbacv1.PolicyRule{
{
Verbs: []string{"get", "create", "delete", "list", "patch", "update"},
// TODO - switch back once group migration is merged in operator repo
// APIGroups: []string{mcadv1beta1.GroupName},
APIGroups: []string{"mcad.ibm.com"},
Resources: []string{"appwrappers"},
},
},
}
role, err = test.Client().Core().RbacV1().Roles(namespace.Name).Create(test.Ctx(), role, metav1.CreateOptions{})
test.Expect(err).NotTo(HaveOccurred())

roleBinding := &rbacv1.RoleBinding{
TypeMeta: metav1.TypeMeta{
APIVersion: rbacv1.SchemeGroupVersion.String(),
Kind: "RoleBinding",
},
ObjectMeta: metav1.ObjectMeta{
Name: "mcad-test",
},
RoleRef: rbacv1.RoleRef{
APIGroup: rbacv1.SchemeGroupVersion.Group,
Kind: "Role",
Name: role.Name,
},
Subjects: []rbacv1.Subject{
{
Kind: "ServiceAccount",
APIGroup: corev1.SchemeGroupVersion.Group,
Name: serviceAccount.Name,
Namespace: serviceAccount.Namespace,
},
},
}
_, err = test.Client().Core().RbacV1().RoleBindings(namespace.Name).Create(test.Ctx(), roleBinding, metav1.CreateOptions{})
test.Expect(err).NotTo(HaveOccurred())

treq := &authenticationv1.TokenRequest{
Spec: authenticationv1.TokenRequestSpec{
ExpirationSeconds: support.Ptr(int64(3600)),
},
}
treq, err = test.Client().Core().CoreV1().ServiceAccounts(namespace.Name).CreateToken(test.Ctx(), "mcad-test-user", treq, metav1.CreateOptions{})
test.Expect(err).NotTo(HaveOccurred())
return treq.Status.Token
}
Loading

0 comments on commit 2f7ab98

Please sign in to comment.