fix: do not set default kind when taskRef resolver is present #7763

l-qing · 2024-03-17T15:18:55Z

Do not set default kind when taskRef resolver is present, keep the original configuration of the user.

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
pre-commit Passed
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

Release Notes

fix: do not set default kind when taskRef resolver is present

/kind bug

tekton-robot · 2024-03-17T15:19:04Z

Hi @l-qing. Thanks for your PR.

I'm waiting for a tektoncd member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

l-qing · 2024-03-17T15:53:27Z

/test check-pr-has-kind-label

tekton-robot · 2024-03-17T15:53:41Z

@l-qing: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/test check-pr-has-kind-label

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

vdemeester

/lgtm

vdemeester · 2024-03-18T01:58:28Z

/ok-to-test

l-qing · 2024-03-20T04:29:42Z

test/conversion_test.go

    pipeline: 1h
  pipelineRef:
-    kind: Pipeline


The pipelineRef does not have a kind field.

pipeline/pkg/apis/pipeline/v1beta1/pipelineref_types.go

Lines 19 to 37 in d714545

// PipelineRef can be used to refer to a specific instance of a Pipeline.

type PipelineRef struct {

// Name of the referent; More info: http://kubernetes.io/docs/user-guide/identifiers#names

Name string `json:"name,omitempty"`

// API version of the referent

// +optional

APIVersion string `json:"apiVersion,omitempty"`

// Bundle url reference to a Tekton Bundle.

//

// Deprecated: Please use ResolverRef with the bundles resolver instead.

// +optional

Bundle string `json:"bundle,omitempty"`

// ResolverRef allows referencing a Pipeline in a remote location

// like a git repo. This field is only supported when the alpha

// feature gate is enabled.

// +optional

ResolverRef `json:",omitempty"`

}

pipeline/pkg/apis/pipeline/v1/pipelineref_types.go

Lines 19 to 32 in d714545

// PipelineRef can be used to refer to a specific instance of a Pipeline.

type PipelineRef struct {

// Name of the referent; More info: http://kubernetes.io/docs/user-guide/identifiers#names

Name string `json:"name,omitempty"`

// API version of the referent

// +optional

APIVersion string `json:"apiVersion,omitempty"`

// ResolverRef allows referencing a Pipeline in a remote location

// like a git repo. This field is only supported when the alpha

// feature gate is enabled.

// +optional

ResolverRef `json:",omitempty"`

}

l-qing · 2024-03-20T04:31:16Z

pkg/apis/pipeline/v1beta1/taskref_conversion.go

@@ -49,6 +49,7 @@ func (tr *TaskRef) ConvertFrom(ctx context.Context, source v1.TaskRef) {
 // default and it will be in beta before the stored version of CRD getting swapped to v1.
 func (tr TaskRef) convertBundleToResolver(sink *v1.TaskRef) {
 	if tr.Bundle != "" {
+		sink.Kind = ""


Remove the original "kind" attribute to stay consistent with the behavior elsewhere: once a resolver is used, "kind" is no longer necessary.

l-qing · 2024-03-20T08:35:10Z

Hi, @vdemeester.
I've resolved the e2e failure issue; please review it when you have time, thank you!

fix tektoncd#7762 Do not set default kind when taskRef resolver is present, keep the original configuration of the user.

afrittoli

Looks good, thank you!
/approve

tekton-robot · 2024-04-25T11:06:52Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: afrittoli

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [afrittoli]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

afrittoli · 2024-04-25T11:09:29Z

pkg/apis/pipeline/v1/pipeline_defaults.go

+		if pt.TaskRef.Kind == "" && pt.TaskRef.Resolver == "" {
+			pt.TaskRef.Kind = NamespacedTaskKind
+		}
 	}


This will continue to work even after TEP-0154 is done

chitrangpatel · 2024-04-25T11:42:01Z

/lgtm

tekton-robot added kind/bug Categorizes issue or PR as related to a bug. release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Mar 17, 2024

tekton-robot requested review from afrittoli and pritidesai March 17, 2024 15:18

tekton-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Mar 17, 2024

vdemeester reviewed Mar 18, 2024

View reviewed changes

tekton-robot assigned vdemeester Mar 18, 2024

tekton-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 18, 2024

tekton-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Mar 18, 2024

l-qing force-pushed the fix/taskRef-resolver-default-kind branch from a069789 to b66a781 Compare March 18, 2024 13:55

tekton-robot removed the lgtm Indicates that a PR is ready to be merged. label Mar 18, 2024

l-qing force-pushed the fix/taskRef-resolver-default-kind branch 4 times, most recently from b9406b2 to e79988d Compare March 20, 2024 04:26

l-qing commented Mar 20, 2024

View reviewed changes

l-qing force-pushed the fix/taskRef-resolver-default-kind branch from e79988d to dc16345 Compare March 21, 2024 15:57

l-qing force-pushed the fix/taskRef-resolver-default-kind branch 2 times, most recently from 4242960 to 797cbd1 Compare April 9, 2024 06:25

l-qing force-pushed the fix/taskRef-resolver-default-kind branch from 797cbd1 to da73725 Compare April 13, 2024 07:36

l-qing force-pushed the fix/taskRef-resolver-default-kind branch from da73725 to a2b9247 Compare April 23, 2024 15:06

fix: do not set default kind when taskRef resolver is present

fc03715

fix tektoncd#7762 Do not set default kind when taskRef resolver is present, keep the original configuration of the user.

l-qing force-pushed the fix/taskRef-resolver-default-kind branch from a2b9247 to fc03715 Compare April 24, 2024 15:29

afrittoli reviewed Apr 25, 2024

View reviewed changes

tekton-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 25, 2024

afrittoli reviewed Apr 25, 2024

View reviewed changes

afrittoli added this to the Pipelines v0.59 milestone Apr 25, 2024

tekton-robot assigned chitrangpatel Apr 25, 2024

tekton-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 25, 2024

tekton-robot merged commit 91bbee5 into tektoncd:main Apr 25, 2024
13 checks passed

l-qing deleted the fix/taskRef-resolver-default-kind branch April 25, 2024 15:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: do not set default kind when taskRef resolver is present #7763

fix: do not set default kind when taskRef resolver is present #7763

l-qing commented Mar 17, 2024

tekton-robot commented Mar 17, 2024

l-qing commented Mar 17, 2024

tekton-robot commented Mar 17, 2024

vdemeester left a comment

vdemeester commented Mar 18, 2024

l-qing Mar 20, 2024

l-qing Mar 20, 2024

l-qing commented Mar 20, 2024

afrittoli left a comment

tekton-robot commented Apr 25, 2024

afrittoli Apr 25, 2024

chitrangpatel commented Apr 25, 2024

	// PipelineRef can be used to refer to a specific instance of a Pipeline.
	type PipelineRef struct {
	// Name of the referent; More info: http://kubernetes.io/docs/user-guide/identifiers#names
	Name string `json:"name,omitempty"`
	// API version of the referent
	// +optional
	APIVersion string `json:"apiVersion,omitempty"`
	// Bundle url reference to a Tekton Bundle.
	//
	// Deprecated: Please use ResolverRef with the bundles resolver instead.
	// +optional
	Bundle string `json:"bundle,omitempty"`

	// ResolverRef allows referencing a Pipeline in a remote location
	// like a git repo. This field is only supported when the alpha
	// feature gate is enabled.
	// +optional
	ResolverRef `json:",omitempty"`
	}

fix: do not set default kind when taskRef resolver is present #7763

fix: do not set default kind when taskRef resolver is present #7763

Conversation

l-qing commented Mar 17, 2024

Changes

Submitter Checklist

Release Notes

tekton-robot commented Mar 17, 2024

l-qing commented Mar 17, 2024

tekton-robot commented Mar 17, 2024

vdemeester left a comment

Choose a reason for hiding this comment

vdemeester commented Mar 18, 2024

l-qing Mar 20, 2024

Choose a reason for hiding this comment

l-qing Mar 20, 2024

Choose a reason for hiding this comment

l-qing commented Mar 20, 2024

afrittoli left a comment

Choose a reason for hiding this comment

tekton-robot commented Apr 25, 2024

afrittoli Apr 25, 2024

Choose a reason for hiding this comment

chitrangpatel commented Apr 25, 2024