@@ -20,6 +20,7 @@ package status
20
20
21
21
import (
22
22
"path/filepath"
23
+ "strings"
23
24
24
25
"github.com/blang/semver/v4"
25
26
conditionsv1 "github.com/openshift/custom-resource-status/conditions/v1"
@@ -306,29 +307,37 @@ func GetReleaseVersion(defaultManifestPath string, componentName string) Compone
306
307
var componentVersion semver.Version
307
308
var repositoryURL string
308
309
var displayName string
310
+ var componentStatusMeta ComponentReleaseStatus
311
+ var componentsReleaseStatus []ComponentReleaseStatus
309
312
310
313
env , err := common .ParseParams (filepath .Join (defaultManifestPath , componentName , ".env" ))
311
314
312
315
if err != nil {
313
316
return ComponentStatus {}
314
317
}
315
-
316
- componentVersion , err = semver .Parse (env ["RHOAI_RELEASE_VERSION" ])
317
-
318
- if err != nil {
319
- return ComponentStatus {}
320
- }
321
- repositoryURL = env ["REPOSITORY_URL" ]
322
-
323
- displayName = env ["DISPLAY_NAME" ]
324
-
325
- return ComponentStatus {
326
- Releases : []ComponentReleaseStatus {{
318
+ for key , value := range env {
319
+ switch {
320
+ case strings .Contains (key , "release-version" ):
321
+ componentVersion , err = semver .Parse (value )
322
+
323
+ if err != nil {
324
+ return ComponentStatus {}
325
+ }
326
+ case strings .Contains (key , "repository-url" ):
327
+ repositoryURL = value
328
+ case strings .Contains (key , "display-name" ):
329
+ displayName = value
330
+ }
331
+ componentStatusMeta = ComponentReleaseStatus {
327
332
Name : componentName ,
328
333
DisplayName : displayName ,
329
334
Version : version.OperatorVersion {Version : componentVersion },
330
335
RepoURL : repositoryURL ,
331
- },
332
- },
336
+ }
337
+ }
338
+ componentsReleaseStatus = append (componentsReleaseStatus , componentStatusMeta )
339
+
340
+ return ComponentStatus {
341
+ Releases : componentsReleaseStatus ,
333
342
}
334
343
}
0 commit comments