From 23633f571a49e344ddb5e262e4be699089a5beea Mon Sep 17 00:00:00 2001
From: Zoe Zhao <35669350+zoez7@users.noreply.github.com>
Date: Tue, 1 Sep 2026 15:40:44 -0700
Subject: [PATCH] ate-setup: Remove waiting for actortemplate CRD (#1375)

The ActorTemplate controller has been deleted, waiting for ActorTemplate
CRD readiness will timeout and cause e2e tests to run for a long time.
---
 cmd/ate-setup/internal/demos/simple.go | 39 ++------------------------
 1 file changed, 2 insertions(+), 37 deletions(-)

diff --git a/cmd/ate-setup/internal/demos/simple.go b/cmd/ate-setup/internal/demos/simple.go
index 6b176163e..dee0b566d 100644
--- a/cmd/ate-setup/internal/demos/simple.go
+++ b/cmd/ate-setup/internal/demos/simple.go
@@ -18,7 +18,6 @@ import (
 	"context"
 
 	"github.com/spf13/pflag"
-	"k8s.io/apimachinery/pkg/runtime/schema"
 
 	"github.com/agent-substrate/substrate/cmd/ate-setup/internal/kube"
 	"github.com/agent-substrate/substrate/cmd/ate-setup/internal/log"
@@ -26,14 +25,6 @@ import (
 	"github.com/agent-substrate/substrate/cmd/ate-setup/internal/steps"
 )
 
-// actorTemplateGVK identifies the resource the demos wait on: an ActorTemplate
-// goes Ready once its golden snapshot has been built.
-var actorTemplateGVK = schema.GroupVersionKind{
-	Group:   "ate.dev",
-	Version: "v1alpha1",
-	Kind:    "ActorTemplate",
-}
-
 // bucketNamePlaceholder is substituted into every demo template with the
 // snapshot bucket for this environment.
 const bucketNamePlaceholder = "BUCKET_NAME"
@@ -65,13 +56,6 @@ func Render(e *steps.Env, relPath string, extraValues map[string]string, drop []
 	return render.Template(e.Cfg.Path(relPath), values, drop)
 }
 
-// WaitActorTemplateReady blocks until an ActorTemplate's golden snapshot is
-// built, the `kubectl wait --for=condition=Ready actortemplate/...` of the demo
-// scripts.
-func WaitActorTemplateReady(ctx context.Context, e *steps.Env, namespace, name string) error {
-	return e.Kube.WaitCondition(ctx, actorTemplateGVK, namespace, name, "Ready", steps.DemoTimeout)
-}
-
 // Simple covers the demos that are one template plus a fixed set of readiness
 // waits: render, ko apply, wait; and on delete, remove the actors then the same
 // rendered manifest.
@@ -95,11 +79,6 @@ type Simple struct {
 	// ActorTemplates are the demo's ActorTemplates. Their actors are removed
 	// before the manifests at delete time.
 	ActorTemplates []steps.TemplateRef
-
-	// SkipReadinessWait deploys without blocking on the ActorTemplates. The
-	// sandbox demo sets this: it has no long-lived workload, and its template
-	// is exercised on demand by the client rather than at install time.
-	SkipReadinessWait bool
 }
 
 func (d *Simple) Name() string        { return d.DemoName }
@@ -134,18 +113,9 @@ func (d *Simple) DeployWorkload(ctx context.Context, e *steps.Env) error {
 	return e.KoApplyBytes(ctx, manifest)
 }
 
-// WaitReady blocks until the demo's workloads and templates are usable.
-//
-// On a cold cluster the first ActorTemplate pays one-time costs: downloading
-// the gVisor runsc binary, the first gVisor pod start, and image pulls.
-// Blocking here means callers -- notably the e2e suite, which creates its own
-// ActorTemplate with a tight readiness deadline -- run against an already-warm
-// node instead of racing that cold-start work.
+// WaitReady blocks until the demo's Deployments are rolled out.
 func (d *Simple) WaitReady(ctx context.Context, e *steps.Env) error {
-	if d.SkipReadinessWait {
-		return nil
-	}
-	if len(d.Deployments) == 0 && len(d.ActorTemplates) == 0 {
+	if len(d.Deployments) == 0 {
 		return nil
 	}
 	log.Stepf("Waiting for %s to be ready...", d.DemoName)
@@ -154,11 +124,6 @@ func (d *Simple) WaitReady(ctx context.Context, e *steps.Env) error {
 			return err
 		}
 	}
-	for _, ref := range d.ActorTemplates {
-		if err := WaitActorTemplateReady(ctx, e, ref.Atespace, ref.Name); err != nil {
-			return err
-		}
-	}
 	return nil
 }