From 88ba13235ff144ece2ad8a9eef0d6ae70d9e818c Mon Sep 17 00:00:00 2001 From: gonzalezzfelipe Date: Tue, 5 Nov 2024 16:49:12 -0300 Subject: [PATCH] fix: Wrong parameters for online variant --- docker/dockerfile.hydra | 1 + src/custom_resource.rs | 13 +++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/docker/dockerfile.hydra b/docker/dockerfile.hydra index 152ad05..8dce2eb 100644 --- a/docker/dockerfile.hydra +++ b/docker/dockerfile.hydra @@ -3,6 +3,7 @@ FROM rust:${RUST_VERSION}-slim-bullseye AS build WORKDIR /app RUN apt-get update && apt-get install -y libssl-dev pkg-config git + RUN git clone https://github.com/gonzalezzfelipe/hydra-control-plane.git RUN cd hydra-control-plane && git checkout chore/use-hydra-vk-instead-of-bytes diff --git a/src/custom_resource.rs b/src/custom_resource.rs index 09f6e98..a006dd3 100644 --- a/src/custom_resource.rs +++ b/src/custom_resource.rs @@ -92,7 +92,7 @@ impl HydraDoomNode { } pub fn external_host(&self, config: &Config, _constants: &K8sConstants) -> String { - format!("{}.{}", self.name_any(), config.external_domain,) + format!("{}.{}", self.name_any(), config.external_domain) } pub fn configmap(&self, config: &Config, _constants: &K8sConstants) -> ConfigMap { @@ -157,8 +157,6 @@ impl HydraDoomNode { self.name_any(), "--cardano-signing-key".to_string(), format!("{}/admin.sk", constants.secret_dir), - "--hydra-signing-key".to_string(), - format!("{}/hydra.sk", constants.data_dir), "--hydra-scripts-tx-id".to_string(), config.hydra_scripts_tx_id.clone(), "--testnet-magic".to_string(), @@ -166,6 +164,7 @@ impl HydraDoomNode { "--node-socket".to_string(), constants.socket_path.clone(), ]; + aux.extend(main_container_common_args); if let Some(start_chain_from) = &self.spec.start_chain_from { aux.push("--start-chain-from".to_string()); aux.push(start_chain_from.clone()); @@ -200,6 +199,11 @@ impl HydraDoomNode { mount_path: constants.data_dir.clone(), ..Default::default() }, + VolumeMount { + name: "secret".to_string(), + mount_path: constants.secret_dir.clone(), + ..Default::default() + }, VolumeMount { name: "ipc".to_string(), mount_path: constants.socat_dir.clone(), @@ -232,13 +236,14 @@ impl HydraDoomNode { // Offline is optional. If undefined, the node is presumed to be online. if !self.spec.offline.unwrap_or(false) { let mut open_head_args = vec![ + "open-head".to_string(), "--network-id".to_string(), self.spec.network_id.unwrap_or(0).to_string(), "--seed-input".to_string(), self.spec.seed_input.clone(), "--participant".to_string(), config.admin_addr.clone(), - "--party-verification-key-file".to_string(), + "--party-verification-file".to_string(), format!("{}/hydra.vk", constants.data_dir), "--cardano-key-file".to_string(), format!("{}/admin.sk", constants.secret_dir),