Merge branch 'main' into init-containers-e2e

aws · Feb 1, 2024 · f35421a · f35421a
2 parents a529c3e + c9ef004
commit f35421a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/go.mod b/go.mod
@@ -27,7 +27,7 @@ require (
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b
 	knative.dev/pkg v0.0.0-20231010144348-ca8c009405dd
 	sigs.k8s.io/controller-runtime v0.17.0
-	sigs.k8s.io/karpenter v0.33.1-0.20240126184319-80b052c49625
+	sigs.k8s.io/karpenter v0.33.1-0.20240201005121-3d56ae365c82
 )
 
 require (

diff --git a/test/pkg/debug/node.go b/test/pkg/debug/node.go
@@ -62,7 +62,7 @@ func (c *NodeController) Reconcile(ctx context.Context, req reconcile.Request) (
 }
 
 func (c *NodeController) GetInfo(ctx context.Context, n *v1.Node) string {
-	pods, _ := nodeutils.GetNodePods(ctx, c.kubeClient, n)
+	pods, _ := nodeutils.GetPods(ctx, c.kubeClient, n)
 	return fmt.Sprintf("ready=%s schedulable=%t initialized=%s pods=%d taints=%v", nodeutils.GetCondition(n, v1.NodeReady).Status, !n.Spec.Unschedulable, n.Labels[v1beta1.NodeInitializedLabelKey], len(pods), n.Spec.Taints)
 }