Skip to content

Commit 6f0128c

Browse files
authored
Merge pull request #24897 from tengqm/zh-resync-secret
[zh] Resync docs/concepts/configuration/secret.md
2 parents 92f5f9e + 72a2baf commit 6f0128c

File tree

2 files changed

+551
-510
lines changed

2 files changed

+551
-510
lines changed

content/en/docs/concepts/configuration/secret.md

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ See the [ServiceAccount](/docs/tasks/configure-pod-container/configure-service-a
137137
documentation for more information on how service accounts work.
138138
You can also check the `automountServiceAccountToken` field and the
139139
`serviceAccountName` field of the
140-
[`Pod`](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#secret-v1-core)
140+
[`Pod`](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#pod-v1-core)
141141
for information on referencing service account from Pods.
142142

143143
### Docker config Secrets
@@ -154,7 +154,7 @@ When using this Secret type, you have to ensure the Secret `data` field
154154
contains a `.dockercfg` key whose value is content of a `~/.dockercfg` file
155155
encoded in the base64 format.
156156

157-
The `kubernetes/dockerconfigjson` type is designed for storing a serialized
157+
The `kubernetes.io/dockerconfigjson` type is designed for storing a serialized
158158
JSON that follows the same format rules as the `~/.docker/config.json` file
159159
which is a new format for `~/.dockercfg`.
160160
When using this Secret type, the `data` field of the Secret object must
@@ -248,7 +248,7 @@ configuration.
248248

249249
The builtin type `kubernetes.io/ssh-auth` is provided for storing data used in
250250
SSH authentication. When using this Secret type, you will have to specify a
251-
`ssh-privatekey` key-value pair in the `data` (or `stringData`) field.
251+
`ssh-privatekey` key-value pair in the `data` (or `stringData`) field
252252
as the SSH credential to use.
253253

254254
The following YAML is an example config for a SSH authentication Secret:
@@ -349,22 +349,21 @@ data:
349349
usage-bootstrap-signing: dHJ1ZQ==
350350
```
351351

352-
A bootstrap type has the following keys specified under `data`:
352+
A bootstrap type Secret has the following keys specified under `data`:
353353

354354
- `token_id`: A random 6 character string as the token identifier. Required.
355355
- `token-secret`: A random 16 character string as the actual token secret. Required.
356-
- `description1`: A human-readable string that describes what the token is
356+
- `description`: A human-readable string that describes what the token is
357357
used for. Optional.
358358
- `expiration`: An absolute UTC time using RFC3339 specifying when the token
359359
should be expired. Optional.
360360
- `usage-bootstrap-<usage>`: A boolean flag indicating additional usage for
361361
the bootstrap token.
362362
- `auth-extra-groups`: A comma-separated list of group names that will be
363-
authenticated as in addition to system:bootstrappers group.
363+
authenticated as in addition to the `system:bootstrappers` group.
364364

365365
The above YAML may look confusing because the values are all in base64 encoded
366-
strings. In fact, you can create an identical Secret using the following YAML
367-
which results in an identical Secret object:
366+
strings. In fact, you can create an identical Secret using the following YAML:
368367

369368
```yaml
370369
apiVersion: v1

0 commit comments

Comments
 (0)