Skip to content

[api] schema: extendedOptions as untyped object #327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 12, 2022
Merged

[api] schema: extendedOptions as untyped object #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions bundle.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3382,14 +3382,8 @@ spec:
options.
properties:
options:
additionalProperties:
description: RawMessage is a raw encoded JSON value.
It implements Marshaler and Unmarshaler and can
be used to delay JSON decoding or precompute a JSON
encoding.
format: byte
type: string
type: object
x-kubernetes-preserve-unknown-fields: true
type:
type: string
type: object
Expand Down
8 changes: 1 addition & 7 deletions helm/m3db-operator/templates/00_operator.m3db.io_m3dbclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3374,14 +3374,8 @@ spec:
options.
properties:
options:
additionalProperties:
description: RawMessage is a raw encoded JSON value.
It implements Marshaler and Unmarshaler and can
be used to delay JSON decoding or precompute a JSON
encoding.
format: byte
type: string
type: object
x-kubernetes-preserve-unknown-fields: true
type:
type: string
type: object
Expand Down
5 changes: 4 additions & 1 deletion pkg/apis/m3dboperator/v1alpha1/namespace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,10 @@ type DownsampleOptions struct {

// ExtendedOptions stores the extended namespace options.
type ExtendedOptions struct {
Type string `json:"type,omitempty"`
Type string `json:"type,omitempty"`
// +kubebuilder:pruning:PreserveUnknownFields
// +kubebuilder:validation:Schemaless
// +kubebuilder:validation:Type=object
Options map[string]json.RawMessage `json:"options,omitempty"`
}

Expand Down