diff --git a/CHANGELOG.md b/CHANGELOG.md index 40bfc5f5..b9808d97 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,7 +21,7 @@ All notable changes to this project will be documented in this file. ### Fixed - Add a startupProbe, which checks via `/v1/info` that the coordinator/worker have finished starting. - Also migrate the other probes from `tcpSocket` to `httpGet` on `/v1/info` ([#715]). + Also migrate the other probes from `tcpSocket` to `httpGet` on `/v1/info` ([#715], [#717]). [#676]: https://github.com/stackabletech/trino-operator/pull/676 [#677]: https://github.com/stackabletech/trino-operator/pull/677 @@ -29,6 +29,7 @@ All notable changes to this project will be documented in this file. [#694]: https://github.com/stackabletech/trino-operator/pull/694 [#695]: https://github.com/stackabletech/trino-operator/pull/695 [#715]: https://github.com/stackabletech/trino-operator/pull/715 +[#717]: https://github.com/stackabletech/trino-operator/pull/717 ## [24.11.1] - 2025-01-10 diff --git a/Cargo.nix b/Cargo.nix index 09062dc5..64e90d14 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -6979,13 +6979,10 @@ rec { }; "ring" = rec { crateName = "ring"; - version = "0.17.8"; + version = "0.17.13"; edition = "2021"; - links = "ring_core_0_17_8"; - sha256 = "03fwlb1ssrmfxdckvqv033pfmk01rhx9ynwi7r186dcfcp5s8zy1"; - authors = [ - "Brian Smith " - ]; + links = "ring_core_0_17_13_"; + sha256 = "1vjhhlmpqqd9lc53ffjj1yk203188n2km27g3myvssm15a1mvb3h"; dependencies = [ { name = "cfg-if"; @@ -7000,14 +6997,13 @@ rec { name = "libc"; packageId = "libc"; usesDefaultFeatures = false; - target = { target, features }: ((("android" == target."os" or null) || ("linux" == target."os" or null)) && (("aarch64" == target."arch" or null) || ("arm" == target."arch" or null))); + target = { target, features }: ((("aarch64" == target."arch" or null) && ("little" == target."endian" or null)) && ("apple" == target."vendor" or null) && (("ios" == target."os" or null) || ("macos" == target."os" or null) || ("tvos" == target."os" or null) || ("visionos" == target."os" or null) || ("watchos" == target."os" or null))); } { - name = "spin"; - packageId = "spin"; + name = "libc"; + packageId = "libc"; usesDefaultFeatures = false; - target = { target, features }: (("aarch64" == target."arch" or null) || ("arm" == target."arch" or null) || ("x86" == target."arch" or null) || ("x86_64" == target."arch" or null)); - features = [ "once" ]; + target = { target, features }: (((("aarch64" == target."arch" or null) && ("little" == target."endian" or null)) || (("arm" == target."arch" or null) && ("little" == target."endian" or null))) && (("android" == target."os" or null) || ("linux" == target."os" or null))); } { name = "untrusted"; @@ -7016,7 +7012,7 @@ rec { { name = "windows-sys"; packageId = "windows-sys 0.52.0"; - target = { target, features }: (("aarch64" == target."arch" or null) && ("windows" == target."os" or null)); + target = { target, features }: ((("aarch64" == target."arch" or null) && ("little" == target."endian" or null)) && ("windows" == target."os" or null)); features = [ "Win32_Foundation" "Win32_System_Threading" ]; } ]; @@ -8199,31 +8195,6 @@ rec { }; resolvedDefaultFeatures = [ "all" ]; }; - "spin" = rec { - crateName = "spin"; - version = "0.9.8"; - edition = "2015"; - sha256 = "0rvam5r0p3a6qhc18scqpvpgb3ckzyqxpgdfyjnghh8ja7byi039"; - authors = [ - "Mathijs van de Nes " - "John Ericson " - "Joshua Barretto " - ]; - features = { - "barrier" = [ "mutex" ]; - "default" = [ "lock_api" "mutex" "spin_mutex" "rwlock" "once" "lazy" "barrier" ]; - "fair_mutex" = [ "mutex" ]; - "lazy" = [ "once" ]; - "lock_api" = [ "lock_api_crate" ]; - "lock_api_crate" = [ "dep:lock_api_crate" ]; - "portable-atomic" = [ "dep:portable-atomic" ]; - "portable_atomic" = [ "portable-atomic" ]; - "spin_mutex" = [ "mutex" ]; - "ticket_mutex" = [ "mutex" ]; - "use_ticket_mutex" = [ "mutex" "ticket_mutex" ]; - }; - resolvedDefaultFeatures = [ "once" ]; - }; "stable_deref_trait" = rec { crateName = "stable_deref_trait"; version = "1.2.0"; diff --git a/rust/operator-binary/src/controller.rs b/rust/operator-binary/src/controller.rs index 8ac9d3a1..ced8957e 100644 --- a/rust/operator-binary/src/controller.rs +++ b/rust/operator-binary/src/controller.rs @@ -1545,6 +1545,12 @@ fn http_get_probe(trino: &v1alpha1::TrinoCluster) -> HTTPGetAction { /// This probe works on coordinators and workers. fn finished_starting_probe(trino: &v1alpha1::TrinoCluster) -> ExecAction { let port = trino.exposed_port(); + let schema = if trino.expose_https_port() { + "https" + } else { + "http" + }; + ExecAction { command: Some(vec![ "/bin/bash".to_string(), @@ -1552,7 +1558,7 @@ fn finished_starting_probe(trino: &v1alpha1::TrinoCluster) -> ExecAction { "-euo".to_string(), "pipefail".to_string(), "-c".to_string(), - format!("curl --fail --insecure https://127.0.0.1:{port}/v1/info | grep --silent '\\\"starting\\\":false'"), + format!("curl --fail --insecure {schema}://127.0.0.1:{port}/v1/info | grep --silent '\\\"starting\\\":false'"), ]), } }