diff --git a/Framework/KubernetesWorkflow/K8sCluster.cs b/Framework/KubernetesWorkflow/K8sCluster.cs index 031d987..8bb71cc 100644 --- a/Framework/KubernetesWorkflow/K8sCluster.cs +++ b/Framework/KubernetesWorkflow/K8sCluster.cs @@ -39,7 +39,7 @@ namespace KubernetesWorkflow return Configuration.OperationTimeout; } - public TimeSpan WaitForK8sServiceDelay() + public TimeSpan K8sOperationRetryDelay() { return Configuration.RetryDelay; } diff --git a/Framework/KubernetesWorkflow/K8sController.cs b/Framework/KubernetesWorkflow/K8sController.cs index a3a69fd..97d0e8b 100644 --- a/Framework/KubernetesWorkflow/K8sController.cs +++ b/Framework/KubernetesWorkflow/K8sController.cs @@ -702,7 +702,7 @@ namespace KubernetesWorkflow var sw = Stopwatch.Begin(log, true); try { - Time.WaitUntil(predicate, cluster.K8sOperationTimeout(), cluster.WaitForK8sServiceDelay()); + Time.WaitUntil(predicate, cluster.K8sOperationTimeout(), cluster.K8sOperationRetryDelay()); } finally { diff --git a/Framework/Utils/Time.cs b/Framework/Utils/Time.cs index 102831e..bf0e116 100644 --- a/Framework/Utils/Time.cs +++ b/Framework/Utils/Time.cs @@ -28,7 +28,7 @@ WaitUntil(predicate, TimeSpan.FromMinutes(1), TimeSpan.FromSeconds(1)); } - public static void WaitUntil(Func predicate, TimeSpan timeout, TimeSpan retryTime) + public static void WaitUntil(Func predicate, TimeSpan timeout, TimeSpan retryDelay) { var start = DateTime.UtcNow; var state = predicate(); @@ -39,7 +39,7 @@ throw new TimeoutException("Operation timed out."); } - Sleep(retryTime); + Sleep(retryDelay); state = predicate(); } } diff --git a/Tools/CodexNetDeployer/Deployer.cs b/Tools/CodexNetDeployer/Deployer.cs index 2c6161c..1b16dcf 100644 --- a/Tools/CodexNetDeployer/Deployer.cs +++ b/Tools/CodexNetDeployer/Deployer.cs @@ -81,8 +81,8 @@ namespace CodexNetDeployer var configuration = new KubernetesWorkflow.Configuration( kubeConfig, - operationTimeout: TimeSpan.FromSeconds(30), - retryDelay: TimeSpan.FromSeconds(10), + operationTimeout: TimeSpan.FromSeconds(120), + retryDelay: TimeSpan.FromSeconds(3), kubernetesNamespace: config.KubeNamespace); return new EntryPoint(log, configuration, string.Empty);