From f5ea15dc42811a551286cc70a04ba19e44e45aca Mon Sep 17 00:00:00 2001
From: Daniel Fox <dan.fox@tigera.io>
Date: Tue, 16 May 2023 18:40:30 -0700
Subject: [PATCH] Fix manifest generation

---
 hack/release/pkg/builder/builder.go  | 12 +++++-------
 hack/release/pkg/builder/commands.go | 21 +++++++++++++++++++++
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/hack/release/pkg/builder/builder.go b/hack/release/pkg/builder/builder.go
index 690ea660f49..3ebb59ce69f 100644
--- a/hack/release/pkg/builder/builder.go
+++ b/hack/release/pkg/builder/builder.go
@@ -319,13 +319,13 @@ func (r *ReleaseBuilder) collectGithubArtifacts(ver string) error {
 	if _, err := r.runner.Run("cp", []string{fmt.Sprintf("node/dist/calico-windows-%s.zip", ver), uploadDir}, nil); err != nil {
 		return err
 	}
-	if _, err := r.runner.Run("cp", []string{"calico/_site/scripts/install-calico-windows.ps1", uploadDir}, nil); err != nil {
+	if _, err := r.runner.Run("cp", []string{"node/dist/install-calico-windows.ps1", uploadDir}, nil); err != nil {
 		return err
 	}
 	if _, err := r.runner.Run("cp", []string{fmt.Sprintf("bin/tigera-operator-%s.tgz", ver), uploadDir}, nil); err != nil {
 		return err
 	}
-	if _, err := r.runner.Run("cp", []string{"manifests/ocp.tgz", ver, uploadDir}, nil); err != nil {
+	if _, err := r.runner.Run("cp", []string{"bin/ocp.tgz", uploadDir}, nil); err != nil {
 		return err
 	}
 
@@ -409,7 +409,7 @@ func (r *ReleaseBuilder) buildReleaseTar(ver string, targetDir string) error {
 	}
 
 	// Add in manifests directory generated from the docs.
-	if _, err := r.runner.Run("cp", []string{"-r", "calico/_site/manifests", releaseBase}, nil); err != nil {
+	if _, err := r.runner.Run("cp", []string{"-r", "manifests", releaseBase}, nil); err != nil {
 		return err
 	}
 
@@ -443,12 +443,10 @@ func (r *ReleaseBuilder) buildContainerImages(ver string) error {
 	)
 
 	for _, dir := range releaseDirs {
-		out, err := r.makeInDirectoryWithOutput(dir, "release-build", env...)
+		err := r.makeInDirectory(dir, "release-build", env...)
 		if err != nil {
-			logrus.Error(out)
 			return fmt.Errorf("Failed to build %s: %s", dir, err)
 		}
-		logrus.Info(out)
 	}
 	return nil
 }
@@ -632,7 +630,7 @@ func (r *ReleaseBuilder) gitOrFail(args ...string) {
 }
 
 func (r *ReleaseBuilder) makeInDirectory(dir, target string, env ...string) error {
-	_, err := r.runner.Run("make", []string{"-C", dir, target}, env)
+	err := r.runner.RunNoCapture("make", []string{"-C", dir, target}, env)
 	return err
 }
 
diff --git a/hack/release/pkg/builder/commands.go b/hack/release/pkg/builder/commands.go
index e10dd2ff9f7..9c4d5c40441 100644
--- a/hack/release/pkg/builder/commands.go
+++ b/hack/release/pkg/builder/commands.go
@@ -3,6 +3,8 @@ package builder
 import (
 	"bytes"
 	"fmt"
+	"io"
+	"os"
 	"os/exec"
 	"strings"
 
@@ -14,8 +16,10 @@ type CommandRunner interface {
 	// Run takes the command to run, a list of args, and list of environment variables
 	// in the form A=B, and returns stdout / error.
 	Run(string, []string, []string) (string, error)
+	RunNoCapture(string, []string, []string) error
 
 	RunInDir(string, string, []string, []string) (string, error)
+	RunInDirNoCapture(string, string, []string, []string) error
 }
 
 // RealCommandRunner runs a command for real on the host.
@@ -39,6 +43,23 @@ func (r *RealCommandRunner) RunInDir(dir, name string, args []string, env []stri
 	return strings.TrimSpace(outb.String()), err
 }
 
+func (r *RealCommandRunner) RunInDirNoCapture(dir, name string, args []string, env []string) error {
+	cmd := exec.Command(name, args...)
+	if len(env) != 0 {
+		cmd.Env = env
+	}
+	cmd.Stdout = io.Writer(os.Stdout)
+	cmd.Stderr = io.Writer(os.Stderr)
+	cmd.Dir = dir
+	logrus.WithField("cmd", cmd.String()).Infof("Running %s command", name)
+	err := cmd.Run()
+	return err
+}
+
 func (r *RealCommandRunner) Run(name string, args []string, env []string) (string, error) {
 	return r.RunInDir("", name, args, env)
 }
+
+func (r *RealCommandRunner) RunNoCapture(name string, args []string, env []string) error {
+	return r.RunInDirNoCapture("", name, args, env)
+}