Skip to content

Commit 1299db8

Browse files
authored
Merge pull request #39896 from mburke5678/fix-requiredDropCapabilities-all
Fixed problems with `BZ-2025586:Documentation update to reflect changes for capabilities` PR
2 parents dc7eb98 + 23c20cf commit 1299db8

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

modules/nodes-pods-autoscaling-about.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ and ensure that your application meets these requirements before using
6565
memory-based autoscaling.
6666
====
6767

68-
The following example shows autoscaling for the `image-registry` `Deployment` object. The initial deployment requires 3 pods. The HPA object increases the minimum to 5. If CPU usage on the pods reaches 75%, the pods will increase to 7:
68+
The following example shows autoscaling for the `image-registry` `Deployment` object. The initial deployment requires 3 pods. The HPA object increases the minimum to 5. If CPU usage on the pods reaches 75%, the pods increase to 7:
6969

7070
[source,terminal]
7171
----

modules/security-context-constraints-about.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ CRI-O has the following default list of capabilities that are allowed for each c
166166
* `NET_BIND_SERVICE`
167167
* `KILL`
168168

169-
The containers use the capabilities from this default list, but pod manifest authors can alter the list by requesting additional capabilities or removing some of the default behaviors. Use the `allowedCapabilities`, `defaultAddCapabilities`, and `requiredDropCapabilities` parameters to control such requests from the pods and to specify which capabilities can be requested, which ones must be added to each container, and which ones must be forbidden, or dropped, from each container.
169+
The containers use the capabilities from this default list, but pod manifest authors can alter the list by requesting additional capabilities or removing some of the default behaviors. Use the `allowedCapabilities`, `defaultAddCapabilities`, and `requiredDropCapabilities` parameters to control such requests from the pods. With these parameters you can specify which capabilities can be requested, which ones must be added to each container, and which ones must be forbidden, or dropped, from each container.
170170

171171
[NOTE]
172172
====

modules/security-context-constraints-example.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ allows any capabilities.
6565
<3> The `FSGroup` strategy, which dictates the allowable values for the
6666
security context.
6767
<4> The groups that can access this SCC.
68-
<5> A list of capabilities to drop from a pod. Or, specify `ALL`
68+
<5> A list of capabilities to drop from a pod. Or, specify `ALL` to drop all
69+
capabilities.
6970
<6> The `runAsUser` strategy type, which dictates the allowable values for the
7071
Security Context.
7172
//could use the available strategies

0 commit comments

Comments
 (0)