Skip to content

Commit 13a402a

Browse files
authored
Merge pull request #47401 from chanieljdan/merged-main-dev-1.31
Merge main branch into dev 1.31
2 parents 8bdcb80 + 3c5c4fc commit 13a402a

File tree

17 files changed

+516
-277
lines changed

17 files changed

+516
-277
lines changed

OWNERS_ALIASES

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ aliases:
1616
- salaxander
1717
- sftim
1818
- tengqm
19+
- drewhagen # RT 1.31 temp acting Docs lead
1920
sig-docs-localization-owners: # Admins for localization content
2021
- a-mccarthy
2122
- divya-mohan0209
@@ -64,6 +65,7 @@ aliases:
6465
- sftim
6566
- tengqm
6667
- Princesso # RT 1.31 Docs Lead
68+
- drewhagen # RT 1.31 temp acting Docs lead
6769
sig-docs-en-reviews: # PR reviews for English content
6870
- dipesh-rawat
6971
- divya-mohan0209
@@ -80,6 +82,7 @@ aliases:
8082
- tengqm
8183
- windsonsea
8284
- Princesso # RT 1.31 Docs Lead
85+
- drewhagen # RT 1.31 temp acting Docs lead
8386
sig-docs-es-owners: # Admins for Spanish content
8487
- electrocucaracha
8588
- krol3
File renamed without changes.
File renamed without changes.
File renamed without changes.

assets/scss/_custom.scss

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1469,4 +1469,15 @@ body.td-search #search {
14691469
section.k8s-birthday-override:has(div.k8s-birthday-override.revert-to-previous input:not(:checked)) + section {
14701470
display: none;
14711471
visibility: hidden;
1472+
}
1473+
1474+
/* Apply site-wide table styles for tables in alert callouts (note, caution, warning) */
1475+
.alert {
1476+
&.alert-info, &.alert-caution, &.alert-danger {
1477+
> table {
1478+
@extend .table-striped;
1479+
@extend .table-responsive;
1480+
@extend .table;
1481+
}
1482+
}
14721483
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Example CEL expressions:
5151
| `self.minReplicas <= self.replicas && self.replicas <= self.maxReplicas` | Validate that the three fields defining replicas are ordered appropriately |
5252
| `'Available' in self.stateCounts` | Validate that an entry with the 'Available' key exists in a map |
5353
| `(self.list1.size() == 0) != (self.list2.size() == 0)` | Validate that one of two lists is non-empty, but not both |
54-
| `self.envars.filter(e, e.name = 'MY_ENV').all(e, e.value.matches('^[a-zA-Z]*$')` | Validate the 'value' field of a listMap entry where key field 'name' is 'MY_ENV' |
54+
| `self.envars.filter(e, e.name = 'MY_ENV').all(e, e.value.matches('^[a-zA-Z]*$'))` | Validate the 'value' field of a listMap entry where key field 'name' is 'MY_ENV' |
5555
| `has(self.expired) && self.created + self.ttl < self.expired` | Validate that 'expired' date is after a 'create' date plus a 'ttl' duration |
5656
| `self.health.startsWith('ok')` | Validate a 'health' string field has the prefix 'ok' |
5757
| `self.widgets.exists(w, w.key == 'x' && w.foo < 10)` | Validate that the 'foo' property of a listMap item with a key 'x' is less than 10 |

content/en/docs/test.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,12 @@ Notes catch the reader's attention without a sense of urgency.
370370
371371
You can have multiple paragraphs and block-level elements inside an admonition.
372372
373-
| Or | a | table |
373+
You can also add tables to organize and highlight key information.
374+
375+
| Header 1 | Header 2 | Header 3 |
376+
| -------- | -------- | -------- |
377+
| Data 1 | Data A | Info X |
378+
| Data 2 | Data B | Info Y |
374379
{{< /note >}}
375380
376381
{{< caution >}}

0 commit comments

Comments
 (0)