Skip to content

Commit ee5b024

Browse files
authored
Merge pull request #71708 from openshift-cherrypick-robot/cherry-pick-71442-to-enterprise-4.15
[enterprise-4.15] OSDOCS#8972: Noting that the deployer service account isn't created i…
2 parents 23a590c + 08fe4c5 commit ee5b024

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

modules/deployment-config-capability.adoc

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,11 @@ The `DeploymentConfig` capability enables and manages the `DeploymentConfig` API
1313

1414
[IMPORTANT]
1515
====
16-
If the `DeploymentConfig` capability is disabled, the cluster cannot use `DeploymentConfig` resources. Disable the capability only if `DeploymentConfig` resources are not required in the cluster.
16+
17+
If you disable the `DeploymentConfig` capability, the following resources will not be available in the cluster:
18+
19+
* `DeploymentConfig` resources
20+
* The `deployer` service account
21+
22+
Disable the `DeploymentConfig` capability only if you do not require `DeploymentConfig` resources and the `deployer` service account in the cluster.
1723
====

modules/service-accounts-default.adoc

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ cluster-wide:
1818

1919
[cols="1,3",options="header"]
2020
|====
21-
|Service Account |Description
21+
|Service account |Description
2222

2323
|`replication-controller`
2424
|Assigned the `system:replication-controller` role
@@ -51,9 +51,9 @@ policyConfig:
5151

5252
Three service accounts are automatically created in each project:
5353

54-
[options="header",cols="1,3"]
54+
[options="header",cols="1,3a"]
5555
|===
56-
|Service Account |Usage
56+
|Service account |Usage
5757

5858
|`builder`
5959
|Used by build pods. It is given the `system:image-builder` role, which allows
@@ -64,10 +64,15 @@ registry.
6464
|Used by deployment pods and given the `system:deployer` role, which allows
6565
viewing and modifying replication controllers and pods in the project.
6666

67+
[NOTE]
68+
====
69+
The `deployer` service account is not created if the `DeploymentConfig` cluster capability is not enabled.
70+
====
71+
6772
|`default`
6873
|Used to run all other pods unless they specify a different service account.
6974
|===
7075

7176
All service accounts in a project are given the `system:image-puller` role,
72-
which allows pulling images from any imagestream in the project using the
77+
which allows pulling images from any image stream in the project using the
7378
internal container image registry.

0 commit comments

Comments
 (0)