Merge pull request #30791 from jlbutler/merged-main-dev-1.23

Final merge of main on dev-1.23 before release
pull/30795/head
Jesse Butler 2021-12-07 13:21:01 -05:00 committed by GitHub
commit b56312a0ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

View File

@ -259,7 +259,7 @@ Other API server flags that are set unconditionally are:
#### Controller manager #### Controller manager
The static Pod manifest for the API server is affected by following parameters provided by the users: The static Pod manifest for the controller manager is affected by following parameters provided by the users:
- If kubeadm is invoked specifying a `--pod-network-cidr`, the subnet manager feature required for some CNI network plugins is enabled by - If kubeadm is invoked specifying a `--pod-network-cidr`, the subnet manager feature required for some CNI network plugins is enabled by
setting: setting:

View File

@ -147,7 +147,7 @@ If your cluster's control plane runs the kube-apiserver as a Pod, remember to mo
to the location of the policy file and log file, so that audit records are persisted. For example: to the location of the policy file and log file, so that audit records are persisted. For example:
```shell ```shell
--audit-policy-file=/etc/kubernetes/audit-policy.yaml \ --audit-policy-file=/etc/kubernetes/audit-policy.yaml \
--audit-log-path=/var/log/audit.log --audit-log-path=/var/log/kubernetes/audit/audit.log
``` ```
then mount the volumes: then mount the volumes:
@ -157,7 +157,7 @@ volumeMounts:
- mountPath: /etc/kubernetes/audit-policy.yaml - mountPath: /etc/kubernetes/audit-policy.yaml
name: audit name: audit
readOnly: true readOnly: true
- mountPath: /var/log/audit.log - mountPath: /var/log/kubernetes/audit/
name: audit-log name: audit-log
readOnly: false readOnly: false
``` ```
@ -172,8 +172,8 @@ and finally configure the `hostPath`:
- name: audit-log - name: audit-log
hostPath: hostPath:
path: /var/log/audit.log path: /var/log/kubernetes/audit/
type: FileOrCreate type: DirectoryOrCreate
``` ```