Skip to content

Commit 3abb7f0

Browse files
committed
minor fixes in space-cli list command
1 parent 8e16661 commit 3abb7f0

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

space-cli/cmd/modules/operations/update.go

+1-6
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,12 @@ func Update(setValuesFlag, valuesYamlFile, chartLocation string) error {
3939
return err
4040
}
4141

42-
// override the clusterId
43-
value, ok := valuesFileObj["clusterId"]
44-
if ok {
45-
return fmt.Errorf("you cannot set a new cluster id (%s) while upgrading an existing cluster, revmove the value & try again", value)
46-
}
47-
4842
// set clusterId of existing cluster
4943
charInfo, err := utils.HelmGet(clusterID)
5044
if err != nil {
5145
return err
5246
}
47+
5348
valuesFileObj["clusterId"] = charInfo.Config["clusterId"]
5449

5550
_, err = utils.HelmUpgrade(clusterID, chartLocation, model.HelmSpaceCloudChartDownloadURL, "", valuesFileObj)

space-cli/cmd/utils/helm.go

+8-2
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,19 @@ func HelmList(filterRegex string) ([]*release.Release, error) {
8080
return nil, err
8181
}
8282
lCli := action.NewList(actionConfig)
83-
lCli.Filter = filterRegex
8483
list, err := lCli.Run()
8584
if err != nil {
8685
return nil, err
8786
}
8887

89-
return list, nil
88+
filteredList := make([]*release.Release, 0)
89+
for _, item := range list {
90+
if strings.Contains(item.Namespace, filterRegex) {
91+
filteredList = append(filteredList, item)
92+
}
93+
}
94+
95+
return filteredList, nil
9096
}
9197

9298
// HelmUpgrade upgrade space cloud chart

0 commit comments

Comments
 (0)