Skip to content

Commit

Permalink
Map component versions to RHOAI status for better visibility
Browse files Browse the repository at this point in the history
commit 8caaedfbbc7da4890f41496275a71e4364730646
Author: Ugo Giordano <[email protected]>
Date:   Wed Jan 29 16:09:34 2025 +0100

    added generated files

commit aedbf41
Merge: 9135927 6e134b1
Author: Ugo Giordano <[email protected]>
Date:   Wed Jan 29 16:00:38 2025 +0100

    Merge branch 'main' into RHOAIENG-11648/component-mapping-refactor

commit 9135927
Author: Ugo Giordano <[email protected]>
Date:   Wed Jan 29 15:28:08 2025 +0100

    removed releases from dashboard since not needed and renamed ComponentReleaseStatus into ComponentRelease

commit 237806d
Author: Ugo Giordano <[email protected]>
Date:   Wed Jan 29 12:56:50 2025 +0100

    removed releases from dashboard since not needed

commit 6e134b1
Author: Wen Zhou <[email protected]>
Date:   Wed Jan 29 12:41:18 2025 +0100

    fix: missing permission to update prometheusrules (opendatahub-io#1581)

    Signed-off-by: Wen Zhou <[email protected]>

commit a044cda
Merge: 2571965 bd00c9b
Author: Ugo Giordano <[email protected]>
Date:   Wed Jan 29 12:13:12 2025 +0100

    Merge branch 'main' into RHOAIENG-11648/component-mapping-refactor

commit 2571965
Author: Ugo Giordano <[email protected]>
Date:   Wed Jan 29 11:42:27 2025 +0100

    Map component versions to RHOAI status for better visibility

    commit 0f1cf7dd9ca20e41c97a1590e18dc888b68e9fd5
    Author: Ugo Giordano <[email protected]>
    Date:   Wed Jan 29 11:40:58 2025 +0100

        fix lint error

    commit 473e86f55fd87e496c5d4251d075dc1082ce6e4c
    Author: Ugo Giordano <[email protected]>
    Date:   Mon Jan 27 16:42:00 2025 +0100

        Map component versions to RHOAI status for better visibility

    commit 3d47679
    Merge: d706b92 bd00c9b
    Author: Ugo Giordano <[email protected]>
    Date:   Wed Jan 29 11:32:16 2025 +0100

        Merge branch 'main' into RHOAIENG-11648/component-mapping-refactor

    commit d706b92
    Author: Ugo Giordano <[email protected]>
    Date:   Tue Jan 28 18:00:29 2025 +0100

        Remove fetch releases action from dashboard & e2e tests

    commit 4e0deb2
    Author: Ugo Giordano <[email protected]>
    Date:   Tue Jan 28 16:10:28 2025 +0100

        unit test

        e2e tests

    commit bd00c9b
    Author: Luca Burgazzoli <[email protected]>
    Date:   Tue Jan 28 23:53:01 2025 +0100

        Improve Kserve's FeatureTraker handing (opendatahub-io#1562)

        * Improve Kserve's FeatureTraker handing

        - Make it possible to set FT's OwnerReference as Controller reference so
          the kubernetes garbage collector can block owner deletion till the FT
          has been deleted
        - Make it possible to set FT's generated resources OwnerReference as
          Controller reference so the kubernetes garbage collector can block
          FT deletion till the resources have been deleted
        - Add an Kserver reconciler action to remove legacy ownership on
          DSCI/DSC is any and related e2e tests

        * Update RBACs

        * Update RBACs

        * Fix findings

        * Update pkg/cluster/meta.go

        Co-authored-by: Gerard Ryan <[email protected]>

        * Fix renaming

        * Remove unrelated methods

        ---------

        Co-authored-by: Gerard Ryan <[email protected]>

    commit df5495e
    Author: Wen Zhou <[email protected]>
    Date:   Tue Jan 28 21:21:23 2025 +0100

        docs: remove duplicated files and update integration docs (opendatahub-io#1575)

        Signed-off-by: Wen Zhou <[email protected]>

    commit ca2f619
    Author: Wen Zhou <[email protected]>
    Date:   Tue Jan 28 21:02:36 2025 +0100

        fix: missing update permission on dashboard object (opendatahub-io#1576)

        - add update on all cases

        Signed-off-by: Wen Zhou <[email protected]>

    commit a996732
    Author: Wen Zhou <[email protected]>
    Date:   Tue Jan 28 20:50:56 2025 +0100

        fix: fix wrong map for DSP images (opendatahub-io#1577)

        - the old images are from 2.15 which have been updated during 2.16

        Signed-off-by: Wen Zhou <[email protected]>

    commit 94095f9
    Author: Dipanshu Gupta <[email protected]>
    Date:   Tue Jan 28 21:57:25 2025 +0530

        Setup admin permissions for hardware profiles (opendatahub-io#1573)

    commit 3056ab4
    Author: Ajay Jaganathan <[email protected]>
    Date:   Tue Jan 28 17:58:06 2025 +0530

        (fix): point to correct path for component integration doc (opendatahub-io#1574)

    commit d538956
    Author: Luca Burgazzoli <[email protected]>
    Date:   Tue Jan 28 10:01:48 2025 +0100

        chore: use constants from the status package where possible (opendatahub-io#1541)

        Co-authored-by: Wen Zhou <[email protected]>

    commit 9aed5e0
    Author: Andrew Ballantyne <[email protected]>
    Date:   Mon Jan 27 13:20:04 2025 -0500

        Clarify and update permissions (opendatahub-io#1538)

        * Add readme to explain values of permissions

        * NIM Accounts are namespaced resources

        * Update permissions to fulfill doc design

        * Based on feedback, less hard-fast ruling wording in the README

    commit 5e60591
    Author: Wen Zhou <[email protected]>
    Date:   Mon Jan 27 17:33:51 2025 +0100

        test: disable monitoring config in DSCI for ODH e2e test (opendatahub-io#1570)

        - we do not enable monitoring in ODH logic
        - we should keep it enable for rhoai branch

        Signed-off-by: Wen Zhou <[email protected]>

    commit a8eb6ff
    Author: Ugo Giordano <[email protected]>
    Date:   Mon Jan 27 16:51:31 2025 +0100

        fix lint add updated api doc

    commit 4b76ca4
    Author: Ugo Giordano <[email protected]>
    Date:   Mon Jan 27 16:42:00 2025 +0100

        Map component versions to RHOAI status for better visibility

    commit 48341ff
    Author: Luca Burgazzoli <[email protected]>
    Date:   Mon Jan 27 15:38:21 2025 +0100

        It takes more than 10 minutes for kserve-controller to be created during 2.17 installation (opendatahub-io#1564)

        * It takes more than 10 minutes for kserve-controller to be created during 2.17 installation

        * cleanup

    commit b0a0f87
    Author: Wen Zhou <[email protected]>
    Date:   Mon Jan 27 13:53:40 2025 +0100

        update: clean up old code before refactor (opendatahub-io#1494)

        * update: clean up old code before refactor

        - remove reference we explicilty check on odhdashboardconfig and kserve
        - remove customized config on controller QPS
        - remove RemoveLabel which is not called anywhere

        Signed-off-by: Wen Zhou <[email protected]>

        * update:

        - remove function for upgrade cleanup introduced before 2.8
        - remove flags to main: operator namespace and application namespace
          ( operator namespace is passing as env variable, app namespace is done by DSCI )

        Signed-off-by: Wen Zhou <[email protected]>

        * fix: Auth CR is cluster-scoped no need to set namespace for request

        - application namespace is removed from reconciler of dsci

        Signed-off-by: Wen Zhou <[email protected]>

        * fix: wrong code for upgrade path + rebase error

        Signed-off-by: Wen Zhou <[email protected]>

        ---------

        Signed-off-by: Wen Zhou <[email protected]>

    commit 7b4dfc2
    Author: Wen Zhou <[email protected]>
    Date:   Mon Jan 27 12:01:07 2025 +0100

        fix: for upgrade case we will need update permission on buildconfig to revmoew ownerref from dsc (opendatahub-io#1567)

        Signed-off-by: Wen Zhou <[email protected]>

    commit a00aa61
    Author: Wen Zhou <[email protected]>
    Date:   Mon Jan 27 09:00:32 2025 +0100

        fix: add matchlabel on NWP for customized appliation (opendatahub-io#1566)

        - update README and troubleshooting

        Signed-off-by: Wen Zhou <[email protected]>

    commit eb42450
    Author: Manjunath Kumatagi <[email protected]>
    Date:   Fri Jan 24 19:11:14 2025 +0530

        Build platform independent binary based on the target platform (opendatahub-io#1549)

    commit bc63cfd
    Author: Wen Zhou <[email protected]>
    Date:   Thu Jan 23 21:04:44 2025 +0100

        update: change previous workaround for subscription and add smcp in the list (opendatahub-io#1557)

        - remove subs from client cache
        - add smcp into exclude cache

        Signed-off-by: Wen Zhou <[email protected]>

    commit 63d4eab
    Author: Wen Zhou <[email protected]>
    Date:   Thu Jan 23 18:44:37 2025 +0100

        fix: missing monitoring NS for NWP if user opt customized app NS (opendatahub-io#1558)

        Signed-off-by: Wen Zhou <[email protected]>

    commit 912dcaa
    Author: Ugo Giordano <[email protected]>
    Date:   Thu Jan 23 16:56:32 2025 +0100

        Align get_all_manifests.sh with Kubeflow main branch (opendatahub-io#1550)

    commit ce7b381
    Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
    Date:   Thu Jan 23 14:08:54 2025 +0100

        Update version to 2.23.1 (opendatahub-io#1553)

        Co-authored-by: zdtsw <[email protected]>

    commit 9845f7e
    Author: Wen Zhou <[email protected]>
    Date:   Thu Jan 23 14:07:25 2025 +0100

        update: various fix backport from RHOAI (opendatahub-io#1536)

        - fix missing RHOAI monitoring namespace for self-managed
        - fix wrong namespace name in  manifests
        - update hardcode label name
        - fix misleading log message

        Signed-off-by: Wen Zhou <[email protected]>

    commit 871c799
    Author: Wen Zhou <[email protected]>
    Date:   Thu Jan 23 13:21:29 2025 +0100

        fix: as a workaround for getting knative opreator check, set cache (opendatahub-io#1555)

        Signed-off-by: Wen Zhou <[email protected]>

    commit 28d0fa1
    Author: Wen Zhou <[email protected]>
    Date:   Thu Jan 23 11:49:37 2025 +0100

        fix: add missing namespace for console in managed cluster (opendatahub-io#1552)

        - blackbox require this
        - move into const in cluster pkg

        Signed-off-by: Wen Zhou <[email protected]>

    commit 5bcbaba
    Author: Luca Burgazzoli <[email protected]>
    Date:   Wed Jan 22 19:31:20 2025 +0100

        Avoid modelmesh and Kserve loop on updating shared CRDs (opendatahub-io#1547)

        The KServe and ModelMesh are shipping the same CRDs as part of
        their manifests but with different versions, this cause the
        respective component reconcilers to keep trying to install
        their respective version, ending in a infinite loop.

        This commit does not solve the underlying problem of having two
        components shipping the same CRDs with different versions, but
        avoids the infinite reconcile loop. The CRDs that is actually
        installed on the cluster is undefined, the latest one that is
        applied wins

    commit 8c7fef2
    Author: Luca Burgazzoli <[email protected]>
    Date:   Wed Jan 22 15:45:51 2025 +0100

        chore: remove unused code (opendatahub-io#1543)

        * chore: remove unused TrimToRFC1123Name function

        * chore: remove unused pkg/cluster/roles functions

        * chore: remove unused pkg/cluster/resources functions

    commit e83f2fc
    Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
    Date:   Wed Jan 22 13:49:00 2025 +0100

        Update version to 2.23.0 (opendatahub-io#1544)

        Co-authored-by: zdtsw <[email protected]>

    commit 21eba1b
    Author: Luca Burgazzoli <[email protected]>
    Date:   Wed Jan 22 12:38:49 2025 +0100

        chore: cleanup Monitoring's initialize action (opendatahub-io#1542)

        The Monitoring controller is initialized only when the platform is
        managed, hence there's no need to conditionally add manifests

    commit 5321b8c
    Author: Luca Burgazzoli <[email protected]>
    Date:   Wed Jan 22 11:05:23 2025 +0100

        fix: use Monitoring.Spec.Namespace instead of the DSCI one (opendatahub-io#1540)

        This reduce the direct dependency from Monitoring to DSCI
  • Loading branch information
ugiordan committed Jan 31, 2025
1 parent ecdb2dc commit 23b6445
Show file tree
Hide file tree
Showing 60 changed files with 1,378 additions and 23 deletions.
25 changes: 25 additions & 0 deletions apis/common/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,26 @@ type Status struct {
Conditions []metav1.Condition `json:"conditions,omitempty"`
}

// ComponentRelease represents the detailed status of a component release.
// +kubebuilder:object:generate=true
type ComponentRelease struct {
// +required
// +kubebuilder:validation:Required
Name string `json:"name"`
Version string `json:"version,omitempty"`
RepoURL string `json:"repoUrl,omitempty"`
}

// ComponentReleaseStatus tracks the list of component releases, including their name, version, and repository URL.
// +kubebuilder:object:generate=true
type ComponentReleaseStatus struct {
// +patchMergeKey=name
// +patchStrategy=merge
// +listType=map
// +listMapKey=name
Releases []ComponentRelease `json:"releases,omitempty"`
}

type WithStatus interface {
GetStatus() *Status
}
Expand All @@ -79,6 +99,11 @@ type WithDevFlags interface {
GetDevFlags() *DevFlags
}

type WithReleases interface {
GetReleaseStatus() *[]ComponentRelease
SetReleaseStatus(status []ComponentRelease)
}

type PlatformObject interface {
client.Object
WithStatus
Expand Down
35 changes: 35 additions & 0 deletions apis/common/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions apis/components/v1alpha1/codeflare_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ const (

// CodeFlareCommonStatus defines the shared observed state of CodeFlare
type CodeFlareCommonStatus struct {
common.ComponentReleaseStatus `json:",inline"`
}

// CodeFlareStatus defines the observed state of CodeFlare
Expand Down Expand Up @@ -70,6 +71,12 @@ func (c *CodeFlare) GetStatus() *common.Status {
return &c.Status.Status
}

func (c *CodeFlare) GetReleaseStatus() *[]common.ComponentRelease { return &c.Status.Releases }

func (c *CodeFlare) SetReleaseStatus(releases []common.ComponentRelease) {
c.Status.Releases = releases
}

func init() {
SchemeBuilder.Register(&CodeFlare{}, &CodeFlareList{})
}
Expand Down
9 changes: 9 additions & 0 deletions apis/components/v1alpha1/datasciencepipelines_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ type DataSciencePipelinesCommonSpec struct {

// DataSciencePipelinesCommonStatus defines the shared observed state of DataSciencePipelines
type DataSciencePipelinesCommonStatus struct {
common.ComponentReleaseStatus `json:",inline"`
}

// DataSciencePipelinesStatus defines the observed state of DataSciencePipelines
Expand All @@ -71,6 +72,14 @@ func (c *DataSciencePipelines) GetStatus() *common.Status {
return &c.Status.Status
}

func (c *DataSciencePipelines) GetReleaseStatus() *[]common.ComponentRelease {
return &c.Status.Releases
}

func (c *DataSciencePipelines) SetReleaseStatus(releases []common.ComponentRelease) {
c.Status.Releases = releases
}

// +kubebuilder:object:root=true

// DataSciencePipelinesList contains a list of DataSciencePipelines
Expand Down
11 changes: 10 additions & 1 deletion apis/components/v1alpha1/kserve_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ type KserveSpec struct {
type KserveCommonStatus struct {
// DefaultDeploymentMode is the value of the defaultDeploymentMode field
// as read from the "deploy" JSON in the inferenceservice-config ConfigMap
DefaultDeploymentMode string `json:"defaultDeploymentMode,omitempty"`
DefaultDeploymentMode string `json:"defaultDeploymentMode,omitempty"`
common.ComponentReleaseStatus `json:",inline"`
}

// KserveStatus defines the observed state of Kserve
Expand Down Expand Up @@ -109,6 +110,14 @@ func (c *Kserve) GetStatus() *common.Status {
return &c.Status.Status
}

func (c *Kserve) GetReleaseStatus() *[]common.ComponentRelease {
return &c.Status.Releases
}

func (c *Kserve) SetReleaseStatus(releases []common.ComponentRelease) {
c.Status.Releases = releases
}

// +kubebuilder:object:root=true

// KserveList contains a list of Kserve
Expand Down
8 changes: 8 additions & 0 deletions apis/components/v1alpha1/kueue_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ type KueueCommonSpec struct {

// KueueCommonStatus defines the shared observed state of Kueue
type KueueCommonStatus struct {
common.ComponentReleaseStatus `json:",inline"`
}

// KueueStatus defines the observed state of Kueue
Expand All @@ -80,10 +81,17 @@ func init() {
func (c *Kueue) GetDevFlags() *common.DevFlags {
return c.Spec.DevFlags
}

func (c *Kueue) GetStatus() *common.Status {
return &c.Status.Status
}

func (c *Kueue) GetReleaseStatus() *[]common.ComponentRelease { return &c.Status.Releases }

func (c *Kueue) SetReleaseStatus(releases []common.ComponentRelease) {
c.Status.Releases = releases
}

// DSCKueue contains all the configuration exposed in DSC instance for Kueue component
type DSCKueue struct {
common.ManagementSpec `json:",inline"`
Expand Down
10 changes: 10 additions & 0 deletions apis/components/v1alpha1/modelmeshserving_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ type ModelMeshServingCommonSpec struct {

// ModelMeshServingCommonStatus defines the shared observed state of ModelMeshServing
type ModelMeshServingCommonStatus struct {
common.ComponentReleaseStatus `json:",inline"`
}

// ModelMeshServingStatus defines the observed state of ModelMeshServing
Expand All @@ -80,10 +81,19 @@ func init() {
func (c *ModelMeshServing) GetDevFlags() *common.DevFlags {
return c.Spec.DevFlags
}

func (c *ModelMeshServing) GetStatus() *common.Status {
return &c.Status.Status
}

func (c *ModelMeshServing) GetReleaseStatus() *[]common.ComponentRelease {
return &c.Status.Releases
}

func (c *ModelMeshServing) SetReleaseStatus(releases []common.ComponentRelease) {
c.Status.Releases = releases
}

// DSCModelMeshServing contains all the configuration exposed in DSC instance for ModelMeshServing component
type DSCModelMeshServing struct {
common.ManagementSpec `json:",inline"`
Expand Down
11 changes: 10 additions & 1 deletion apis/components/v1alpha1/modelregistry_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ type ModelRegistrySpec struct {

// ModelRegistryCommonStatus defines the shared observed state of ModelRegistry
type ModelRegistryCommonStatus struct {
RegistriesNamespace string `json:"registriesNamespace,omitempty"`
RegistriesNamespace string `json:"registriesNamespace,omitempty"`
common.ComponentReleaseStatus `json:",inline"`
}

// ModelRegistryStatus defines the observed state of ModelRegistry
Expand Down Expand Up @@ -83,6 +84,14 @@ func (c *ModelRegistry) GetStatus() *common.Status {
return &c.Status.Status
}

func (c *ModelRegistry) GetReleaseStatus() *[]common.ComponentRelease {
return &c.Status.Releases
}

func (c *ModelRegistry) SetReleaseStatus(releases []common.ComponentRelease) {
c.Status.Releases = releases
}

// +kubebuilder:object:root=true

// ModelRegistryList contains a list of ModelRegistry
Expand Down
8 changes: 8 additions & 0 deletions apis/components/v1alpha1/ray_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ type RayCommonSpec struct {

// RayCommonStatus defines the shared observed state of Ray
type RayCommonStatus struct {
common.ComponentReleaseStatus `json:",inline"`
}

// RayStatus defines the observed state of Ray
Expand All @@ -80,10 +81,17 @@ func init() {
func (c *Ray) GetDevFlags() *common.DevFlags {
return c.Spec.DevFlags
}

func (c *Ray) GetStatus() *common.Status {
return &c.Status.Status
}

func (c *Ray) GetReleaseStatus() *[]common.ComponentRelease { return &c.Status.Releases }

func (c *Ray) SetReleaseStatus(releases []common.ComponentRelease) {
c.Status.Releases = releases
}

// DSCRay contains all the configuration exposed in DSC instance for Ray component
type DSCRay struct {
common.ManagementSpec `json:",inline"`
Expand Down
10 changes: 10 additions & 0 deletions apis/components/v1alpha1/trainingoperator_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ type TrainingOperatorCommonSpec struct {

// TrainingOperatorCommonStatus defines the shared observed state of TrainingOperator
type TrainingOperatorCommonStatus struct {
common.ComponentReleaseStatus `json:",inline"`
}

// TrainingOperatorStatus defines the observed state of TrainingOperator
Expand All @@ -80,10 +81,19 @@ func init() {
func (c *TrainingOperator) GetDevFlags() *common.DevFlags {
return c.Spec.DevFlags
}

func (c *TrainingOperator) GetStatus() *common.Status {
return &c.Status.Status
}

func (c *TrainingOperator) GetReleaseStatus() *[]common.ComponentRelease {
return &c.Status.Releases
}

func (c *TrainingOperator) SetReleaseStatus(releases []common.ComponentRelease) {
c.Status.Releases = releases
}

// DSCTrainingOperator contains all the configuration exposed in DSC instance for TrainingOperator component
type DSCTrainingOperator struct {
common.ManagementSpec `json:",inline"`
Expand Down
8 changes: 8 additions & 0 deletions apis/components/v1alpha1/trustyai_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ type TrustyAICommonSpec struct {

// TrustyAICommonStatus defines the shared observed state of TrustyAI
type TrustyAICommonStatus struct {
common.ComponentReleaseStatus `json:",inline"`
}

// TrustyAIStatus defines the observed state of TrustyAI
Expand All @@ -80,10 +81,17 @@ func init() {
func (c *TrustyAI) GetDevFlags() *common.DevFlags {
return c.Spec.DevFlags
}

func (c *TrustyAI) GetStatus() *common.Status {
return &c.Status.Status
}

func (c *TrustyAI) GetReleaseStatus() *[]common.ComponentRelease { return &c.Status.Releases }

func (c *TrustyAI) SetReleaseStatus(releases []common.ComponentRelease) {
c.Status.Releases = releases
}

// DSCTrustyAI contains all the configuration exposed in DSC instance for TrustyAI component
type DSCTrustyAI struct {
common.ManagementSpec `json:",inline"`
Expand Down
7 changes: 7 additions & 0 deletions apis/components/v1alpha1/workbenches_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ type WorkbenchesSpec struct {

// WorkbenchesCommonStatus defines the shared observed state of Workbenches
type WorkbenchesCommonStatus struct {
common.ComponentReleaseStatus `json:",inline"`
}

// WorkbenchesStatus defines the observed state of Workbenches
Expand Down Expand Up @@ -76,6 +77,12 @@ func (c *Workbenches) GetStatus() *common.Status {
return &c.Status.Status
}

func (c *Workbenches) GetReleaseStatus() *[]common.ComponentRelease { return &c.Status.Releases }

func (c *Workbenches) SetReleaseStatus(releases []common.ComponentRelease) {
c.Status.Releases = releases
}

// +kubebuilder:object:root=true

// WorkbenchesList contains a list of Workbenches
Expand Down
Loading

0 comments on commit 23b6445

Please sign in to comment.