Skip to content

Commit 7e694ae

Browse files
committed
Increase memory resource from 9126 to 10752
With Openshift-4.15, OVN-K require extra 1.5G mem resource we need to increase that otherwise cluster doesn't comeup correctly.
1 parent 8bd4b78 commit 7e694ae

8 files changed

Lines changed: 20 additions & 20 deletions

File tree

docs/modules/getting_started/partials/proc_configuring-the-instance.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Values for available memory are set in mebibytes (MiB).
4141
One gibibyte (GiB) of memory is equal to 1024 MiB.
4242
====
4343
+
44-
The default value for the `memory` property is `9216`.
44+
The default value for the `memory` property is `10752`.
4545
The amount of memory to assign must be greater than or equal to the default.
4646
4747
* To start the instance with the desired amount of memory:

pkg/crc/api/api_client_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ func TestConfigGetMultiple(t *testing.T) {
223223
apiClient.GetConfigResult{
224224
Configs: map[string]interface{}{
225225
"cpus": float64(4),
226-
"memory": float64(9216),
226+
"memory": float64(10752),
227227
},
228228
},
229229
configGetMultiplePropertyResult,

pkg/crc/config/settings_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ func TestSetPreset(t *testing.T) {
7878

7979
_, err = cfg.Set(Preset, crcpreset.Podman)
8080
require.NoError(t, err)
81-
_, err = cfg.Set(Memory, 10000)
81+
_, err = cfg.Set(Memory, 10800)
8282
require.NoError(t, err)
8383
assert.Equal(t, SettingValue{
84-
Value: 10000,
84+
Value: 10800,
8585
Invalid: false,
8686
IsDefault: false,
8787
IsSecret: false,
@@ -99,7 +99,7 @@ func TestSetPreset(t *testing.T) {
9999
_, err = cfg.Set(Preset, crcpreset.OpenShift)
100100
require.NoError(t, err)
101101
assert.Equal(t, SettingValue{
102-
Value: 10000,
102+
Value: 10800,
103103
Invalid: false,
104104
IsDefault: false,
105105
IsSecret: false,
@@ -120,10 +120,10 @@ func TestUnsetPreset(t *testing.T) {
120120

121121
_, err = cfg.Set(Preset, crcpreset.Podman)
122122
require.NoError(t, err)
123-
_, err = cfg.Set(Memory, 10000)
123+
_, err = cfg.Set(Memory, 10800)
124124
require.NoError(t, err)
125125
assert.Equal(t, SettingValue{
126-
Value: 10000,
126+
Value: 10800,
127127
Invalid: false,
128128
IsDefault: false,
129129
IsSecret: false,
@@ -147,7 +147,7 @@ func TestUnsetPreset(t *testing.T) {
147147
IsSecret: false,
148148
}, cfg.Get(Preset))
149149
assert.Equal(t, SettingValue{
150-
Value: 10000,
150+
Value: 10800,
151151
Invalid: false,
152152
IsDefault: false,
153153
IsSecret: false,

pkg/crc/constants/constants.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,14 +216,14 @@ func GetDefaultCPUs(preset crcpreset.Preset) int {
216216
func GetDefaultMemory(preset crcpreset.Preset) int {
217217
switch preset {
218218
case crcpreset.OpenShift, crcpreset.OKD:
219-
return 9216
219+
return 10752
220220
case crcpreset.Podman:
221221
return 2048
222222
case crcpreset.Microshift:
223223
return 4096
224224
default:
225225
// should not be reached
226-
return 9216
226+
return 10752
227227
}
228228
}
229229

pkg/libmachine/host/migrate_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ func TestLoadHost(t *testing.T) {
1717
"IPAddress": "192.168.130.11",
1818
"MachineName": "crc",
1919
"BundleName": "crc_libvirt_4.6.6.crcbundle",
20-
"Memory": 9216,
20+
"Memory": 10752,
2121
"CPU": 4
2222
}`
2323

test/e2e/features/config.feature

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,23 @@ Feature: Test configuration settings
1919
Examples: Config settings on Mac
2020
| property | value1 | value2 |
2121
| cpus | 5 | 3 |
22-
| memory | 9217 | 4096 |
22+
| memory | 10753 | 4096 |
2323
| nameserver | 120.0.0.1 | 999.999.999.999 |
2424
| pull-secret-file | /etc | /nonexistent-file |
2525

2626
@linux
2727
Examples: Config settings on Linux
2828
| property | value1 | value2 |
2929
| cpus | 5 | 3 |
30-
| memory | 9217 | 4096 |
30+
| memory | 10753 | 4096 |
3131
| nameserver | 120.0.0.1 | 999.999.999.999 |
3232
| pull-secret-file | /etc | /nonexistent-file |
3333

3434
@windows
3535
Examples: Config settings on Windows
3636
| property | value1 | value2 |
3737
| cpus | 5 | 3 |
38-
| memory | 9217 | 4096 |
38+
| memory | 10753 | 4096 |
3939
| nameserver | 120.0.0.1 | 999.999.999.999 |
4040
| pull-secret-file | /Users | /nonexistent-file |
4141

test/integration/proxy_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ var _ = Describe("", Serial, Ordered, Label("openshift-preset", "goproxy"), func
6767
})
6868

6969
It("start CRC", func() {
70-
// default values: "--memory", "9216", "--cpus", "4", "disk-size", "31"
70+
// default values: "--memory", "10752", "--cpus", "4", "disk-size", "31"
7171
if bundlePath == "" {
7272
Expect(RunCRCExpectSuccess("start", "-p", pullSecretPath)).To(ContainSubstring("Started the OpenShift cluster"))
7373
} else {

test/integration/resize_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ var _ = Describe("vary VM parameters: memory cpus, disk", Serial, Ordered, Label
3434
})
3535

3636
It("start CRC", func() {
37-
// default values: "--memory", "9216", "--cpus", "4", "disk-size", "31"
37+
// default values: "--memory", "10752", "--cpus", "4", "disk-size", "31"
3838
if bundlePath == "" {
3939
Expect(RunCRCExpectSuccess("start", "--memory", "12000", "--cpus", "5", "--disk-size", "40", "-p", pullSecretPath)).To(ContainSubstring("Started the OpenShift cluster"))
4040
} else {
@@ -118,8 +118,8 @@ var _ = Describe("vary VM parameters: memory cpus, disk", Serial, Ordered, Label
118118

119119
Describe("use flawed values", Serial, Ordered, func() {
120120

121-
It("start CRC with sub-minimum memory", func() { // less than min = 9216
122-
Expect(RunCRCExpectFail("start", "--memory", "9000")).To(ContainSubstring("requires memory in MiB >= 9216"))
121+
It("start CRC with sub-minimum memory", func() { // less than min = 10752
122+
Expect(RunCRCExpectFail("start", "--memory", "9000")).To(ContainSubstring("requires memory in MiB >= 10752"))
123123
})
124124
It("start CRC with sub-minimum cpus", func() { // fewer than min
125125
Expect(RunCRCExpectFail("start", "--cpus", "3")).To(ContainSubstring("requires CPUs >= 4"))
@@ -139,13 +139,13 @@ var _ = Describe("vary VM parameters: memory cpus, disk", Serial, Ordered, Label
139139
Describe("use default values again", Serial, Ordered, func() {
140140

141141
It("start CRC", func() {
142-
Expect(RunCRCExpectSuccess("start")).To(ContainSubstring("Started the OpenShift cluster")) // default values: "--memory", "9216", "--cpus", "4", "disk-size", "31"
142+
Expect(RunCRCExpectSuccess("start")).To(ContainSubstring("Started the OpenShift cluster")) // default values: "--memory", "10752", "--cpus", "4", "disk-size", "31"
143143
})
144144

145145
It("check VM's memory size", func() {
146146
out, err := util.SendCommandToVM("cat /proc/meminfo")
147147
Expect(err).NotTo(HaveOccurred())
148-
Expect(out).Should(MatchRegexp(`MemTotal:[\s]*9\d{6}`)) // there should be a check if cluster needs >9216MiB; it isn't there and mem gets scaled down regardless
148+
Expect(out).Should(MatchRegexp(`MemTotal:[\s]*1\d{6}`)) // there should be a check if cluster needs >10752MiB; it isn't there and mem gets scaled down regardless
149149
})
150150

151151
It("check VM's number of cpus", func() {

0 commit comments

Comments
 (0)