diff --git a/Cargo.lock b/Cargo.lock index aec5e8f9..33989b08 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1353,9 +1353,9 @@ dependencies = [ [[package]] name = "k8s-openapi" -version = "0.26.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06d9e5e61dd037cdc51da0d7e2b2be10f497478ea7e120d85dad632adb99882b" +checksum = "d13f06d5326a915becaffabdfab75051b8cdc260c2a5c06c0e90226ede89a692" dependencies = [ "base64", "chrono", @@ -2490,6 +2490,7 @@ dependencies = [ "fnv", "futures 0.3.31", "indoc", + "k8s-openapi", "product-config", "rand", "rstest", diff --git a/Cargo.nix b/Cargo.nix index 3e1b1150..d8151fa1 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -4201,10 +4201,10 @@ rec { }; "k8s-openapi" = rec { crateName = "k8s-openapi"; - version = "0.26.1"; + version = "0.26.0"; edition = "2021"; - links = "k8s-openapi-0.26.1"; - sha256 = "0aw8k7djlqxdbpc21qd7ir3rgx0hpsrf5mx03p2wsdyh3pkfbn86"; + links = "k8s-openapi-0.26.0"; + sha256 = "14m6i7g6w8lh1rnc19f2c31cvf2ia2vzmggsmzn5p4ba6bahcgyi"; libName = "k8s_openapi"; authors = [ "Arnav Singh " @@ -4246,7 +4246,7 @@ rec { "latest" = [ "v1_34" ]; "schemars" = [ "dep:schemars" ]; }; - resolvedDefaultFeatures = [ "schemars" "v1_34" ]; + resolvedDefaultFeatures = [ "default" "schemars" "std" "v1_34" ]; }; "k8s-version" = rec { crateName = "k8s-version"; @@ -8115,6 +8115,10 @@ rec { name = "indoc"; packageId = "indoc"; } + { + name = "k8s-openapi"; + packageId = "k8s-openapi"; + } { name = "product-config"; packageId = "product-config"; diff --git a/Cargo.toml b/Cargo.toml index ef3cacb2..b73d9df8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,6 +32,9 @@ strum = { version = "0.27", features = ["derive"] } tokio = { version = "1.40", features = ["full"] } tracing = "0.1" +# k8s-openapi 0.26.1 doesn't play well with our kube version: https://github.com/kube-rs/kube/issues/1869 +k8s-openapi = "=0.26.0" + [patch."https://github.com/stackabletech/operator-rs.git"] # stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" } # stackable-operator = { path = "../operator-rs/crates/stackable-operator" } diff --git a/deploy/helm/airflow-operator/crds/crds.yaml b/deploy/helm/airflow-operator/crds/crds.yaml index 30a24c06..44ebe492 100644 --- a/deploy/helm/airflow-operator/crds/crds.yaml +++ b/deploy/helm/airflow-operator/crds/crds.yaml @@ -200,14 +200,16 @@ spec: Equivalent to the `limit` 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`. - x-kubernetes-int-or-string: true + nullable: true + type: string 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`. - x-kubernetes-int-or-string: true + nullable: true + type: string type: object memory: properties: @@ -219,7 +221,8 @@ spec: You can also use the power-of-two equivalents: Ei, Pi, Ti, Gi, Mi, Ki. For example, the following represent roughly the same value: `128974848, 129e6, 129M, 128974848000m, 123Mi` - x-kubernetes-int-or-string: true + nullable: true + type: string runtimeLimits: description: Additional options that can be specified. type: object @@ -465,14 +468,16 @@ spec: Equivalent to the `limit` 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`. - x-kubernetes-int-or-string: true + nullable: true + type: string 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`. - x-kubernetes-int-or-string: true + nullable: true + type: string type: object memory: properties: @@ -484,7 +489,8 @@ spec: You can also use the power-of-two equivalents: Ei, Pi, Ti, Gi, Mi, Ki. For example, the following represent roughly the same value: `128974848, 129e6, 129M, 128974848000m, 123Mi` - x-kubernetes-int-or-string: true + nullable: true + type: string runtimeLimits: description: Additional options that can be specified. type: object @@ -954,14 +960,16 @@ spec: Equivalent to the `limit` 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`. - x-kubernetes-int-or-string: true + nullable: true + type: string 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`. - x-kubernetes-int-or-string: true + nullable: true + type: string type: object memory: properties: @@ -973,7 +981,8 @@ spec: You can also use the power-of-two equivalents: Ei, Pi, Ti, Gi, Mi, Ki. For example, the following represent roughly the same value: `128974848, 129e6, 129M, 128974848000m, 123Mi` - x-kubernetes-int-or-string: true + nullable: true + type: string runtimeLimits: description: Additional options that can be specified. type: object @@ -1219,14 +1228,16 @@ spec: Equivalent to the `limit` 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`. - x-kubernetes-int-or-string: true + nullable: true + type: string 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`. - x-kubernetes-int-or-string: true + nullable: true + type: string type: object memory: properties: @@ -1238,7 +1249,8 @@ spec: You can also use the power-of-two equivalents: Ei, Pi, Ti, Gi, Mi, Ki. For example, the following represent roughly the same value: `128974848, 129e6, 129M, 128974848000m, 123Mi` - x-kubernetes-int-or-string: true + nullable: true + type: string runtimeLimits: description: Additional options that can be specified. type: object @@ -1512,14 +1524,16 @@ spec: Equivalent to the `limit` 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`. - x-kubernetes-int-or-string: true + nullable: true + type: string 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`. - x-kubernetes-int-or-string: true + nullable: true + type: string type: object memory: properties: @@ -1531,7 +1545,8 @@ spec: You can also use the power-of-two equivalents: Ei, Pi, Ti, Gi, Mi, Ki. For example, the following represent roughly the same value: `128974848, 129e6, 129M, 128974848000m, 123Mi` - x-kubernetes-int-or-string: true + nullable: true + type: string runtimeLimits: description: Additional options that can be specified. type: object @@ -1756,14 +1771,16 @@ spec: Equivalent to the `limit` 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`. - x-kubernetes-int-or-string: true + nullable: true + type: string 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`. - x-kubernetes-int-or-string: true + nullable: true + type: string type: object memory: properties: @@ -1775,7 +1792,8 @@ spec: You can also use the power-of-two equivalents: Ei, Pi, Ti, Gi, Mi, Ki. For example, the following represent roughly the same value: `128974848, 129e6, 129M, 128974848000m, 123Mi` - x-kubernetes-int-or-string: true + nullable: true + type: string runtimeLimits: description: Additional options that can be specified. type: object @@ -2021,14 +2039,16 @@ spec: Equivalent to the `limit` 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`. - x-kubernetes-int-or-string: true + nullable: true + type: string 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`. - x-kubernetes-int-or-string: true + nullable: true + type: string type: object memory: properties: @@ -2040,7 +2060,8 @@ spec: You can also use the power-of-two equivalents: Ei, Pi, Ti, Gi, Mi, Ki. For example, the following represent roughly the same value: `128974848, 129e6, 129M, 128974848000m, 123Mi` - x-kubernetes-int-or-string: true + nullable: true + type: string runtimeLimits: description: Additional options that can be specified. type: object @@ -2259,14 +2280,16 @@ spec: Equivalent to the `limit` 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`. - x-kubernetes-int-or-string: true + nullable: true + type: string 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`. - x-kubernetes-int-or-string: true + nullable: true + type: string type: object memory: properties: @@ -2278,7 +2301,8 @@ spec: You can also use the power-of-two equivalents: Ei, Pi, Ti, Gi, Mi, Ki. For example, the following represent roughly the same value: `128974848, 129e6, 129M, 128974848000m, 123Mi` - x-kubernetes-int-or-string: true + nullable: true + type: string runtimeLimits: description: Additional options that can be specified. type: object @@ -2524,14 +2548,16 @@ spec: Equivalent to the `limit` 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`. - x-kubernetes-int-or-string: true + nullable: true + type: string 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`. - x-kubernetes-int-or-string: true + nullable: true + type: string type: object memory: properties: @@ -2543,7 +2569,8 @@ spec: You can also use the power-of-two equivalents: Ei, Pi, Ti, Gi, Mi, Ki. For example, the following represent roughly the same value: `128974848, 129e6, 129M, 128974848000m, 123Mi` - x-kubernetes-int-or-string: true + nullable: true + type: string runtimeLimits: description: Additional options that can be specified. type: object @@ -2762,14 +2789,16 @@ spec: Equivalent to the `limit` 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`. - x-kubernetes-int-or-string: true + nullable: true + type: string 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`. - x-kubernetes-int-or-string: true + nullable: true + type: string type: object memory: properties: @@ -2781,7 +2810,8 @@ spec: You can also use the power-of-two equivalents: Ei, Pi, Ti, Gi, Mi, Ki. For example, the following represent roughly the same value: `128974848, 129e6, 129M, 128974848000m, 123Mi` - x-kubernetes-int-or-string: true + nullable: true + type: string runtimeLimits: description: Additional options that can be specified. type: object @@ -3032,14 +3062,16 @@ spec: Equivalent to the `limit` 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`. - x-kubernetes-int-or-string: true + nullable: true + type: string 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`. - x-kubernetes-int-or-string: true + nullable: true + type: string type: object memory: properties: @@ -3051,7 +3083,8 @@ spec: You can also use the power-of-two equivalents: Ei, Pi, Ti, Gi, Mi, Ki. For example, the following represent roughly the same value: `128974848, 129e6, 129M, 128974848000m, 123Mi` - x-kubernetes-int-or-string: true + nullable: true + type: string runtimeLimits: description: Additional options that can be specified. type: object diff --git a/rust/operator-binary/Cargo.toml b/rust/operator-binary/Cargo.toml index 8abd5e6f..4d7c1ba0 100644 --- a/rust/operator-binary/Cargo.toml +++ b/rust/operator-binary/Cargo.toml @@ -28,6 +28,9 @@ strum.workspace = true tokio.workspace = true tracing.workspace = true +# Needed to pin the version in the root Cargo.toml +k8s-openapi.workspace = true + [build-dependencies] built.workspace = true