Skip to content

Commit ea06ec5

Browse files
authored
Merge pull request #37041 from my-git9/somedocsync2
[zh] sync certificates.md user-namespaces.md update-api-object-kubectl-patch.md
2 parents 8af8102 + ce70eab commit ea06ec5

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

content/zh-cn/docs/tasks/administer-cluster/certificates.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ manually through `easyrsa`, `openssl` or `cfssl`.
200200
```shell
201201
openssl x509 -req -in server.csr -CA ca.crt -CAkey ca.key \
202202
-CAcreateserial -out server.crt -days 10000 \
203-
-extensions v3_ext -extfile csr.conf
203+
-extensions v3_ext -extfile csr.conf -sha256
204204
```
205205

206206
<!--

content/zh-cn/docs/tasks/configure-pod-container/user-namespaces.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,13 +164,13 @@ output from running the command in the pod to the output of running in the host:
164164
```none
165165
readlink /proc/$pid/ns/user
166166
user:[4026534732]
167-
167+
```
168168
169169
replacing `$pid` with the kubelet PID.
170170
-->
171171
```none
172172
readlink /proc/$pid/ns/user
173173
user:[4026534732]
174-
174+
```
175175

176176
使用 kubelet 的进程号代替 `$pid`

content/zh-cn/docs/tasks/manage-kubernetes-objects/update-api-object-kubectl-patch.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ patch 策略:
227227
"x-kubernetes-patch-strategy": "merge"
228228
}
229229
```
230-
<!-- for editors: intionally use yaml instead of json here, to prevent syntax highlight error. -->
230+
<!-- for editors: intentionally use yaml instead of json here, to prevent syntax highlight error. -->
231231

232232
<!--
233233
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
574574
....
575575
}
576576
```
577-
<!-- for editors: intionally use yaml instead of json here, to prevent syntax highlight error. -->
577+
<!-- for editors: intentionally use yaml instead of json here, to prevent syntax highlight error. -->
578578

579579
<!--
580580
And you can see the `retainKeys` strategy in the

0 commit comments

Comments
 (0)