Skip to content

Set the scripts dir to readonly after init #4161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 17, 2021
Merged

Set the scripts dir to readonly after init #4161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkg/pod/pod_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@ func TestPodBuild(t *testing.T) {
Name: "place-scripts",
Image: "busybox",
Command: []string{"sh"},
VolumeMounts: []corev1.VolumeMount{scriptsVolumeMount, toolsMount},
VolumeMounts: []corev1.VolumeMount{writeScriptsVolumeMount, toolsMount},
Args: []string{"-c", `scriptfile="/tekton/scripts/sidecar-script-0-9l9zj"
touch ${scriptfile} && chmod +x ${scriptfile}
cat > ${scriptfile} << '_EOF_'
Expand Down Expand Up @@ -910,7 +910,7 @@ IyEvdXNyL2Jpbi9lbnYgcHl0aG9uCnByaW50KCJIZWxsbyBmcm9tIFB5dGhvbiIp
_EOF_
/tekton/tools/entrypoint decode-script "${scriptfile}"
`},
VolumeMounts: []corev1.VolumeMount{scriptsVolumeMount, toolsMount},
VolumeMounts: []corev1.VolumeMount{writeScriptsVolumeMount, toolsMount},
},
},
Containers: []corev1.Container{{
Expand Down Expand Up @@ -1035,7 +1035,7 @@ IyEvYmluL3NoCiQk
_EOF_
/tekton/tools/entrypoint decode-script "${scriptfile}"
`},
VolumeMounts: []corev1.VolumeMount{scriptsVolumeMount, toolsMount},
VolumeMounts: []corev1.VolumeMount{writeScriptsVolumeMount, toolsMount},
}},
Containers: []corev1.Container{{
Name: "step-one",
Expand Down
8 changes: 7 additions & 1 deletion pkg/pod/script.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@ var (
scriptsVolumeMount = corev1.VolumeMount{
Name: scriptsVolumeName,
MountPath: scriptsDir,
ReadOnly: true,
}
writeScriptsVolumeMount = corev1.VolumeMount{
Name: scriptsVolumeName,
MountPath: scriptsDir,
ReadOnly: false,
}
debugScriptsVolume = corev1.Volume{
Name: debugScriptsVolumeName,
Expand Down Expand Up @@ -78,7 +84,7 @@ func convertScripts(shellImage string, steps []v1beta1.Step, sidecars []v1beta1.
Image: shellImage,
Command: []string{"sh"},
Args: []string{"-c", ""},
VolumeMounts: []corev1.VolumeMount{scriptsVolumeMount, toolsMount},
VolumeMounts: []corev1.VolumeMount{writeScriptsVolumeMount, toolsMount},
}

breakpoints := []string{}
Expand Down
6 changes: 3 additions & 3 deletions pkg/pod/script_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ IyEvYmluL3NoCnNldCAteGUKbm8tc2hlYmFuZw==
_EOF_
/tekton/tools/entrypoint decode-script "${scriptfile}"
`},
VolumeMounts: []corev1.VolumeMount{scriptsVolumeMount, toolsMount},
VolumeMounts: []corev1.VolumeMount{writeScriptsVolumeMount, toolsMount},
}
want := []corev1.Container{{
Image: "step-1",
Expand Down Expand Up @@ -316,7 +316,7 @@ else
fi
debug-fail-continue-heredoc-randomly-generated-6nl7g
`},
VolumeMounts: []corev1.VolumeMount{scriptsVolumeMount, toolsMount, debugScriptsVolumeMount},
VolumeMounts: []corev1.VolumeMount{writeScriptsVolumeMount, toolsMount, debugScriptsVolumeMount},
}
want := []corev1.Container{{
Image: "step-1",
Expand Down Expand Up @@ -408,7 +408,7 @@ IyEvYmluL3NoCnNpZGVjYXItMQ==
_EOF_
/tekton/tools/entrypoint decode-script "${scriptfile}"
`},
VolumeMounts: []corev1.VolumeMount{scriptsVolumeMount, toolsMount},
VolumeMounts: []corev1.VolumeMount{writeScriptsVolumeMount, toolsMount},
}
want := []corev1.Container{{
Image: "step-1",
Expand Down