Skip to content

Commit 3816d08

Browse files
authored
Merge pull request #38138 from mburke5678/GH#38021
GH#38021:Fix ClusterResourceOverride examples
2 parents 360b27f + 188f53b commit 3816d08

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

modules/nodes-cluster-resource-configure.adoc

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,13 @@ To modify cluster-level overcommit:
2626
apiVersion: operator.autoscaling.openshift.io/v1
2727
kind: ClusterResourceOverride
2828
metadata:
29-
- name: cluster
29+
name: cluster
3030
spec:
31-
memoryRequestToLimitPercent: 50 <1>
32-
cpuRequestToLimitPercent: 25 <2>
33-
limitCPUToMemoryPercent: 200 <3>
31+
podResourceOverride:
32+
spec:
33+
memoryRequestToLimitPercent: 50 <1>
34+
cpuRequestToLimitPercent: 25 <2>
35+
limitCPUToMemoryPercent: 200 <3>
3436
----
3537
<1> Optional. Specify the percentage to override the container memory limit, if used, between 1-100. The default is 50.
3638
<2> Optional. Specify the percentage to override the container CPU limit, if used, between 1-100. The default is 25.
@@ -44,11 +46,11 @@ apiVersion: v1
4446
kind: Namespace
4547
metadata:
4648
47-
....
49+
...
4850
4951
labels:
5052
clusterresourceoverrides.admission.autoscaling.openshift.io/enabled: "true" <1>
5153
52-
....
54+
...
5355
----
5456
<1> Add this label to each project.

modules/nodes-cluster-resource-override.adoc

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,13 @@ following example:
1818
apiVersion: operator.autoscaling.openshift.io/v1
1919
kind: ClusterResourceOverride
2020
metadata:
21-
- name: cluster <1>
21+
name: cluster <1>
2222
spec:
23-
memoryRequestToLimitPercent: 50 <2>
24-
cpuRequestToLimitPercent: 25 <3>
25-
limitCPUToMemoryPercent: 200 <4>
23+
podResourceOverride:
24+
spec:
25+
memoryRequestToLimitPercent: 50 <2>
26+
cpuRequestToLimitPercent: 25 <3>
27+
limitCPUToMemoryPercent: 200 <4>
2628
----
2729
<1> The name must be `cluster`.
2830
<2> Optional. If a container memory limit has been specified or defaulted, the memory request is overridden to this percentage of the limit, between 1-100. The default is 50.

0 commit comments

Comments
 (0)