Remove fetch releases action from dashboard & e2e tests

ugiordan · Jan 29, 2025 · d706b92 · d706b92
1 parent 4e0deb2
commit d706b92
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 2 deletions.
diff --git a/controllers/components/dashboard/dashboard_controller.go b/controllers/components/dashboard/dashboard_controller.go
@@ -33,7 +33,6 @@ import (
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/controller/actions/deploy"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/controller/actions/gc"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/controller/actions/render/kustomize"
-	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/controller/actions/status/releases"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/controller/actions/updatestatus"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/controller/handlers"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/controller/predicates/component"
@@ -90,7 +89,6 @@ func (s *componentHandler) NewComponentReconciler(ctx context.Context, mgr ctrl.
 		// actions
 		WithAction(initialize).
 		WithAction(devFlags).
-		WithAction(releases.NewAction()).
 		WithAction(configureDependencies).
 		WithAction(kustomize.NewAction(
 			kustomize.WithCache(),

diff --git a/controllers/components/workbenches/workbenches_controller.go b/controllers/components/workbenches/workbenches_controller.go
@@ -18,6 +18,9 @@ package workbenches
 
 import (
 	"context"
+	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/controller/actions/status/releases"
+	odhdeploy "github.com/opendatahub-io/opendatahub-operator/v2/pkg/deploy"
+	"path"
 
 	admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
 	appsv1 "k8s.io/api/apps/v1"
@@ -60,6 +63,7 @@ func (s *componentHandler) NewComponentReconciler(ctx context.Context, mgr ctrl.
 		).
 		WithAction(initialize).
 		WithAction(devFlags).
+		WithAction(releases.NewAction(releases.WithMetadataFilePath(path.Join(odhdeploy.DefaultManifestPath, ComponentName, kfNotebookControllerPath, releases.ComponentMetadataFilename)))).
 		WithAction(configureDependencies).
 		WithAction(kustomize.NewAction(
 			kustomize.WithCache(),

diff --git a/tests/e2e/codeflare_test.go b/tests/e2e/codeflare_test.go
@@ -22,6 +22,7 @@ func codeflareTestSuite(t *testing.T) {
 	t.Run("Validate operands have OwnerReferences", componentCtx.ValidateOperandsOwnerReferences)
 	t.Run("Validate update operand resources", componentCtx.ValidateUpdateDeploymentsResources)
 	t.Run("Validate component disabled", componentCtx.ValidateComponentDisabled)
+	t.Run("Validate component releases", componentCtx.ValidateComponentReleases)
 }
 
 type CodeFlareTestCtx struct {

diff --git a/tests/e2e/kserve_test.go b/tests/e2e/kserve_test.go
@@ -43,6 +43,7 @@ func kserveTestSuite(t *testing.T) {
 	t.Run("Validate default certs", componentCtx.validateDefaultCertsAvailable)
 	t.Run("Validate update operand resources", componentCtx.ValidateUpdateDeploymentsResources)
 	t.Run("Validate component disabled", componentCtx.ValidateComponentDisabled)
+	t.Run("Validate component releases", componentCtx.ValidateComponentReleases)
 }
 
 type KserveTestCtx struct {

diff --git a/tests/e2e/kueue_test.go b/tests/e2e/kueue_test.go
@@ -32,6 +32,7 @@ func kueueTestSuite(t *testing.T) {
 	t.Run("Validate Kueue Dynamically create VAP and VAPB", componentCtx.validateKueueVAPReady)
 	t.Run("Validate CRDs reinstated", componentCtx.validateCRDReinstated)
 	t.Run("Validate component disabled", componentCtx.ValidateComponentDisabled)
+	t.Run("Validate component releases", componentCtx.ValidateComponentReleases)
 }
 
 type KueueTestCtx struct {

diff --git a/tests/e2e/modelmeshserving_test.go b/tests/e2e/modelmeshserving_test.go
@@ -29,6 +29,7 @@ func modelMeshServingTestSuite(t *testing.T) {
 	t.Run("Validate operands have OwnerReferences", componentCtx.ValidateOperandsOwnerReferences)
 	t.Run("Validate update operand resources", componentCtx.ValidateUpdateDeploymentsResources)
 	t.Run("Validate component disabled", componentCtx.ValidateComponentDisabled)
+	t.Run("Validate component releases", componentCtx.ValidateComponentReleases)
 }
 
 type ModelMeshServingTestCtx struct {

diff --git a/tests/e2e/modelregistry_test.go b/tests/e2e/modelregistry_test.go
@@ -48,6 +48,7 @@ func modelRegistryTestSuite(t *testing.T) {
 	t.Run("Validate ServiceMeshMember", componentCtx.validateModelRegistryServiceMeshMember)
 
 	t.Run("Validate component disabled", componentCtx.ValidateComponentDisabled)
+	t.Run("Validate component releases", componentCtx.ValidateComponentReleases)
 }
 
 func (c *ModelRegistryTestCtx) validateSpec(t *testing.T) {

diff --git a/tests/e2e/ray_test.go b/tests/e2e/ray_test.go
@@ -22,6 +22,7 @@ func rayTestSuite(t *testing.T) {
 	t.Run("Validate operands have OwnerReferences", componentCtx.ValidateOperandsOwnerReferences)
 	t.Run("Validate update operand resources", componentCtx.ValidateUpdateDeploymentsResources)
 	t.Run("Validate component disabled", componentCtx.ValidateComponentDisabled)
+	t.Run("Validate component releases", componentCtx.ValidateComponentReleases)
 }
 
 type RayTestCtx struct {

diff --git a/tests/e2e/trainingoperator_test.go b/tests/e2e/trainingoperator_test.go
@@ -22,6 +22,7 @@ func trainingOperatorTestSuite(t *testing.T) {
 	t.Run("Validate operands have OwnerReferences", componentCtx.ValidateOperandsOwnerReferences)
 	t.Run("Validate update operand resources", componentCtx.ValidateUpdateDeploymentsResources)
 	t.Run("Validate component disabled", componentCtx.ValidateComponentDisabled)
+	t.Run("Validate component releases", componentCtx.ValidateComponentReleases)
 }
 
 type TrainingOperatorTestCtx struct {

diff --git a/tests/e2e/trustyai_test.go b/tests/e2e/trustyai_test.go
@@ -22,6 +22,7 @@ func trustyAITestSuite(t *testing.T) {
 	t.Run("Validate operands have OwnerReferences", componentCtx.ValidateOperandsOwnerReferences)
 	t.Run("Validate update operand resources", componentCtx.ValidateUpdateDeploymentsResources)
 	t.Run("Validate component disabled", componentCtx.ValidateComponentDisabled)
+	t.Run("Validate component releases", componentCtx.ValidateComponentReleases)
 }
 
 type TrustyAITestCtx struct {