Skip to content

Commit

Permalink
Revert "multiregion cluster support"
Browse files Browse the repository at this point in the history
This reverts commit 1e5b47d.
  • Loading branch information
danielxiangzl committed Dec 12, 2024
1 parent 2b51389 commit cf17217
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 6 deletions.
2 changes: 1 addition & 1 deletion testsuite/forge-cli/src/suites/realistic_environment.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ pub(crate) fn realistic_env_sweep_wrap(
.with_validator_override_node_config_fn(Arc::new(|config, _| {
config.execution.processed_transactions_detailed_counters = true;
}))
.add_network_test(test)
.add_network_test(wrap_with_realistic_env(num_validators, test))
// Test inherits the main EmitJobRequest, so update here for more precise latency measurements
.with_emit_job(
EmitJobRequest::default().latency_polling_interval(Duration::from_millis(100)),
Expand Down
3 changes: 0 additions & 3 deletions testsuite/forge-test-runner-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,6 @@ spec:
- effect: NoExecute
key: aptos.org/nodepool
value: validators
- effect: NoExecute
key: AptosNodeOnly
value: "false"
volumes:
- name: multiregion-kubeconfig
secret:
Expand Down
2 changes: 1 addition & 1 deletion testsuite/forge/src/backend/k8s/cluster_helper.rs
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,7 @@ pub async fn install_testnet_resources(
kube_client.clone(),
kube_namespace.clone(),
FORGE_TESTNET_DEPLOYER_DOCKER_IMAGE_REPO.to_string(),
Some("4d49cd28bdbbfefad7b6e68d2f0b200216ea981f".into()),
None,
);

testnet_deployer.start(config).await?;
Expand Down
2 changes: 1 addition & 1 deletion testsuite/test_framework/cluster.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def set_kubeconf(self, kubeconf: str) -> ForgeCluster:

@property
def kubectl_create_context_arg(self) -> List[str]:
return [] if self.is_multiregion else []
return ["--context=karmada-apiserver"] if self.is_multiregion else []

async def write(self, shell: Shell) -> None:
assert self.kubeconf is not None, "kubeconf must be set"
Expand Down

0 comments on commit cf17217

Please sign in to comment.