Skip to content

Commit 3b98323

Browse files
Extend the documentation of the userProvided JsonConfigOverrides
1 parent 8d7f40f commit 3b98323

2 files changed

Lines changed: 77 additions & 3 deletions

File tree

crates/stackable-operator/crds/DummyCluster.yaml

Lines changed: 52 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,7 +1008,32 @@ spec:
10081008
x-kubernetes-preserve-unknown-fields: true
10091009
type: array
10101010
userProvided:
1011-
description: Override the entire config file with the specified JSON value.
1011+
description: |-
1012+
Override the entire config file with the specified JSON document.
1013+
1014+
Please note that you can in-line JSON into YAML as follows:
1015+
1016+
```yaml
1017+
# ... other YAML content
1018+
userProvided: {
1019+
"myString": "test",
1020+
"myList": ["test"],
1021+
"myBool": true,
1022+
"my": {"nested.field.with.dots": 42}
1023+
}
1024+
```
1025+
1026+
As an alternative you can also stick to YAML:
1027+
1028+
```yaml
1029+
# ... other YAML content
1030+
userProvided:
1031+
myString: test
1032+
myList: [test]
1033+
myBool: true
1034+
my:
1035+
nested.field.with.dots: 42
1036+
```
10121037
type: object
10131038
x-kubernetes-preserve-unknown-fields: true
10141039
type: object
@@ -1662,7 +1687,32 @@ spec:
16621687
x-kubernetes-preserve-unknown-fields: true
16631688
type: array
16641689
userProvided:
1665-
description: Override the entire config file with the specified JSON value.
1690+
description: |-
1691+
Override the entire config file with the specified JSON document.
1692+
1693+
Please note that you can in-line JSON into YAML as follows:
1694+
1695+
```yaml
1696+
# ... other YAML content
1697+
userProvided: {
1698+
"myString": "test",
1699+
"myList": ["test"],
1700+
"myBool": true,
1701+
"my": {"nested.field.with.dots": 42}
1702+
}
1703+
```
1704+
1705+
As an alternative you can also stick to YAML:
1706+
1707+
```yaml
1708+
# ... other YAML content
1709+
userProvided:
1710+
myString: test
1711+
myList: [test]
1712+
myBool: true
1713+
my:
1714+
nested.field.with.dots: 42
1715+
```
16661716
type: object
16671717
x-kubernetes-preserve-unknown-fields: true
16681718
type: object

crates/stackable-operator/src/v2/config_overrides.rs

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,31 @@ pub enum JsonConfigOverrides {
9999
#[schemars(schema_with = "raw_object_list_schema")]
100100
JsonPatch(json_patch::Patch),
101101

102-
/// Override the entire config file with the specified JSON value.
102+
/// Override the entire config file with the specified JSON document.
103+
///
104+
/// Please note that you can in-line JSON into YAML as follows:
105+
///
106+
/// ```yaml
107+
/// # ... other YAML content
108+
/// userProvided: {
109+
/// "myString": "test",
110+
/// "myList": ["test"],
111+
/// "myBool": true,
112+
/// "my": {"nested.field.with.dots": 42}
113+
/// }
114+
/// ```
115+
///
116+
/// As an alternative you can also stick to YAML:
117+
///
118+
/// ```yaml
119+
/// # ... other YAML content
120+
/// userProvided:
121+
/// myString: test
122+
/// myList: [test]
123+
/// myBool: true
124+
/// my:
125+
/// nested.field.with.dots: 42
126+
/// ```
103127
#[schemars(schema_with = "raw_object_schema")]
104128
UserProvided(serde_json::Value),
105129

0 commit comments

Comments
 (0)