feat: Mapping component versions to RHOAI releases

opendatahub-io · Oct 20, 2024 · 210bde1 · 210bde1
1 parent 0c16075
commit 210bde1
Show file tree

Hide file tree

Showing 22 changed files with 493 additions and 58 deletions.
diff --git a/apis/datasciencecluster/v1/datasciencecluster_types.go b/apis/datasciencecluster/v1/datasciencecluster_types.go
@@ -87,12 +87,6 @@ type Components struct {
 	TrainingOperator trainingoperator.TrainingOperator `json:"trainingoperator,omitempty"`
 }
 
-// ComponentsStatus defines the custom status of DataScienceCluster components.
-type ComponentsStatus struct {
-	// ModelRegistry component status
-	ModelRegistry *status.ModelRegistryStatus `json:"modelregistry,omitempty"`
-}
-
 // DataScienceClusterStatus defines the observed state of DataScienceCluster.
 type DataScienceClusterStatus struct {
 	// Phase describes the Phase of DataScienceCluster reconciliation state
@@ -114,7 +108,7 @@ type DataScienceClusterStatus struct {
 
 	// Expose component's specific status
 	// +optional
-	Components ComponentsStatus `json:"components,omitempty"`
+	Components map[string]status.ComponentStatus `json:"components,omitempty"`
 
 	// Version and release type
 	Release cluster.Release `json:"release,omitempty"`

diff --git a/apis/datasciencecluster/v1/zz_generated.deepcopy.go b/apis/datasciencecluster/v1/zz_generated.deepcopy.go
diff --git a/components/codeflare/codeflare.go b/components/codeflare/codeflare.go
@@ -8,13 +8,17 @@ import (
 	"fmt"
 	"path/filepath"
 
+	"github.com/blang/semver/v4"
+	"github.com/joho/godotenv"
 	operatorv1 "github.com/openshift/api/operator/v1"
+	"github.com/operator-framework/api/pkg/lib/version"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 
 	dsciv1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/dscinitialization/v1"
 	"github.com/opendatahub-io/opendatahub-operator/v2/components"
+	"github.com/opendatahub-io/opendatahub-operator/v2/controllers/status"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/cluster"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/deploy"
 )
@@ -71,6 +75,35 @@ func (c *CodeFlare) GetComponentName() string {
 	return ComponentName
 }
 
+func (c *CodeFlare) GetUpstreamReleaseStatus() status.UpstreamReleases {
+	var componentVersion semver.Version
+	var repositoryURL string
+	var releaseDetails = make([]status.ComponentReleaseStatus, 0)
+	var releaseStatus status.UpstreamReleases
+
+	env, err := godotenv.Read(filepath.Join(deploy.DefaultManifestPath, ComponentName, ".env"))
+
+	if err != nil {
+		return status.UpstreamReleases{}
+	}
+	if env != nil {
+		componentVersion, err = semver.Parse(env["UPSTREAM_RELEASE_VERSION"])
+
+		if err != nil {
+			return status.UpstreamReleases{}
+		}
+		repositoryURL = env["REPOSITORY_URL"]
+	}
+	componentReleaseStatus := status.ComponentReleaseStatus{
+		Name:        status.Platform(ComponentName),
+		DisplayName: CodeflareOperator,
+		Version:     version.OperatorVersion{Version: componentVersion},
+		RepoURL:     repositoryURL}
+	releaseDetails = append(releaseDetails, componentReleaseStatus)
+	releaseStatus.UpstreamRelease = releaseDetails
+	return releaseStatus
+}
+
 func (c *CodeFlare) ReconcileComponent(ctx context.Context,
 	cli client.Client,
 	owner metav1.Object,

diff --git a/components/component.go b/components/component.go
@@ -14,6 +14,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	dsciv1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/dscinitialization/v1"
+	"github.com/opendatahub-io/opendatahub-operator/v2/controllers/status"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/cluster"
 )
 
@@ -86,6 +87,7 @@ type ComponentInterface interface {
 		owner metav1.Object, DSCISpec *dsciv1.DSCInitializationSpec, platform cluster.Platform, currentComponentStatus bool) error
 	Cleanup(ctx context.Context, cli client.Client, owner metav1.Object, DSCISpec *dsciv1.DSCInitializationSpec) error
 	GetComponentName() string
+	GetUpstreamReleaseStatus() status.UpstreamReleases
 	GetManagementState() operatorv1.ManagementState
 	OverrideManifests(ctx context.Context, platform cluster.Platform) error
 	UpdatePrometheusConfig(cli client.Client, logger logr.Logger, enable bool, component string) error

diff --git a/components/dashboard/dashboard.go b/components/dashboard/dashboard.go
@@ -19,6 +19,7 @@ import (
 
 	dsciv1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/dscinitialization/v1"
 	"github.com/opendatahub-io/opendatahub-operator/v2/components"
+	"github.com/opendatahub-io/opendatahub-operator/v2/controllers/status"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/cluster"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/deploy"
 )
@@ -82,6 +83,10 @@ func (d *Dashboard) GetComponentName() string {
 	return ComponentNameUpstream
 }
 
+func (d *Dashboard) GetUpstreamReleaseStatus() status.UpstreamReleases {
+	return status.UpstreamReleases{}
+}
+
 func (d *Dashboard) ReconcileComponent(ctx context.Context,
 	cli client.Client,
 	owner metav1.Object,

diff --git a/components/datasciencepipelines/datasciencepipelines.go b/components/datasciencepipelines/datasciencepipelines.go
@@ -8,8 +8,11 @@ import (
 	"fmt"
 	"path/filepath"
 
+	"github.com/blang/semver/v4"
+	"github.com/joho/godotenv"
 	operatorv1 "github.com/openshift/api/operator/v1"
 	conditionsv1 "github.com/openshift/custom-resource-status/conditions/v1"
+	"github.com/operator-framework/api/pkg/lib/version"
 	corev1 "k8s.io/api/core/v1"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	k8serr "k8s.io/apimachinery/pkg/api/errors"
@@ -92,6 +95,35 @@ func (d *DataSciencePipelines) GetComponentName() string {
 	return ComponentName
 }
 
+func (d *DataSciencePipelines) GetUpstreamReleaseStatus() status.UpstreamReleases {
+	var componentVersion semver.Version
+	var repositoryURL string
+	var releaseDetails = make([]status.ComponentReleaseStatus, 0)
+	var releaseStatus status.UpstreamReleases
+
+	env, err := godotenv.Read(filepath.Join(deploy.DefaultManifestPath, ComponentName, ".env"))
+
+	if err != nil {
+		return status.UpstreamReleases{}
+	}
+	if env != nil {
+		componentVersion, err = semver.Parse(env["UPSTREAM_RELEASE_VERSION"])
+
+		if err != nil {
+			return status.UpstreamReleases{}
+		}
+		repositoryURL = env["REPOSITORY_URL"]
+	}
+	componentReleaseStatus := status.ComponentReleaseStatus{
+		Name:        status.Platform(ComponentName),
+		DisplayName: ComponentName,
+		Version:     version.OperatorVersion{Version: componentVersion},
+		RepoURL:     repositoryURL}
+	releaseDetails = append(releaseDetails, componentReleaseStatus)
+	releaseStatus.UpstreamRelease = releaseDetails
+	return releaseStatus
+}
+
 func (d *DataSciencePipelines) ReconcileComponent(ctx context.Context,
 	cli client.Client,
 	owner metav1.Object,

diff --git a/components/kserve/kserve.go b/components/kserve/kserve.go
@@ -8,14 +8,18 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/blang/semver/v4"
+	"github.com/joho/godotenv"
 	operatorv1 "github.com/openshift/api/operator/v1"
+	"github.com/operator-framework/api/pkg/lib/version"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 
 	dsciv1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/dscinitialization/v1"
 	infrav1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/infrastructure/v1"
 	"github.com/opendatahub-io/opendatahub-operator/v2/components"
+	"github.com/opendatahub-io/opendatahub-operator/v2/controllers/status"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/cluster"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/deploy"
 )
@@ -110,6 +114,35 @@ func (k *Kserve) GetComponentName() string {
 	return ComponentName
 }
 
+func (k *Kserve) GetUpstreamReleaseStatus() status.UpstreamReleases {
+	var componentVersion semver.Version
+	var repositoryURL string
+	var releaseDetails = make([]status.ComponentReleaseStatus, 0)
+	var releaseStatus status.UpstreamReleases
+
+	env, err := godotenv.Read(filepath.Join(deploy.DefaultManifestPath, ComponentName, ".env"))
+
+	if err != nil {
+		return status.UpstreamReleases{}
+	}
+	if env != nil {
+		componentVersion, err = semver.Parse(env["UPSTREAM_RELEASE_VERSION"])
+
+		if err != nil {
+			return status.UpstreamReleases{}
+		}
+		repositoryURL = env["REPOSITORY_URL"]
+	}
+	componentReleaseStatus := status.ComponentReleaseStatus{
+		Name:        status.Platform(ComponentName),
+		DisplayName: ComponentName,
+		Version:     version.OperatorVersion{Version: componentVersion},
+		RepoURL:     repositoryURL}
+	releaseDetails = append(releaseDetails, componentReleaseStatus)
+	releaseStatus.UpstreamRelease = releaseDetails
+	return releaseStatus
+}
+
 func (k *Kserve) ReconcileComponent(ctx context.Context, cli client.Client,
 	owner metav1.Object, dscispec *dsciv1.DSCInitializationSpec, platform cluster.Platform, _ bool) error {
 	l := logf.FromContext(ctx)

diff --git a/components/kueue/kueue.go b/components/kueue/kueue.go
@@ -6,13 +6,17 @@ import (
 	"fmt"
 	"path/filepath"
 
+	"github.com/blang/semver/v4"
+	"github.com/joho/godotenv"
 	operatorv1 "github.com/openshift/api/operator/v1"
+	"github.com/operator-framework/api/pkg/lib/version"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 
 	dsciv1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/dscinitialization/v1"
 	"github.com/opendatahub-io/opendatahub-operator/v2/components"
+	"github.com/opendatahub-io/opendatahub-operator/v2/controllers/status"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/cluster"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/deploy"
 )
@@ -67,6 +71,35 @@ func (k *Kueue) GetComponentName() string {
 	return ComponentName
 }
 
+func (k *Kueue) GetUpstreamReleaseStatus() status.UpstreamReleases {
+	var componentVersion semver.Version
+	var repositoryURL string
+	var releaseDetails = make([]status.ComponentReleaseStatus, 0)
+	var releaseStatus status.UpstreamReleases
+
+	env, err := godotenv.Read(filepath.Join(deploy.DefaultManifestPath, ComponentName, ".env"))
+
+	if err != nil {
+		return status.UpstreamReleases{}
+	}
+	if env != nil {
+		componentVersion, err = semver.Parse(env["UPSTREAM_RELEASE_VERSION"])
+
+		if err != nil {
+			return status.UpstreamReleases{}
+		}
+		repositoryURL = env["REPOSITORY_URL"]
+	}
+	componentReleaseStatus := status.ComponentReleaseStatus{
+		Name:        status.Platform(ComponentName),
+		DisplayName: ComponentName,
+		Version:     version.OperatorVersion{Version: componentVersion},
+		RepoURL:     repositoryURL}
+	releaseDetails = append(releaseDetails, componentReleaseStatus)
+	releaseStatus.UpstreamRelease = releaseDetails
+	return releaseStatus
+}
+
 func (k *Kueue) ReconcileComponent(ctx context.Context, cli client.Client,
 	owner metav1.Object, dscispec *dsciv1.DSCInitializationSpec, platform cluster.Platform, _ bool) error {
 	l := logf.FromContext(ctx)

diff --git a/components/modelmeshserving/modelmeshserving.go b/components/modelmeshserving/modelmeshserving.go
@@ -8,13 +8,17 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/blang/semver/v4"
+	"github.com/joho/godotenv"
 	operatorv1 "github.com/openshift/api/operator/v1"
+	"github.com/operator-framework/api/pkg/lib/version"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 
 	dsciv1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/dscinitialization/v1"
 	"github.com/opendatahub-io/opendatahub-operator/v2/components"
+	"github.com/opendatahub-io/opendatahub-operator/v2/controllers/status"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/cluster"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/deploy"
 )
@@ -100,6 +104,35 @@ func (m *ModelMeshServing) GetComponentName() string {
 	return ComponentName
 }
 
+func (m *ModelMeshServing) GetUpstreamReleaseStatus() status.UpstreamReleases {
+	var componentVersion semver.Version
+	var repositoryURL string
+	var releaseDetails = make([]status.ComponentReleaseStatus, 0)
+	var releaseStatus status.UpstreamReleases
+
+	env, err := godotenv.Read(filepath.Join(deploy.DefaultManifestPath, ComponentName, ".env"))
+
+	if err != nil {
+		return status.UpstreamReleases{}
+	}
+	if env != nil {
+		componentVersion, err = semver.Parse(env["UPSTREAM_RELEASE_VERSION"])
+
+		if err != nil {
+			return status.UpstreamReleases{}
+		}
+		repositoryURL = env["REPOSITORY_URL"]
+	}
+	componentReleaseStatus := status.ComponentReleaseStatus{
+		Name:        status.Platform(ComponentName),
+		DisplayName: ComponentName,
+		Version:     version.OperatorVersion{Version: componentVersion},
+		RepoURL:     repositoryURL}
+	releaseDetails = append(releaseDetails, componentReleaseStatus)
+	releaseStatus.UpstreamRelease = releaseDetails
+	return releaseStatus
+}
+
 func (m *ModelMeshServing) ReconcileComponent(ctx context.Context,
 	cli client.Client,
 	owner metav1.Object,