Don't set TTY:true in place-scripts

tektoncd · Aug 21, 2020 · 0de5401 · 0de5401
1 parent 290899a
commit 0de5401
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 5 deletions.
diff --git a/go.mod b/go.mod
@@ -3,6 +3,7 @@ module github.com/tektoncd/pipeline
 go 1.13
 
 require (
+	cloud.google.com/go/storage v1.8.0
 	contrib.go.opencensus.io/exporter/stackdriver v0.13.1 // indirect
 	github.com/GoogleCloudPlatform/cloud-builders/gcs-fetcher v0.0.0-20191203181535-308b93ad1f39
 	github.com/cloudevents/sdk-go/v2 v2.1.0
@@ -24,6 +25,7 @@ require (
 	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
 	golang.org/x/text v0.3.3 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.1.0
+	google.golang.org/api v0.25.0
 	k8s.io/api v0.17.6
 	k8s.io/apimachinery v0.17.6
 	k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible

diff --git a/pkg/pod/pod_test.go b/pkg/pod/pod_test.go
@@ -518,7 +518,6 @@ func TestPodBuild(t *testing.T) {
 					Name:         "place-scripts",
 					Image:        "busybox",
 					Command:      []string{"sh"},
-					TTY:          true,
 					VolumeMounts: []corev1.VolumeMount{scriptsVolumeMount},
 					Args: []string{"-c", `tmpfile="/tekton/scripts/sidecar-script-0-9l9zj"
 touch ${tmpfile} && chmod +x ${tmpfile}
@@ -756,7 +755,6 @@ print("Hello from Python")`,
 					Name:    "place-scripts",
 					Image:   images.ShellImage,
 					Command: []string{"sh"},
-					TTY:     true,
 					Args: []string{"-c", `tmpfile="/tekton/scripts/script-0-9l9zj"
 touch ${tmpfile} && chmod +x ${tmpfile}
 cat > ${tmpfile} << 'script-heredoc-randomly-generated-mz4c7'

diff --git a/pkg/pod/script.go b/pkg/pod/script.go
@@ -55,7 +55,6 @@ func convertScripts(shellImage string, steps []v1beta1.Step, sidecars []v1beta1.
 	placeScriptsInit := corev1.Container{
 		Name:         "place-scripts",
 		Image:        shellImage,
-		TTY:          true,
 		Command:      []string{"sh"},
 		Args:         []string{"-c", ""},
 		VolumeMounts: []corev1.VolumeMount{scriptsVolumeMount},

diff --git a/pkg/pod/script_test.go b/pkg/pod/script_test.go
@@ -157,7 +157,6 @@ script-3`,
 	wantInit := &corev1.Container{
 		Name:    "place-scripts",
 		Image:   images.ShellImage,
-		TTY:     true,
 		Command: []string{"sh"},
 		Args: []string{"-c", `tmpfile="/tekton/scripts/script-0-9l9zj"
 touch ${tmpfile} && chmod +x ${tmpfile}
@@ -249,7 +248,6 @@ sidecar-1`,
 	wantInit := &corev1.Container{
 		Name:    "place-scripts",
 		Image:   images.ShellImage,
-		TTY:     true,
 		Command: []string{"sh"},
 		Args: []string{"-c", `tmpfile="/tekton/scripts/script-0-9l9zj"
 touch ${tmpfile} && chmod +x ${tmpfile}