Skip to content

Commit 0a8ed69

Browse files
Sara4994Sara4994
committed
restored parseParams methods and removed manager file
1 parent 89d0ef9 commit 0a8ed69

File tree

5 files changed

+58
-60
lines changed

5 files changed

+58
-60
lines changed

‎config/crd/bases/datasciencecluster.opendatahub.io_datascienceclusters.yaml

+22-22
Original file line numberDiff line numberDiff line change
@@ -655,9 +655,9 @@ spec:
655655
releases:
656656
items:
657657
properties:
658-
displayname:
658+
name:
659659
type: string
660-
repourl:
660+
repoURL:
661661
type: string
662662
version:
663663
type: string
@@ -669,9 +669,9 @@ spec:
669669
releases:
670670
items:
671671
properties:
672-
displayname:
672+
name:
673673
type: string
674-
repourl:
674+
repoURL:
675675
type: string
676676
version:
677677
type: string
@@ -683,9 +683,9 @@ spec:
683683
releases:
684684
items:
685685
properties:
686-
displayname:
686+
name:
687687
type: string
688-
repourl:
688+
repoURL:
689689
type: string
690690
version:
691691
type: string
@@ -697,9 +697,9 @@ spec:
697697
releases:
698698
items:
699699
properties:
700-
displayname:
700+
name:
701701
type: string
702-
repourl:
702+
repoURL:
703703
type: string
704704
version:
705705
type: string
@@ -711,9 +711,9 @@ spec:
711711
releases:
712712
items:
713713
properties:
714-
displayname:
714+
name:
715715
type: string
716-
repourl:
716+
repoURL:
717717
type: string
718718
version:
719719
type: string
@@ -725,9 +725,9 @@ spec:
725725
releases:
726726
items:
727727
properties:
728-
displayname:
728+
name:
729729
type: string
730-
repourl:
730+
repoURL:
731731
type: string
732732
version:
733733
type: string
@@ -741,9 +741,9 @@ spec:
741741
releases:
742742
items:
743743
properties:
744-
displayname:
744+
name:
745745
type: string
746-
repourl:
746+
repoURL:
747747
type: string
748748
version:
749749
type: string
@@ -755,9 +755,9 @@ spec:
755755
releases:
756756
items:
757757
properties:
758-
displayname:
758+
name:
759759
type: string
760-
repourl:
760+
repoURL:
761761
type: string
762762
version:
763763
type: string
@@ -769,9 +769,9 @@ spec:
769769
releases:
770770
items:
771771
properties:
772-
displayname:
772+
name:
773773
type: string
774-
repourl:
774+
repoURL:
775775
type: string
776776
version:
777777
type: string
@@ -783,9 +783,9 @@ spec:
783783
releases:
784784
items:
785785
properties:
786-
displayname:
786+
name:
787787
type: string
788-
repourl:
788+
repoURL:
789789
type: string
790790
version:
791791
type: string
@@ -797,9 +797,9 @@ spec:
797797
releases:
798798
items:
799799
properties:
800-
displayname:
800+
name:
801801
type: string
802-
repourl:
802+
repoURL:
803803
type: string
804804
version:
805805
type: string

‎controllers/status/status.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -218,9 +218,9 @@ func RemoveComponentCondition(conditions *[]conditionsv1.Condition, component st
218218

219219
// +k8s:deepcopy-gen=true
220220
type ComponentReleaseStatus struct {
221-
DisplayName string `json:"displayname,omitempty"`
222-
Version version.OperatorVersion `json:"version,omitempty"`
223-
RepoURL string `json:"repourl,omitempty"`
221+
Name string `json:"name,omitempty"`
222+
Version version.OperatorVersion `json:"version,omitempty"`
223+
RepoURL string `json:"repoURL,omitempty"`
224224
}
225225

226226
// +k8s:deepcopy-gen=true
@@ -306,20 +306,20 @@ type ReleaseFileMeta struct {
306306

307307
// +k8s:deepcopy-gen=true
308308
type ComponentReleaseStatusMeta struct {
309-
DisplayName string `yaml:"displayname,omitempty"`
310-
Version string `yaml:"version,omitempty"`
311-
RepoURL string `yaml:"repourl,omitempty"`
309+
Name string `yaml:"name,omitempty"`
310+
Version string `yaml:"version,omitempty"`
311+
RepoURL string `yaml:"repoURL,omitempty"`
312312
}
313313

314-
// GetReleaseVersion read .env file and parse env variables delimiter by "=".
314+
// GetReleaseVersion reads odh_metadata.yaml file and parses release information.
315315
// If version is not set or set to "", return empty {}.
316316
func GetReleaseVersion(defaultManifestPath string, componentName string) ComponentStatus {
317317
var componentVersion semver.Version
318318
var releaseInfo ReleaseFileMeta
319319
var releaseStatus ComponentReleaseStatus
320320
componentReleaseStatus := make([]ComponentReleaseStatus, 0)
321321

322-
yamlData, err := os.ReadFile(filepath.Join(defaultManifestPath, componentName, "releases.yaml"))
322+
yamlData, err := os.ReadFile(filepath.Join(defaultManifestPath, componentName, "odh_metadata.yaml"))
323323
if err != nil {
324324
return ComponentStatus{}
325325
}
@@ -337,9 +337,9 @@ func GetReleaseVersion(defaultManifestPath string, componentName string) Compone
337337
}
338338

339339
releaseStatus = ComponentReleaseStatus{
340-
DisplayName: release.DisplayName,
341-
Version: version.OperatorVersion{Version: componentVersion},
342-
RepoURL: release.RepoURL,
340+
Name: release.Name,
341+
Version: version.OperatorVersion{Version: componentVersion},
342+
RepoURL: release.RepoURL,
343343
}
344344
componentReleaseStatus = append(componentReleaseStatus, releaseStatus)
345345
}

‎manager

-65.7 MB
Binary file not shown.

‎pkg/common/common.go

-24
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ limitations under the License.
1919
package common
2020

2121
import (
22-
"bufio"
2322
"crypto/sha256"
2423
b64 "encoding/base64"
2524
"fmt"
@@ -117,26 +116,3 @@ func GetMonitoringData(data string) (string, error) {
117116

118117
return encodedData, nil
119118
}
120-
121-
func ParseParams(fileName string) (map[string]string, error) {
122-
paramsEnv, err := os.Open(fileName)
123-
if err != nil {
124-
return nil, err
125-
}
126-
defer paramsEnv.Close()
127-
128-
paramsEnvMap := make(map[string]string)
129-
scanner := bufio.NewScanner(paramsEnv)
130-
for scanner.Scan() {
131-
line := scanner.Text()
132-
parts := strings.SplitN(line, "=", 2)
133-
if len(parts) == 2 {
134-
paramsEnvMap[parts[0]] = parts[1]
135-
}
136-
}
137-
if err := scanner.Err(); err != nil {
138-
return nil, err
139-
}
140-
141-
return paramsEnvMap, nil
142-
}

‎pkg/deploy/envParams.go

+25-3
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,32 @@ import (
55
"fmt"
66
"os"
77
"path/filepath"
8-
9-
"github.com/opendatahub-io/opendatahub-operator/v2/pkg/common"
8+
"strings"
109
)
1110

11+
func parseParams(fileName string) (map[string]string, error) {
12+
paramsEnv, err := os.Open(fileName)
13+
if err != nil {
14+
return nil, err
15+
}
16+
defer paramsEnv.Close()
17+
18+
paramsEnvMap := make(map[string]string)
19+
scanner := bufio.NewScanner(paramsEnv)
20+
for scanner.Scan() {
21+
line := scanner.Text()
22+
parts := strings.SplitN(line, "=", 2)
23+
if len(parts) == 2 {
24+
paramsEnvMap[parts[0]] = parts[1]
25+
}
26+
}
27+
if err := scanner.Err(); err != nil {
28+
return nil, err
29+
}
30+
31+
return paramsEnvMap, nil
32+
}
33+
1234
func writeParamsToTmp(params map[string]string, tmpDir string) (string, error) {
1335
tmp, err := os.CreateTemp(tmpDir, "params.env-")
1436
if err != nil {
@@ -54,7 +76,7 @@ func ApplyParams(componentPath string, imageParamsMap map[string]string, extraPa
5476
paramsFile := filepath.Join(componentPath, "params.env")
5577
// Require params.env at the root folder
5678

57-
paramsEnvMap, err := common.ParseParams(paramsFile)
79+
paramsEnvMap, err := parseParams(paramsFile)
5880
if err != nil {
5981
if os.IsNotExist(err) {
6082
// params.env doesn't exist, do not apply any changes

0 commit comments

Comments
 (0)