@@ -20,7 +20,6 @@ package status
20
20
21
21
import (
22
22
"path/filepath"
23
- "strings"
24
23
25
24
"github.com/blang/semver/v4"
26
25
conditionsv1 "github.com/openshift/custom-resource-status/conditions/v1"
@@ -307,37 +306,29 @@ func GetReleaseVersion(defaultManifestPath string, componentName string) Compone
307
306
var componentVersion semver.Version
308
307
var repositoryURL string
309
308
var displayName string
310
- var componentStatusMeta ComponentReleaseStatus
311
- var componentsReleaseStatus []ComponentReleaseStatus
312
309
313
310
env , err := common .ParseParams (filepath .Join (defaultManifestPath , componentName , ".env" ))
314
311
315
312
if err != nil {
316
313
return ComponentStatus {}
317
314
}
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 {
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 {{
332
327
Name : componentName ,
333
328
DisplayName : displayName ,
334
329
Version : version.OperatorVersion {Version : componentVersion },
335
330
RepoURL : repositoryURL ,
336
- }
337
- }
338
- componentsReleaseStatus = append (componentsReleaseStatus , componentStatusMeta )
339
-
340
- return ComponentStatus {
341
- Releases : componentsReleaseStatus ,
331
+ },
332
+ },
342
333
}
343
334
}
0 commit comments