Skip to content

Commit 13f55fd

Browse files
Sara4994Sara4994
committed
GetReleaseStatus function refactor
1 parent 0a8ed69 commit 13f55fd

File tree

14 files changed

+183
-108
lines changed

14 files changed

+183
-108
lines changed

‎components/codeflare/codeflare.go

+16-9
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,24 @@ func (c *CodeFlare) GetComponentName() string {
7272
return ComponentName
7373
}
7474

75-
func (c *CodeFlare) UpdateStatus(in *status.ComponentsStatus) {
76-
enabled := c.GetManagementState() == operatorv1.Managed
77-
if enabled {
78-
codeFlareStatus := status.GetReleaseVersion(deploy.DefaultManifestPath, ComponentName)
79-
80-
in.CodeFlare = &status.CodeFlareStatus{
81-
ComponentStatus: codeFlareStatus,
82-
}
83-
} else {
75+
func (c *CodeFlare) UpdateStatus(in *status.ComponentsStatus) error {
76+
if c.GetManagementState() != operatorv1.Managed {
8477
in.CodeFlare = nil
78+
return nil
8579
}
80+
81+
releases, err := status.GetReleaseStatus(deploy.DefaultManifestPath, ComponentName)
82+
83+
if err != nil {
84+
return err
85+
}
86+
87+
in.CodeFlare = &status.CodeFlareStatus{
88+
ComponentStatus: status.ComponentStatus{
89+
Releases: releases,
90+
},
91+
}
92+
return nil
8693
}
8794

8895
func (c *CodeFlare) ReconcileComponent(ctx context.Context,

‎components/component.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ type ComponentInterface interface {
8787
owner metav1.Object, DSCISpec *dsciv1.DSCInitializationSpec, platform cluster.Platform, currentComponentStatus bool) error
8888
Cleanup(ctx context.Context, cli client.Client, owner metav1.Object, DSCISpec *dsciv1.DSCInitializationSpec) error
8989
GetComponentName() string
90-
UpdateStatus(status *status.ComponentsStatus)
90+
UpdateStatus(status *status.ComponentsStatus) error
9191
GetManagementState() operatorv1.ManagementState
9292
OverrideManifests(ctx context.Context, platform cluster.Platform) error
9393
UpdatePrometheusConfig(cli client.Client, logger logr.Logger, enable bool, component string) error

‎components/dashboard/dashboard.go

+7-6
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,15 @@ func (d *Dashboard) GetComponentName() string {
8383
return ComponentNameUpstream
8484
}
8585

86-
func (d *Dashboard) UpdateStatus(in *status.ComponentsStatus) {
87-
enabled := d.GetManagementState() == operatorv1.Managed
88-
89-
if enabled {
90-
in.Dashboard = &status.DashboardStatus{}
91-
} else {
86+
func (d *Dashboard) UpdateStatus(in *status.ComponentsStatus) error {
87+
if d.GetManagementState() != operatorv1.Managed {
9288
in.Dashboard = nil
89+
return nil
9390
}
91+
92+
in.Dashboard = &status.DashboardStatus{}
93+
94+
return nil
9495
}
9596

9697
func (d *Dashboard) ReconcileComponent(ctx context.Context,

‎components/datasciencepipelines/datasciencepipelines.go

+16-9
Original file line numberDiff line numberDiff line change
@@ -92,17 +92,24 @@ func (d *DataSciencePipelines) GetComponentName() string {
9292
return ComponentName
9393
}
9494

95-
func (d *DataSciencePipelines) UpdateStatus(in *status.ComponentsStatus) {
96-
enabled := d.GetManagementState() == operatorv1.Managed
97-
if enabled {
98-
dataSciencePipelinesStatus := status.GetReleaseVersion(deploy.DefaultManifestPath, ComponentName)
99-
100-
in.DataSciencePipelines = &status.DataSciencePipelinesStatus{
101-
ComponentStatus: dataSciencePipelinesStatus,
102-
}
103-
} else {
95+
func (d *DataSciencePipelines) UpdateStatus(in *status.ComponentsStatus) error {
96+
if d.GetManagementState() != operatorv1.Managed {
10497
in.DataSciencePipelines = nil
98+
return nil
99+
}
100+
101+
releases, err := status.GetReleaseStatus(deploy.DefaultManifestPath, ComponentName)
102+
103+
if err != nil {
104+
return err
105105
}
106+
107+
in.DataSciencePipelines = &status.DataSciencePipelinesStatus{
108+
ComponentStatus: status.ComponentStatus{
109+
Releases: releases,
110+
},
111+
}
112+
return nil
106113
}
107114

108115
func (d *DataSciencePipelines) ReconcileComponent(ctx context.Context,

‎components/kserve/kserve.go

+16-9
Original file line numberDiff line numberDiff line change
@@ -111,17 +111,24 @@ func (k *Kserve) GetComponentName() string {
111111
return ComponentName
112112
}
113113

114-
func (k *Kserve) UpdateStatus(in *status.ComponentsStatus) {
115-
enabled := k.GetManagementState() == operatorv1.Managed
116-
if enabled {
117-
kserveStatus := status.GetReleaseVersion(deploy.DefaultManifestPath, ComponentName)
118-
119-
in.Kserve = &status.KserveStatus{
120-
ComponentStatus: kserveStatus,
121-
}
122-
} else {
114+
func (k *Kserve) UpdateStatus(in *status.ComponentsStatus) error {
115+
if k.GetManagementState() != operatorv1.Managed {
123116
in.Kserve = nil
117+
return nil
124118
}
119+
120+
releases, err := status.GetReleaseStatus(deploy.DefaultManifestPath, ComponentName)
121+
122+
if err != nil {
123+
return err
124+
}
125+
126+
in.Kserve = &status.KserveStatus{
127+
ComponentStatus: status.ComponentStatus{
128+
Releases: releases,
129+
},
130+
}
131+
return nil
125132
}
126133

127134
func (k *Kserve) ReconcileComponent(ctx context.Context, cli client.Client,

‎components/kueue/kueue.go

+16-9
Original file line numberDiff line numberDiff line change
@@ -68,17 +68,24 @@ func (k *Kueue) GetComponentName() string {
6868
return ComponentName
6969
}
7070

71-
func (k *Kueue) UpdateStatus(in *status.ComponentsStatus) {
72-
enabled := k.GetManagementState() == operatorv1.Managed
73-
if enabled {
74-
kueueStatus := status.GetReleaseVersion(deploy.DefaultManifestPath, ComponentName)
75-
76-
in.Kueue = &status.KueueStatus{
77-
ComponentStatus: kueueStatus,
78-
}
79-
} else {
71+
func (k *Kueue) UpdateStatus(in *status.ComponentsStatus) error {
72+
if k.GetManagementState() != operatorv1.Managed {
8073
in.Kueue = nil
74+
return nil
75+
}
76+
77+
releases, err := status.GetReleaseStatus(deploy.DefaultManifestPath, ComponentName)
78+
79+
if err != nil {
80+
return err
8181
}
82+
83+
in.Kueue = &status.KueueStatus{
84+
ComponentStatus: status.ComponentStatus{
85+
Releases: releases,
86+
},
87+
}
88+
return nil
8289
}
8390

8491
func (k *Kueue) ReconcileComponent(ctx context.Context, cli client.Client,

‎components/modelmeshserving/modelmeshserving.go

+16-9
Original file line numberDiff line numberDiff line change
@@ -101,17 +101,24 @@ func (m *ModelMeshServing) GetComponentName() string {
101101
return ComponentName
102102
}
103103

104-
func (m *ModelMeshServing) UpdateStatus(in *status.ComponentsStatus) {
105-
enabled := m.GetManagementState() == operatorv1.Managed
106-
if enabled {
107-
modelMeshServingStatus := status.GetReleaseVersion(deploy.DefaultManifestPath, ComponentName)
108-
109-
in.ModelMeshServing = &status.ModelMeshServingStatus{
110-
ComponentStatus: modelMeshServingStatus,
111-
}
112-
} else {
104+
func (m *ModelMeshServing) UpdateStatus(in *status.ComponentsStatus) error {
105+
if m.GetManagementState() != operatorv1.Managed {
113106
in.ModelMeshServing = nil
107+
return nil
108+
}
109+
110+
releases, err := status.GetReleaseStatus(deploy.DefaultManifestPath, ComponentName)
111+
112+
if err != nil {
113+
return err
114114
}
115+
116+
in.ModelMeshServing = &status.ModelMeshServingStatus{
117+
ComponentStatus: status.ComponentStatus{
118+
Releases: releases,
119+
},
120+
}
121+
return nil
115122
}
116123

117124
func (m *ModelMeshServing) ReconcileComponent(ctx context.Context,

‎components/modelregistry/modelregistry.go

+16-10
Original file line numberDiff line numberDiff line change
@@ -97,18 +97,24 @@ func (m *ModelRegistry) GetComponentName() string {
9797
return ComponentName
9898
}
9999

100-
func (m *ModelRegistry) UpdateStatus(in *status.ComponentsStatus) {
101-
enabled := m.GetManagementState() == operatorv1.Managed
102-
if enabled {
103-
modelRegistryStatus := status.GetReleaseVersion(deploy.DefaultManifestPath, ComponentName)
100+
func (m *ModelRegistry) UpdateStatus(in *status.ComponentsStatus) error {
101+
if m.GetManagementState() != operatorv1.Managed {
102+
in.ModelRegistry = nil
103+
return nil
104+
}
104105

105-
in.ModelRegistry = &status.ModelRegistryStatus{
106-
ComponentStatus: modelRegistryStatus,
107-
RegistriesNamespace: m.RegistriesNamespace,
108-
}
109-
} else {
110-
in.ModelRegistry = &status.ModelRegistryStatus{}
106+
releases, err := status.GetReleaseStatus(deploy.DefaultManifestPath, ComponentName)
107+
108+
if err != nil {
109+
return err
110+
}
111+
112+
in.ModelRegistry = &status.ModelRegistryStatus{
113+
ComponentStatus: status.ComponentStatus{
114+
Releases: releases,
115+
},
111116
}
117+
return nil
112118
}
113119

114120
func (m *ModelRegistry) ReconcileComponent(ctx context.Context, cli client.Client,

‎components/ray/ray.go

+16-9
Original file line numberDiff line numberDiff line change
@@ -69,17 +69,24 @@ func (r *Ray) GetComponentName() string {
6969
return ComponentName
7070
}
7171

72-
func (r *Ray) UpdateStatus(in *status.ComponentsStatus) {
73-
enabled := r.GetManagementState() == operatorv1.Managed
74-
if enabled {
75-
rayStatus := status.GetReleaseVersion(deploy.DefaultManifestPath, ComponentName)
76-
77-
in.Ray = &status.RayStatus{
78-
ComponentStatus: rayStatus,
79-
}
80-
} else {
72+
func (r *Ray) UpdateStatus(in *status.ComponentsStatus) error {
73+
if r.GetManagementState() != operatorv1.Managed {
8174
in.Ray = nil
75+
return nil
76+
}
77+
78+
releases, err := status.GetReleaseStatus(deploy.DefaultManifestPath, ComponentName)
79+
80+
if err != nil {
81+
return err
8282
}
83+
84+
in.Ray = &status.RayStatus{
85+
ComponentStatus: status.ComponentStatus{
86+
Releases: releases,
87+
},
88+
}
89+
return nil
8390
}
8491

8592
func (r *Ray) ReconcileComponent(ctx context.Context, cli client.Client,

‎components/trainingoperator/trainingoperator.go

+16-9
Original file line numberDiff line numberDiff line change
@@ -70,17 +70,24 @@ func (r *TrainingOperator) GetComponentName() string {
7070
return ComponentName
7171
}
7272

73-
func (r *TrainingOperator) UpdateStatus(in *status.ComponentsStatus) {
74-
enabled := r.GetManagementState() == operatorv1.Managed
75-
if enabled {
76-
trainingOperatorStatus := status.GetReleaseVersion(deploy.DefaultManifestPath, ComponentName)
77-
78-
in.TrainingOperator = &status.TrainingOperatorStatus{
79-
ComponentStatus: trainingOperatorStatus,
80-
}
81-
} else {
73+
func (r *TrainingOperator) UpdateStatus(in *status.ComponentsStatus) error {
74+
if r.GetManagementState() != operatorv1.Managed {
8275
in.TrainingOperator = nil
76+
return nil
8377
}
78+
79+
releases, err := status.GetReleaseStatus(deploy.DefaultManifestPath, ComponentName)
80+
81+
if err != nil {
82+
return err
83+
}
84+
85+
in.TrainingOperator = &status.TrainingOperatorStatus{
86+
ComponentStatus: status.ComponentStatus{
87+
Releases: releases,
88+
},
89+
}
90+
return nil
8491
}
8592

8693
func (r *TrainingOperator) ReconcileComponent(ctx context.Context, cli client.Client,

‎components/trustyai/trustyai.go

+16-9
Original file line numberDiff line numberDiff line change
@@ -79,17 +79,24 @@ func (t *TrustyAI) GetComponentName() string {
7979
return ComponentName
8080
}
8181

82-
func (t *TrustyAI) UpdateStatus(in *status.ComponentsStatus) {
83-
enabled := t.GetManagementState() == operatorv1.Managed
84-
if enabled {
85-
trustyAIStatus := status.GetReleaseVersion(deploy.DefaultManifestPath, ComponentName)
86-
87-
in.TrustyAI = &status.TrustyAIStatus{
88-
ComponentStatus: trustyAIStatus,
89-
}
90-
} else {
82+
func (t *TrustyAI) UpdateStatus(in *status.ComponentsStatus) error {
83+
if t.GetManagementState() != operatorv1.Managed {
9184
in.TrustyAI = nil
85+
return nil
9286
}
87+
88+
releases, err := status.GetReleaseStatus(deploy.DefaultManifestPath, ComponentName)
89+
90+
if err != nil {
91+
return err
92+
}
93+
94+
in.TrustyAI = &status.TrustyAIStatus{
95+
ComponentStatus: status.ComponentStatus{
96+
Releases: releases,
97+
},
98+
}
99+
return nil
93100
}
94101

95102
func (t *TrustyAI) ReconcileComponent(ctx context.Context, cli client.Client,

‎components/workbenches/workbenches.go

+16-9
Original file line numberDiff line numberDiff line change
@@ -111,17 +111,24 @@ func (w *Workbenches) GetComponentName() string {
111111
return ComponentName
112112
}
113113

114-
func (w *Workbenches) UpdateStatus(in *status.ComponentsStatus) {
115-
enabled := w.GetManagementState() == operatorv1.Managed
116-
if enabled {
117-
workbenchesStatus := status.GetReleaseVersion(deploy.DefaultManifestPath, ComponentName)
118-
119-
in.Workbenches = &status.WorkbenchesStatus{
120-
ComponentStatus: workbenchesStatus,
121-
}
122-
} else {
114+
func (w *Workbenches) UpdateStatus(in *status.ComponentsStatus) error {
115+
if w.GetManagementState() != operatorv1.Managed {
123116
in.Workbenches = nil
117+
return nil
124118
}
119+
120+
releases, err := status.GetReleaseStatus(deploy.DefaultManifestPath, ComponentName)
121+
122+
if err != nil {
123+
return err
124+
}
125+
126+
in.Workbenches = &status.WorkbenchesStatus{
127+
ComponentStatus: status.ComponentStatus{
128+
Releases: releases,
129+
},
130+
}
131+
return nil
125132
}
126133

127134
func (w *Workbenches) ReconcileComponent(ctx context.Context, cli client.Client,

‎controllers/datasciencecluster/datasciencecluster_controller.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,11 @@ func (r *DataScienceClusterReconciler) reconcileSubComponent(ctx context.Context
337337
saved.Status.InstalledComponents = make(map[string]bool)
338338
}
339339
saved.Status.InstalledComponents[componentName] = enabled
340-
component.UpdateStatus(&saved.Status.Components)
340+
err := component.UpdateStatus(&saved.Status.Components)
341+
342+
if err != nil {
343+
r.reportError(ctx, err, instance, "failed to update DataScienceCluster status after reconciling "+componentName)
344+
}
341345
if enabled {
342346
status.SetComponentCondition(&saved.Status.Conditions, componentName, status.ReconcileCompleted, "Component reconciled successfully", corev1.ConditionTrue)
343347
} else {

0 commit comments

Comments
 (0)