Skip to content

Commit 2b4f559

Browse files
thaJeztahthaJeztah
authored
Merge pull request moby#50989 from thaJeztah/remove_KernelMemory
remove support for deprecated kernel memory limit
2 parents 07453ab + c1be6ef commit 2b4f559

File tree

31 files changed

+0
-181
lines changed

31 files changed

+0
-181
lines changed

‎api/docs/v1.24.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,6 @@ Create a container
310310
"Memory": 0,
311311
"MemorySwap": 0,
312312
"MemoryReservation": 0,
313-
"KernelMemory": 0,
314313
"CpuPercent": 80,
315314
"CpuShares": 512,
316315
"CpuPeriod": 100000,
@@ -438,7 +437,6 @@ Create a container
438437
- **MemorySwap** - Total memory limit (memory + swap); set `-1` to enable unlimited swap.
439438
You must use this with `memory` and make the swap value larger than `memory`.
440439
- **MemoryReservation** - Memory soft limit in bytes.
441-
- **KernelMemory** - Kernel memory limit in bytes.
442440
- **CpuPercent** - An integer value containing the usable percentage of the available CPUs. (Windows daemon only)
443441
- **CpuShares** - An integer value containing the container's CPU Shares
444442
(ie. the relative weight vs other containers).
@@ -627,7 +625,6 @@ Return low-level information on the container `id`
627625
"Memory": 0,
628626
"MemorySwap": 0,
629627
"MemoryReservation": 0,
630-
"KernelMemory": 0,
631628
"OomKillDisable": false,
632629
"OomScoreAdj": 500,
633630
"NetworkMode": "bridge",
@@ -1197,7 +1194,6 @@ Update configuration of one or more containers.
11971194
"Memory": 314572800,
11981195
"MemorySwap": 514288000,
11991196
"MemoryReservation": 209715200,
1200-
"KernelMemory": 52428800,
12011197
"RestartPolicy": {
12021198
"MaximumRetryCount": 4,
12031199
"Name": "on-failure"

‎api/docs/v1.25.yaml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -432,10 +432,6 @@ definitions:
432432
description: "Disk limit (in bytes)."
433433
type: "integer"
434434
format: "int64"
435-
KernelMemory:
436-
description: "Kernel memory limit in bytes."
437-
type: "integer"
438-
format: "int64"
439435
MemoryReservation:
440436
description: "Memory soft limit in bytes."
441437
type: "integer"
@@ -2717,7 +2713,6 @@ paths:
27172713
Memory: 0
27182714
MemorySwap: 0
27192715
MemoryReservation: 0
2720-
KernelMemory: 0
27212716
NanoCpus: 500000
27222717
CpuPercent: 80
27232718
CpuShares: 512
@@ -3017,7 +3012,6 @@ paths:
30173012
Memory: 0
30183013
MemorySwap: 0
30193014
MemoryReservation: 0
3020-
KernelMemory: 0
30213015
OomKillDisable: false
30223016
OomScoreAdj: 500
30233017
NetworkMode: "bridge"
@@ -3698,7 +3692,6 @@ paths:
36983692
Memory: 314572800
36993693
MemorySwap: 514288000
37003694
MemoryReservation: 209715200
3701-
KernelMemory: 52428800
37023695
RestartPolicy:
37033696
MaximumRetryCount: 4
37043697
Name: "on-failure"
@@ -5105,7 +5098,6 @@ paths:
51055098
IndexServerAddress: "https://index.docker.io/v1/"
51065099
InitPath: "/usr/bin/docker"
51075100
InitSha1: ""
5108-
KernelMemory: true
51095101
KernelVersion: "3.12.0-1-amd64"
51105102
Labels:
51115103
- "storage=ssd"

‎api/docs/v1.26.yaml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -432,10 +432,6 @@ definitions:
432432
description: "Disk limit (in bytes)."
433433
type: "integer"
434434
format: "int64"
435-
KernelMemory:
436-
description: "Kernel memory limit in bytes."
437-
type: "integer"
438-
format: "int64"
439435
MemoryReservation:
440436
description: "Memory soft limit in bytes."
441437
type: "integer"
@@ -2721,7 +2717,6 @@ paths:
27212717
Memory: 0
27222718
MemorySwap: 0
27232719
MemoryReservation: 0
2724-
KernelMemory: 0
27252720
NanoCpus: 500000
27262721
CpuPercent: 80
27272722
CpuShares: 512

‎api/docs/v1.27.yaml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -434,10 +434,6 @@ definitions:
434434
description: "Disk limit (in bytes)."
435435
type: "integer"
436436
format: "int64"
437-
KernelMemory:
438-
description: "Kernel memory limit in bytes."
439-
type: "integer"
440-
format: "int64"
441437
MemoryReservation:
442438
description: "Memory soft limit in bytes."
443439
type: "integer"
@@ -2780,7 +2776,6 @@ paths:
27802776
Memory: 0
27812777
MemorySwap: 0
27822778
MemoryReservation: 0
2783-
KernelMemory: 0
27842779
NanoCpus: 500000
27852780
CpuPercent: 80
27862781
CpuShares: 512
@@ -3080,7 +3075,6 @@ paths:
30803075
Memory: 0
30813076
MemorySwap: 0
30823077
MemoryReservation: 0
3083-
KernelMemory: 0
30843078
OomKillDisable: false
30853079
OomScoreAdj: 500
30863080
NetworkMode: "bridge"

‎api/docs/v1.28.yaml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -440,10 +440,6 @@ definitions:
440440
description: "Disk limit (in bytes)."
441441
type: "integer"
442442
format: "int64"
443-
KernelMemory:
444-
description: "Kernel memory limit in bytes."
445-
type: "integer"
446-
format: "int64"
447443
MemoryReservation:
448444
description: "Memory soft limit in bytes."
449445
type: "integer"
@@ -2869,7 +2865,6 @@ paths:
28692865
Memory: 0
28702866
MemorySwap: 0
28712867
MemoryReservation: 0
2872-
KernelMemory: 0
28732868
NanoCpus: 500000
28742869
CpuPercent: 80
28752870
CpuShares: 512
@@ -3169,7 +3164,6 @@ paths:
31693164
Memory: 0
31703165
MemorySwap: 0
31713166
MemoryReservation: 0
3172-
KernelMemory: 0
31733167
OomKillDisable: false
31743168
OomScoreAdj: 500
31753169
NetworkMode: "bridge"
@@ -3860,7 +3854,6 @@ paths:
38603854
Memory: 314572800
38613855
MemorySwap: 514288000
38623856
MemoryReservation: 209715200
3863-
KernelMemory: 52428800
38643857
RestartPolicy:
38653858
MaximumRetryCount: 4
38663859
Name: "on-failure"
@@ -5292,7 +5285,6 @@ paths:
52925285
IndexServerAddress: "https://index.docker.io/v1/"
52935286
InitPath: "/usr/bin/docker"
52945287
InitSha1: ""
5295-
KernelMemory: true
52965288
KernelVersion: "3.12.0-1-amd64"
52975289
Labels:
52985290
- "storage=ssd"

‎api/docs/v1.29.yaml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -443,10 +443,6 @@ definitions:
443443
description: "Disk limit (in bytes)."
444444
type: "integer"
445445
format: "int64"
446-
KernelMemory:
447-
description: "Kernel memory limit in bytes."
448-
type: "integer"
449-
format: "int64"
450446
MemoryReservation:
451447
description: "Memory soft limit in bytes."
452448
type: "integer"
@@ -2902,7 +2898,6 @@ paths:
29022898
Memory: 0
29032899
MemorySwap: 0
29042900
MemoryReservation: 0
2905-
KernelMemory: 0
29062901
NanoCpus: 500000
29072902
CpuPercent: 80
29082903
CpuShares: 512
@@ -3202,7 +3197,6 @@ paths:
32023197
Memory: 0
32033198
MemorySwap: 0
32043199
MemoryReservation: 0
3205-
KernelMemory: 0
32063200
OomKillDisable: false
32073201
OomScoreAdj: 500
32083202
NetworkMode: "bridge"
@@ -3893,7 +3887,6 @@ paths:
38933887
Memory: 314572800
38943888
MemorySwap: 514288000
38953889
MemoryReservation: 209715200
3896-
KernelMemory: 52428800
38973890
RestartPolicy:
38983891
MaximumRetryCount: 4
38993892
Name: "on-failure"
@@ -5325,7 +5318,6 @@ paths:
53255318
IndexServerAddress: "https://index.docker.io/v1/"
53265319
InitPath: "/usr/bin/docker"
53275320
InitSha1: ""
5328-
KernelMemory: true
53295321
KernelVersion: "3.12.0-1-amd64"
53305322
Labels:
53315323
- "storage=ssd"

‎api/docs/v1.30.yaml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -445,10 +445,6 @@ definitions:
445445
description: "Disk limit (in bytes)."
446446
type: "integer"
447447
format: "int64"
448-
KernelMemory:
449-
description: "Kernel memory limit in bytes."
450-
type: "integer"
451-
format: "int64"
452448
MemoryReservation:
453449
description: "Memory soft limit in bytes."
454450
type: "integer"
@@ -3115,7 +3111,6 @@ paths:
31153111
Memory: 0
31163112
MemorySwap: 0
31173113
MemoryReservation: 0
3118-
KernelMemory: 0
31193114
NanoCpus: 500000
31203115
CpuPercent: 80
31213116
CpuShares: 512

‎api/docs/v1.31.yaml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -445,10 +445,6 @@ definitions:
445445
description: "Disk limit (in bytes)."
446446
type: "integer"
447447
format: "int64"
448-
KernelMemory:
449-
description: "Kernel memory limit in bytes."
450-
type: "integer"
451-
format: "int64"
452448
MemoryReservation:
453449
description: "Memory soft limit in bytes."
454450
type: "integer"
@@ -3188,7 +3184,6 @@ paths:
31883184
Memory: 0
31893185
MemorySwap: 0
31903186
MemoryReservation: 0
3191-
KernelMemory: 0
31923187
NanoCpus: 500000
31933188
CpuPercent: 80
31943189
CpuShares: 512

‎api/docs/v1.32.yaml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -449,10 +449,6 @@ definitions:
449449
description: "Disk limit (in bytes)."
450450
type: "integer"
451451
format: "int64"
452-
KernelMemory:
453-
description: "Kernel memory limit in bytes."
454-
type: "integer"
455-
format: "int64"
456452
MemoryReservation:
457453
description: "Memory soft limit in bytes."
458454
type: "integer"
@@ -3523,10 +3519,6 @@ definitions:
35233519
description: "Indicates if the host has memory swap limit support enabled."
35243520
type: "boolean"
35253521
example: true
3526-
KernelMemory:
3527-
description: "Indicates if the host has kernel memory limit support enabled."
3528-
type: "boolean"
3529-
example: true
35303522
CpuCfsPeriod:
35313523
description: "Indicates if CPU CFS(Completely Fair Scheduler) period is supported by the host."
35323524
type: "boolean"
@@ -4400,7 +4392,6 @@ paths:
44004392
Memory: 0
44014393
MemorySwap: 0
44024394
MemoryReservation: 0
4403-
KernelMemory: 0
44044395
NanoCpus: 500000
44054396
CpuPercent: 80
44064397
CpuShares: 512
@@ -4708,7 +4699,6 @@ paths:
47084699
Memory: 0
47094700
MemorySwap: 0
47104701
MemoryReservation: 0
4711-
KernelMemory: 0
47124702
OomKillDisable: false
47134703
OomScoreAdj: 500
47144704
NetworkMode: "bridge"
@@ -5397,7 +5387,6 @@ paths:
53975387
Memory: 314572800
53985388
MemorySwap: 514288000
53995389
MemoryReservation: 209715200
5400-
KernelMemory: 52428800
54015390
RestartPolicy:
54025391
MaximumRetryCount: 4
54035392
Name: "on-failure"

‎api/docs/v1.33.yaml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -453,10 +453,6 @@ definitions:
453453
description: "Disk limit (in bytes)."
454454
type: "integer"
455455
format: "int64"
456-
KernelMemory:
457-
description: "Kernel memory limit in bytes."
458-
type: "integer"
459-
format: "int64"
460456
MemoryReservation:
461457
description: "Memory soft limit in bytes."
462458
type: "integer"
@@ -3527,10 +3523,6 @@ definitions:
35273523
description: "Indicates if the host has memory swap limit support enabled."
35283524
type: "boolean"
35293525
example: true
3530-
KernelMemory:
3531-
description: "Indicates if the host has kernel memory limit support enabled."
3532-
type: "boolean"
3533-
example: true
35343526
CpuCfsPeriod:
35353527
description: "Indicates if CPU CFS(Completely Fair Scheduler) period is supported by the host."
35363528
type: "boolean"
@@ -4404,7 +4396,6 @@ paths:
44044396
Memory: 0
44054397
MemorySwap: 0
44064398
MemoryReservation: 0
4407-
KernelMemory: 0
44084399
NanoCpus: 500000
44094400
CpuPercent: 80
44104401
CpuShares: 512
@@ -4712,7 +4703,6 @@ paths:
47124703
Memory: 0
47134704
MemorySwap: 0
47144705
MemoryReservation: 0
4715-
KernelMemory: 0
47164706
OomKillDisable: false
47174707
OomScoreAdj: 500
47184708
NetworkMode: "bridge"
@@ -5401,7 +5391,6 @@ paths:
54015391
Memory: 314572800
54025392
MemorySwap: 514288000
54035393
MemoryReservation: 209715200
5404-
KernelMemory: 52428800
54055394
RestartPolicy:
54065395
MaximumRetryCount: 4
54075396
Name: "on-failure"

0 commit comments

Comments
 (0)