Merge pull request #37041 from my-git9/somedocsync2

[zh] sync certificates.md user-namespaces.md update-api-object-kubectl-patch.md
pull/37050/head
Kubernetes Prow Robot 2022-09-27 18:05:36 -07:00 committed by GitHub
commit ea06ec5302
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions

View File

@ -200,7 +200,7 @@ manually through `easyrsa`, `openssl` or `cfssl`.
```shell
openssl x509 -req -in server.csr -CA ca.crt -CAkey ca.key \
-CAcreateserial -out server.crt -days 10000 \
-extensions v3_ext -extfile csr.conf
-extensions v3_ext -extfile csr.conf -sha256
```
<!--

View File

@ -164,13 +164,13 @@ output from running the command in the pod to the output of running in the host:
```none
readlink /proc/$pid/ns/user
user:[4026534732]
```
replacing `$pid` with the kubelet PID.
-->
```none
readlink /proc/$pid/ns/user
user:[4026534732]
```
使用 kubelet 的进程号代替 `$pid`

View File

@ -227,7 +227,7 @@ patch 策略:
"x-kubernetes-patch-strategy": "merge"
}
```
<!-- for editors: intionally use yaml instead of json here, to prevent syntax highlight error. -->
<!-- for editors: intentionally use yaml instead of json here, to prevent syntax highlight error. -->
<!--
And you can see the patch strategy in the
@ -574,7 +574,7 @@ You can also see the `retainKeys` strategy in the [OpenApi spec](https://raw.git
....
}
```
<!-- for editors: intionally use yaml instead of json here, to prevent syntax highlight error. -->
<!-- for editors: intentionally use yaml instead of json here, to prevent syntax highlight error. -->
<!--
And you can see the `retainKeys` strategy in the