Skip to content

Commit 455f618

Browse files
aviralsrivastava01Aviral Srivastava
andauthored
decimal value in memory (#890)
* decimal value in memory * decimal value in memory new Co-authored-by: Aviral Srivastava <[email protected]>
1 parent 42bb653 commit 455f618

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

pkg/pipeline/ChartService.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1040,7 +1040,7 @@ func (impl ChartServiceImpl) AppMetricsEnableDisable(appMetricRequest AppMetricE
10401040
return nil, err
10411041
}
10421042

1043-
const memoryPattern = `"100Mi" or "1Gi" or "1Ti"`
1043+
const memoryPattern = `"1000Mi" or "1Gi"`
10441044
const cpuPattern = `"50m" or "0.05"`
10451045
const cpu = "cpu"
10461046
const memory = "memory"

util/ValidatorHelper.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func validateAndBuildResourcesAssignment(dat map[string]interface{}, validationK
5050

5151
func MemoryToNumber(memory string) (float64, error) {
5252
if memoryParser == nil {
53-
pattern := "(\\d*e?\\d*)(Ei?|Pi?|Ti?|Gi?|Mi?|Ki?|$)"
53+
pattern := "([0-9.]+)(Ei?|Pi?|Ti?|Gi?|Mi?|Ki?|$)"
5454
re, _ := regexp.Compile(pattern)
5555
memoryParser = &resourceParser{
5656
name: "memory",
@@ -80,7 +80,7 @@ func CpuToNumber(cpu string) (float64, error) {
8080
return strconv.ParseFloat(cpu, 64)
8181
}
8282
if cpuParser == nil {
83-
pattern := "(\\d*e?\\d*)(m?)"
83+
pattern := "^([0-9.]+)(m?)"
8484
re, _ := regexp.Compile(pattern)
8585
cpuParser = &resourceParser{
8686
name: "cpu",
@@ -262,11 +262,11 @@ func AutoScale(dat map[string]interface{}) (bool, error) {
262262
var (
263263
CpuUnitChecker, _ = regexp.Compile("^([0-9.]+)m$")
264264
NoCpuUnitChecker, _ = regexp.Compile("^([0-9.]+)$")
265-
MiChecker, _ = regexp.Compile("^[0-9]+Mi$")
266-
GiChecker, _ = regexp.Compile("^[0-9]+Gi$")
267-
TiChecker, _ = regexp.Compile("^[0-9]+Ti$")
268-
PiChecker, _ = regexp.Compile("^[0-9]+Pi$")
269-
KiChecker, _ = regexp.Compile("^[0-9]+Ki$")
265+
MiChecker, _ = regexp.Compile("^[0-9.]+Mi$")
266+
GiChecker, _ = regexp.Compile("^[0-9.]+Gi$")
267+
TiChecker, _ = regexp.Compile("^[0-9.]+Ti$")
268+
PiChecker, _ = regexp.Compile("^[0-9.]+Pi$")
269+
KiChecker, _ = regexp.Compile("^[0-9.]+Ki$")
270270
)
271271

272272
func (f CpuChecker) IsFormat(input interface{}) bool {

0 commit comments

Comments
 (0)