From d847c4f3ec757d70c94fc1fadbfe2111a84350e7 Mon Sep 17 00:00:00 2001 From: benbierens Date: Sun, 14 Apr 2024 08:56:22 +0200 Subject: [PATCH] Adds names to kube wait functions --- Framework/KubernetesWorkflow/K8sController.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Framework/KubernetesWorkflow/K8sController.cs b/Framework/KubernetesWorkflow/K8sController.cs index a17ad82..d81b87c 100644 --- a/Framework/KubernetesWorkflow/K8sController.cs +++ b/Framework/KubernetesWorkflow/K8sController.cs @@ -868,7 +868,7 @@ namespace KubernetesWorkflow private void WaitUntilNamespaceCreated() { - WaitUntil(() => IsNamespaceOnline(K8sNamespace)); + WaitUntil(() => IsNamespaceOnline(K8sNamespace), nameof(WaitUntilNamespaceCreated)); } private void WaitUntilDeploymentOnline(string deploymentName) @@ -877,7 +877,7 @@ namespace KubernetesWorkflow { var deployment = client.Run(c => c.ReadNamespacedDeployment(deploymentName, K8sNamespace)); return deployment?.Status.AvailableReplicas != null && deployment.Status.AvailableReplicas > 0; - }); + }, nameof(WaitUntilDeploymentOnline)); } private void WaitUntilDeploymentOffline(string deploymentName) @@ -887,7 +887,7 @@ namespace KubernetesWorkflow var deployments = client.Run(c => c.ListNamespacedDeployment(K8sNamespace)); var deployment = deployments.Items.SingleOrDefault(d => d.Metadata.Name == deploymentName); return deployment == null || deployment.Status.AvailableReplicas == 0; - }); + }, nameof(WaitUntilDeploymentOffline)); } private void WaitUntilPodsForDeploymentAreOffline(RunningDeployment deployment) @@ -896,10 +896,10 @@ namespace KubernetesWorkflow { var pods = FindPodsByLabel(deployment.PodLabel); return !pods.Any(); - }); + }, nameof(WaitUntilPodsForDeploymentAreOffline)); } - private void WaitUntil(Func predicate) + private void WaitUntil(Func predicate, string msg) { var sw = Stopwatch.Begin(log, true); try @@ -908,7 +908,7 @@ namespace KubernetesWorkflow } finally { - sw.End("", 1); + sw.End(msg, 1); } }