Skip to content

Commit b56312a

Browse files
authored
Merge pull request #30791 from jlbutler/merged-main-dev-1.23
Final merge of main on dev-1.23 before release
2 parents f0e6f1f + 45d37b7 commit b56312a

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

content/en/docs/reference/setup-tools/kubeadm/implementation-details.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ Other API server flags that are set unconditionally are:
259259

260260
#### Controller manager
261261

262-
The static Pod manifest for the API server is affected by following parameters provided by the users:
262+
The static Pod manifest for the controller manager is affected by following parameters provided by the users:
263263

264264
- If kubeadm is invoked specifying a `--pod-network-cidr`, the subnet manager feature required for some CNI network plugins is enabled by
265265
setting:

content/en/docs/tasks/debug-application-cluster/audit.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ If your cluster's control plane runs the kube-apiserver as a Pod, remember to mo
147147
to the location of the policy file and log file, so that audit records are persisted. For example:
148148
```shell
149149
--audit-policy-file=/etc/kubernetes/audit-policy.yaml \
150-
--audit-log-path=/var/log/audit.log
150+
--audit-log-path=/var/log/kubernetes/audit/audit.log
151151
```
152152
then mount the volumes:
153153

@@ -157,7 +157,7 @@ volumeMounts:
157157
- mountPath: /etc/kubernetes/audit-policy.yaml
158158
name: audit
159159
readOnly: true
160-
- mountPath: /var/log/audit.log
160+
- mountPath: /var/log/kubernetes/audit/
161161
name: audit-log
162162
readOnly: false
163163
```
@@ -172,8 +172,8 @@ and finally configure the `hostPath`:
172172
173173
- name: audit-log
174174
hostPath:
175-
path: /var/log/audit.log
176-
type: FileOrCreate
175+
path: /var/log/kubernetes/audit/
176+
type: DirectoryOrCreate
177177
178178
```
179179

0 commit comments

Comments
 (0)