Skip to content
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

Jump to bottom

Switch to ghcr.io/distroless/busybox for shell-image #4762

Merged
merged 1 commit into from
Apr 15, 2022
Merged

Switch to ghcr.io/distroless/busybox for shell-image #4762

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
8 changes: 5 additions & 3 deletions config/controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,12 @@ spec:

# This is gcr.io/google.com/cloudsdktool/cloud-sdk:302.0.0-slim
"-gsutil-image", "gcr.io/google.com/cloudsdktool/cloud-sdk@sha256:27b2c22bf259d9bc1a291e99c63791ba0c27a04d2db0a43241ba0f1f20f4067f",
# The shell image must be root in order to create directories and copy files to PVCs.
# gcr.io/distroless/base:debug as of February 17, 2022

# The shell image must allow root in order to create directories and copy files to PVCs.
# ghcr.io/distroless/busybox as of April 14 2022
# image shall not contains tag, so it will be supported on a runtime like cri-o
"-shell-image", "gcr.io/distroless/base@sha256:3cebc059e7e52a4f5a389aa6788ac2b582227d7953933194764ea434f4d70d64",
"-shell-image", "ghcr.io/distroless/busybox@sha256:19f02276bf8dbdd62f069b922f10c65262cc34b710eea26ff928129a736be791",

# for script mode to work with windows we need a powershell image
# pinning to nanoserver tag as of July 15 2021
"-shell-image-win", "mcr.microsoft.com/powershell:nanoserver@sha256:b6d5ff841b78bdf2dfed7550000fd4f3437385b8fa686ec0f010be24777654d6",
Expand Down
19 changes: 15 additions & 4 deletions pkg/apis/resource/v1alpha1/storage/artifact_pvc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
"github.com/tektoncd/pipeline/pkg/names"
corev1 "k8s.io/api/core/v1"
"knative.dev/pkg/ptr"
)

var (
Expand Down Expand Up @@ -64,13 +65,23 @@ func (p *ArtifactPVC) GetCopyFromStorageToSteps(name, sourcePath, destinationPat
// GetCopyToStorageFromSteps returns a container used to upload artifacts for temporary storage.
func (p *ArtifactPVC) GetCopyToStorageFromSteps(name, sourcePath, destinationPath string) []v1beta1.Step {
return []v1beta1.Step{{Container: corev1.Container{
Name: names.SimpleNameGenerator.RestrictLengthWithRandomSuffix(fmt.Sprintf("source-mkdir-%s", name)),
Image: p.ShellImage,
Name: names.SimpleNameGenerator.RestrictLengthWithRandomSuffix(fmt.Sprintf("source-mkdir-%s", name)),
Image: p.ShellImage,
// This requires us to run as root, and the ShellImage is nonroot
// by default.
SecurityContext: &corev1.SecurityContext{
RunAsUser: ptr.Int64(0),
},
Command: []string{"mkdir", "-p", destinationPath},
VolumeMounts: []corev1.VolumeMount{GetPvcMount(p.Name)},
}}, {Container: corev1.Container{
Name: names.SimpleNameGenerator.RestrictLengthWithRandomSuffix(fmt.Sprintf("source-copy-%s", name)),
Image: p.ShellImage,
Name: names.SimpleNameGenerator.RestrictLengthWithRandomSuffix(fmt.Sprintf("source-copy-%s", name)),
Image: p.ShellImage,
// This requires us to run as root, and the ShellImage is nonroot
// by default.
SecurityContext: &corev1.SecurityContext{
RunAsUser: ptr.Int64(0),
},
Command: []string{"cp", "-r", fmt.Sprintf("%s/.", sourcePath), destinationPath},
VolumeMounts: []corev1.VolumeMount{GetPvcMount(p.Name)},
Env: []corev1.EnvVar{{
Expand Down
15 changes: 11 additions & 4 deletions pkg/apis/resource/v1alpha1/storage/artifact_pvc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"github.com/tektoncd/pipeline/test/names"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"knative.dev/pkg/ptr"
)

func TestPVCGetCopyFromContainerSpec(t *testing.T) {
Expand Down Expand Up @@ -57,13 +58,19 @@ func TestPVCGetCopyToContainerSpec(t *testing.T) {
ShellImage: "busybox",
}
want := []v1beta1.Step{{Container: corev1.Container{
Name: "source-mkdir-workspace-9l9zj",
Image: "busybox",
Name: "source-mkdir-workspace-9l9zj",
Image: "busybox",
SecurityContext: &corev1.SecurityContext{
RunAsUser: ptr.Int64(0),
},
Command: []string{"mkdir", "-p", "/workspace/destination"},
VolumeMounts: []corev1.VolumeMount{{MountPath: "/pvc", Name: "pipelinerun-pvc"}},
}}, {Container: corev1.Container{
Name: "source-copy-workspace-mz4c7",
Image: "busybox",
Name: "source-copy-workspace-mz4c7",
Image: "busybox",
SecurityContext: &corev1.SecurityContext{
RunAsUser: ptr.Int64(0),
},
Command: []string{"cp", "-r", "src-path/.", "/workspace/destination"},
VolumeMounts: []corev1.VolumeMount{{MountPath: "/pvc", Name: "pipelinerun-pvc"}},
Env: []corev1.EnvVar{{Name: "TEKTON_RESOURCE_NAME", Value: "workspace"}},
Expand Down
57 changes: 41 additions & 16 deletions pkg/reconciler/taskrun/resources/output_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
fakek8s "k8s.io/client-go/kubernetes/fake"
"knative.dev/pkg/ptr"
)

var (
Expand Down Expand Up @@ -224,16 +225,22 @@ func TestValidOutputResources(t *testing.T) {
Image: "busybox",
Command: []string{"mkdir", "-p", "/workspace/output/source-workspace"},
}}, {Container: corev1.Container{
Name: "source-mkdir-source-git-mz4c7",
Image: "busybox",
Name: "source-mkdir-source-git-mz4c7",
Image: "busybox",
SecurityContext: &corev1.SecurityContext{
RunAsUser: ptr.Int64(0),
},
Command: []string{"mkdir", "-p", "pipeline-task-name"},
VolumeMounts: []corev1.VolumeMount{{
Name: "pipelinerun-pvc",
MountPath: "/pvc",
}},
}}, {Container: corev1.Container{
Name: "source-copy-source-git-mssqb",
Image: "busybox",
Name: "source-copy-source-git-mssqb",
Image: "busybox",
SecurityContext: &corev1.SecurityContext{
RunAsUser: ptr.Int64(0),
},
Command: []string{"cp", "-r", "/workspace/output/source-workspace/.", "pipeline-task-name"},
VolumeMounts: []corev1.VolumeMount{{
Name: "pipelinerun-pvc",
Expand Down Expand Up @@ -298,16 +305,22 @@ func TestValidOutputResources(t *testing.T) {
Image: "busybox",
Command: []string{"mkdir", "-p", "/workspace/output/source-workspace"},
}}, {Container: corev1.Container{
Name: "source-mkdir-source-git-mz4c7",
Image: "busybox",
Name: "source-mkdir-source-git-mz4c7",
Image: "busybox",
SecurityContext: &corev1.SecurityContext{
RunAsUser: ptr.Int64(0),
},
Command: []string{"mkdir", "-p", "pipeline-task-name"},
VolumeMounts: []corev1.VolumeMount{{
Name: "pipelinerun-pvc",
MountPath: "/pvc",
}},
}}, {Container: corev1.Container{
Name: "source-copy-source-git-mssqb",
Image: "busybox",
Name: "source-copy-source-git-mssqb",
Image: "busybox",
SecurityContext: &corev1.SecurityContext{
RunAsUser: ptr.Int64(0),
},
Command: []string{"cp", "-r", "/workspace/output/source-workspace/.", "pipeline-task-name"},
VolumeMounts: []corev1.VolumeMount{{
Name: "pipelinerun-pvc",
Expand Down Expand Up @@ -476,14 +489,20 @@ func TestValidOutputResources(t *testing.T) {
Command: []string{"mkdir", "-p", "/workspace/output/source-workspace"},
}},
{Container: corev1.Container{
Name: "source-mkdir-source-gcs-mz4c7",
Image: "busybox",
Name: "source-mkdir-source-gcs-mz4c7",
Image: "busybox",
SecurityContext: &corev1.SecurityContext{
RunAsUser: ptr.Int64(0),
},
Command: []string{"mkdir", "-p", "pipeline-task-path"},
VolumeMounts: []corev1.VolumeMount{{Name: "pipelinerun-parent-pvc", MountPath: "/pvc"}},
}},
{Container: corev1.Container{
Name: "source-copy-source-gcs-mssqb",
Image: "busybox",
Name: "source-copy-source-gcs-mssqb",
Image: "busybox",
SecurityContext: &corev1.SecurityContext{
RunAsUser: ptr.Int64(0),
},
Command: []string{"cp", "-r", "/workspace/output/source-workspace/.", "pipeline-task-path"},
VolumeMounts: []corev1.VolumeMount{{Name: "pipelinerun-parent-pvc", MountPath: "/pvc"}},
Env: []corev1.EnvVar{
Expand Down Expand Up @@ -570,14 +589,20 @@ func TestValidOutputResources(t *testing.T) {
Command: []string{"mkdir", "-p", "/workspace/output/source-workspace"},
}},
{Container: corev1.Container{
Name: "source-mkdir-source-gcs-mz4c7",
Image: "busybox",
Name: "source-mkdir-source-gcs-mz4c7",
Image: "busybox",
SecurityContext: &corev1.SecurityContext{
RunAsUser: ptr.Int64(0),
},
Command: []string{"mkdir", "-p", "pipeline-task-path"},
VolumeMounts: []corev1.VolumeMount{{Name: "pipelinerun-pvc", MountPath: "/pvc"}},
}},
{Container: corev1.Container{
Name: "source-copy-source-gcs-mssqb",
Image: "busybox",
Name: "source-copy-source-gcs-mssqb",
Image: "busybox",
SecurityContext: &corev1.SecurityContext{
RunAsUser: ptr.Int64(0),
},
Command: []string{"cp", "-r", "/workspace/output/source-workspace/.", "pipeline-task-path"},
VolumeMounts: []corev1.VolumeMount{{Name: "pipelinerun-pvc", MountPath: "/pvc"}},
Env: []corev1.EnvVar{
Expand Down