Skip to content

Commit 5067091

Browse files
author
Per Goncalves da Silva
committed
Update inline config docs and annotations
Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>
1 parent 4355cde commit 5067091

File tree

5 files changed

+14
-13
lines changed

5 files changed

+14
-13
lines changed

api/v1/clusterextension_types.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,12 +176,13 @@ type ClusterExtensionConfig struct {
176176
// inline contains JSON or YAML values specified directly in the
177177
// ClusterExtension.
178178
//
179-
// inline must be set if configType is 'Inline'.
180-
// inline accepts arbitrary JSON/YAML objects.
181-
// inline is validation at runtime against the schema provided by the bundle if a schema is provided.
179+
// inline is used to specify arbitrary configuration values for the ClusterExtension.
180+
// It must be set if configType is 'Inline' and must be a valid JSON/YAML object.
181+
// The configuration values are validated at runtime against a JSON schema provided by the bundle.
182182
//
183183
// +kubebuilder:validation:Type=object
184184
// +optional
185+
// +unionMember
185186
Inline *apiextensionsv1.JSON `json:"inline,omitempty"`
186187
}
187188

docs/api-reference/olmv1-api-reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ _Appears in:_
254254
| Field | Description | Default | Validation |
255255
| --- | --- | --- | --- |
256256
| `configType` _[ClusterExtensionConfigType](#clusterextensionconfigtype)_ | configType is a required reference to the type of configuration source.<br />Allowed values are "Inline"<br />When this field is set to "Inline", the cluster extension configuration is defined inline within the<br />ClusterExtension resource. | | Enum: [Inline] <br />Required: \{\} <br /> |
257-
| `inline` _[JSON](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.31/#json-v1-apiextensions-k8s-io)_ | inline contains JSON or YAML values specified directly in the<br />ClusterExtension.<br />inline must be set if configType is 'Inline'.<br />inline accepts arbitrary JSON/YAML objects.<br />inline is validation at runtime against the schema provided by the bundle if a schema is provided. | | Type: object <br /> |
257+
| `inline` _[JSON](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.31/#json-v1-apiextensions-k8s-io)_ | inline contains JSON or YAML values specified directly in the<br />ClusterExtension.<br />inline is used to specify arbitrary configuration values for the ClusterExtension.<br />It must be set if configType is 'Inline' and must be a valid JSON/YAML object.<br />The configuration values are validated at runtime against a JSON schema provided by the bundle. | | Type: object <br /> |
258258

259259

260260
#### ClusterExtensionConfigType

helm/olmv1/base/operator-controller/crd/experimental/olm.operatorframework.io_clusterextensions.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ spec:
8383
inline contains JSON or YAML values specified directly in the
8484
ClusterExtension.
8585
86-
inline must be set if configType is 'Inline'.
87-
inline accepts arbitrary JSON/YAML objects.
88-
inline is validation at runtime against the schema provided by the bundle if a schema is provided.
86+
inline is used to specify arbitrary configuration values for the ClusterExtension.
87+
It must be set if configType is 'Inline' and must be a valid JSON/YAML object.
88+
The configuration values are validated at runtime against a JSON schema provided by the bundle.
8989
type: object
9090
x-kubernetes-preserve-unknown-fields: true
9191
required:

manifests/experimental-e2e.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -981,9 +981,9 @@ spec:
981981
inline contains JSON or YAML values specified directly in the
982982
ClusterExtension.
983983
984-
inline must be set if configType is 'Inline'.
985-
inline accepts arbitrary JSON/YAML objects.
986-
inline is validation at runtime against the schema provided by the bundle if a schema is provided.
984+
inline is used to specify arbitrary configuration values for the ClusterExtension.
985+
It must be set if configType is 'Inline' and must be a valid JSON/YAML object.
986+
The configuration values are validated at runtime against a JSON schema provided by the bundle.
987987
type: object
988988
x-kubernetes-preserve-unknown-fields: true
989989
required:

manifests/experimental.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -946,9 +946,9 @@ spec:
946946
inline contains JSON or YAML values specified directly in the
947947
ClusterExtension.
948948
949-
inline must be set if configType is 'Inline'.
950-
inline accepts arbitrary JSON/YAML objects.
951-
inline is validation at runtime against the schema provided by the bundle if a schema is provided.
949+
inline is used to specify arbitrary configuration values for the ClusterExtension.
950+
It must be set if configType is 'Inline' and must be a valid JSON/YAML object.
951+
The configuration values are validated at runtime against a JSON schema provided by the bundle.
952952
type: object
953953
x-kubernetes-preserve-unknown-fields: true
954954
required:

0 commit comments

Comments
 (0)