Merge branch 'main' into feat/security-config

Author: siegfriedweber

Cargo.lock

@@ -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"
@@ -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" }

Cargo.nix

@@ -1346,11 +1346,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
@@ -1373,6 +1374,7 @@ spec:
                                       - ERROR
                                       - FATAL
                                       - NONE
+                                      - null
                                       nullable: true
                                       type: string
                                   type: object
@@ -1392,6 +1394,7 @@ spec:
                                         - ERROR
                                         - FATAL
                                         - NONE
+                                        - null
                                         nullable: true
                                         type: string
                                     type: object
@@ -1459,15 +1462,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:
@@ -1480,7 +1483,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
@@ -1494,7 +1497,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
@@ -1712,11 +1715,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
@@ -1739,6 +1743,7 @@ spec:
                                             - ERROR
                                             - FATAL
                                             - NONE
+                                            - null
                                             nullable: true
                                             type: string
                                         type: object
@@ -1758,6 +1763,7 @@ spec:
                                               - ERROR
                                               - FATAL
                                               - NONE
+                                              - null
                                               nullable: true
                                               type: string
                                           type: object
@@ -1825,15 +1831,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:
@@ -1846,7 +1852,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
@@ -1860,7 +1866,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

Cargo.toml

@@ -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