Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
209 changes: 111 additions & 98 deletions Cargo.lock

Large diffs are not rendered by default.

565 changes: 305 additions & 260 deletions Cargo.nix

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,14 @@ edition = "2024"
repository = "https://github.com/stackabletech/opensearch-operator"

[workspace.dependencies]
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.105.0", features = ["telemetry", "versioned", "webhook"] }
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.106.1", features = ["telemetry", "versioned", "webhook"] }

built = { version = "0.8.0", features = ["chrono", "git2"] }
clap = "4.5"
futures = { version = "0.3", features = ["compat"] }
pretty_assertions = "1.4"
regex = "1.11"
rstest = "0.26"
schemars = { version = "1.0.0", features = ["url2"] } # same as in operator-rs
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
snafu = "0.8"
Expand All @@ -27,5 +26,5 @@ tokio = { version = "1.47", features = ["full"] }
tracing = "0.1"
uuid = "1.18"

#[patch."https://github.com/stackabletech/operator-rs"]
[patch."https://github.com/stackabletech/operator-rs"]
# stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" }
28 changes: 14 additions & 14 deletions crate-hashes.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 16 additions & 10 deletions extra/crds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -294,11 +294,12 @@ spec:
- ERROR
- FATAL
- NONE
- null
nullable: true
type: string
type: object
custom:
description: Log configuration provided in a ConfigMap
description: Custom log configuration provided in a ConfigMap
properties:
configMap:
description: ConfigMap containing the log configuration files
Expand All @@ -321,6 +322,7 @@ spec:
- ERROR
- FATAL
- NONE
- null
nullable: true
type: string
type: object
Expand All @@ -340,6 +342,7 @@ spec:
- ERROR
- FATAL
- NONE
- null
nullable: true
type: string
type: object
Expand Down Expand Up @@ -407,15 +410,15 @@ spec:
Cores are specified either as a decimal point number or as milli units.
For example:`1.5` will be 1.5 cores, also written as `1500m`.
nullable: true
type: string
x-kubernetes-int-or-string: true
min:
description: |-
The minimal amount of CPU cores that Pods need to run.
Equivalent to the `request` for Pod resource configuration.
Cores are specified either as a decimal point number or as milli units.
For example:`1.5` will be 1.5 cores, also written as `1500m`.
nullable: true
type: string
x-kubernetes-int-or-string: true
type: object
memory:
properties:
Expand All @@ -428,7 +431,7 @@ spec:
For example, the following represent roughly the same value:
`128974848, 129e6, 129M, 128974848000m, 123Mi`
nullable: true
type: string
x-kubernetes-int-or-string: true
runtimeLimits:
description: Additional options that can be specified.
type: object
Expand All @@ -442,7 +445,7 @@ spec:
capacity:
description: "Quantity is a fixed-point representation of a number. It provides convenient marshaling/unmarshaling in JSON and YAML, in addition to String() and AsInt64() accessors.\n\nThe serialization format is:\n\n``` <quantity> ::= <signedNumber><suffix>\n\n\t(Note that <suffix> may be empty, from the \"\" case in <decimalSI>.)\n\n<digit> ::= 0 | 1 | ... | 9 <digits> ::= <digit> | <digit><digits> <number> ::= <digits> | <digits>.<digits> | <digits>. | .<digits> <sign> ::= \"+\" | \"-\" <signedNumber> ::= <number> | <sign><number> <suffix> ::= <binarySI> | <decimalExponent> | <decimalSI> <binarySI> ::= Ki | Mi | Gi | Ti | Pi | Ei\n\n\t(International System of units; See: http://physics.nist.gov/cuu/Units/binary.html)\n\n<decimalSI> ::= m | \"\" | k | M | G | T | P | E\n\n\t(Note that 1024 = 1Ki but 1000 = 1k; I didn't choose the capitalization.)\n\n<decimalExponent> ::= \"e\" <signedNumber> | \"E\" <signedNumber> ```\n\nNo matter which of the three exponent forms is used, no quantity may represent a number greater than 2^63-1 in magnitude, nor may it have more than 3 decimal places. Numbers larger or more precise will be capped or rounded up. (E.g.: 0.1m will rounded up to 1m.) This may be extended in the future if we require larger or smaller quantities.\n\nWhen a Quantity is parsed from a string, it will remember the type of suffix it had, and will use the same type again when it is serialized.\n\nBefore serializing, Quantity will be put in \"canonical form\". This means that Exponent/suffix will be adjusted up or down (with a corresponding increase or decrease in Mantissa) such that:\n\n- No precision is lost - No fractional digits will be emitted - The exponent (or suffix) is as large as possible.\n\nThe sign will be omitted unless the number is negative.\n\nExamples:\n\n- 1.5 will be serialized as \"1500m\" - 1.5Gi will be serialized as \"1536Mi\"\n\nNote that the quantity will NEVER be internally represented by a floating point number. That is the whole point of this exercise.\n\nNon-canonical values will still parse as long as they are well formed, but will be re-emitted in their canonical form. (So always use canonical form, or don't diff.)\n\nThis format is intended to make it difficult to use these numbers without writing some sort of special handling code in the hopes that that will cause implementors to also use a fixed point implementation."
nullable: true
type: string
x-kubernetes-int-or-string: true
selectors:
description: A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.
nullable: true
Expand Down Expand Up @@ -660,11 +663,12 @@ spec:
- ERROR
- FATAL
- NONE
- null
nullable: true
type: string
type: object
custom:
description: Log configuration provided in a ConfigMap
description: Custom log configuration provided in a ConfigMap
properties:
configMap:
description: ConfigMap containing the log configuration files
Expand All @@ -687,6 +691,7 @@ spec:
- ERROR
- FATAL
- NONE
- null
nullable: true
type: string
type: object
Expand All @@ -706,6 +711,7 @@ spec:
- ERROR
- FATAL
- NONE
- null
nullable: true
type: string
type: object
Expand Down Expand Up @@ -773,15 +779,15 @@ spec:
Cores are specified either as a decimal point number or as milli units.
For example:`1.5` will be 1.5 cores, also written as `1500m`.
nullable: true
type: string
x-kubernetes-int-or-string: true
min:
description: |-
The minimal amount of CPU cores that Pods need to run.
Equivalent to the `request` for Pod resource configuration.
Cores are specified either as a decimal point number or as milli units.
For example:`1.5` will be 1.5 cores, also written as `1500m`.
nullable: true
type: string
x-kubernetes-int-or-string: true
type: object
memory:
properties:
Expand All @@ -794,7 +800,7 @@ spec:
For example, the following represent roughly the same value:
`128974848, 129e6, 129M, 128974848000m, 123Mi`
nullable: true
type: string
x-kubernetes-int-or-string: true
runtimeLimits:
description: Additional options that can be specified.
type: object
Expand All @@ -808,7 +814,7 @@ spec:
capacity:
description: "Quantity is a fixed-point representation of a number. It provides convenient marshaling/unmarshaling in JSON and YAML, in addition to String() and AsInt64() accessors.\n\nThe serialization format is:\n\n``` <quantity> ::= <signedNumber><suffix>\n\n\t(Note that <suffix> may be empty, from the \"\" case in <decimalSI>.)\n\n<digit> ::= 0 | 1 | ... | 9 <digits> ::= <digit> | <digit><digits> <number> ::= <digits> | <digits>.<digits> | <digits>. | .<digits> <sign> ::= \"+\" | \"-\" <signedNumber> ::= <number> | <sign><number> <suffix> ::= <binarySI> | <decimalExponent> | <decimalSI> <binarySI> ::= Ki | Mi | Gi | Ti | Pi | Ei\n\n\t(International System of units; See: http://physics.nist.gov/cuu/Units/binary.html)\n\n<decimalSI> ::= m | \"\" | k | M | G | T | P | E\n\n\t(Note that 1024 = 1Ki but 1000 = 1k; I didn't choose the capitalization.)\n\n<decimalExponent> ::= \"e\" <signedNumber> | \"E\" <signedNumber> ```\n\nNo matter which of the three exponent forms is used, no quantity may represent a number greater than 2^63-1 in magnitude, nor may it have more than 3 decimal places. Numbers larger or more precise will be capped or rounded up. (E.g.: 0.1m will rounded up to 1m.) This may be extended in the future if we require larger or smaller quantities.\n\nWhen a Quantity is parsed from a string, it will remember the type of suffix it had, and will use the same type again when it is serialized.\n\nBefore serializing, Quantity will be put in \"canonical form\". This means that Exponent/suffix will be adjusted up or down (with a corresponding increase or decrease in Mantissa) such that:\n\n- No precision is lost - No fractional digits will be emitted - The exponent (or suffix) is as large as possible.\n\nThe sign will be omitted unless the number is negative.\n\nExamples:\n\n- 1.5 will be serialized as \"1500m\" - 1.5Gi will be serialized as \"1536Mi\"\n\nNote that the quantity will NEVER be internally represented by a floating point number. That is the whole point of this exercise.\n\nNon-canonical values will still parse as long as they are well formed, but will be re-emitted in their canonical form. (So always use canonical form, or don't diff.)\n\nThis format is intended to make it difficult to use these numbers without writing some sort of special handling code in the hopes that that will cause implementors to also use a fixed point implementation."
nullable: true
type: string
x-kubernetes-int-or-string: true
selectors:
description: A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.
nullable: true
Expand Down
1 change: 0 additions & 1 deletion rust/operator-binary/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ stackable-operator.workspace = true
clap.workspace = true
futures.workspace = true
regex.workspace = true
schemars.workspace = true
serde.workspace = true
serde_json.workspace = true
snafu.workspace = true
Expand Down
Loading