Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typo in documentation #275

Merged
merged 2 commits into from
May 6, 2024
Merged

Fix typo in documentation #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a58500
Fix typo in documentation
SpiffyEight77 May 3, 2024
41e5b35
Fix dead PSP link
dereknola May 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/security/hardening-guide.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ plugins:
</TabItem>
<TabItem value="v1.24 and Older" default>

K3s v1.24 and older support [Pod Security Policies (PSPs)](https://v1-24.docs.kubernetes.io/docs/concepts/security/pod-security-policy/) for controlling pod security. PSPs are enabled by passing the following flag to the K3s server:
K3s v1.24 and older support [Pod Security Policies (PSPs)](https://kubernetes.io/docs/concepts/security/pod-security-policy/) for controlling pod security. PSPs are enabled by passing the following flag to the K3s server:

```
--kube-apiserver-arg="enable-admission-plugins=NodeRestriction,PodSecurityPolicy"
Expand Down
2 changes: 1 addition & 1 deletion docs/upgrades/manual.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ curl -sfL https://get.k3s.io | INSTALL_K3S_VERSION=vX.Y.Z+k3s1 <EXISTING_K3S_ENV
```

:::tip
If you want to download the new verision of k3s, but not start it, you can use the `INSTALL_K3S_SKIP_START=true` environment variable.
If you want to download the new version of k3s, but not start it, you can use the `INSTALL_K3S_SKIP_START=true` environment variable.
:::

### Upgrade K3s Using the Binary
Expand Down
2 changes: 1 addition & 1 deletion i18n/zh/docusaurus-plugin-content-docs/current/known-issues.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ title: 已知问题

### 将强化集群从 v1.24.x 升级到 v1.25.x {#hardened-125}

Kubernetes v1.25 删除了 PodSecurityPolicy，支持 Pod Security Standard（PSS）。你可以在[上游文档](https://kubernetes.io/docs/concepts/security/pod-security-standards/)中阅读有关 PSS 的更多信息。对于 K3s，如果在节点上配置了任何 `PodSecurityPoliciy`，则必须执行一些手动步骤。
Kubernetes v1.25 删除了 PodSecurityPolicy，支持 Pod Security Standard（PSS）。你可以在[上游文档](https://kubernetes.io/docs/concepts/security/pod-security-standards/)中阅读有关 PSS 的更多信息。对于 K3s，如果在节点上配置了任何 `PodSecurityPolicy`，则必须执行一些手动步骤。

1. 在所有节点上，更新 `kube-apiserver-arg` 值以删除 `PodSecurityPolicy` admission-plugin。添加以下参数值：`'admission-control-config-file=/var/lib/rancher/k3s/server/psa.yaml'`，但不要重启或升级 K3s。以下是节点加固更新后配置文件的示例：
```yaml
Expand Down
Loading