Skip to content

Commit b9e96d0

Browse files
committedApr 21, 2025
Support configurable resource limits and requests.
Signed-off-by: xuezhaojun <zxue@redhat.com>
1 parent b05c94d commit b9e96d0

File tree

3 files changed

+30
-14
lines changed

3 files changed

+30
-14
lines changed
 

‎pkg/proxyagent/agent/agent.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,9 @@ func NewAgentAddon(
145145
addonfactory.GetAddOnDeploymentConfigValues(
146146
utils.NewAddOnDeploymentConfigGetter(addonClient),
147147
toAgentAddOnChartValues(caCertData),
148+
addonfactory.ToAddOnNodePlacementValues,
149+
addonfactory.ToAddOnProxyConfigValues,
150+
addonfactory.ToAddOnResourceRequirementsValues,
148151
),
149152
).
150153
WithConfigCheckEnabledOption().

‎pkg/proxyagent/agent/manifests/charts/addon-agent/templates/addon-agent-deployment.yaml

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,14 @@ spec:
3232
{{- end }}
3333
containers:
3434
- name: proxy-agent
35+
{{- $reverseResourceRequirements := reverse .Values.global.resourceRequirements }}
36+
{{- range $item := $reverseResourceRequirements }}
37+
{{- if regexMatch $item.containerIDRegex "deployments:deployment1:container1" }}
38+
resources:
39+
{{- toYaml $item.resources | nindent 12 }}
40+
{{- break -}}
41+
{{- end -}}
42+
{{- end }}
3543
image: {{ .Values.proxyAgentImage }}
3644
imagePullPolicy: IfNotPresent
3745
command:
@@ -84,14 +92,15 @@ spec:
8492
- name: hub
8593
mountPath: /etc/tls
8694
readOnly: true
87-
resources:
88-
requests:
89-
memory: "100Mi"
90-
cpu: "200m"
91-
limits:
92-
memory: "200Mi"
93-
cpu: "300m"
9495
- name: addon-agent
96+
{{- $reverseResourceRequirements := reverse .Values.global.resourceRequirements }}
97+
{{- range $item := $reverseResourceRequirements }}
98+
{{- if regexMatch $item.containerIDRegex "deployments:deployment1:container1" }}
99+
resources:
100+
{{- toYaml $item.resources | nindent 12 }}
101+
{{- break -}}
102+
{{- end -}}
103+
{{- end }}
95104
image: {{ .Values.registry }}/{{ .Values.image }}:{{ .Values.tag }}
96105
imagePullPolicy: IfNotPresent
97106
command:
@@ -116,13 +125,6 @@ spec:
116125
- name: hub
117126
mountPath: /etc/tls
118127
readOnly: true
119-
resources:
120-
requests:
121-
memory: "50Mi"
122-
cpu: "100m"
123-
limits:
124-
memory: "100Mi"
125-
cpu: "200m"
126128
env:
127129
- name: POD_NAMESPACE
128130
valueFrom:

‎pkg/proxyagent/agent/manifests/charts/addon-agent/values.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,14 @@ proxyConfig:
3737
HTTP_PROXY: null
3838
HTTPS_PROXY: null
3939
NO_PROXY: null
40+
41+
global:
42+
resourceRequirements:
43+
- containerIDRegex: ^.+:.+:.+$
44+
resources:
45+
requests:
46+
memory: 100Mi
47+
cpu: 200m
48+
limits:
49+
memory: 200Mi
50+
cpu: 300m

0 commit comments

Comments
 (0)