[cbrgm]

Background

Part of #644, the arc is one command to spin up SolAr locally with the demo app deployed -> make demo

1. ✅ make make dev-cluster reliably populate the catalog (fix(dev): make dev-cluster reliably populate the catalog #731)
2. ✅ single source of truth for the OCM transfer step (refactor(dev): single source of truth for the OCM transfer step #733)
3. (this PR) make demo-app / make demo / make demo-clean for the full render -> bootstrap flow
4. a CI smoke test that runs the demo so it cant silently rot

What

Three make targets, backed by two scripts under hack/demo:

• make demo-app -> seeds the ocm-demo app end to end on an existing dev cluster: transfer -> discover -> release -> render -> bootstrap -> running workload. Idempotent.
• make demo -> from zero: create the dev cluster if its missing, then demo-app.
• make demo-clean -> remove the demo resources and the app namespace, keep the cluster and the catalog.

Why

After make dev-cluster we had an empty SolAr and getting the demo app actually deployed was a manual, order-sensitive dance across a few scripts. demo-app walks that whole path in one go.

The important bit for not drifting: demo-app mirrors the exact happy path the e2e suite exercises and reuses the same test/fixtures/e2e manifests (release, target, registry, bindings, regcred, bootstrap). So the demo and the e2e tests share their inputs and cant diverge. CI will guard the ordering in step 4 (pr follows after this one :)).

Topology -> everything runs in solar-system, because thats where dev-cluster's discovery writes the ComponentVersion and where the discovery Registry (zot-scan) and the zot-deploy pull secret already live. So every reference resolves in-namespace, no ReferenceGrants needed. This matches how the e2e suite runs the whole flow in a single namespace. The app itself lands in the Release's targetNamespace (demo).

Re-runs are cheap -> demo-app skips the transfer when the ComponentVersion is already in the catalog.

Testing

Full loop against a local kind cluster (make dev-cluster first):

$ make demo-app
>>> Transferring the ocm-demo component and waiting for discovery...
>>> ...
ocirepository.../solar-bootstrap condition met
helmrelease.../solar-bootstrap condition met

$ kubectl -n solar-system get releases,rendertasks,renderartifacts
release/...-release      ...   Resolved
rendertask/render-rel-...   Target   cluster-1   JobSucceeded
rendertask/render-tgt-cluster-1-0   Target   cluster-1   JobSucceeded
renderartifact/...  solar-system/bootstrap-cluster-1  v0.0.0

$ kubectl -n demo get pods
solar-bootstrap-opendefense-cloud-ocm-demo-...-demo...   1/1   Running     # the demo app is deployed

For the person who reviews this, try to run the following locally:

• fresh make demo-app -> workload Running
• make demo-clean -> demo resources + demo namespace gone, catalog + cluster kept
• re-seed from clean -> workload Running again
• idempotent re-run with catalog present -> skips the transfer, still reaches Ready
• make shellcheck clean

e2e suite is untouched

Checklist

• Tests added/updated (n/a, dev tooling, verified manually end to end against a live kind cluster; reuses the e2e fixtures; CI smoke test lands in the follow-up PR)
• No breaking changes (new targets only, e2e untouched)
• Readable commit history (one focused commit)
• AI code review considered and comments resolved

Part of #644

Summary by CodeRabbit

• New Features
  • Added commands to launch a complete demo environment, either using an existing development cluster or creating one as needed.
  • Added automated demo setup covering namespaces, credentials, registries, releases, rendering, and readiness checks.
  • Added cleanup support to remove demo resources while preserving the development cluster and shared setup.
  • Added configurable options, progress reporting, timeout handling, and re-seeding guidance for demo workflows.

[coderabbitai]

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro Plus

Run ID: 89e397a0-293d-409c-b8e2-aab96a1b6188

📥 Commits

Reviewing files that changed from the base of the PR and between 87a9f64 and 1524092.

📒 Files selected for processing (3)

• Makefile
• hack/demo/demo-app.sh
• hack/demo/demo-clean.sh

🚧 Files skipped from review as they are similar to previous changes (2)

• hack/demo/demo-app.sh
• hack/demo/demo-clean.sh

---

📝 Walkthrough

Walkthrough

Adds Make targets and executable scripts for a repeatable demo workflow. The workflow creates or reuses a development cluster, seeds application and Flux resources, waits for readiness, prints inspection commands, and removes demo resources without deleting the cluster.

Changes

Demo workflow

Layer / File(s)	Summary
Demo Make entry points Makefile	Adds demo-app, demo, and demo-clean targets. demo creates the development Kind cluster when it does not exist.
Application seeding and readiness hack/demo/demo-app.sh	Adds configurable, strict-mode setup for discovery, namespaces, credentials, registries, targets, releases, render artifacts, and Flux resources. The script polls required resource states and reports inspection commands.
Demo resource cleanup hack/demo/demo-clean.sh	Deletes demo Flux and SolAr resources, credentials, and the application namespace while preserving the cluster, discovery setup, and catalog.

Estimated code review effort: 3 (Moderate) | ~20 minutes

Sequence Diagram(s)

sequenceDiagram
  participant Make
  participant DevelopmentCluster
  participant DemoApp
  participant OCM
  participant Kubernetes
  participant Flux
  Make->>DevelopmentCluster: Create or reuse cluster
  Make->>DemoApp: Run demo-app
  DemoApp->>OCM: Transfer discovery and create release resources
  DemoApp->>Kubernetes: Apply demo namespaces and bindings
  Kubernetes-->>DemoApp: Report render artifact
  DemoApp->>Flux: Apply bootstrap resources
  Flux-->>DemoApp: Report resource readiness

Loading

Possibly related PRs

• opendefensecloud/solution-arsenal#733: Provides the hack/demo/transfer-discovery.sh helper reused by the demo seeding workflow.

🚥 Pre-merge checks | ✅ 5

✅ Passed checks (5 passed)

Check name	Status	Explanation
Title check	✅ Passed	The title clearly identifies the three new demo Make targets and their one-command purpose.
Description check	✅ Passed	The description covers the change, motivation, testing, reviewer steps, and checklist; the optional Notes section is not needed.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.

✨ Finishing Touches

📝 Generate docstrings

• Create stacked PR
• Commit on current branch

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch feat/make-demo

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands.}

[coderabbitai]

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@Makefile`:
- Around line 167-170: Update the cluster-name check in the Kind reuse logic to
match an exact cluster entry rather than any substring containing
$(KIND_CLUSTER_DEV). Preserve reuse only when the exact development cluster
exists; otherwise invoke the existing dev-cluster target so demo-app receives
the correct context.

🪄 Autofix

Fix all unresolved CodeRabbit comments on this PR:

• Push a commit to this branch (recommended)
• Create a new PR with the fixes

---

ℹ️ Review info

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro Plus

Run ID: 609ee201-bf9f-4fcf-98a3-141c15b5c6c6

📥 Commits

Reviewing files that changed from the base of the PR and between 87a9f64 and a45f3fa.

📒 Files selected for processing (3)

• Makefile
• hack/demo/demo-app.sh
• hack/demo/demo-clean.sh

[coveralls]

Coverage Report for CI Build 31086393960

Warning

No base build found for commit 87a9f64 on main.
Coverage changes can't be calculated without a base build.
If a base build is processing, this comment will update automatically when it completes.

Coverage: 82.019%

Details

• Patch coverage: No coverable lines changed in this PR.

Uncovered Changes

No uncovered changes found.

Coverage Regressions

Requires a base build to compare against. How to fix this →

---

Coverage Stats

Relevant Lines:	6468
Covered Lines:	5305
Line Coverage:	82.02%
Coverage Strength:	36.1 hits per line

---

💛 - Coveralls

[coderabbitai]

Note

GitHub couldn't provide a complete incremental comparison for this pull request, so CodeRabbit is performing a full review instead. This review may take a little longer.

[olzemal]

lgtm make demo and demo-clean ran with no errors on my machine as well.

[cbrgm]

Alright, then I can't say works only on my machine anymore and I woul merge this right now :D
I will continue and add a GitHub workflow so we run the demo setup and teardown via CI in a next PR

[cbrgm]

Thanks for the review @olzemal