From 69c88769468241ee76a46cc738adcb23f70b2606 Mon Sep 17 00:00:00 2001 From: Tom George Date: Mon, 3 Feb 2020 21:02:15 -0600 Subject: [PATCH] Made formatting and comment changes in response to code review Signed-off-by: Tom George --- examples/taskruns/sidecar-ready-script.yaml | 2 -- pkg/pod/pod_test.go | 30 ++++++++++----------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/examples/taskruns/sidecar-ready-script.yaml b/examples/taskruns/sidecar-ready-script.yaml index bddc1cfb2ac..08f5339820c 100644 --- a/examples/taskruns/sidecar-ready-script.yaml +++ b/examples/taskruns/sidecar-ready-script.yaml @@ -16,8 +16,6 @@ spec: steps: - name: check-ready image: ubuntu - # The step will only succeed if the sidecar has written this file, which - # it does 5s after it starts, before it reports Ready. script: cat /shared/message volumeMounts: - name: shared diff --git a/pkg/pod/pod_test.go b/pkg/pod/pod_test.go index 69ba00e916d..2e3f2494a23 100644 --- a/pkg/pod/pod_test.go +++ b/pkg/pod/pod_test.go @@ -406,34 +406,32 @@ func TestMakePod(t *testing.T) { Image: "primary-image", Command: []string{"cmd"}, // avoid entrypoint lookup. }}}, - Sidecars: []v1alpha1.Sidecar{ - { - Container: corev1.Container{ - Name: "sc-name", - Image: "sidecar-image", - }, - Script: "#!/bin/sh\necho hello from sidecar", + Sidecars: []v1alpha1.Sidecar{{ + Container: corev1.Container{ + Name: "sc-name", + Image: "sidecar-image", }, + Script: "#!/bin/sh\necho hello from sidecar", + }, }, }, wantAnnotations: map[string]string{}, want: &corev1.PodSpec{ RestartPolicy: corev1.RestartPolicyNever, - InitContainers: []corev1.Container{ - { - Name: "place-scripts", - Image: "busybox", - Command: []string{"sh"}, - TTY: true, - VolumeMounts: []corev1.VolumeMount{scriptsVolumeMount}, - Args: []string{"-c", `tmpfile="/tekton/scripts/sidecar-script-0-9l9zj" + InitContainers: []corev1.Container{{ + 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} cat > ${tmpfile} << 'sidecar-script-heredoc-randomly-generated-mz4c7' #!/bin/sh echo hello from sidecar sidecar-script-heredoc-randomly-generated-mz4c7 `}, - }, + }, placeToolsInit, }, Containers: []corev1.Container{{