Merge branch 'develop'

Conflicts:
	cli/cmd/tap.go
This commit is contained in:
RamiBerm
2021-07-14 09:06:40 +03:00
6 changed files with 14 additions and 13 deletions

View File

@@ -78,7 +78,7 @@ func (provider *Provider) CreateMizuAggregatorPod(ctx context.Context, namespace
return nil, err
}
cpuLimit, err := resource.ParseQuantity("750")
cpuLimit, err := resource.ParseQuantity("750m")
if err != nil {
return nil, errors.New("invalid cpu limit for aggregator container")
}