Bring back the kind remote net tests

ndr-ds · ndr-ds · commit a1f632f13000 · 2025-08-27T21:36:52.000-03:00
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -73,7 +73,9 @@ jobs:
         cargo run --release -p linera-storage-service -- memory --endpoint $LINERA_STORAGE_SERVICE &
     - name: Wait for storage service to be ready
       run: |
-        until nc -z 127.0.0.1 1235; do sleep 1; done
+        STORAGE_HOST=$(echo "$LINERA_STORAGE_SERVICE" | cut -d: -f1)
+        STORAGE_PORT=$(echo "$LINERA_STORAGE_SERVICE" | cut -d: -f2)
+        until nc -z "$STORAGE_HOST" "$STORAGE_PORT"; do sleep 1; done
     - name: Build binaries
       run: |
         cargo build --features storage-service --bin linera-server --bin linera-proxy --bin linera
@@ -86,14 +88,53 @@ jobs:
       run: |
         cargo run --bin linera -- resource-control-policy --http-request-timeout-ms 1000
         cargo run --bin linera -- resource-control-policy --http-request-timeout-ms 500
-        cargo run --bin linera -- faucet --amount 1000 --port 8079 &
+        FAUCET_PORT=$(echo "$LINERA_FAUCET_URL" | cut -d: -f3)
+        cargo run --bin linera -- faucet --amount 1000 --port $FAUCET_PORT &
     - name: Wait for faucet to be ready
       run: |
-        until curl -s http://localhost:8079 >/dev/null; do sleep 1; done
+        until curl -s $LINERA_FAUCET_URL >/dev/null; do sleep 1; done
     - name: Run the remote-net tests
       run: |
         cargo test -p linera-service remote_net_grpc --features remote-net
 
+  remote-kubernetes-net-test:
+    needs: changed-files
+    if: needs.changed-files.outputs.should-run == 'true'
+    runs-on: ubuntu-latest-16-cores
+    timeout-minutes: 60
+
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions-rust-lang/setup-rust-toolchain@v1
+    - name: Install Protoc
+      uses: arduino/setup-protoc@v3
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+    - name: Install helmfile
+      run: |
+        # Install specific version to match local development environment
+        HELMFILE_VERSION="v0.168.0"
+        curl -fsSL -o helmfile.tar.gz "https://github.com/helmfile/helmfile/releases/download/${HELMFILE_VERSION}/helmfile_${HELMFILE_VERSION#v}_linux_amd64.tar.gz"
+        tar -xzf helmfile.tar.gz helmfile
+        sudo mv helmfile /usr/local/bin/
+        rm helmfile.tar.gz
+        # Verify installation
+        which helmfile && helmfile --version
+    - name: Build binaries
+      run: |
+        cargo build --features storage-service --bin linera-server --bin linera-proxy --bin linera
+    - name: Run the validators with Kubernetes
+      run: |
+        mkdir /tmp/local-linera-net
+        FAUCET_PORT=$(echo "$LINERA_FAUCET_URL" | cut -d: -f3)
+        cargo run --bin linera --features kubernetes -- net up --kubernetes --policy-config testnet --path /tmp/local-linera-net --validators 2 --shards 2 --with-faucet --faucet-port $FAUCET_PORT --faucet-amount 1000 &
+    - name: Wait for faucet to be ready
+      run: |
+        until curl -s $LINERA_FAUCET_URL >/dev/null; do sleep 1; done
+    - name: Run the Kubernetes tests
+      run: |
+        cargo test -p linera-service remote_net_grpc --features remote-net
+
   execution-wasmtime-test:
     needs: changed-files
     if: needs.changed-files.outputs.should-run == 'true'
@@ -202,7 +243,9 @@ jobs:
         cargo run --release -p linera-storage-service -- memory --endpoint $LINERA_STORAGE_SERVICE &
     - name: Wait for storage service to be ready
       run: |
-        until nc -z 127.0.0.1 1235; do sleep 1; done
+        STORAGE_HOST=$(echo "$LINERA_STORAGE_SERVICE" | cut -d: -f1)
+        STORAGE_PORT=$(echo "$LINERA_STORAGE_SERVICE" | cut -d: -f2)
+        until nc -z "$STORAGE_HOST" "$STORAGE_PORT"; do sleep 1; done
     - name: Run the benchmark test
       run: |
         cargo build --locked -p linera-service --bin linera-benchmark --features storage-service
@@ -262,7 +305,9 @@ jobs:
         cargo run --release -p linera-storage-service -- memory --endpoint $LINERA_STORAGE_SERVICE &
     - name: Wait for storage service to be ready
       run: |
-        until nc -z 127.0.0.1 1235; do sleep 1; done
+        STORAGE_HOST=$(echo "$LINERA_STORAGE_SERVICE" | cut -d: -f1)
+        STORAGE_PORT=$(echo "$LINERA_STORAGE_SERVICE" | cut -d: -f2)
+        until nc -z "$STORAGE_HOST" "$STORAGE_PORT"; do sleep 1; done
     - name: Run Ethereum tests
       run: |
         cargo test -p linera-ethereum --features ethereum
@@ -292,7 +337,9 @@ jobs:
         cargo run --release -p linera-storage-service -- memory --endpoint $LINERA_STORAGE_SERVICE &
     - name: Wait for storage service to be ready
       run: |
-        until nc -z 127.0.0.1 1235; do sleep 1; done
+        STORAGE_HOST=$(echo "$LINERA_STORAGE_SERVICE" | cut -d: -f1)
+        STORAGE_PORT=$(echo "$LINERA_STORAGE_SERVICE" | cut -d: -f2)
+        until nc -z "$STORAGE_HOST" "$STORAGE_PORT"; do sleep 1; done
     - name: Run the storage-service tests
       run: |
         cargo test --features storage-service -- storage_service --nocapture
diff --git a/linera-service/src/cli/main.rs b/linera-service/src/cli/main.rs
@@ -2211,6 +2211,7 @@ async fn run(options: &ClientOptions) -> Result<i32, Error> {
                 faucet_port,
                 faucet_amount,
                 dual_store,
+                path,
                 ..
             } => {
                 net_up_utils::handle_net_up_kubernetes(
@@ -2229,6 +2230,7 @@ async fn run(options: &ClientOptions) -> Result<i32, Error> {
                     *faucet_port,
                     *faucet_amount,
                     *dual_store,
+                    path,
                 )
                 .boxed()
                 .await?;
diff --git a/linera-service/src/cli/net_up_utils.rs b/linera-service/src/cli/net_up_utils.rs
@@ -125,6 +125,7 @@ pub async fn handle_net_up_kubernetes(
     faucet_port: NonZeroU16,
     faucet_amount: Amount,
     dual_store: bool,
+    path: &Option<String>,
 ) -> anyhow::Result<()> {
     if num_initial_validators < 1 {
         panic!("The local test network must have at least one validator.");
@@ -155,6 +156,7 @@ pub async fn handle_net_up_kubernetes(
         build_mode,
         policy_config,
         dual_store,
+        path_provider: PathProvider::from_path_option(path)?,
     };
     let (mut net, client) = config.instantiate().await?;
     let faucet_service = print_messages_and_create_faucet(
diff --git a/linera-service/src/cli_wrappers/helmfile.rs b/linera-service/src/cli_wrappers/helmfile.rs
@@ -42,9 +42,12 @@ impl HelmFile {
             )
             .env("LINERA_HELMFILE_SET_NUM_SHARDS", num_shards.to_string())
             .env("LINERA_HELMFILE_LINERA_IMAGE", docker_image_name)
+            .env(
+                "LINERA_HELMFILE_SET_KUBE_CONTEXT",
+                format!("kind-{}", cluster_id),
+            )
             .arg("sync")
             .arg("--wait")
-            .args(["--kube-context", &format!("kind-{}", cluster_id)])
             .spawn_and_wait()
             .await
     }
diff --git a/linera-service/src/cli_wrappers/local_kubernetes_net.rs b/linera-service/src/cli_wrappers/local_kubernetes_net.rs
@@ -13,7 +13,6 @@ use linera_base::{
     data_types::Amount,
 };
 use linera_client::client_options::ResourceControlPolicyConfig;
-use tempfile::{tempdir, TempDir};
 use tokio::process::Command;
 #[cfg(with_testing)]
 use {linera_base::command::current_binary_parent, tokio::sync::OnceCell};
@@ -69,6 +68,7 @@ pub struct LocalKubernetesNetConfig {
     pub build_mode: BuildMode,
     pub policy_config: ResourceControlPolicyConfig,
     pub dual_store: bool,
+    pub path_provider: PathProvider,
 }
 
 /// A wrapper of [`LocalKubernetesNetConfig`] to create a shared local Kubernetes network
@@ -82,7 +82,6 @@ pub struct LocalKubernetesNet {
     network: Network,
     testing_prng_seed: Option<u64>,
     next_client_id: usize,
-    tmp_dir: Arc<TempDir>,
     binaries: BuildArg,
     no_build: bool,
     docker_image_name: String,
@@ -92,6 +91,7 @@ pub struct LocalKubernetesNet {
     num_initial_validators: usize,
     num_shards: usize,
     dual_store: bool,
+    path_provider: PathProvider,
 }
 
 #[cfg(with_testing)]
@@ -127,6 +127,8 @@ impl SharedLocalKubernetesNetTestingConfig {
             build_mode: BuildMode::Release,
             policy_config: ResourceControlPolicyConfig::Testnet,
             dual_store: false,
+            path_provider: PathProvider::create_temporary_directory()
+                .expect("Creating temporary directory should not fail"),
         })
     }
 }
@@ -160,6 +162,7 @@ impl LineraNetConfig for LocalKubernetesNetConfig {
             self.num_initial_validators,
             self.num_shards,
             self.dual_store,
+            self.path_provider,
         )?;
 
         let client = net.make_client().await;
@@ -276,11 +279,8 @@ impl LineraNet for LocalKubernetesNet {
     }
 
     async fn make_client(&mut self) -> ClientWrapper {
-        let path_provider = PathProvider::TemporaryDirectory {
-            tmp_dir: self.tmp_dir.clone(),
-        };
         let client = ClientWrapper::new(
-            path_provider,
+            self.path_provider.clone(),
             self.network,
             self.testing_prng_seed,
             self.next_client_id,
@@ -340,12 +340,12 @@ impl LocalKubernetesNet {
         num_initial_validators: usize,
         num_shards: usize,
         dual_store: bool,
+        path_provider: PathProvider,
     ) -> Result<Self> {
         Ok(Self {
             network,
             testing_prng_seed,
             next_client_id: 0,
-            tmp_dir: Arc::new(tempdir()?),
             binaries,
             no_build,
             docker_image_name,
@@ -355,19 +355,23 @@ impl LocalKubernetesNet {
             num_initial_validators,
             num_shards,
             dual_store,
+            path_provider,
         })
     }
 
     async fn command_for_binary(&self, name: &'static str) -> Result<Command> {
         let path = resolve_binary(name, env!("CARGO_PKG_NAME")).await?;
         let mut command = Command::new(path);
-        command.current_dir(self.tmp_dir.path());
+        command.current_dir(self.path_provider.path());
         Ok(command)
     }
 
     fn configuration_string(&self, server_number: usize) -> Result<String> {
         let n = server_number;
-        let path = self.tmp_dir.path().join(format!("validator_{n}.toml"));
+        let path = self
+            .path_provider
+            .path()
+            .join(format!("validator_{n}.toml"));
         let port = 19100 + server_number;
         let internal_port = 20100;
         let metrics_port = 21100;
@@ -382,8 +386,8 @@ impl LocalKubernetesNet {
                 Grpc = "ClearText"
 
                 [[proxies]]
-                host = "proxy-0.default.svc.cluster.local"
-                public_port = {port}
+                host = "proxy.default.svc.cluster.local"
+                public_port = 19100
                 private_port = {internal_port}
                 metrics_port = {metrics_port}
             "#
@@ -451,12 +455,12 @@ impl LocalKubernetesNet {
             .join("linera-validator")
             .join("working");
         fs_err::copy(
-            self.tmp_dir.path().join("genesis.json"),
+            self.path_provider.path().join("genesis.json"),
             base_dir.join("genesis.json"),
         )?;
 
         let kubectl_instance_clone = self.kubectl_instance.clone();
-        let tmp_dir_path_clone = self.tmp_dir.path().to_path_buf();
+        let path_provider_path_clone = self.path_provider.path().to_path_buf();
         let num_shards = self.num_shards;
 
         let mut validators_initialization_futures = Vec::new();
@@ -465,7 +469,7 @@ impl LocalKubernetesNet {
             let github_root = github_root.clone();
 
             let kubectl_instance = kubectl_instance_clone.clone();
-            let tmp_dir_path = tmp_dir_path_clone.clone();
+            let path_provider_path = path_provider_path_clone.clone();
 
             let docker_image_name = docker_image_name.clone();
             let dual_store = self.dual_store;
@@ -475,7 +479,7 @@ impl LocalKubernetesNet {
 
                 let server_config_filename = format!("server_{}.json", i);
                 fs_err::copy(
-                    tmp_dir_path.join(&server_config_filename),
+                    path_provider_path.join(&server_config_filename),
                     base_dir.join(&server_config_filename),
                 )?;
 
@@ -495,7 +499,7 @@ impl LocalKubernetesNet {
                 let local_port = 19100 + i;
                 kubectl_instance.port_forward(
                     proxy_service,
-                    &format!("{local_port}:{local_port}"),
+                    &format!("{local_port}:19100"),
                     cluster_id,
                 )?;
 

Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,12 @@ impl HelmFile {`
`42`	`42`	`)`
`43`	`43`	`.env("LINERA_HELMFILE_SET_NUM_SHARDS", num_shards.to_string())`
`44`	`44`	`.env("LINERA_HELMFILE_LINERA_IMAGE", docker_image_name)`
	`45`	`+ .env(`
	`46`	`+ "LINERA_HELMFILE_SET_KUBE_CONTEXT",`
	`47`	`+ format!("kind-{}", cluster_id),`
	`48`	`+ )`
`45`	`49`	`.arg("sync")`
`46`	`50`	`.arg("--wait")`
`47`		`- .args(["--kube-context", &format!("kind-{}", cluster_id)])`
`48`	`51`	`.spawn_and_wait()`
`49`	`52`	`.await`
`50`	`53`	`}`