Skip to content

Commit 6600709

Browse files
committed
support to read multiple upstreams
1 parent 29ef355 commit 6600709

File tree

1 file changed

+23
-14
lines changed

1 file changed

+23
-14
lines changed

controllers/status/status.go

+23-14
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ package status
2020

2121
import (
2222
"path/filepath"
23+
"strings"
2324

2425
"github.com/blang/semver/v4"
2526
conditionsv1 "github.com/openshift/custom-resource-status/conditions/v1"
@@ -306,29 +307,37 @@ func GetReleaseVersion(defaultManifestPath string, componentName string) Compone
306307
var componentVersion semver.Version
307308
var repositoryURL string
308309
var displayName string
310+
var componentStatusMeta ComponentReleaseStatus
311+
var componentsReleaseStatus []ComponentReleaseStatus
309312

310313
env, err := common.ParseParams(filepath.Join(defaultManifestPath, componentName, ".env"))
311314

312315
if err != nil {
313316
return ComponentStatus{}
314317
}
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{
327332
Name: componentName,
328333
DisplayName: displayName,
329334
Version: version.OperatorVersion{Version: componentVersion},
330335
RepoURL: repositoryURL,
331-
},
332-
},
336+
}
337+
}
338+
componentsReleaseStatus = append(componentsReleaseStatus, componentStatusMeta)
339+
340+
return ComponentStatus{
341+
Releases: componentsReleaseStatus,
333342
}
334343
}

0 commit comments

Comments
 (0)