From 20bd9070003a848d4e5c1c7228306ffbed787fc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Va=C5=A1ek?= Date: Tue, 27 Aug 2024 14:51:38 +0200 Subject: [PATCH 1/2] Updated git-clone task --- pkg/pipelines/tekton/tasks.go | 6 ++++-- pkg/pipelines/tekton/templates.go | 2 +- pkg/pipelines/tekton/templates_pack.go | 3 +++ pkg/pipelines/tekton/templates_s2i.go | 3 +++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pkg/pipelines/tekton/tasks.go b/pkg/pipelines/tekton/tasks.go index 239ddec25a..2888f96dcf 100644 --- a/pkg/pipelines/tekton/tasks.go +++ b/pkg/pipelines/tekton/tasks.go @@ -66,7 +66,7 @@ spec: default: "1001" - name: GROUP_ID description: The group ID of the builder image user. - default: "0" + default: "65532" ############################################################## ##### "default" has been changed to "0" for Knative Functions - name: PLATFORM_DIR @@ -108,6 +108,8 @@ spec: fi done + chmod -R g+w "$(workspaces.source.path)" + echo "> Parsing additional configuration..." parsing_flag="" envs=() @@ -187,7 +189,7 @@ spec: runAsUser: 1001 ################################################################# ##### "runAsGroup" has been changed to "0" for Knative Functions - runAsGroup: 0 + runAsGroup: 65532 - name: results image: docker.io/library/bash:5.1.4@sha256:b208215a4655538be652b2769d82e576bc4d0a2bb132144c060efc5be8c3f5d6 diff --git a/pkg/pipelines/tekton/templates.go b/pkg/pipelines/tekton/templates.go index 41d6b112ed..d202f6e096 100644 --- a/pkg/pipelines/tekton/templates.go +++ b/pkg/pipelines/tekton/templates.go @@ -57,7 +57,7 @@ const ( - name: name value: git-clone - name: version - value: "0.4" + value: "0.9" workspaces: - name: output workspace: source-workspace` diff --git a/pkg/pipelines/tekton/templates_pack.go b/pkg/pipelines/tekton/templates_pack.go index 88a2d76c40..fe62f3a931 100644 --- a/pkg/pipelines/tekton/templates_pack.go +++ b/pkg/pipelines/tekton/templates_pack.go @@ -103,6 +103,9 @@ metadata: {{end}} generateName: {{.PipelineRunName}} spec: + podTemplate: + securityContext: + fsGroup: 65532 params: - name: gitRepository value: {{.RepoUrl}} diff --git a/pkg/pipelines/tekton/templates_s2i.go b/pkg/pipelines/tekton/templates_s2i.go index b78fc47a90..dc06bf20e9 100644 --- a/pkg/pipelines/tekton/templates_s2i.go +++ b/pkg/pipelines/tekton/templates_s2i.go @@ -108,6 +108,9 @@ metadata: {{end}} generateName: {{.PipelineRunName}} spec: + podTemplate: + securityContext: + fsGroup: 65532 params: - name: gitRepository value: {{.RepoUrl}} From f45e83c5620a5c172314e651b4785f4e6753538e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Va=C5=A1ek?= Date: Wed, 28 Aug 2024 09:47:35 +0200 Subject: [PATCH 2/2] gid 65532 => 1000 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Matej VaĊĦek --- pkg/pipelines/tekton/tasks.go | 4 ++-- pkg/pipelines/tekton/templates_pack.go | 2 +- pkg/pipelines/tekton/templates_s2i.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/pipelines/tekton/tasks.go b/pkg/pipelines/tekton/tasks.go index 2888f96dcf..e63de10fca 100644 --- a/pkg/pipelines/tekton/tasks.go +++ b/pkg/pipelines/tekton/tasks.go @@ -66,7 +66,7 @@ spec: default: "1001" - name: GROUP_ID description: The group ID of the builder image user. - default: "65532" + default: "1000" ############################################################## ##### "default" has been changed to "0" for Knative Functions - name: PLATFORM_DIR @@ -189,7 +189,7 @@ spec: runAsUser: 1001 ################################################################# ##### "runAsGroup" has been changed to "0" for Knative Functions - runAsGroup: 65532 + runAsGroup: 1000 - name: results image: docker.io/library/bash:5.1.4@sha256:b208215a4655538be652b2769d82e576bc4d0a2bb132144c060efc5be8c3f5d6 diff --git a/pkg/pipelines/tekton/templates_pack.go b/pkg/pipelines/tekton/templates_pack.go index fe62f3a931..fc4b2056b1 100644 --- a/pkg/pipelines/tekton/templates_pack.go +++ b/pkg/pipelines/tekton/templates_pack.go @@ -105,7 +105,7 @@ metadata: spec: podTemplate: securityContext: - fsGroup: 65532 + fsGroup: 1000 params: - name: gitRepository value: {{.RepoUrl}} diff --git a/pkg/pipelines/tekton/templates_s2i.go b/pkg/pipelines/tekton/templates_s2i.go index dc06bf20e9..3421b24a93 100644 --- a/pkg/pipelines/tekton/templates_s2i.go +++ b/pkg/pipelines/tekton/templates_s2i.go @@ -110,7 +110,7 @@ metadata: spec: podTemplate: securityContext: - fsGroup: 65532 + fsGroup: 1000 params: - name: gitRepository value: {{.RepoUrl}}