Skip to content

Commit 8b27481

Browse files
authored
Merge pull request #39940 from craigbox/shortcodes-en
[en] Shortcode fixes
2 parents 94a8fcf + 46bf59d commit 8b27481

File tree

4 files changed

+10
-0
lines changed

4 files changed

+10
-0
lines changed

content/en/blog/_posts/2021-04-20-annotating-k8s-for-humans.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ Adopting a common convention for annotations ensures consistency and understanda
8383
| `a8r.io/uptime` | Link to external uptime dashboard. |
8484
| `a8r.io/performance` | Link to external performance dashboard. |
8585
| `a8r.io/dependencies` | Unstructured text describing the service dependencies for humans. |
86+
{{< /table >}}
8687

8788

8889
## Visualizing annotations: Service Catalogs

content/en/docs/reference/command-line-tools-reference/feature-gates-removed.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,7 @@ In the following table:
333333
| `WindowsRunAsUserName` | `false` | Alpha | 1.16 | 1.16 |
334334
| `WindowsRunAsUserName` | `true` | Beta | 1.17 | 1.17 |
335335
| `WindowsRunAsUserName` | `true` | GA | 1.18 | 1.20 |
336+
{{< /table >}}
336337

337338
## Descriptions for removed feature gates
338339

content/en/docs/reference/using-api/cel.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ Example CEL expressions:
5959
| `self.metadata.name == 'singleton'` | Validate that an object's name matches a specific value (making it a singleton) |
6060
| `self.set1.all(e, !(e in self.set2))` | Validate that two listSets are disjoint |
6161
| `self.names.size() == self.details.size() && self.names.all(n, n in self.details)` | Validate the 'details' map is keyed by the items in the 'names' listSet |
62+
{{< /table >}}
6263

6364
## CEL community libraries
6465

@@ -95,6 +96,7 @@ Examples:
9596
| `items.map(x, x.weight).sum() == 1.0` | Verify that the "weights" of a list of objects sum to 1.0 |
9697
| `lowPriorities.map(x, x.priority).max() < highPriorities.map(x, x.priority).min()` | Verify that two sets of priorities do not overlap |
9798
| `names.indexOf('should-be-first') == 1` | Require that the first name in a list if a specific value |
99+
{{< /table >}}
98100

99101
See the [Kubernetes List Library](https://pkg.go.dev/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/library#Lists)
100102
godoc for more information.
@@ -112,6 +114,7 @@ Examples:
112114
|-------------------------------------------------------------|----------------------------------------------------------|
113115
| `"abc 123".find('[0-9]*')` | Find the first number in a string |
114116
| `"1, 2, 3, 4".findAll('[0-9]*').map(x, int(x)).sum() < 100` | Verify that the numbers in a string sum to less than 100 |
117+
{{< /table >}}
115118

116119
See the [Kubernetes regex library](https://pkg.go.dev/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/library#Regex)
117120
godoc for more information.
@@ -136,6 +139,7 @@ Examples:
136139
|-----------------------------------------------------------------|------------------------------------------------|
137140
| `url('https://example.com:80/').getHost()` | Get the 'example.com:80' host part of the URL. |
138141
| `url('https://example.com/path with spaces/').getEscapedPath()` | Returns '/path%20with%20spaces/' |
142+
{{< /table >}}
139143

140144
See the [Kubernetes URL library](https://pkg.go.dev/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/library#URLs)
141145
godoc for more information.
@@ -191,6 +195,7 @@ has(object.namex) ? object.namex == 'special' : request.name == 'special'
191195
| 'string' with format=date | timestamp (google.protobuf.Timestamp) |
192196
| 'string' with format=datetime | timestamp (google.protobuf.Timestamp) |
193197
| 'string' with format=duration | duration (google.protobuf.Duration) |
198+
{{< /table >}}
194199

195200
Also see: [CEL types](https://github.com/google/cel-spec/blob/v0.6.0/doc/langdef.md#values),
196201
[OpenAPI types](https://swagger.io/specification/#data-types),
@@ -225,6 +230,7 @@ expression:
225230
| `__dash__` | `-` |
226231
| `__slash__` | `/` |
227232
| `__{keyword}__` | [CEL **RESERVED** keyword](https://github.com/google/cel-spec/blob/v0.6.0/doc/langdef.md#syntax) |
233+
{{< /table >}}
228234

229235
When you escape any of CEL's **RESERVED** keywords you need to match the exact property name
230236
use the underscore escaping
@@ -239,6 +245,7 @@ Examples on escaping:
239245
| `x-prop` | `self.x__dash__prop > 0` |
240246
| `redact__d` | `self.redact__underscores__d > 0` |
241247
| `string` | `self.startsWith('kube')` |
248+
{{< /table >}}
242249

243250
## Resource constraints
244251

content/en/docs/tasks/administer-cluster/encrypt-data.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ Name | Encryption | Strength | Speed | Key Length | Other Considerations
103103
`aesgcm` | AES-GCM with random nonce | Must be rotated every 200k writes | Fastest | 16, 24, or 32-byte | Is not recommended for use except when an automated key rotation scheme is implemented.
104104
`aescbc` | AES-CBC with [PKCS#7](https://datatracker.ietf.org/doc/html/rfc2315) padding | Weak | Fast | 32-byte | Not recommended due to CBC's vulnerability to padding oracle attacks.
105105
`kms` | Uses envelope encryption scheme: Data is encrypted by data encryption keys (DEKs) using AES-CBC with [PKCS#7](https://datatracker.ietf.org/doc/html/rfc2315) padding (prior to v1.25), using AES-GCM starting from v1.25, DEKs are encrypted by key encryption keys (KEKs) according to configuration in Key Management Service (KMS) | Strongest | Fast | 32-bytes | The recommended choice for using a third party tool for key management. Simplifies key rotation, with a new DEK generated for each encryption, and KEK rotation controlled by the user. [Configure the KMS provider](/docs/tasks/administer-cluster/kms-provider/).
106+
{{< /table >}}
106107

107108
Each provider supports multiple keys - the keys are tried in order for decryption, and if the provider
108109
is the first provider, the first key is used for encryption.

0 commit comments

Comments
 (0)