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

Git PipelineResource errs when HOME != /tekton/home & UID is non-zero #2575

Merged
merged 1 commit into from May 13, 2020
Merged

Git PipelineResource errs when HOME != /tekton/home & UID is non-zero #2575

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
2 changes: 2 additions & 0 deletions pkg/apis/pipeline/paths.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,6 @@ const (
WorkspaceDir = "/workspace"
// DefaultResultPath is the path for task result
DefaultResultPath = "/tekton/results"
// HomeDir is the HOME directory of PipelineResources
HomeDir = "/tekton/home"
)
3 changes: 3 additions & 0 deletions pkg/apis/resource/v1alpha1/git/git_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,9 @@ func (s *Resource) GetInputTaskModifier(_ *v1beta1.TaskSpec, path string) (v1bet
env := []corev1.EnvVar{{
Name: "TEKTON_RESOURCE_NAME",
Value: s.Name,
}, {
Name: "HOME",
Value: pipeline.HomeDir,
}}

if len(s.HTTPProxy) != 0 {
Expand Down
9 changes: 9 additions & 0 deletions pkg/apis/resource/v1alpha1/git/git_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (

"github.com/google/go-cmp/cmp"
tb "github.com/tektoncd/pipeline/internal/builder/v1beta1"
pipeline "github.com/tektoncd/pipeline/pkg/apis/pipeline"
resourcev1alpha1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1"
"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
"github.com/tektoncd/pipeline/pkg/apis/resource/v1alpha1/git"
Expand Down Expand Up @@ -401,6 +402,7 @@ func TestGitResource_GetDownloadTaskModifier(t *testing.T) {
WorkingDir: "/workspace",
Env: []corev1.EnvVar{
{Name: "TEKTON_RESOURCE_NAME", Value: "git-resource"},
{Name: "HOME", Value: pipeline.HomeDir},
{Name: "HTTP_PROXY", Value: "http-proxy.git.com"},
{Name: "HTTPS_PROXY", Value: "https-proxy.git.com"},
{Name: "NO_PROXY", Value: "no-proxy.git.com"},
Expand Down Expand Up @@ -438,6 +440,7 @@ func TestGitResource_GetDownloadTaskModifier(t *testing.T) {
WorkingDir: "/workspace",
Env: []corev1.EnvVar{
{Name: "TEKTON_RESOURCE_NAME", Value: "git-resource"},
{Name: "HOME", Value: pipeline.HomeDir},
{Name: "HTTP_PROXY", Value: "http-proxy.git.com"},
{Name: "HTTPS_PROXY", Value: "https-proxy.git.com"},
{Name: "NO_PROXY", Value: "no-proxy.git.com"},
Expand Down Expand Up @@ -476,6 +479,7 @@ func TestGitResource_GetDownloadTaskModifier(t *testing.T) {
WorkingDir: "/workspace",
Env: []corev1.EnvVar{
{Name: "TEKTON_RESOURCE_NAME", Value: "git-resource"},
{Name: "HOME", Value: pipeline.HomeDir},
{Name: "HTTP_PROXY", Value: "http-proxy.git.com"},
{Name: "HTTPS_PROXY", Value: "https-proxy.git.com"},
{Name: "NO_PROXY", Value: "no-proxy.git.com"},
Expand Down Expand Up @@ -514,6 +518,7 @@ func TestGitResource_GetDownloadTaskModifier(t *testing.T) {
WorkingDir: "/workspace",
Env: []corev1.EnvVar{
{Name: "TEKTON_RESOURCE_NAME", Value: "git-resource"},
{Name: "HOME", Value: pipeline.HomeDir},
{Name: "HTTP_PROXY", Value: "http-proxy.git.com"},
{Name: "HTTPS_PROXY", Value: "https-proxy.git.com"},
{Name: "NO_PROXY", Value: "no-proxy.git.com"},
Expand Down Expand Up @@ -551,6 +556,7 @@ func TestGitResource_GetDownloadTaskModifier(t *testing.T) {
WorkingDir: "/workspace",
Env: []corev1.EnvVar{
{Name: "TEKTON_RESOURCE_NAME", Value: "git-resource"},
{Name: "HOME", Value: pipeline.HomeDir},
{Name: "HTTPS_PROXY", Value: "https-proxy.git.com"},
{Name: "NO_PROXY", Value: "no-proxy.git.com"},
},
Expand Down Expand Up @@ -587,6 +593,7 @@ func TestGitResource_GetDownloadTaskModifier(t *testing.T) {
WorkingDir: "/workspace",
Env: []corev1.EnvVar{
{Name: "TEKTON_RESOURCE_NAME", Value: "git-resource"},
{Name: "HOME", Value: pipeline.HomeDir},
{Name: "HTTP_PROXY", Value: "http-proxy.git.com"},
{Name: "NO_PROXY", Value: "no-proxy.git.com"},
},
Expand Down Expand Up @@ -623,6 +630,7 @@ func TestGitResource_GetDownloadTaskModifier(t *testing.T) {
WorkingDir: "/workspace",
Env: []corev1.EnvVar{
{Name: "TEKTON_RESOURCE_NAME", Value: "git-resource"},
{Name: "HOME", Value: pipeline.HomeDir},
{Name: "HTTP_PROXY", Value: "http-proxy.git.com"},
{Name: "HTTPS_PROXY", Value: "https-proxy.git.com"},
},
Expand Down Expand Up @@ -661,6 +669,7 @@ func TestGitResource_GetDownloadTaskModifier(t *testing.T) {
WorkingDir: "/workspace",
Env: []corev1.EnvVar{
{Name: "TEKTON_RESOURCE_NAME", Value: "git-resource"},
{Name: "HOME", Value: pipeline.HomeDir},
{Name: "HTTP_PROXY", Value: "http-proxy.git.com"},
{Name: "HTTPS_PROXY", Value: "https-proxy.git.com"},
{Name: "NO_PROXY", Value: "no-proxy.git.com"},
Expand Down
3 changes: 2 additions & 1 deletion pkg/pod/creds_init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package pod
import (
"fmt"

"github.com/tektoncd/pipeline/pkg/apis/pipeline"
"github.com/tektoncd/pipeline/pkg/credentials"
"github.com/tektoncd/pipeline/pkg/credentials/dockercreds"
"github.com/tektoncd/pipeline/pkg/credentials/gitcreds"
Expand Down Expand Up @@ -120,7 +121,7 @@ func credsInit(credsImage string, serviceAccountName, namespace string, kubeclie
// with /tekton/home.
func CredentialsPath(shouldOverrideHomeEnv bool) string {
if shouldOverrideHomeEnv {
return homeDir
return pipeline.HomeDir
}
return credsInitHomeDir
}
Expand Down
6 changes: 2 additions & 4 deletions pkg/pod/pod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ func GetFeatureFlagsConfigName() string {
}

const (
homeDir = "/tekton/home"

// ResultsDir is the folder used by default to create the results file
ResultsDir = "/tekton/results"

Expand All @@ -69,7 +67,7 @@ var (
MountPath: pipeline.WorkspaceDir,
}, {
Name: "tekton-internal-home",
MountPath: homeDir,
MountPath: pipeline.HomeDir,
}, {
Name: "tekton-internal-results",
MountPath: ResultsDir,
Expand Down Expand Up @@ -101,7 +99,7 @@ func MakePod(images pipeline.Images, taskRun *v1beta1.TaskRun, taskSpec v1beta1.
if overrideHomeEnv {
implicitEnvVars = append(implicitEnvVars, corev1.EnvVar{
Name: "HOME",
Value: homeDir,
Value: pipeline.HomeDir,
})
} else {
// Add the volume that creds-init will write to when
Expand Down
2 changes: 1 addition & 1 deletion pkg/pod/pod_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func TestMakePod(t *testing.T) {

implicitEnvVars := []corev1.EnvVar{{
Name: "HOME",
Value: homeDir,
Value: pipeline.HomeDir,
}}
secretsVolumeMount := corev1.VolumeMount{
Name: "tekton-internal-secret-volume-multi-creds-9l9zj",
Expand Down
42 changes: 33 additions & 9 deletions pkg/reconciler/taskrun/resources/input_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,10 @@ func TestAddInputResourceToTask(t *testing.T) {
Command: []string{"/ko-app/git-init"},
Args: []string{"-url", "https://github.com/grafeas/kritis", "-revision", "master", "-path", "/workspace/gitspace"},
WorkingDir: "/workspace",
Env: []corev1.EnvVar{{Name: "TEKTON_RESOURCE_NAME", Value: "the-git"}},
Env: []corev1.EnvVar{
{Name: "TEKTON_RESOURCE_NAME", Value: "the-git"},
{Name: "HOME", Value: pipeline.HomeDir},
},
}}},
Resources: &v1beta1.TaskResources{
Inputs: gitInputs,
Expand Down Expand Up @@ -408,7 +411,10 @@ func TestAddInputResourceToTask(t *testing.T) {
Command: []string{"/ko-app/git-init"},
Args: []string{"-url", "https://github.com/grafeas/kritis", "-revision", "branch", "-path", "/workspace/gitspace"},
WorkingDir: "/workspace",
Env: []corev1.EnvVar{{Name: "TEKTON_RESOURCE_NAME", Value: "the-git-with-branch"}},
Env: []corev1.EnvVar{
{Name: "TEKTON_RESOURCE_NAME", Value: "the-git-with-branch"},
{Name: "HOME", Value: pipeline.HomeDir},
},
}}},
Resources: &v1beta1.TaskResources{
Inputs: gitInputs,
Expand Down Expand Up @@ -453,14 +459,20 @@ func TestAddInputResourceToTask(t *testing.T) {
Command: []string{"/ko-app/git-init"},
Args: []string{"-url", "https://github.com/grafeas/kritis", "-revision", "branch", "-path", "/workspace/gitspace"},
WorkingDir: "/workspace",
Env: []corev1.EnvVar{{Name: "TEKTON_RESOURCE_NAME", Value: "the-git-with-branch"}},
Env: []corev1.EnvVar{
{Name: "TEKTON_RESOURCE_NAME", Value: "the-git-with-branch"},
{Name: "HOME", Value: pipeline.HomeDir},
},
}}, {Container: corev1.Container{
Name: "git-source-the-git-with-branch-9l9zj",
Image: "override-with-git:latest",
Command: []string{"/ko-app/git-init"},
Args: []string{"-url", "https://github.com/grafeas/kritis", "-revision", "branch", "-path", "/workspace/git-duplicate-space"},
WorkingDir: "/workspace",
Env: []corev1.EnvVar{{Name: "TEKTON_RESOURCE_NAME", Value: "the-git-with-branch"}},
Env: []corev1.EnvVar{
{Name: "TEKTON_RESOURCE_NAME", Value: "the-git-with-branch"},
{Name: "HOME", Value: pipeline.HomeDir},
},
}}},
Resources: &v1beta1.TaskResources{
Inputs: multipleGitInputs,
Expand Down Expand Up @@ -498,14 +510,17 @@ func TestAddInputResourceToTask(t *testing.T) {
Command: []string{"/ko-app/git-init"},
Args: []string{"-url", "https://github.com/grafeas/kritis", "-revision", "master", "-path", "/workspace/gitspace"},
WorkingDir: "/workspace",
Env: []corev1.EnvVar{{Name: "TEKTON_RESOURCE_NAME", Value: "the-git"}},
Env: []corev1.EnvVar{
{Name: "TEKTON_RESOURCE_NAME", Value: "the-git"},
{Name: "HOME", Value: pipeline.HomeDir},
},
}}},
Resources: &v1beta1.TaskResources{
Inputs: gitInputs,
},
},
}, {
desc: "set revision to provdided branch",
desc: "set revision to provided branch",
task: task,
taskRun: &v1beta1.TaskRun{
ObjectMeta: metav1.ObjectMeta{
Expand Down Expand Up @@ -536,7 +551,10 @@ func TestAddInputResourceToTask(t *testing.T) {
Command: []string{"/ko-app/git-init"},
Args: []string{"-url", "https://github.com/grafeas/kritis", "-revision", "branch", "-path", "/workspace/gitspace"},
WorkingDir: "/workspace",
Env: []corev1.EnvVar{{Name: "TEKTON_RESOURCE_NAME", Value: "the-git-with-branch"}},
Env: []corev1.EnvVar{
{Name: "TEKTON_RESOURCE_NAME", Value: "the-git-with-branch"},
{Name: "HOME", Value: pipeline.HomeDir},
},
}}},
Resources: &v1beta1.TaskResources{
Inputs: gitInputs,
Expand Down Expand Up @@ -622,7 +640,10 @@ func TestAddInputResourceToTask(t *testing.T) {
Command: []string{"/ko-app/git-init"},
Args: []string{"-url", "https://github.com/grafeas/kritis", "-revision", "branch", "-path", "/workspace/gitspace", "-sslVerify=false"},
WorkingDir: "/workspace",
Env: []corev1.EnvVar{{Name: "TEKTON_RESOURCE_NAME", Value: "the-git-with-sslVerify-false"}},
Env: []corev1.EnvVar{
{Name: "TEKTON_RESOURCE_NAME", Value: "the-git-with-sslVerify-false"},
{Name: "HOME", Value: pipeline.HomeDir},
},
}}},
Resources: &v1beta1.TaskResources{
Inputs: gitInputs,
Expand Down Expand Up @@ -922,7 +943,10 @@ gsutil cp gs://fake-bucket/rules.zip /workspace/gcs-dir
Command: []string{"/ko-app/git-init"},
Args: []string{"-url", "https://github.com/grafeas/kritis", "-revision", "branch", "-path", "/workspace/gitspace"},
WorkingDir: "/workspace",
Env: []corev1.EnvVar{{Name: "TEKTON_RESOURCE_NAME", Value: "the-git-with-branch"}},
Env: []corev1.EnvVar{
{Name: "TEKTON_RESOURCE_NAME", Value: "the-git-with-branch"},
{Name: "HOME", Value: pipeline.HomeDir},
},
}}},
Resources: &v1beta1.TaskResources{
Inputs: optionalGitInputs,
Expand Down
9 changes: 9 additions & 0 deletions pkg/reconciler/taskrun/taskrun_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -732,6 +732,7 @@ func TestReconcile(t *testing.T) {
tb.WorkingDir(workspaceDir),
tb.EnvVar("HOME", "/tekton/home"),
tb.EnvVar("TEKTON_RESOURCE_NAME", "git-resource"),
tb.EnvVar("HOME", "/tekton/home"),
tb.VolumeMount("tekton-internal-tools", "/tekton/tools"),
tb.VolumeMount("tekton-internal-workspace", workspaceDir),
tb.VolumeMount("tekton-internal-home", "/tekton/home"),
Expand Down Expand Up @@ -816,8 +817,12 @@ func TestReconcile(t *testing.T) {
"/workspace/workspace",
),
tb.WorkingDir(workspaceDir),
// Note: the duplication of HOME env var here is intentional: our pod builder
// adds it first and the git pipelineresource adds its own to ensure that HOME
// is set even when disable-home-env-overwrite feature flag is "true".
tb.EnvVar("HOME", "/tekton/home"),
tb.EnvVar("TEKTON_RESOURCE_NAME", "git-resource"),
tb.EnvVar("HOME", "/tekton/home"),
tb.VolumeMount("tekton-internal-tools", "/tekton/tools"),
tb.VolumeMount("tekton-internal-downward", "/tekton/downward"),
tb.VolumeMount("tekton-internal-workspace", workspaceDir),
Expand Down Expand Up @@ -920,8 +925,12 @@ func TestReconcile(t *testing.T) {
"-path",
"/workspace/workspace"),
tb.WorkingDir(workspaceDir),
// Note: the duplication of HOME env var here is intentional: our pod builder
// adds it first and the git pipelineresource adds its own to ensure that HOME
// is set even when disable-home-env-overwrite feature flag is "true".
tb.EnvVar("HOME", "/tekton/home"),
tb.EnvVar("TEKTON_RESOURCE_NAME", "workspace"),
tb.EnvVar("HOME", "/tekton/home"),
tb.VolumeMount("tekton-internal-tools", "/tekton/tools"),
tb.VolumeMount("tekton-internal-downward", "/tekton/downward"),
tb.VolumeMount("tekton-internal-workspace", workspaceDir),
Expand Down