e2e: assert booted image matches seeded registry image

Verify that the BootcNode booted image and digest match the seeded
registry image when available.

Assisted-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: alicefr

test/e2e/bootcnode_test.go

@@ -14,7 +14,6 @@ import (
 
 	bootcv1alpha1 "github.com/jlebon/bootc-operator/api/v1alpha1"
 	"github.com/jlebon/bootc-operator/test/e2e/e2eutil"
-	testutil "github.com/jlebon/bootc-operator/test/util"
 )
 
 const (
@@ -35,13 +34,7 @@ func TestControllerMembership(t *testing.T) {
 
 	ctx := context.Background()
 
-	// Use real registry image when seeded; fall back to fake ref for
-	// local dev runs without deploy-bink.
-	imageRef := testutil.ImageDigestRefA
-	if ref := env.NodeImageDigestRef(); ref != "" {
-		imageRef = ref
-	}
-	pool := env.NewPool("workers", imageRef)
+	pool := env.NewPool("workers", env.NodeImageDigestedPullSpec())
 	g.Expect(env.Client.Create(ctx, pool)).To(Succeed())
 
 	// Wait for BootcNode to appear for the worker.
@@ -56,7 +49,7 @@ func TestControllerMembership(t *testing.T) {
 	g.Expect(owner.Name).To(Equal(pool.Name))
 
 	// Verify desiredImage.
-	g.Expect(bn.Spec.DesiredImage).To(Equal(imageRef))
+	g.Expect(bn.Spec.DesiredImage).To(Equal(env.NodeImageDigestedPullSpec()))
 
 	// Verify the worker has the managed label.
 	var node corev1.Node
@@ -85,6 +78,15 @@ func TestControllerMembership(t *testing.T) {
 		g.Expect(bn.Status.Booted).NotTo(BeNil(), "expected booted status to be populated")
 		g.Expect(bn.Status.Booted.Image).NotTo(BeEmpty(), "expected booted image to be non-empty")
 		g.Expect(bn.Status.Booted.ImageDigest).NotTo(BeEmpty(), "expected booted imageDigest to be non-empty")
+	}).WithTimeout(3 * time.Minute).Should(Succeed())
+
+	g.Expect(bn.Status.Booted.Image).To(Equal(env.NodeImageDigestedPullSpec()),
+		"booted image should match seeded registry image")
+	g.Expect(bn.Status.Booted.ImageDigest).To(Equal(env.NodeImageDigest()),
+		"booted image digest should match seeded registry image")
+
+	g.Eventually(func(g Gomega) {
+		g.Expect(env.Client.Get(ctx, client.ObjectKey{Name: nodeName}, &bn)).To(Succeed())
 		g.Expect(bn.Status.Conditions).To(ContainElement(And(
 			HaveField("Type", bootcv1alpha1.NodeIdle),
 			HaveField("Status", metav1.ConditionTrue),

test/e2e/e2eutil/env.go

@@ -146,10 +146,10 @@ func (e *Env) AddNode(t *testing.T, opts ...NodeOption) string {
 	}
 
 	if cfg.targetImgRef == "" {
-		if e.nodeImageRegistry == "" {
-			t.Fatal("BINK_LOCAL_REGISTRY_NODE_IMAGE must be set (or use WithTargetImgRef)")
+		if e.nodeImageRegistry == "" || e.nodeImageDigest == "" {
+			t.Fatal("BINK_LOCAL_REGISTRY_NODE_IMAGE and NODE_IMAGE_DIGEST must be set (or use WithTargetImgRef)")
 		}
-		cfg.targetImgRef = e.nodeImageRegistry + ":latest"
+		cfg.targetImgRef = e.nodeImageRegistry + "@" + e.nodeImageDigest
 	}
 
 	nodeName := e.generateNodeName(t)
@@ -209,6 +209,11 @@ func (e *Env) NodeImageDigestedPullSpec() string {
 	return e.nodeImageRegistry + "@" + e.nodeImageDigest
 }
 
+// NodeImageDigest returns the manifest digest of the seeded node image.
+func (e *Env) NodeImageDigest() string {
+	return e.nodeImageDigest
+}
+
 // cleanup gathers diagnostic logs, then deletes test-scoped resources
 // and bink nodes.
 func (e *Env) cleanup(t *testing.T) {