Revert "Fix issue with "$$" in Script blocks"

This reverts commit 9a9f896. Attempting to fix instances of "$$" introduced a new bug in the way bash scripts are interpreted: #3935
tektoncd · May 11, 2021 · 7ca5d61 · 7ca5d61
1 parent d3666c2
commit 7ca5d61
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 105 deletions.
diff --git a/examples/v1alpha1/taskruns/step-script.yaml b/examples/v1alpha1/taskruns/step-script.yaml
@@ -97,22 +97,3 @@ spec:
         [[ $# == 2 ]]
         [[ $1 == "hello" ]]
         [[ $2 == "world" ]]
-
-    # Test that multiple dollar signs next to each other are not replaced by Kubernetes
-    - name: dollar-signs-allowed
-      image: python
-      script: |
-        #!/usr/bin/env python3
-        if '$' != '\u0024':
-          print('single dollar signs ($) are not passed through as expected :(')
-          exit(1)
-        if '$$' != '\u0024\u0024':
-          print('double dollar signs ($$) are not passed through as expected :(')
-          exit(2)
-        if '$$$' != '\u0024\u0024\u0024':
-          print('three dollar signs ($$$) are not passed through as expected :(')
-          exit(3)
-        if '$$$$' != '\u0024\u0024\u0024\u0024':
-          print('four dollar signs ($$$$) are not passed through as expected :(')
-          exit(3)
-        print('dollar signs appear to be handled correctly! :)')
diff --git a/examples/v1beta1/taskruns/step-script.yaml b/examples/v1beta1/taskruns/step-script.yaml
@@ -96,22 +96,3 @@ spec:
         [[ $# == 2 ]]
         [[ $1 == "hello" ]]
         [[ $2 == "world" ]]
-
-    # Test that multiple dollar signs next to each other are not replaced by Kubernetes
-    - name: dollar-signs-allowed
-      image: python
-      script: |
-        #!/usr/bin/env python3
-        if '$' != '\u0024':
-          print('single dollar signs ($) are not passed through as expected :(')
-          exit(1)
-        if '$$' != '\u0024\u0024':
-          print('double dollar signs ($$) are not passed through as expected :(')
-          exit(2)
-        if '$$$' != '\u0024\u0024\u0024':
-          print('three dollar signs ($$$) are not passed through as expected :(')
-          exit(3)
-        if '$$$$' != '\u0024\u0024\u0024\u0024':
-          print('four dollar signs ($$$$) are not passed through as expected :(')
-          exit(3)
-        print('dollar signs appear to be handled correctly! :)')
diff --git a/pkg/pod/pod_test.go b/pkg/pod/pod_test.go
@@ -889,67 +889,6 @@ script-heredoc-randomly-generated-78c5n
 				VolumeSource: corev1.VolumeSource{EmptyDir: &corev1.EmptyDirVolumeSource{Medium: corev1.StorageMediumMemory}},
 			}),
 		},
-	}, {
-		desc: "step with script that uses two dollar signs",
-		ts: v1beta1.TaskSpec{
-			Steps: []v1beta1.Step{{
-				Container: corev1.Container{
-					Name:  "one",
-					Image: "image",
-				},
-				Script: "#!/bin/sh\n$$",
-			}},
-		},
-		want: &corev1.PodSpec{
-			RestartPolicy: corev1.RestartPolicyNever,
-			InitContainers: []corev1.Container{
-				{
-					Name:    "place-scripts",
-					Image:   images.ShellImage,
-					Command: []string{"sh"},
-					Args: []string{"-c", `tmpfile="/tekton/scripts/script-0-9l9zj"
-touch ${tmpfile} && chmod +x ${tmpfile}
-cat > ${tmpfile} << 'script-heredoc-randomly-generated-mz4c7'
-#!/bin/sh
-$$$$
-script-heredoc-randomly-generated-mz4c7
-`},
-					VolumeMounts: []corev1.VolumeMount{scriptsVolumeMount},
-				},
-				{
-					Name:         "place-tools",
-					Image:        images.EntrypointImage,
-					Command:      []string{"/ko-app/entrypoint", "cp", "/ko-app/entrypoint", "/tekton/tools/entrypoint"},
-					VolumeMounts: []corev1.VolumeMount{toolsMount},
-				}},
-			Containers: []corev1.Container{{
-				Name:    "step-one",
-				Image:   "image",
-				Command: []string{"/tekton/tools/entrypoint"},
-				Args: []string{
-					"-wait_file",
-					"/tekton/downward/ready",
-					"-wait_file_content",
-					"-post_file",
-					"/tekton/tools/0",
-					"-termination_path",
-					"/tekton/termination",
-					"-entrypoint",
-					"/tekton/scripts/script-0-9l9zj",
-					"--",
-				},
-				VolumeMounts: append([]corev1.VolumeMount{scriptsVolumeMount, toolsMount, downwardMount, {
-					Name:      "tekton-creds-init-home-0",
-					MountPath: "/tekton/creds",
-				}}, implicitVolumeMounts...),
-				Resources:              corev1.ResourceRequirements{Requests: allZeroQty()},
-				TerminationMessagePath: "/tekton/termination",
-			}},
-			Volumes: append(implicitVolumes, scriptsVolume, toolsVolume, downwardVolume, corev1.Volume{
-				Name:         "tekton-creds-init-home-0",
-				VolumeSource: corev1.VolumeSource{EmptyDir: &corev1.EmptyDirVolumeSource{Medium: corev1.StorageMediumMemory}},
-			}),
-		},
 	}, {
 		desc: "using another scheduler",
 		ts: v1beta1.TaskSpec{

diff --git a/pkg/pod/script.go b/pkg/pod/script.go
@@ -107,12 +107,6 @@ func convertListOfSteps(steps []v1beta1.Step, initContainer *corev1.Container, p
 		// non-nil init container.
 		*placeScripts = true
 
-		// Kubernetes replaces instances of "$$" with "$". So we double-up
-		// on these instances in our args and Kubernetes reduces them back down
-		// to the expected number of dollar signs. This is a workaround for
-		// https://github.com/kubernetes/kubernetes/issues/101137
-		script = strings.ReplaceAll(script, "$$", "$$$$")
-
 		// Append to the place-scripts script to place the
 		// script file in a known location in the scripts volume.
 		tmpFile := filepath.Join(scriptsDir, names.SimpleNameGenerator.RestrictLengthWithRandomSuffix(fmt.Sprintf("%s-%d", namePrefix, i)))