Skip to content

Commit

Permalink
[zh] sync certificates.md user-namespaces.md update-api-object-kubect…
Browse files Browse the repository at this point in the history
…l-patch.md

Signed-off-by: xin.li <xin.li@daocloud.io>
  • Loading branch information
my-git9 committed Sep 27, 2022
1 parent ee1b7ef commit ce70eab
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
```

<!--
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit ce70eab

Please sign in to comment.