Skip to content

Commit 7622f27

Browse files
committed
fix(operator): Updated default API cmd to match binary
This updates the default API spec cmd value to match the new thorium binary name thorium-api. This fixes an issue where the CI/CD pipeline is building a binary with a different name that the operator expects when deploying the thorium API deployment in k8s resulting in pod CreateContainerErrors for the API Pod.
1 parent 98c88b7 commit 7622f27

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ default-members = [
3232
]
3333

3434
[workspace.package]
35-
version = "1.5.0"
35+
version = "1.5.1"
3636
authors = ["mcarson <mcarson@sandia.gov>", "gmbaker <gmbaker@sandia.gov>", "jehamza <jehamza@sandia.gov>"]
3737
edition = "2024"
3838

@@ -41,8 +41,8 @@ inherits = "release"
4141
debug = true
4242

4343
[workspace.dependencies]
44-
thorium-api = { version= "1.5.0", path="api", default-features = false }
45-
thorium-derive = { version = "1.5.0", path = "thorium-derive" }
44+
thorium-api = { version= "1.5.1", path="api", default-features = false }
45+
thorium-derive = { version = "1.5.1", path = "thorium-derive" }
4646
reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls", "multipart", "stream", "blocking"] }
4747
tokio = { version = "1.45", features = ["full"] }
4848
kube = { git = "https://github.com/stackabletech/kube-rs.git", rev="cfdfcd1", features = ["rustls-tls", "derive", "config", "client", "runtime", "http-proxy"] }

operator/src/k8s/crds.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ use k8s_openapi::{
33
apimachinery::pkg::api::resource::Quantity,
44
};
55
use kube::{
6+
Client,
67
api::{Api, Patch, PatchParams},
78
core::CustomResourceExt,
89
runtime::{conditions, wait::await_condition},
9-
Client,
1010
};
1111
use kube_derive::CustomResource;
1212
use schemars::JsonSchema;
@@ -94,7 +94,7 @@ fn default_envs() -> Vec<EnvVar> {
9494

9595
/// Serde helper for default api container args (cmd in a Dockerfile)
9696
fn default_api_cmd() -> Vec<String> {
97-
vec!["/app/thorium".to_owned()]
97+
vec!["/app/thorium-api".to_owned()]
9898
}
9999

100100
/// Serde helper for default api container cmd (entrypoint in a Dockerfile)
@@ -448,7 +448,7 @@ pub async fn create_or_update(client: &Client) -> Result<(), Error> {
448448
Err(_) => {
449449
return Err(Error::new(format!(
450450
"Timed out waiting for ThoriumCluster CRD to be established"
451-
)))
451+
)));
452452
}
453453
}
454454
Ok(())

0 commit comments

Comments
 (0)