Merge pull request #2537 from Shell32-Natsu/fix-clone-hash

Fix git commit hash ignored
Merge pull request #2542 from monopole/pinKustomizeToCmdKubectl_v0_1_0
2026-06-23 14:58:17 +00:00 · 2020-05-27 13:22:08 -07:00 · 2020-05-27 12:36:44 -07:00 · 2020-05-27 12:20:39 -07:00 · 2020-05-27 11:13:15 -07:00 · 2020-05-27 10:56:01 -07:00
6 changed files with 26 additions and 22 deletions
--- a/api/internal/git/cloner.go
+++ b/api/internal/git/cloner.go
@@ -4,7 +4,6 @@
 package git

 import (
-	"bytes"
 	"log"
 	"os/exec"

@@ -34,34 +33,38 @@ func ClonerUsingGitExec(repoSpec *RepoSpec) error {
 	cmd := exec.Command(
 		gitProgram,
 		"clone",
-		"--depth=1",
 		repoSpec.CloneSpec(),
-		"-b",
-		repoSpec.Ref,
 		repoSpec.Dir.String())
-	var out bytes.Buffer
-	cmd.Stdout = &out
-	cmd.Stderr = &out
-	err = cmd.Run()
+	out, err := cmd.CombinedOutput()
 	if err != nil {
-		log.Printf("Error cloning git repo: %s", out.String())
+		log.Printf("Error cloning git repo: %s", out)
 		return errors.Wrapf(
 			err,
 			"trouble cloning git repo %v in %s",
 			repoSpec.CloneSpec(), repoSpec.Dir.String())
 	}

+	cmd = exec.Command(
+		gitProgram,
+		"checkout",
+		repoSpec.Ref)
+	cmd.Dir = repoSpec.Dir.String()
+	out, err = cmd.CombinedOutput()
+	if err != nil {
+		log.Printf("Error checking out ref: %s", out)
+		return errors.Wrapf(err, "trouble checking out %s", repoSpec.Ref)
+	}
+
 	cmd = exec.Command(
 		gitProgram,
 		"submodule",
 		"update",
 		"--init",
 		"--recursive")
-	cmd.Stdout = &out
-	cmd.Stderr = &out
 	cmd.Dir = repoSpec.Dir.String()
-	err = cmd.Run()
+	out, err = cmd.CombinedOutput()
 	if err != nil {
+		log.Printf("Error fetching submodules: %s", out)
 		return errors.Wrapf(err, "trouble fetching submodules for %s", repoSpec.CloneSpec())
 	}

--- a/api/loader/getter.go
+++ b/api/loader/getter.go
@@ -60,6 +60,8 @@ func getRemoteTarget(rs *remoteTargetSpec) error {
 		return err
 	}

+	rs.Dir = filesys.ConfirmedDir(rs.Dir.Join("repo"))
+
 	// Get the pwd
 	pwd, err := os.Getwd()
 	if err != nil {
--- a/cmd/kubectl/go.mod
+++ b/cmd/kubectl/go.mod
@@ -13,8 +13,6 @@ require (
 	k8s.io/component-base v0.17.0 // indirect
 	k8s.io/kubectl v0.0.0-20191219154910-1528d4eea6dd
 	sigs.k8s.io/controller-runtime v0.4.0
-	sigs.k8s.io/kustomize/kstatus v0.0.1
+	sigs.k8s.io/kustomize/kstatus v0.0.2
 	sigs.k8s.io/kustomize/kyaml v0.1.11
 )
-
-replace sigs.k8s.io/kustomize/kstatus v0.0.1 => ../../kstatus
--- a/cmd/kubectl/go.sum
+++ b/cmd/kubectl/go.sum
@@ -597,6 +597,8 @@ sigs.k8s.io/controller-runtime v0.4.0 h1:wATM6/m+3w8lj8FXNaO6Fs/rq/vqoOjO1Q116Z9
 sigs.k8s.io/controller-runtime v0.4.0/go.mod h1:ApC79lpY3PHW9xj/w9pj+lYkLgwAAUZwfXkME1Lajns=
 sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=
 sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU=
+sigs.k8s.io/kustomize/kstatus v0.0.2 h1:7GoHi/Vq7rIAS8AQONlfcdaCpVXY0HqzNhU5us7dToA=
+sigs.k8s.io/kustomize/kstatus v0.0.2/go.mod h1:6qUKWLy4+yGExtjbs+fibz2tOBZG7413yx2NHyAzIU0=
 sigs.k8s.io/kustomize/kyaml v0.1.11 h1:/VvWxVIgH5gG1K4A7trgbyLgO3tRBiAWNhLFVU1HEmo=
 sigs.k8s.io/kustomize/kyaml v0.1.11/go.mod h1:72/rLkSi+L/pHM1oCjwrf3ClU+tH5kZQvvdLSqIHwWU=
 sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
--- a/kustomize/go.mod
+++ b/kustomize/go.mod
@@ -14,8 +14,8 @@ require (
 	sigs.k8s.io/controller-runtime v0.4.0
 	sigs.k8s.io/kustomize/api v0.4.0
 	sigs.k8s.io/kustomize/cmd/config v0.1.11
-	sigs.k8s.io/kustomize/cmd/kubectl v0.0.3
-	sigs.k8s.io/kustomize/kstatus v0.0.1
+	sigs.k8s.io/kustomize/cmd/kubectl v0.1.0
+	sigs.k8s.io/kustomize/kstatus v0.0.2
 	sigs.k8s.io/kustomize/kyaml v0.1.11
 	sigs.k8s.io/yaml v1.2.0
 )
@@ -24,8 +24,3 @@ exclude (
 	github.com/russross/blackfriday v2.0.0+incompatible
 	sigs.k8s.io/kustomize/api v0.2.0
 )
-
-replace (
-	sigs.k8s.io/kustomize/cmd/kubectl v0.0.3 => ../cmd/kubectl
-	sigs.k8s.io/kustomize/kstatus v0.0.1 => ../kstatus
-)
--- a/kustomize/go.sum
+++ b/kustomize/go.sum
@@ -790,6 +790,10 @@ sigs.k8s.io/kustomize/api v0.4.0 h1:EhlPWA4S1S1UUPzNanVR/SfPQ7g66j+jiN8ovtyby3Y=
 sigs.k8s.io/kustomize/api v0.4.0/go.mod h1:NqxqT+wbYHrD0P19Uu4dXiMsVwI1IwQs+MJHlLhmPqQ=
 sigs.k8s.io/kustomize/cmd/config v0.1.11 h1:wSVvutGQtgiYWcd4IH5sr8jP4v6zgr9IcUAbA+32ULo=
 sigs.k8s.io/kustomize/cmd/config v0.1.11/go.mod h1:w6vK8ulANez23sOTtmdej5KpBU9Ykdomu/W70PC8YMs=
+sigs.k8s.io/kustomize/cmd/kubectl v0.1.0 h1:TAAv9ZhUalC0tqgHp1rr8Vv5fA5ILcQwGYjdAGdCmhg=
+sigs.k8s.io/kustomize/cmd/kubectl v0.1.0/go.mod h1:qF57icqAzCMX+jN0jp21jlWiVBzyXWwPdBF8aW/amX0=
+sigs.k8s.io/kustomize/kstatus v0.0.2 h1:7GoHi/Vq7rIAS8AQONlfcdaCpVXY0HqzNhU5us7dToA=
+sigs.k8s.io/kustomize/kstatus v0.0.2/go.mod h1:6qUKWLy4+yGExtjbs+fibz2tOBZG7413yx2NHyAzIU0=
 sigs.k8s.io/kustomize/kyaml v0.1.11 h1:/VvWxVIgH5gG1K4A7trgbyLgO3tRBiAWNhLFVU1HEmo=
 sigs.k8s.io/kustomize/kyaml v0.1.11/go.mod h1:72/rLkSi+L/pHM1oCjwrf3ClU+tH5kZQvvdLSqIHwWU=
 sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
Author	SHA1	Message	Date
Jeff Regan	dd4aafe148	Merge pull request #2537 from Shell32-Natsu/fix-clone-hash Fix git commit hash ignored	2020-05-27 13:22:08 -07:00
Jeff Regan	adb56abd99	Merge pull request #2542 from monopole/pinKustomizeToCmdKubectl_v0_1_0 pin kustomize to cmd/kubectl_v0_1_0	2020-05-27 12:36:44 -07:00
jregan	def978b334	pin kustomize to cmd/kubectl_v0_1_0	2020-05-27 12:20:39 -07:00
Jeff Regan	ff7a7937c5	Merge pull request #2541 from monopole/pinToKStatus_v0_0_2 Pin to kstatus/v0.0.2	2020-05-27 11:13:15 -07:00
jregan	90c23026c2	Pin to kstatus/v0.0.2	2020-05-27 10:56:01 -07:00
Donny Xia	e5e4f33ac7	Fix go-getter	2020-05-26 17:42:31 -07:00
Donny Xia	5449dbc775	Fix git commit hash ignored	2020-05-26 14:44:37 -07:00