fix: add timeout to find deployment call

uselagoon · Dec 18, 2023 · 5d39c74 · 5d39c74
1 parent 5f44c07
commit 5d39c74
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/internal/k8s/client.go b/internal/k8s/client.go
@@ -14,6 +14,10 @@ const (
 	timeout = 90 * time.Second
 )
 
+// timeoutSeconds defines the common timeout for k8s API operations in the type
+// required by metav1.ListOptions.
+var timeoutSeconds = int64(timeout / time.Second)
+
 // Client is a k8s client.
 type Client struct {
 	config    *rest.Config

diff --git a/internal/k8s/finddeployment.go b/internal/k8s/finddeployment.go
@@ -13,7 +13,8 @@ func (c *Client) FindDeployment(ctx context.Context, namespace,
 	service string) (string, error) {
 	deployments, err := c.clientset.AppsV1().Deployments(namespace).
 		List(ctx, metav1.ListOptions{
-			LabelSelector: fmt.Sprintf("lagoon.sh/service=%s", service),
+			LabelSelector:  fmt.Sprintf("lagoon.sh/service=%s", service),
+			TimeoutSeconds: &timeoutSeconds,
 		})
 	if err != nil {
 		return "", fmt.Errorf("couldn't list deployments: %v", err)