test: Add additional node info to testing (#2521)

Author: jonathan-innis

pkg/controllers/node/initialization.go

@@ -25,6 +25,7 @@ import (
 
 	"github.com/aws/karpenter/pkg/apis/provisioning/v1alpha5"
 	"github.com/aws/karpenter/pkg/cloudprovider"
+	"github.com/aws/karpenter/pkg/utils/node"
 	"github.com/aws/karpenter/pkg/utils/resources"
 )
 
@@ -69,19 +70,10 @@ func (r *Initialization) getInstanceType(ctx context.Context, provisioner *v1alp
 // b) all the startup taints have been removed from the node
 // c) all extended resources have been registered
 // This method handles both nil provisioners and nodes without extended resources gracefully.
-func (r *Initialization) isInitialized(node *v1.Node, provisioner *v1alpha5.Provisioner, instanceType cloudprovider.InstanceType) bool {
+func (r *Initialization) isInitialized(n *v1.Node, provisioner *v1alpha5.Provisioner, instanceType cloudprovider.InstanceType) bool {
 	// fast checks first
-	return getCondition(node.Status.Conditions, v1.NodeReady).Status == v1.ConditionTrue &&
-		isStartupTaintRemoved(node, provisioner) && isExtendedResourceRegistered(node, instanceType)
-}
-
-func getCondition(conditions []v1.NodeCondition, match v1.NodeConditionType) v1.NodeCondition {
-	for _, condition := range conditions {
-		if condition.Type == match {
-			return condition
-		}
-	}
-	return v1.NodeCondition{}
+	return node.GetCondition(n, v1.NodeReady).Status == v1.ConditionTrue &&
+		isStartupTaintRemoved(n, provisioner) && isExtendedResourceRegistered(n, instanceType)
 }
 
 // isStartupTaintRemoved returns true if there are no startup taints registered for the provisioner, or if all startup

pkg/utils/node/node.go

@@ -47,3 +47,12 @@ func GetNodePods(ctx context.Context, kubeClient client.Client, nodes ...*v1.Nod
 	}
 	return pods, nil
 }
+
+func GetCondition(n *v1.Node, match v1.NodeConditionType) v1.NodeCondition {
+	for _, condition := range n.Status.Conditions {
+		if condition.Type == match {
+			return condition
+		}
+	}
+	return v1.NodeCondition{}
+}

test/pkg/environment/expectations.go

@@ -42,6 +42,7 @@ import (
 
 	"github.com/aws/karpenter/pkg/apis/awsnodetemplate/v1alpha1"
 	"github.com/aws/karpenter/pkg/apis/provisioning/v1alpha5"
+	nodeutils "github.com/aws/karpenter/pkg/utils/node"
 	"github.com/aws/karpenter/pkg/utils/pod"
 )
 
@@ -94,8 +95,10 @@ func (env *Environment) BeforeEach() {
 }
 
 func (env *Environment) dumpNodeInformation(nodes v1.NodeList) {
-	for _, node := range nodes.Items {
-		fmt.Printf("node %s taints = %v\n", node.Name, node.Spec.Taints)
+	for i := range nodes.Items {
+		node := nodes.Items[i]
+		pods, _ := nodeutils.GetNodePods(env, env.Client, &node)
+		fmt.Printf("node %s ready=%s initialized=%s pods=%d taints = %v\n", node.Name, nodeutils.GetCondition(&node, v1.NodeReady).Status, node.Labels[v1alpha5.LabelNodeInitialized], len(pods), node.Spec.Taints)
 	}
 }
 

test/suites/upgrade/pipeline.yaml

@@ -9,7 +9,7 @@ spec:
       default: $(context.pipelineRun.namespace)-$(context.pipelineRun.name)
       description: Uniquely identifies a cluster name for the suite.
     - name: from-git-ref
-      default: v0.15.0
+      default: v0.16.1
       description: Git commit, tag, or branch to check out. Requires a corresponding Karpenter snapshot release.
     - name: to-git-ref
       default: HEAD