Address PR review comments

- Fix kubectl apply command: change -k to -f for single YAML file
- Extract duplicate version logic to main() function
- Remove OS-specific installation commands from prerequisites
- Simplify check_prerequisites error messages

Addresses feedback from PR kubernetes-sigs#5068

Author: wazery

scripts/demo/README.md

@@ -48,33 +48,9 @@ make clean-demo
 ## Prerequisites for Recording
 
 - `kind`: For creating local Kubernetes clusters
-  ```sh
-  # macOS
-  brew install kind
-  # Linux
-  curl -Lo ./kind https://kind.sigs.k8s.io/dl/v0.20.0/kind-linux-amd64
-  chmod +x ./kind && sudo mv ./kind /usr/local/bin/kind
-  ```
-
 - `kubectl`: For interacting with Kubernetes
-  ```sh
-  # macOS
-  brew install kubectl
-  # Other platforms: https://kubernetes.io/docs/tasks/tools/install-kubectl/
-  ```
-
 - `asciinema`: For recording terminal sessions
-  ```sh
-  # macOS
-  brew install asciinema
-  # Ubuntu/Debian
-  sudo apt-get install asciinema
-  ```
-
-- `svg-term`: For converting recordings to SVG
-  ```sh
-  npm install -g svg-term-cli
-  ```
+- `svg-term`: For converting recordings to SVG (requires Node.js/npm)
 
 ## What the Demo Shows
 

scripts/demo/generate-demo.sh

@@ -44,19 +44,19 @@ check_prerequisites() {
     local missing_tools=()
 
     if ! command -v asciinema &> /dev/null; then
-        missing_tools+=("asciinema (install with: brew install asciinema)")
+        missing_tools+=("asciinema")
     fi
 
     if ! command -v svg-term &> /dev/null; then
-        missing_tools+=("svg-term (install with: npm install -g svg-term-cli)")
+        missing_tools+=("svg-term")
     fi
 
     if ! command -v kind &> /dev/null; then
-        missing_tools+=("kind (install with: brew install kind)")
+        missing_tools+=("kind")
     fi
 
     if ! command -v kubectl &> /dev/null; then
-        missing_tools+=("kubectl (install from: https://kubernetes.io/docs/tasks/tools/install-kubectl/)")
+        missing_tools+=("kubectl")
     fi
 
     if [ ${#missing_tools[@]} -ne 0 ]; then
@@ -96,8 +96,7 @@ record_demo() {
 
 convert_to_svg() {
     local recording_dir="/tmp/kb-demo-recording"
-    local version
-    version=$(git -C "$PROJECT_ROOT" describe --tags --abbrev=0 2>/dev/null || echo "v4.0.0")
+    local version="$1"
     local svg_file="${PROJECT_ROOT}/docs/gif/kb-demo.${version}.svg"
 
     log "Converting recording to SVG..."
@@ -113,8 +112,7 @@ convert_to_svg() {
 }
 
 update_readme() {
-    local version
-    version=$(git -C "$PROJECT_ROOT" describe --tags --abbrev=0 2>/dev/null || echo "v4.0.0")
+    local version="$1"
 
     log "Updating README.md with new demo..."
     if [[ "$OSTYPE" == "darwin"* ]]; then
@@ -137,11 +135,15 @@ cleanup() {
 main() {
     log "Starting Kubebuilder demo generation..."
 
+    # Extract version once to avoid duplication
+    local version
+    version=$(git -C "$PROJECT_ROOT" describe --tags --abbrev=0 2>/dev/null || echo "v4.0.0")
+    
     check_prerequisites
     setup_cluster
     record_demo
-    convert_to_svg
-    update_readme
+    convert_to_svg "$version"
+    update_readme "$version"
     cleanup
 
     log "Demo generation completed successfully! 🎉"

scripts/demo/run.sh

@@ -74,7 +74,7 @@ run "cat config/samples/webapp_v1_guestbook.yaml"
 clear
 
 desc "Apply the sample resources to test our APIs"
-run "kubectl apply -k config/samples/webapp_v1alpha1_busybox.yaml --context kind-kubebuilder-demo"
+run "kubectl apply -f config/samples/webapp_v1alpha1_busybox.yaml --context kind-kubebuilder-demo"
 
 desc "Check the created custom resources in the cluster"
 run "kubectl get guestbooks,busyboxes -A --context kind-kubebuilder-demo"