Merge pull request #890 from replicatedhq/generic-kots-error

Fix generic kustomize error during kots pull release
replicatedhq · Jul 31, 2020 · 87acd16 · 87acd16
2 parents 39a1938 + 7d7a9b8
commit 87acd16
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/kotsadm/pkg/downstream/diff.go b/kotsadm/pkg/downstream/diff.go
@@ -10,7 +10,6 @@ import (
 
 	"github.com/marccampbell/yaml-toolbox/pkg/splitter"
 	"github.com/pkg/errors"
-	"github.com/replicatedhq/kots/kotsadm/pkg/logger"
 	"github.com/sergi/go-diff/diffmatchpatch"
 )
 
@@ -52,14 +51,14 @@ func DiffAppVersionsForDownstream(downstreamName string, archive string, diffBas
 	archiveOutput, err := exec.Command(fmt.Sprintf("kustomize%s", kustomizeVersion), "build", filepath.Join(archive, "overlays", "downstreams", downstreamName)).Output()
 	if err != nil {
 		if ee, ok := err.(*exec.ExitError); ok {
-			logger.Errorf("kustomize stderr: %q", string(ee.Stderr))
+			err = fmt.Errorf("kustomize stderr: %q", string(ee.Stderr))
 		}
 		return nil, errors.Wrap(err, "failed to run kustomize on archive dir")
 	}
 	baseOutput, err := exec.Command(fmt.Sprintf("kustomize%s", kustomizeVersion), "build", filepath.Join(diffBasePath, "overlays", "downstreams", downstreamName)).Output()
 	if err != nil {
 		if ee, ok := err.(*exec.ExitError); ok {
-			logger.Errorf("kustomize stderr: %q", string(ee.Stderr))
+			err = fmt.Errorf("kustomize stderr: %q", string(ee.Stderr))
 		}
 		return nil, errors.Wrap(err, "failed to run kustomize on base dir")
 	}

diff --git a/kotsadm/pkg/gitops/gitops.go b/kotsadm/pkg/gitops/gitops.go
@@ -15,7 +15,6 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/replicatedhq/kots/kotsadm/pkg/kotsutil"
-	"github.com/replicatedhq/kots/kotsadm/pkg/logger"
 	"github.com/replicatedhq/kots/pkg/crypto"
 	"golang.org/x/crypto/ssh"
 	"gopkg.in/src-d/go-git.v4"
@@ -225,11 +224,11 @@ func UpdateDownstreamGitOps(appID, clusterID, uri, branch, path, format, action
 
 	appKey := fmt.Sprintf("%s-%s", appID, clusterID)
 	newAppData := map[string]string{
-		"repoUri":   uri,
-		"branch":    branch,
-		"path":      path,
-		"format":    format,
-		"action":    action,
+		"repoUri": uri,
+		"branch":  branch,
+		"path":    path,
+		"format":  format,
+		"action":  action,
 	}
 
 	// check if to reset or keep last error
@@ -326,7 +325,7 @@ func CreateGitOpsCommit(gitOpsConfig *GitOpsConfig, appSlug string, appName stri
 	out, err := cmd.Output()
 	if err != nil {
 		if ee, ok := err.(*exec.ExitError); ok {
-			logger.Errorf("kustomize stderr: %q", string(ee.Stderr))
+			err = fmt.Errorf("kustomize stderr: %q", string(ee.Stderr))
 		}
 		return "", errors.Wrap(err, "failed to run kustomize")
 	}

diff --git a/kotsadm/pkg/handlers/rendered_contents.go b/kotsadm/pkg/handlers/rendered_contents.go
@@ -87,7 +87,7 @@ func GetAppRenderedContents(w http.ResponseWriter, r *http.Request) {
 	archiveOutput, err := exec.Command(fmt.Sprintf("kustomize%s", kotsKinds.KustomizeVersion()), "build", kustomizeBuildTarget).Output()
 	if err != nil {
 		if ee, ok := err.(*exec.ExitError); ok {
-			logger.Errorf("kustomize stderr: %q", string(ee.Stderr))
+			err = fmt.Errorf("kustomize stderr: %q", string(ee.Stderr))
 		}
 		logger.Error(err)
 		w.WriteHeader(500)