feat: adapt for tekton 0.55 #83

l-qing · 2024-01-17T09:41:50Z

Changes

Submitter Checklist

As the author of this PR, please check off the items in this checklist:

Has Docs if any changes are user facing, including updates to minimum requirements e.g. Kubernetes version bumps
Has Tests included if any functionality added or changed
Follows the commit message standard
Meets the Tekton contributor standards (including functionality, content, code)
Has a kind label. You can add one by adding a comment on this PR that contains /kind <type>. Valid types are bug, cleanup, design, documentation, feature, flake, misc, question, tep
Release notes block below has been updated with any user facing changes (API changes, bug fixes, changes requiring upgrade notices or deprecation warnings). See some examples of good release notes.
Release notes contains the string "action required" if the change requires additional action from users switching to the new release

revert some changes from tektoncd#6445

revert some changes from tektoncd#6650

l-qing · 2024-01-17T09:44:40Z

.build/build.yaml

+  workspaces:
+  - name: source
+  - name: source-tkn
+  - name: source-git-init


新增了 git-init 和 tkn 的镜像构建。

默认的 tkn 存在安全漏洞，git-init 被移出了 pipeline 代码仓库。
现在单独构建后，就避免了安全问题。

l-qing · 2024-01-17T09:45:05Z

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/ahmetb/gen-crd-api-reference-docs v0.3.1-0.20220720053627-e327d0730470 // Waiting for https://github.com/ahmetb/gen-crd-api-reference-docs/pull/43/files to merge
 	github.com/cloudevents/sdk-go/v2 v2.14.0
 	github.com/containerd/containerd v1.7.8
-	github.com/go-git/go-git/v5 v5.10.0
+	github.com/go-git/go-git/v5 v5.11.0


修复安全问题。

l-qing · 2024-01-17T09:45:45Z

pkg/apis/pipeline/v1/container_types.go

@@ -140,7 +140,6 @@ type Step struct {
 	Ref *Ref `json:"ref,omitempty"`
 	// Params declares parameters passed to this step action.
 	// +optional
-	// +listType=atomic
 	Params Params `json:"params,omitempty"`


改了后，controller-gen 生成 crds 时才不报错。
社区没有这个问题是他们的 crds 都是精简版的，可能并没有用 controller-gen 来生成。

l-qing · 2024-01-17T09:47:04Z

pkg/apis/pipeline/v1/param_types.go

@@ -482,11 +484,11 @@ var AllParamTypes = []ParamType{ParamTypeString, ParamTypeArray, ParamTypeObject
 // Used in JSON unmarshalling so that a single JSON field can accept
 // either an individual string or an array of strings.
 type ParamValue struct {
-	Type      ParamType // Represents the stored type of ParamValues.
-	StringVal string
+	Type      ParamType `json:"type"` // Represents the stored type of ParamValues.


社区在这个 PR 中移除了 json 的 tag，他们给出了解释。但我们生成 crds 还是需要该 tag，所以加回来了。
tektoncd#6445

l-qing · 2024-01-17T09:48:59Z

pkg/credentials/dockercreds/creds.go

@@ -76,10 +76,6 @@ func (dc *basicDocker) Set(value string) error {
 	secret := parts[0]
 	url := parts[1]

-	if _, ok := dc.Entries[url]; ok {


等我们完全移除了凭据中的该 annotations 后，就不需要定制这部分内容了。
原来 @yuzp1996 的 PR：#1

l-qing · 2024-01-17T09:51:47Z

pkg/apis/pipeline/pod/template.go

-			tpl.Env = defaultTpl.Env
-		}
+		tpl.Env = mergeByName(defaultTpl.Env, tpl.Env)
+		tpl.Volumes = mergeByName(defaultTpl.Volumes, tpl.Volumes)


等更新到社区的 v0.56.0 后，这部分就不需要了。
变动已经在该 PR 中合并了：tektoncd#7552

l-qing · 2024-01-17T09:52:35Z

pkg/reconciler/pipelinerun/resources/pipelinerunresolution_test.go

+		// 			},
+		// 		},
+		// 	},
+		// 	wantErr: fmt.Errorf("unexpected error in ExtractVariablesFromString: Invalid referencing of parameters in \"$(params.p1.aaa.bbb)\"! Only two dot-separated components after the prefix \"params\" are allowed."),


因为调整了 substitution 中的限制，所以这个 case 不通过了。这个目前看只影响了 enum 枚举类型的校验。

l-qing · 2024-01-17T09:53:57Z

pkg/remote/resolution/resolver.go

@@ -80,6 +82,15 @@ func (resolver *Resolver) Get(ctx context.Context, _, _ string) (runtime.Object,
 	if err != nil {
 		return nil, nil, &InvalidRuntimeObjectError{original: err}
 	}
+
+	// Copy annotations from the resolved resource to the runtime object.
+	if new, ok := obj.(metav1.Object); ok {


原来定制的 PR：#65

目前还是先 copy 下注释，后面有时间了可以适配到社区的新字段中。

PR 链接是否可以放到代码中注释?

准备在 gitlab 中代码仓库的 readme 中添加详细的变更项，以及对应的 PR。所以没准备在代码中添加这种注释。

l-qing · 2024-01-17T09:55:19Z

pkg/substitution/substitution.go

@@ -48,6 +48,111 @@ var paramIndexingRegex = regexp.MustCompile(paramIndexing)
 // intIndexRegex will match all `[int]` for param expression
 var intIndexRegex = regexp.MustCompile(intIndex)

+// ValidateVariable makes sure all variables in the provided string are known
+func ValidateVariable(name, value, prefix, locationName, path string, vars sets.String) *apis.FieldError {


这个是还原了 v0.41.0 中的函数，让我们依赖的组件能成功编译。
后续还是需要看社区变动(移除)的原因，然后调整我们自己的代码。

加个 TODO?

暂时不加了。
等我马上开始做持续构建的适配时，就会深入研究这部分代码，看之前社区为什么移除，我们是否可以切换到新的方法上。
之前只是为了编译通过，先把函数给加回来了。

danielfbm

看到了有几个单元测试被 comment 掉的，不会是我们的改动导致质量问题的话就OK哈

yuzp1996 · 2024-01-17T10:03:54Z

sonar-project.properties

@@ -0,0 +1,19 @@
+# if you want disabled the DTD verification for a proxy problem for example, true by default
+sonar.projectKey=github.com-tektoncd-pipeline.git


l-qing added 4 commits January 17, 2024 13:00

fix: security vulnerability problem

d5a8957

chore: let controller-gen can generate crds correctly

315d68a

revert some changes from tektoncd#6445

chore: recover some substitution changes

e6da3b3

revert some changes from tektoncd#6650

chore: sync modify to release

d231cef

l-qing force-pushed the feat/adapt-for-tekton-0.55 branch from 7a0a509 to d231cef Compare January 17, 2024 09:50

l-qing commented Jan 17, 2024

View reviewed changes

danielfbm approved these changes Jan 17, 2024

View reviewed changes

yuzp1996 reviewed Jan 17, 2024

View reviewed changes

yuzp1996 approved these changes Jan 17, 2024

View reviewed changes

l-qing merged commit 30ab5aa into alauda/release-v0.55.x Jan 17, 2024
2 checks passed

l-qing added a commit that referenced this pull request Jan 21, 2024

Merge pull request #83 from katanomi/feat/adapt-for-tekton-0.55

d25bfba

l-qing mentioned this pull request Jan 21, 2024

feat: adapt for tekton 0.56 #91

Merged

l-qing added a commit that referenced this pull request Jan 22, 2024

Merge pull request #83 from katanomi/feat/adapt-for-tekton-0.55

9a13150

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: adapt for tekton 0.55 #83

feat: adapt for tekton 0.55 #83

l-qing commented Jan 17, 2024

l-qing Jan 17, 2024

l-qing Jan 17, 2024

l-qing Jan 17, 2024

l-qing Jan 17, 2024

l-qing Jan 17, 2024

l-qing Jan 17, 2024

l-qing Jan 17, 2024

l-qing Jan 17, 2024

yuzp1996 Jan 17, 2024

l-qing Jan 17, 2024

l-qing Jan 17, 2024

yuzp1996 Jan 17, 2024

l-qing Jan 17, 2024

danielfbm left a comment

yuzp1996 Jan 17, 2024

		@@ -0,0 +1,19 @@
		# if you want disabled the DTD verification for a proxy problem for example, true by default
		sonar.projectKey=github.com-tektoncd-pipeline.git

feat: adapt for tekton 0.55 #83

feat: adapt for tekton 0.55 #83

Conversation

l-qing commented Jan 17, 2024

Changes

Submitter Checklist

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

danielfbm left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment