Adjust Trainer v2 precondition to check JobSet CRD

Author: sutaakar

internal/controller/components/trainer/trainer_controller_actions.go

@@ -19,7 +19,9 @@ package trainer
 import (
 	"context"
 
+	"github.com/opendatahub-io/opendatahub-operator/v2/internal/controller/status"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/cluster"
+	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/cluster/gvk"
 	odherrors "github.com/opendatahub-io/opendatahub-operator/v2/pkg/controller/actions/errors"
 	odhtypes "github.com/opendatahub-io/opendatahub-operator/v2/pkg/controller/types"
 )
@@ -33,6 +35,15 @@ func checkPreConditions(ctx context.Context, rr *odhtypes.ReconciliationRequest)
 		return ErrJobSetOperatorNotInstalled
 	}
 
+	jobset, err := cluster.HasCRD(ctx, rr.Client, gvk.JobSetv1alpha2)
+	if err != nil {
+		return odherrors.NewStopError("failed to check %s CRDs version: %w", gvk.JobSetv1alpha2, err)
+	}
+
+	if !jobset {
+		return odherrors.NewStopError(status.JobSetCRDMissingMessage)
+	}
+
 	return nil
 }
 

internal/controller/components/trainer/trainer_controller_actions_test.go

@@ -4,11 +4,18 @@ package trainer
 import (
 	"testing"
 
+	ofapiv2 "github.com/operator-framework/api/pkg/operators/v2"
+	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+
 	componentApi "github.com/opendatahub-io/opendatahub-operator/v2/api/components/v1alpha1"
 	"github.com/opendatahub-io/opendatahub-operator/v2/internal/controller/status"
+	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/cluster/gvk"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/controller/conditions"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/controller/types"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/utils/test/fakeclient"
+	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/utils/test/scheme"
 
 	. "github.com/onsi/gomega"
 )
@@ -34,3 +41,72 @@ func TestCheckPreConditions_Managed_JobSetOperatorNotInstalled(t *testing.T) {
 	g.Expect(err).Should(HaveOccurred())
 	g.Expect(err).To(MatchError(ContainSubstring(status.JobSetOperatorNotInstalledMessage)))
 }
+
+func TestCheckPreConditions_Managed_JobSetCRDNotInstalled(t *testing.T) {
+	ctx := t.Context()
+	g := NewWithT(t)
+
+	cli, err := fakeclient.New(
+		fakeclient.WithObjects(
+			&ofapiv2.OperatorCondition{ObjectMeta: metav1.ObjectMeta{
+				Name: jobSetOperator,
+			}},
+		),
+	)
+	g.Expect(err).ShouldNot(HaveOccurred())
+
+	trainer := componentApi.Trainer{
+		Spec: componentApi.TrainerSpec{},
+	}
+
+	rr := types.ReconciliationRequest{
+		Client:     cli,
+		Instance:   &trainer,
+		Conditions: conditions.NewManager(&trainer, status.ConditionTypeReady),
+	}
+
+	err = checkPreConditions(ctx, &rr)
+	g.Expect(err).Should(HaveOccurred())
+	g.Expect(err).To(MatchError(ContainSubstring(status.JobSetCRDMissingMessage)))
+}
+
+func TestCheckPreConditions_Managed_JobSetCRDInstalled(t *testing.T) {
+	ctx := t.Context()
+	g := NewWithT(t)
+
+	fakeSchema, err := scheme.New()
+	g.Expect(err).ShouldNot(HaveOccurred())
+
+	fakeSchema.AddKnownTypeWithName(gvk.JobSetv1alpha2, &unstructured.Unstructured{})
+
+	jobSetCRD := &apiextensionsv1.CustomResourceDefinition{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "jobsets.jobset.x-k8s.io",
+		},
+		Status: apiextensionsv1.CustomResourceDefinitionStatus{
+			StoredVersions: []string{gvk.JobSetv1alpha2.Version},
+		},
+	}
+	jobSetOperatorCondition := &ofapiv2.OperatorCondition{ObjectMeta: metav1.ObjectMeta{
+		Name: jobSetOperator,
+	}}
+
+	cli, err := fakeclient.New(
+		fakeclient.WithScheme(fakeSchema),
+		fakeclient.WithObjects(jobSetCRD, jobSetOperatorCondition),
+	)
+	g.Expect(err).ShouldNot(HaveOccurred())
+
+	trainer := componentApi.Trainer{
+		Spec: componentApi.TrainerSpec{},
+	}
+
+	rr := types.ReconciliationRequest{
+		Client:     cli,
+		Instance:   &trainer,
+		Conditions: conditions.NewManager(&trainer, status.ConditionTypeReady),
+	}
+
+	err = checkPreConditions(ctx, &rr)
+	g.Expect(err).ShouldNot(HaveOccurred())
+}

internal/controller/status/status.go

@@ -180,6 +180,7 @@ To uninstall it, you should delete all RayClusters resources from the cluster, d
 // For JobSet operator checks.
 const (
 	JobSetOperatorNotInstalledMessage = "JobSet operator not installed, please install it first"
+	JobSetCRDMissingMessage           = "JobSet CRD does not exist, please create JobSetOperator CR to proceed"
 )
 
 // setConditions is a helper function to set multiple conditions at once.

pkg/cluster/gvk/gvk.go

@@ -637,4 +637,10 @@ var (
 		Version: "v1beta1",
 		Kind:    "Kuadrant",
 	}
+
+	JobSetv1alpha2 = schema.GroupVersionKind{
+		Group:   "jobset.x-k8s.io",
+		Version: "v1alpha2",
+		Kind:    "JobSet",
+	}
 )

tests/e2e/creation_test.go

@@ -51,6 +51,7 @@ func dscManagementTestSuite(t *testing.T) {
 	testCases := []TestCase{
 		{"Ensure required operators with custom channels are installed", dscTestCtx.ValidateOperatorsWithCustomChannelsInstallation},
 		{"Ensure required operators are installed", dscTestCtx.ValidateOperatorsInstallation},
+		{"Ensure required resources are created", dscTestCtx.ValidateResourcesCreation},
 		{"Validate creation of DSCInitialization instance", dscTestCtx.ValidateDSCICreation},
 		{"Validate creation of DataScienceCluster instance", dscTestCtx.ValidateDSCCreation},
 		{"Validate HardwareProfile resource", dscTestCtx.ValidateHardwareProfileCR},
@@ -157,6 +158,17 @@ func (tc *DSCTestCtx) ValidateOperatorsInstallation(t *testing.T) {
 	RunTestCases(t, testCases, WithParallel())
 }
 
+// ValidateResourcesCreation validates the creation of the required resources.
+func (tc *DSCTestCtx) ValidateResourcesCreation(t *testing.T) {
+	t.Helper()
+
+	tc.EventuallyResourceCreatedOrUpdated(
+		WithObjectToCreate(CreateJobSetOperator()),
+		WithCondition(jq.Match(`.status.conditions[] | select(.type == "Available") | .status == "True"`)),
+		WithCustomErrorMsg("Failed to create JobSetOperator resource"),
+	)
+}
+
 // ValidateDSCICreation validates the creation of a DSCInitialization.
 func (tc *DSCTestCtx) ValidateDSCICreation(t *testing.T) {
 	t.Helper()

tests/e2e/helper_test.go

@@ -402,6 +402,23 @@ func CreateHardwareProfile(name, namespace, apiVersion string) *unstructured.Uns
 	return hwProfile
 }
 
+// CreateJobSetOperator creates a JobSetOperator CR.
+func CreateJobSetOperator() *unstructured.Unstructured {
+	return &unstructured.Unstructured{
+		Object: map[string]interface{}{
+			"apiVersion": "operator.openshift.io/v1",
+			"kind":       "JobSetOperator",
+			"metadata": map[string]interface{}{
+				"name": "cluster",
+			},
+			"spec": map[string]interface{}{
+				"logLevel":         "Normal",
+				"operatorLogLevel": "Normal",
+			},
+		},
+	}
+}
+
 // CreateNamespaceWithLabels creates a namespace manifest with optional labels for use with WithObjectToCreate.
 func CreateNamespaceWithLabels(name string, labels map[string]string) *corev1.Namespace {
 	ns := &corev1.Namespace{