Skip to content

Commit 3b08a90

Browse files
hj-johannes-leehj-johannes-lee
committed
Add cpu/memory requests and limits
Operator maturity level 3 requires cpu/memory requests and limits for operands. Add them to all plugins deployed by operator Signed-off-by: Hyeongju Johannes Lee <[email protected]>
1 parent c8dec63 commit 3b08a90

File tree

14 files changed

+126
-0
lines changed

14 files changed

+126
-0
lines changed

‎deployments/dlb_plugin/base/intel-dlb-plugin.yaml

+7
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,13 @@ spec:
3232
readOnlyRootFilesystem: true
3333
allowPrivilegeEscalation: false
3434
terminationMessagePath: /tmp/termination-log
35+
resources:
36+
requests:
37+
memory: "15Mi"
38+
cpu: 40m
39+
limits:
40+
memory: "30Mi"
41+
cpu: 100m
3542
volumeMounts:
3643
- name: devfs
3744
mountPath: /dev

‎deployments/dsa_plugin/base/intel-dsa-plugin.yaml

+7
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,13 @@ spec:
3333
type: "container_device_plugin_t"
3434
readOnlyRootFilesystem: true
3535
allowPrivilegeEscalation: false
36+
resources:
37+
requests:
38+
memory: "25Mi"
39+
cpu: 50m
40+
limits:
41+
memory: "50Mi"
42+
cpu: 100m
3643
volumeMounts:
3744
- name: devfs
3845
mountPath: /dev/dsa

‎deployments/fpga_plugin/base/intel-fpga-plugin-daemonset.yaml

+7
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,13 @@ spec:
4444
securityContext:
4545
readOnlyRootFilesystem: true
4646
allowPrivilegeEscalation: false
47+
resources:
48+
requests:
49+
memory: "30Mi"
50+
cpu: 80m
51+
limits:
52+
memory: "60Mi"
53+
cpu: 160m
4754
volumeMounts:
4855
- name: devfs
4956
mountPath: /dev

‎deployments/gpu_plugin/base/intel-gpu-plugin.yaml

+7
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,13 @@ spec:
3636
type: "container_device_plugin_t"
3737
readOnlyRootFilesystem: true
3838
allowPrivilegeEscalation: false
39+
resources:
40+
requests:
41+
memory: "45Mi"
42+
cpu: 40m
43+
limits:
44+
memory: "90Mi"
45+
cpu: 100m
3946
volumeMounts:
4047
- name: devfs
4148
mountPath: /dev/dri

‎deployments/iaa_plugin/base/intel-iaa-plugin.yaml

+7
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,13 @@ spec:
3333
type: "container_device_plugin_t"
3434
readOnlyRootFilesystem: true
3535
allowPrivilegeEscalation: false
36+
resources:
37+
requests:
38+
memory: "25Mi"
39+
cpu: 60m
40+
limits:
41+
memory: "50Mi"
42+
cpu: 120m
3643
volumeMounts:
3744
- name: devfs
3845
mountPath: /dev/iax

‎deployments/qat_plugin/base/intel-qat-plugin.yaml

+7
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,13 @@ spec:
3737
readOnlyRootFilesystem: true
3838
allowPrivilegeEscalation: false
3939
imagePullPolicy: IfNotPresent
40+
resources:
41+
requests:
42+
memory: "15Mi"
43+
cpu: 70m
44+
limits:
45+
memory: "30Mi"
46+
cpu: 140m
4047
volumeMounts:
4148
- name: devdir
4249
mountPath: /dev/vfio

‎deployments/sgx_plugin/base/intel-sgx-plugin.yaml

+7
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,13 @@ spec:
2828
readOnlyRootFilesystem: true
2929
allowPrivilegeEscalation: false
3030
imagePullPolicy: IfNotPresent
31+
resources:
32+
requests:
33+
memory: "15Mi"
34+
cpu: 40m
35+
limits:
36+
memory: "30Mi"
37+
cpu: 100m
3138
volumeMounts:
3239
- name: kubeletsockets
3340
mountPath: /var/lib/kubelet/device-plugins

‎pkg/controllers/dlb/controller_test.go

+11
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121

2222
apps "k8s.io/api/apps/v1"
2323
v1 "k8s.io/api/core/v1"
24+
"k8s.io/apimachinery/pkg/api/resource"
2425
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2526
"k8s.io/apimachinery/pkg/util/diff"
2627
"k8s.io/apimachinery/pkg/util/intstr"
@@ -92,6 +93,16 @@ func (c *controller) newDaemonSetExpected(rawObj client.Object) *apps.DaemonSet
9293
ReadOnlyRootFilesystem: &yes,
9394
AllowPrivilegeEscalation: &no,
9495
},
96+
Resources: v1.ResourceRequirements{
97+
Limits: v1.ResourceList{
98+
v1.ResourceCPU: resource.MustParse("100m"),
99+
v1.ResourceMemory: resource.MustParse("30Mi"),
100+
},
101+
Requests: v1.ResourceList{
102+
v1.ResourceCPU: resource.MustParse("40m"),
103+
v1.ResourceMemory: resource.MustParse("15Mi"),
104+
},
105+
},
95106
VolumeMounts: []v1.VolumeMount{
96107
{
97108
Name: "devfs",

‎pkg/controllers/dsa/controller_test.go

+11
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020

2121
apps "k8s.io/api/apps/v1"
2222
v1 "k8s.io/api/core/v1"
23+
"k8s.io/apimachinery/pkg/api/resource"
2324
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2425
"k8s.io/apimachinery/pkg/util/diff"
2526
"k8s.io/apimachinery/pkg/util/intstr"
@@ -96,6 +97,16 @@ func (c *controller) newDaemonSetExpected(rawObj client.Object) *apps.DaemonSet
9697
ReadOnlyRootFilesystem: &yes,
9798
AllowPrivilegeEscalation: &no,
9899
},
100+
Resources: v1.ResourceRequirements{
101+
Limits: v1.ResourceList{
102+
v1.ResourceCPU: resource.MustParse("100m"),
103+
v1.ResourceMemory: resource.MustParse("50Mi"),
104+
},
105+
Requests: v1.ResourceList{
106+
v1.ResourceCPU: resource.MustParse("50m"),
107+
v1.ResourceMemory: resource.MustParse("25Mi"),
108+
},
109+
},
99110
VolumeMounts: []v1.VolumeMount{
100111
{
101112
Name: "devfs",

‎pkg/controllers/fpga/controller_test.go

+11
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121

2222
apps "k8s.io/api/apps/v1"
2323
v1 "k8s.io/api/core/v1"
24+
"k8s.io/apimachinery/pkg/api/resource"
2425
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2526
"k8s.io/apimachinery/pkg/util/diff"
2627
"k8s.io/apimachinery/pkg/util/intstr"
@@ -94,6 +95,16 @@ func (c *controller) newDaemonSetExpected(rawObj client.Object) *apps.DaemonSet
9495
AllowPrivilegeEscalation: &no,
9596
},
9697
TerminationMessagePath: "/tmp/termination-log",
98+
Resources: v1.ResourceRequirements{
99+
Limits: v1.ResourceList{
100+
v1.ResourceCPU: resource.MustParse("160m"),
101+
v1.ResourceMemory: resource.MustParse("60Mi"),
102+
},
103+
Requests: v1.ResourceList{
104+
v1.ResourceCPU: resource.MustParse("80m"),
105+
v1.ResourceMemory: resource.MustParse("30Mi"),
106+
},
107+
},
97108
VolumeMounts: []v1.VolumeMount{
98109
{
99110
MountPath: "/dev",

‎pkg/controllers/gpu/controller_test.go

+11
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222

2323
apps "k8s.io/api/apps/v1"
2424
v1 "k8s.io/api/core/v1"
25+
"k8s.io/apimachinery/pkg/api/resource"
2526
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2627
"k8s.io/apimachinery/pkg/util/diff"
2728
"k8s.io/apimachinery/pkg/util/intstr"
@@ -106,6 +107,16 @@ func (c *controller) newDaemonSetExpected(rawObj client.Object) *apps.DaemonSet
106107
ReadOnlyRootFilesystem: &yes,
107108
AllowPrivilegeEscalation: &no,
108109
},
110+
Resources: v1.ResourceRequirements{
111+
Limits: v1.ResourceList{
112+
v1.ResourceCPU: resource.MustParse("100m"),
113+
v1.ResourceMemory: resource.MustParse("90Mi"),
114+
},
115+
Requests: v1.ResourceList{
116+
v1.ResourceCPU: resource.MustParse("40m"),
117+
v1.ResourceMemory: resource.MustParse("45Mi"),
118+
},
119+
},
109120
VolumeMounts: []v1.VolumeMount{
110121
{
111122
Name: "devfs",

‎pkg/controllers/iaa/controller_test.go

+11
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020

2121
apps "k8s.io/api/apps/v1"
2222
v1 "k8s.io/api/core/v1"
23+
"k8s.io/apimachinery/pkg/api/resource"
2324
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2425
"k8s.io/apimachinery/pkg/util/diff"
2526
"k8s.io/apimachinery/pkg/util/intstr"
@@ -96,6 +97,16 @@ func (c *controller) newDaemonSetExpected(rawObj client.Object) *apps.DaemonSet
9697
ReadOnlyRootFilesystem: &yes,
9798
AllowPrivilegeEscalation: &no,
9899
},
100+
Resources: v1.ResourceRequirements{
101+
Limits: v1.ResourceList{
102+
v1.ResourceCPU: resource.MustParse("120m"),
103+
v1.ResourceMemory: resource.MustParse("50Mi"),
104+
},
105+
Requests: v1.ResourceList{
106+
v1.ResourceCPU: resource.MustParse("60m"),
107+
v1.ResourceMemory: resource.MustParse("25Mi"),
108+
},
109+
},
99110
VolumeMounts: []v1.VolumeMount{
100111
{
101112
Name: "devfs",

‎pkg/controllers/qat/controller_test.go

+11
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121

2222
apps "k8s.io/api/apps/v1"
2323
v1 "k8s.io/api/core/v1"
24+
"k8s.io/apimachinery/pkg/api/resource"
2425
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2526
"k8s.io/apimachinery/pkg/util/diff"
2627
"k8s.io/apimachinery/pkg/util/intstr"
@@ -100,6 +101,16 @@ func (c *controller) newDaemonSetExpected(rawObj client.Object) *apps.DaemonSet
100101
ReadOnlyRootFilesystem: &yes,
101102
AllowPrivilegeEscalation: &no,
102103
},
104+
Resources: v1.ResourceRequirements{
105+
Limits: v1.ResourceList{
106+
v1.ResourceCPU: resource.MustParse("140m"),
107+
v1.ResourceMemory: resource.MustParse("30Mi"),
108+
},
109+
Requests: v1.ResourceList{
110+
v1.ResourceCPU: resource.MustParse("70m"),
111+
v1.ResourceMemory: resource.MustParse("15Mi"),
112+
},
113+
},
103114
VolumeMounts: []v1.VolumeMount{
104115
{
105116
Name: "devdir",

‎pkg/controllers/sgx/controller_test.go

+11
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121

2222
apps "k8s.io/api/apps/v1"
2323
v1 "k8s.io/api/core/v1"
24+
"k8s.io/apimachinery/pkg/api/resource"
2425
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2526
"k8s.io/apimachinery/pkg/util/diff"
2627
"k8s.io/apimachinery/pkg/util/intstr"
@@ -88,6 +89,16 @@ func (c *controller) newDaemonSetExpected(rawObj client.Object) *apps.DaemonSet
8889
ReadOnlyRootFilesystem: &yes,
8990
AllowPrivilegeEscalation: &no,
9091
},
92+
Resources: v1.ResourceRequirements{
93+
Limits: v1.ResourceList{
94+
v1.ResourceCPU: resource.MustParse("100m"),
95+
v1.ResourceMemory: resource.MustParse("30Mi"),
96+
},
97+
Requests: v1.ResourceList{
98+
v1.ResourceCPU: resource.MustParse("40m"),
99+
v1.ResourceMemory: resource.MustParse("15Mi"),
100+
},
101+
},
91102
VolumeMounts: []v1.VolumeMount{
92103
{
93104
Name: "kubeletsockets",

0 commit comments

Comments
 (0)