diff --git a/pkg/pipelines/tekton/templates_pack.go b/pkg/pipelines/tekton/templates_pack.go index 5d6b7859e5..1ea6ecb7b7 100644 --- a/pkg/pipelines/tekton/templates_pack.go +++ b/pkg/pipelines/tekton/templates_pack.go @@ -125,11 +125,12 @@ spec: value: "{{.Commit}}" pipelineRef: name: {{.PipelineName}} - podTemplate: - securityContext: - runAsUser: 1001 - runAsGroup: 0 - fsGroup: 1002 + taskRunTemplate: + podTemplate: + securityContext: + runAsUser: 1001 + runAsGroup: 0 + fsGroup: 1002 workspaces: - name: source-workspace persistentVolumeClaim: @@ -190,11 +191,12 @@ spec: {{end}} pipelineRef: name: {{.PipelineName}} - podTemplate: - securityContext: - runAsUser: 1001 - runAsGroup: 0 - fsGroup: 1002 + taskRunTemplate: + podTemplate: + securityContext: + runAsUser: 1001 + runAsGroup: 0 + fsGroup: 1002 workspaces: - name: source-workspace persistentVolumeClaim: diff --git a/pkg/pipelines/tekton/templates_s2i.go b/pkg/pipelines/tekton/templates_s2i.go index 4063add270..b38408e383 100644 --- a/pkg/pipelines/tekton/templates_s2i.go +++ b/pkg/pipelines/tekton/templates_s2i.go @@ -136,11 +136,12 @@ spec: value: "{{.Commit}}" pipelineRef: name: {{.PipelineName}} - podTemplate: - securityContext: - runAsUser: 1001 - runAsGroup: 0 - fsGroup: 1002 + taskRunTemplate: + podTemplate: + securityContext: + runAsUser: 1001 + runAsGroup: 0 + fsGroup: 1002 workspaces: - name: source-workspace persistentVolumeClaim: @@ -208,11 +209,12 @@ spec: value: {{.TlsVerify}} pipelineRef: name: {{.PipelineName}} - podTemplate: - securityContext: - runAsUser: 1001 - runAsGroup: 0 - fsGroup: 1002 + taskRunTemplate: + podTemplate: + securityContext: + runAsUser: 1001 + runAsGroup: 0 + fsGroup: 1002 workspaces: - name: source-workspace persistentVolumeClaim: diff --git a/pkg/pipelines/tekton/templates_test.go b/pkg/pipelines/tekton/templates_test.go index 6624540d45..481bdb3c5d 100644 --- a/pkg/pipelines/tekton/templates_test.go +++ b/pkg/pipelines/tekton/templates_test.go @@ -376,9 +376,14 @@ func Test_PipelineRunHasPodTemplateSecurityContext(t *testing.T) { contentStr := string(content) - // Verify podTemplate is present + // Verify taskRunTemplate is present (Tekton v1 API requirement) + if !strings.Contains(contentStr, "taskRunTemplate:") { + t.Error("taskRunTemplate not found in generated PipelineRun") + } + + // Verify podTemplate is nested under taskRunTemplate if !strings.Contains(contentStr, "podTemplate:") { - t.Error("podTemplate not found in generated PipelineRun") + t.Error("podTemplate not found in taskRunTemplate") } // Verify securityContext is present