diff --git a/go.mod b/go.mod index 36d6ea2f1..e53829f24 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( github.com/tektoncd/hub v1.17.0 github.com/tektoncd/pipeline v0.59.0 github.com/tektoncd/plumbing v0.0.0-20230907180608-5625252a2de1 - github.com/tektoncd/triggers v0.26.2 + github.com/tektoncd/triggers v0.27.0 github.com/theupdateframework/go-tuf v0.7.0 go.opencensus.io v0.24.0 go.uber.org/multierr v1.11.0 diff --git a/go.sum b/go.sum index 3acba3264..9bd9e1b5a 100644 --- a/go.sum +++ b/go.sum @@ -1295,8 +1295,8 @@ github.com/tektoncd/pipeline v0.59.0 h1:bX+DX3J/SfIokDbXLtKD48ffcfZw0lZ3Ef8QxyOZ github.com/tektoncd/pipeline v0.59.0/go.mod h1:VjXZUGLrOy45B35ufbJZ2DLMt+TSJ3R4ZjKJvi7RWg4= github.com/tektoncd/plumbing v0.0.0-20230907180608-5625252a2de1 h1:9paprRIBXQgcvdhGq3wKiSspXP0JIFSY52ru3sIMjKM= github.com/tektoncd/plumbing v0.0.0-20230907180608-5625252a2de1/go.mod h1:7eWs1XNkmReggow7ggRbRyRuHi7646B8b2XipCZ3VOw= -github.com/tektoncd/triggers v0.26.2 h1:oPArs4S1wuHMh4QcvEuQk+at4BZUHI7cHe9k3NI+0ps= -github.com/tektoncd/triggers v0.26.2/go.mod h1:eMNvsnzJlv/tQvrcVQnKT90IihWUnrvOyX66+TzOMZQ= +github.com/tektoncd/triggers v0.27.0 h1:c55e/YJF6Vs5BEarqDYksFYuR4sFbmAVEqrLNPZvXUk= +github.com/tektoncd/triggers v0.27.0/go.mod h1:DkkAkdSd9aAW9RklUVyFRKQ8kONmZQw4Ur2G1r3wFQo= github.com/thales-e-security/pool v0.0.2 h1:RAPs4q2EbWsTit6tpzuvTFlgFRJ3S8Evf5gtvVDbmPg= github.com/thales-e-security/pool v0.0.2/go.mod h1:qtpMm2+thHtqhLzTwgDBj/OuNnMpupY8mv0Phz0gjhU= github.com/theupdateframework/go-tuf v0.7.0 h1:CqbQFrWo1ae3/I0UCblSbczevCCbS31Qvs5LdxRWqRI= diff --git a/vendor/github.com/tektoncd/triggers/pkg/apis/config/allowed_types.go b/vendor/github.com/tektoncd/triggers/pkg/apis/config/allowed_types.go deleted file mode 100644 index d8aeb9962..000000000 --- a/vendor/github.com/tektoncd/triggers/pkg/apis/config/allowed_types.go +++ /dev/null @@ -1,45 +0,0 @@ -package config - -import ( - pipelinev1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1" - customrunsv1alpha1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1" - pipelinev1beta1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/serializer" - utilruntime "k8s.io/apimachinery/pkg/util/runtime" -) - -var Decoder runtime.Decoder - -// TODO(dibyom): We should have a way of configuring this instead of an init function? -func init() { - scheme := runtime.NewScheme() - utilruntime.Must(customrunsv1alpha1.AddToScheme(scheme)) - utilruntime.Must(pipelinev1beta1.AddToScheme(scheme)) - utilruntime.Must(pipelinev1.AddToScheme(scheme)) - codec := serializer.NewCodecFactory(scheme) - Decoder = codec.UniversalDecoder( - customrunsv1alpha1.SchemeGroupVersion, // customrunsv1alpha1 share the same SchemeGroupVersion - pipelinev1beta1.SchemeGroupVersion, - pipelinev1.SchemeGroupVersion, - ) -} - -// EnsureAllowedType returns nil if the resourceTemplate has an apiVersion -// and kind field set to one of the allowed ones. -func EnsureAllowedType(rt runtime.RawExtension) error { - _, err := runtime.Decode(Decoder, rt.Raw) - return err -} - -var ( - AllowedPipelineTypes = map[string][]string{ - "v1alpha1": {"pipelineruns", "taskruns", "pipelines", "clustertasks", "tasks", "conditions", "runs"}, - "v1beta1": {"pipelineruns", "taskruns", "pipelines", "clustertasks", "tasks", "customruns"}, - "v1": {"pipelineruns", "taskruns", "pipelines", "tasks"}, - } - AllowedTriggersTypes = map[string][]string{ - "v1alpha1": {"clusterinterceptors", "interceptors"}, - "v1beta1": {"clustertriggerbindings", "eventlisteners", "triggerbindings", "triggers", "triggertemplates"}, - } -) diff --git a/vendor/github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1/trigger_template_types.go b/vendor/github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1/trigger_template_types.go index 0a5fa6113..a8e5cb631 100644 --- a/vendor/github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1/trigger_template_types.go +++ b/vendor/github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1/trigger_template_types.go @@ -42,10 +42,10 @@ type TriggerResourceTemplate struct { // TriggerTemplateStatus describes the desired state of TriggerTemplate type TriggerTemplateStatus struct{} -// TriggerTemplate takes parameters and uses them to create CRDs -// // +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object + +// TriggerTemplate takes parameters and uses them to create CRDs // +k8s:openapi-gen=true type TriggerTemplate struct { metav1.TypeMeta `json:",inline"` diff --git a/vendor/github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1/trigger_template_validation.go b/vendor/github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1/trigger_template_validation.go index ef23af689..a7731eb4b 100644 --- a/vendor/github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1/trigger_template_validation.go +++ b/vendor/github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1/trigger_template_validation.go @@ -20,12 +20,10 @@ import ( "context" "fmt" "regexp" - "strings" "github.com/tektoncd/pipeline/pkg/apis/validate" - "github.com/tektoncd/triggers/pkg/apis/config" "k8s.io/apimachinery/pkg/api/equality" - "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/util/sets" "knative.dev/pkg/apis" ) @@ -60,27 +58,14 @@ func (s *TriggerTemplateSpec) validate(ctx context.Context) (errs *apis.FieldErr func validateResourceTemplates(templates []TriggerResourceTemplate) (errs *apis.FieldError) { for i, trt := range templates { - if err := config.EnsureAllowedType(trt.RawExtension); err != nil { - if runtime.IsMissingVersion(err) { - errs = errs.Also(apis.ErrMissingField(fmt.Sprintf("[%d].apiVersion", i))) - } - if runtime.IsMissingKind(err) { - errs = errs.Also(apis.ErrMissingField(fmt.Sprintf("[%d].kind", i))) - } - if runtime.IsNotRegisteredError(err) { - errStr := err.Error() - if inSchemeIdx := strings.Index(errStr, " in scheme"); inSchemeIdx > -1 { - // not registered error messages currently include the scheme variable location in your file, - // which can of course change if you move the location of the variable in your file. - // So will filter it out here to facilitate our unit testing, as the scheme location is not - // useful for our purposes. - errStr = errStr[:inSchemeIdx] - } - errs = errs.Also(apis.ErrInvalidValue( - errStr, - fmt.Sprintf("[%d]", i))) - } - // we allow structural errors because of param substitution + data := new(unstructured.Unstructured) + if err := data.UnmarshalJSON(trt.Raw); err != nil { + // a missing kind makes the unmarshalling throw an error + errs = errs.Also(apis.ErrMissingField(fmt.Sprintf("[%d].kind", i))) + } + + if data.GetAPIVersion() == "" { + errs = errs.Also(apis.ErrMissingField(fmt.Sprintf("[%d].apiVersion", i))) } } return errs diff --git a/vendor/github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1/event_listener_types.go b/vendor/github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1/event_listener_types.go index b2f19fef7..58e5bb8d6 100644 --- a/vendor/github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1/event_listener_types.go +++ b/vendor/github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1/event_listener_types.go @@ -79,10 +79,11 @@ type CustomResource struct { } type KubernetesResource struct { - Replicas *int32 `json:"replicas,omitempty"` - ServiceType corev1.ServiceType `json:"serviceType,omitempty"` - ServicePort *int32 `json:"servicePort,omitempty"` - duckv1.WithPodSpec `json:"spec,omitempty"` + Replicas *int32 `json:"replicas,omitempty"` + ServiceType corev1.ServiceType `json:"serviceType,omitempty"` + ServicePort *int32 `json:"servicePort,omitempty"` + ServiceLoadBalancerClass *string `json:"serviceLoadBalancerClass,omitempty"` + duckv1.WithPodSpec `json:"spec,omitempty"` } // EventListenerTrigger represents a connection between TriggerBinding, Params, diff --git a/vendor/github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1/event_listener_validation.go b/vendor/github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1/event_listener_validation.go index ce54d5793..8ab268d94 100644 --- a/vendor/github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1/event_listener_validation.go +++ b/vendor/github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1/event_listener_validation.go @@ -149,6 +149,10 @@ func validateKubernetesObject(orig *KubernetesResource) (errs *apis.FieldError) errs = errs.Also(validateEnv(orig.Template.Spec.Containers[0].Env).ViaField("spec.template.spec.containers[0].env")) } + if orig.ServiceLoadBalancerClass != nil && orig.ServiceType != corev1.ServiceTypeLoadBalancer { + errs = errs.Also(apis.ErrInvalidValue(*orig.ServiceLoadBalancerClass, "serviceLoadBalancerClass", "ServiceLoadBalancerClass is only needed for LoadBalancer service type")) + } + return errs } diff --git a/vendor/github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1/openapi_generated.go b/vendor/github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1/openapi_generated.go index 2e42df5a6..b3434a36a 100644 --- a/vendor/github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1/openapi_generated.go +++ b/vendor/github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1/openapi_generated.go @@ -826,6 +826,12 @@ func schema_pkg_apis_triggers_v1beta1_KubernetesResource(ref common.ReferenceCal Format: "int32", }, }, + "serviceLoadBalancerClass": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, "spec": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, diff --git a/vendor/github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1/swagger.json b/vendor/github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1/swagger.json index e86e43b3b..8dd5fe14d 100644 --- a/vendor/github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1/swagger.json +++ b/vendor/github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1/swagger.json @@ -293,6 +293,60 @@ } } }, + "v1beta1.Artifact": { + "description": "TaskRunStepArtifact represents an artifact produced or used by a step within a task run. It directly uses the Artifact type for its structure.", + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "values": { + "description": "The artifact's identifying category name", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/v1beta1.ArtifactValue" + } + } + } + }, + "v1beta1.ArtifactValue": { + "description": "ArtifactValue represents a specific value or data element within an Artifact.", + "type": "object", + "properties": { + "digest": { + "type": "object", + "additionalProperties": { + "type": "string", + "default": "" + } + }, + "uri": { + "description": "Algorithm-specific digests for verifying the content (e.g., SHA256)", + "type": "string" + } + } + }, + "v1beta1.Artifacts": { + "description": "Artifacts represents the collection of input and output artifacts associated with a task run or a similar process. Artifacts in this context are units of data or resources that the process either consumes as input or produces as output.", + "type": "object", + "properties": { + "inputs": { + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/v1beta1.Artifact" + } + }, + "outputs": { + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/v1beta1.Artifact" + } + } + } + }, "v1beta1.ChildStatusReference": { "description": "ChildStatusReference is used to point to the statuses of individual TaskRuns and Runs within this PipelineRun.", "type": "object", @@ -300,6 +354,10 @@ "apiVersion": { "type": "string" }, + "displayName": { + "description": "DisplayName is a user-facing name of the pipelineTask that may be used to populate a UI.", + "type": "string" + }, "kind": { "type": "string" }, @@ -1094,6 +1152,7 @@ "$ref": "#/definitions/v1beta1.PipelineRef" }, "pipelineSpec": { + "description": "Specifying PipelineSpec can be disabled by setting `disable-inline-spec` feature flag..", "$ref": "#/definitions/v1beta1.PipelineSpec" }, "podTemplate": { @@ -1446,7 +1505,7 @@ "$ref": "#/definitions/v1beta1.PipelineRef" }, "pipelineSpec": { - "description": "PipelineSpec is a specification of a pipeline Note: PipelineSpec is in preview mode and not yet supported", + "description": "PipelineSpec is a specification of a pipeline Note: PipelineSpec is in preview mode and not yet supported Specifying TaskSpec can be disabled by setting `disable-inline-spec` feature flag..", "$ref": "#/definitions/v1beta1.PipelineSpec" }, "resources": { @@ -1472,7 +1531,7 @@ "$ref": "#/definitions/v1beta1.TaskRef" }, "taskSpec": { - "description": "TaskSpec is a specification of a task", + "description": "TaskSpec is a specification of a task Specifying TaskSpec can be disabled by setting `disable-inline-spec` feature flag..", "$ref": "#/definitions/v1beta1.EmbeddedTask" }, "timeout": { @@ -2216,9 +2275,23 @@ "imageID": { "type": "string" }, + "inputs": { + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/v1beta1.Artifact" + } + }, "name": { "type": "string" }, + "outputs": { + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/v1beta1.Artifact" + } + }, "results": { "type": "array", "items": { @@ -2820,6 +2893,7 @@ "$ref": "#/definitions/v1beta1.TaskRef" }, "taskSpec": { + "description": "Specifying PipelineSpec can be disabled by setting `disable-inline-spec` feature flag..", "$ref": "#/definitions/v1beta1.TaskSpec" }, "timeout": { diff --git a/vendor/github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1/trigger_template_types.go b/vendor/github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1/trigger_template_types.go index 78689cdb8..9fedae829 100644 --- a/vendor/github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1/trigger_template_types.go +++ b/vendor/github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1/trigger_template_types.go @@ -42,10 +42,11 @@ type TriggerResourceTemplate struct { // TriggerTemplateStatus describes the desired state of TriggerTemplate type TriggerTemplateStatus struct{} -// TriggerTemplate takes parameters and uses them to create CRDs // // +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object + +// TriggerTemplate takes parameters and uses them to create CRDs // +k8s:openapi-gen=true type TriggerTemplate struct { metav1.TypeMeta `json:",inline"` diff --git a/vendor/github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1/trigger_template_validation.go b/vendor/github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1/trigger_template_validation.go index 6200787c8..8e29227a4 100644 --- a/vendor/github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1/trigger_template_validation.go +++ b/vendor/github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1/trigger_template_validation.go @@ -20,13 +20,11 @@ import ( "context" "fmt" "regexp" - "strings" "github.com/tektoncd/pipeline/pkg/apis/validate" - "github.com/tektoncd/triggers/pkg/apis/config" admissionregistrationv1 "k8s.io/api/admissionregistration/v1" "k8s.io/apimachinery/pkg/api/equality" - "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/util/sets" "knative.dev/pkg/apis" "knative.dev/pkg/webhook/resourcesemantics" @@ -65,27 +63,14 @@ func (s *TriggerTemplateSpec) validate(ctx context.Context) (errs *apis.FieldErr func validateResourceTemplates(templates []TriggerResourceTemplate) (errs *apis.FieldError) { for i, trt := range templates { - if err := config.EnsureAllowedType(trt.RawExtension); err != nil { - if runtime.IsMissingVersion(err) { - errs = errs.Also(apis.ErrMissingField(fmt.Sprintf("[%d].apiVersion", i))) - } - if runtime.IsMissingKind(err) { - errs = errs.Also(apis.ErrMissingField(fmt.Sprintf("[%d].kind", i))) - } - if runtime.IsNotRegisteredError(err) { - errStr := err.Error() - if inSchemeIdx := strings.Index(errStr, " in scheme"); inSchemeIdx > -1 { - // not registered error messages currently include the scheme variable location in your file, - // which can of course change if you move the location of the variable in your file. - // So will filter it out here to facilitate our unit testing, as the scheme location is not - // useful for our purposes. - errStr = errStr[:inSchemeIdx] - } - errs = errs.Also(apis.ErrInvalidValue( - errStr, - fmt.Sprintf("[%d]", i))) - } - // we allow structural errors because of param substitution + data := new(unstructured.Unstructured) + if err := data.UnmarshalJSON(trt.Raw); err != nil { + // a missing kind makes the unmarshalling throw an error + errs = errs.Also(apis.ErrMissingField(fmt.Sprintf("[%d].kind", i))) + } + + if data.GetAPIVersion() == "" { + errs = errs.Also(apis.ErrMissingField(fmt.Sprintf("[%d].apiVersion", i))) } } return errs diff --git a/vendor/github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1/zz_generated.deepcopy.go b/vendor/github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1/zz_generated.deepcopy.go index 29cc4dc06..77f928a15 100644 --- a/vendor/github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1/zz_generated.deepcopy.go +++ b/vendor/github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1/zz_generated.deepcopy.go @@ -379,6 +379,11 @@ func (in *KubernetesResource) DeepCopyInto(out *KubernetesResource) { *out = new(int32) **out = **in } + if in.ServiceLoadBalancerClass != nil { + in, out := &in.ServiceLoadBalancerClass, &out.ServiceLoadBalancerClass + *out = new(string) + **out = **in + } in.WithPodSpec.DeepCopyInto(&out.WithPodSpec) return } diff --git a/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1alpha1/fake/fake_clusterinterceptor.go b/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1alpha1/fake/fake_clusterinterceptor.go index 878403312..347b7b2c5 100644 --- a/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1alpha1/fake/fake_clusterinterceptor.go +++ b/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1alpha1/fake/fake_clusterinterceptor.go @@ -24,7 +24,6 @@ import ( v1alpha1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" - schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" @@ -35,9 +34,9 @@ type FakeClusterInterceptors struct { Fake *FakeTriggersV1alpha1 } -var clusterinterceptorsResource = schema.GroupVersionResource{Group: "triggers.tekton.dev", Version: "v1alpha1", Resource: "clusterinterceptors"} +var clusterinterceptorsResource = v1alpha1.SchemeGroupVersion.WithResource("clusterinterceptors") -var clusterinterceptorsKind = schema.GroupVersionKind{Group: "triggers.tekton.dev", Version: "v1alpha1", Kind: "ClusterInterceptor"} +var clusterinterceptorsKind = v1alpha1.SchemeGroupVersion.WithKind("ClusterInterceptor") // Get takes name of the clusterInterceptor, and returns the corresponding clusterInterceptor object, and an error if there is any. func (c *FakeClusterInterceptors) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.ClusterInterceptor, err error) { diff --git a/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1alpha1/fake/fake_clustertriggerbinding.go b/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1alpha1/fake/fake_clustertriggerbinding.go index 59be88c8a..5377d9270 100644 --- a/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1alpha1/fake/fake_clustertriggerbinding.go +++ b/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1alpha1/fake/fake_clustertriggerbinding.go @@ -24,7 +24,6 @@ import ( v1alpha1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" - schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" @@ -35,9 +34,9 @@ type FakeClusterTriggerBindings struct { Fake *FakeTriggersV1alpha1 } -var clustertriggerbindingsResource = schema.GroupVersionResource{Group: "triggers.tekton.dev", Version: "v1alpha1", Resource: "clustertriggerbindings"} +var clustertriggerbindingsResource = v1alpha1.SchemeGroupVersion.WithResource("clustertriggerbindings") -var clustertriggerbindingsKind = schema.GroupVersionKind{Group: "triggers.tekton.dev", Version: "v1alpha1", Kind: "ClusterTriggerBinding"} +var clustertriggerbindingsKind = v1alpha1.SchemeGroupVersion.WithKind("ClusterTriggerBinding") // Get takes name of the clusterTriggerBinding, and returns the corresponding clusterTriggerBinding object, and an error if there is any. func (c *FakeClusterTriggerBindings) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.ClusterTriggerBinding, err error) { diff --git a/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1alpha1/fake/fake_eventlistener.go b/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1alpha1/fake/fake_eventlistener.go index 866e2a9a7..c687f4d01 100644 --- a/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1alpha1/fake/fake_eventlistener.go +++ b/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1alpha1/fake/fake_eventlistener.go @@ -24,7 +24,6 @@ import ( v1alpha1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" - schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" @@ -36,9 +35,9 @@ type FakeEventListeners struct { ns string } -var eventlistenersResource = schema.GroupVersionResource{Group: "triggers.tekton.dev", Version: "v1alpha1", Resource: "eventlisteners"} +var eventlistenersResource = v1alpha1.SchemeGroupVersion.WithResource("eventlisteners") -var eventlistenersKind = schema.GroupVersionKind{Group: "triggers.tekton.dev", Version: "v1alpha1", Kind: "EventListener"} +var eventlistenersKind = v1alpha1.SchemeGroupVersion.WithKind("EventListener") // Get takes name of the eventListener, and returns the corresponding eventListener object, and an error if there is any. func (c *FakeEventListeners) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.EventListener, err error) { diff --git a/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1alpha1/fake/fake_interceptor.go b/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1alpha1/fake/fake_interceptor.go index 4347eba98..fb4c1b49a 100644 --- a/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1alpha1/fake/fake_interceptor.go +++ b/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1alpha1/fake/fake_interceptor.go @@ -24,7 +24,6 @@ import ( v1alpha1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" - schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" @@ -36,9 +35,9 @@ type FakeInterceptors struct { ns string } -var interceptorsResource = schema.GroupVersionResource{Group: "triggers.tekton.dev", Version: "v1alpha1", Resource: "interceptors"} +var interceptorsResource = v1alpha1.SchemeGroupVersion.WithResource("interceptors") -var interceptorsKind = schema.GroupVersionKind{Group: "triggers.tekton.dev", Version: "v1alpha1", Kind: "Interceptor"} +var interceptorsKind = v1alpha1.SchemeGroupVersion.WithKind("Interceptor") // Get takes name of the interceptor, and returns the corresponding interceptor object, and an error if there is any. func (c *FakeInterceptors) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.Interceptor, err error) { diff --git a/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1alpha1/fake/fake_trigger.go b/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1alpha1/fake/fake_trigger.go index f52e01e6b..eac0e95ed 100644 --- a/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1alpha1/fake/fake_trigger.go +++ b/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1alpha1/fake/fake_trigger.go @@ -24,7 +24,6 @@ import ( v1alpha1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" - schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" @@ -36,9 +35,9 @@ type FakeTriggers struct { ns string } -var triggersResource = schema.GroupVersionResource{Group: "triggers.tekton.dev", Version: "v1alpha1", Resource: "triggers"} +var triggersResource = v1alpha1.SchemeGroupVersion.WithResource("triggers") -var triggersKind = schema.GroupVersionKind{Group: "triggers.tekton.dev", Version: "v1alpha1", Kind: "Trigger"} +var triggersKind = v1alpha1.SchemeGroupVersion.WithKind("Trigger") // Get takes name of the trigger, and returns the corresponding trigger object, and an error if there is any. func (c *FakeTriggers) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.Trigger, err error) { diff --git a/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1alpha1/fake/fake_triggerbinding.go b/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1alpha1/fake/fake_triggerbinding.go index cd179ae40..91094defe 100644 --- a/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1alpha1/fake/fake_triggerbinding.go +++ b/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1alpha1/fake/fake_triggerbinding.go @@ -24,7 +24,6 @@ import ( v1alpha1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" - schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" @@ -36,9 +35,9 @@ type FakeTriggerBindings struct { ns string } -var triggerbindingsResource = schema.GroupVersionResource{Group: "triggers.tekton.dev", Version: "v1alpha1", Resource: "triggerbindings"} +var triggerbindingsResource = v1alpha1.SchemeGroupVersion.WithResource("triggerbindings") -var triggerbindingsKind = schema.GroupVersionKind{Group: "triggers.tekton.dev", Version: "v1alpha1", Kind: "TriggerBinding"} +var triggerbindingsKind = v1alpha1.SchemeGroupVersion.WithKind("TriggerBinding") // Get takes name of the triggerBinding, and returns the corresponding triggerBinding object, and an error if there is any. func (c *FakeTriggerBindings) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.TriggerBinding, err error) { diff --git a/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1alpha1/fake/fake_triggertemplate.go b/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1alpha1/fake/fake_triggertemplate.go index 9984e0766..5a3c32bc2 100644 --- a/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1alpha1/fake/fake_triggertemplate.go +++ b/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1alpha1/fake/fake_triggertemplate.go @@ -24,7 +24,6 @@ import ( v1alpha1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" - schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" @@ -36,9 +35,9 @@ type FakeTriggerTemplates struct { ns string } -var triggertemplatesResource = schema.GroupVersionResource{Group: "triggers.tekton.dev", Version: "v1alpha1", Resource: "triggertemplates"} +var triggertemplatesResource = v1alpha1.SchemeGroupVersion.WithResource("triggertemplates") -var triggertemplatesKind = schema.GroupVersionKind{Group: "triggers.tekton.dev", Version: "v1alpha1", Kind: "TriggerTemplate"} +var triggertemplatesKind = v1alpha1.SchemeGroupVersion.WithKind("TriggerTemplate") // Get takes name of the triggerTemplate, and returns the corresponding triggerTemplate object, and an error if there is any. func (c *FakeTriggerTemplates) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.TriggerTemplate, err error) { diff --git a/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1beta1/fake/fake_clustertriggerbinding.go b/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1beta1/fake/fake_clustertriggerbinding.go index a17aed9e6..c1c5e289d 100644 --- a/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1beta1/fake/fake_clustertriggerbinding.go +++ b/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1beta1/fake/fake_clustertriggerbinding.go @@ -24,7 +24,6 @@ import ( v1beta1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" - schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" @@ -35,9 +34,9 @@ type FakeClusterTriggerBindings struct { Fake *FakeTriggersV1beta1 } -var clustertriggerbindingsResource = schema.GroupVersionResource{Group: "triggers.tekton.dev", Version: "v1beta1", Resource: "clustertriggerbindings"} +var clustertriggerbindingsResource = v1beta1.SchemeGroupVersion.WithResource("clustertriggerbindings") -var clustertriggerbindingsKind = schema.GroupVersionKind{Group: "triggers.tekton.dev", Version: "v1beta1", Kind: "ClusterTriggerBinding"} +var clustertriggerbindingsKind = v1beta1.SchemeGroupVersion.WithKind("ClusterTriggerBinding") // Get takes name of the clusterTriggerBinding, and returns the corresponding clusterTriggerBinding object, and an error if there is any. func (c *FakeClusterTriggerBindings) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1beta1.ClusterTriggerBinding, err error) { diff --git a/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1beta1/fake/fake_eventlistener.go b/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1beta1/fake/fake_eventlistener.go index 3c653d121..2ccb892de 100644 --- a/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1beta1/fake/fake_eventlistener.go +++ b/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1beta1/fake/fake_eventlistener.go @@ -24,7 +24,6 @@ import ( v1beta1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" - schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" @@ -36,9 +35,9 @@ type FakeEventListeners struct { ns string } -var eventlistenersResource = schema.GroupVersionResource{Group: "triggers.tekton.dev", Version: "v1beta1", Resource: "eventlisteners"} +var eventlistenersResource = v1beta1.SchemeGroupVersion.WithResource("eventlisteners") -var eventlistenersKind = schema.GroupVersionKind{Group: "triggers.tekton.dev", Version: "v1beta1", Kind: "EventListener"} +var eventlistenersKind = v1beta1.SchemeGroupVersion.WithKind("EventListener") // Get takes name of the eventListener, and returns the corresponding eventListener object, and an error if there is any. func (c *FakeEventListeners) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1beta1.EventListener, err error) { diff --git a/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1beta1/fake/fake_trigger.go b/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1beta1/fake/fake_trigger.go index a3550a06a..cf7ac1538 100644 --- a/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1beta1/fake/fake_trigger.go +++ b/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1beta1/fake/fake_trigger.go @@ -24,7 +24,6 @@ import ( v1beta1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" - schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" @@ -36,9 +35,9 @@ type FakeTriggers struct { ns string } -var triggersResource = schema.GroupVersionResource{Group: "triggers.tekton.dev", Version: "v1beta1", Resource: "triggers"} +var triggersResource = v1beta1.SchemeGroupVersion.WithResource("triggers") -var triggersKind = schema.GroupVersionKind{Group: "triggers.tekton.dev", Version: "v1beta1", Kind: "Trigger"} +var triggersKind = v1beta1.SchemeGroupVersion.WithKind("Trigger") // Get takes name of the trigger, and returns the corresponding trigger object, and an error if there is any. func (c *FakeTriggers) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1beta1.Trigger, err error) { diff --git a/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1beta1/fake/fake_triggerbinding.go b/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1beta1/fake/fake_triggerbinding.go index 6de675b1e..a5f2b1838 100644 --- a/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1beta1/fake/fake_triggerbinding.go +++ b/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1beta1/fake/fake_triggerbinding.go @@ -24,7 +24,6 @@ import ( v1beta1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" - schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" @@ -36,9 +35,9 @@ type FakeTriggerBindings struct { ns string } -var triggerbindingsResource = schema.GroupVersionResource{Group: "triggers.tekton.dev", Version: "v1beta1", Resource: "triggerbindings"} +var triggerbindingsResource = v1beta1.SchemeGroupVersion.WithResource("triggerbindings") -var triggerbindingsKind = schema.GroupVersionKind{Group: "triggers.tekton.dev", Version: "v1beta1", Kind: "TriggerBinding"} +var triggerbindingsKind = v1beta1.SchemeGroupVersion.WithKind("TriggerBinding") // Get takes name of the triggerBinding, and returns the corresponding triggerBinding object, and an error if there is any. func (c *FakeTriggerBindings) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1beta1.TriggerBinding, err error) { diff --git a/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1beta1/fake/fake_triggertemplate.go b/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1beta1/fake/fake_triggertemplate.go index 5c38f0b81..e53e7595f 100644 --- a/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1beta1/fake/fake_triggertemplate.go +++ b/vendor/github.com/tektoncd/triggers/pkg/client/clientset/versioned/typed/triggers/v1beta1/fake/fake_triggertemplate.go @@ -24,7 +24,6 @@ import ( v1beta1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" - schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" @@ -36,9 +35,9 @@ type FakeTriggerTemplates struct { ns string } -var triggertemplatesResource = schema.GroupVersionResource{Group: "triggers.tekton.dev", Version: "v1beta1", Resource: "triggertemplates"} +var triggertemplatesResource = v1beta1.SchemeGroupVersion.WithResource("triggertemplates") -var triggertemplatesKind = schema.GroupVersionKind{Group: "triggers.tekton.dev", Version: "v1beta1", Kind: "TriggerTemplate"} +var triggertemplatesKind = v1beta1.SchemeGroupVersion.WithKind("TriggerTemplate") // Get takes name of the triggerTemplate, and returns the corresponding triggerTemplate object, and an error if there is any. func (c *FakeTriggerTemplates) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1beta1.TriggerTemplate, err error) { diff --git a/vendor/github.com/tektoncd/triggers/pkg/client/informers/externalversions/factory.go b/vendor/github.com/tektoncd/triggers/pkg/client/informers/externalversions/factory.go index 8cbd4c3a7..337bb370f 100644 --- a/vendor/github.com/tektoncd/triggers/pkg/client/informers/externalversions/factory.go +++ b/vendor/github.com/tektoncd/triggers/pkg/client/informers/externalversions/factory.go @@ -166,7 +166,7 @@ func (f *sharedInformerFactory) WaitForCacheSync(stopCh <-chan struct{}) map[ref return res } -// InternalInformerFor returns the SharedIndexInformer for obj using an internal +// InformerFor returns the SharedIndexInformer for obj using an internal // client. func (f *sharedInformerFactory) InformerFor(obj runtime.Object, newFunc internalinterfaces.NewInformerFunc) cache.SharedIndexInformer { f.lock.Lock() @@ -239,7 +239,7 @@ type SharedInformerFactory interface { // ForResource gives generic access to a shared informer of the matching type. ForResource(resource schema.GroupVersionResource) (GenericInformer, error) - // InternalInformerFor returns the SharedIndexInformer for obj using an internal + // InformerFor returns the SharedIndexInformer for obj using an internal // client. InformerFor(obj runtime.Object, newFunc internalinterfaces.NewInformerFunc) cache.SharedIndexInformer diff --git a/vendor/github.com/tektoncd/triggers/pkg/interceptors/cel/cel.go b/vendor/github.com/tektoncd/triggers/pkg/interceptors/cel/cel.go index b70466cbb..f7a56b2f1 100644 --- a/vendor/github.com/tektoncd/triggers/pkg/interceptors/cel/cel.go +++ b/vendor/github.com/tektoncd/triggers/pkg/interceptors/cel/cel.go @@ -105,6 +105,9 @@ func makeCelEnv(ctx context.Context, ns string, sg interceptors.SecretGetter) (* Triggers(ctx, ns, sg), celext.Strings(), celext.Encoders(), + celext.Sets(), + celext.Lists(), + celext.Math(), cel.Declarations( decls.NewVar("body", mapStrDyn), decls.NewVar("header", mapStrDyn), diff --git a/vendor/github.com/tektoncd/triggers/pkg/interceptors/interceptors.go b/vendor/github.com/tektoncd/triggers/pkg/interceptors/interceptors.go index 05cee74aa..f8fe7962e 100644 --- a/vendor/github.com/tektoncd/triggers/pkg/interceptors/interceptors.go +++ b/vendor/github.com/tektoncd/triggers/pkg/interceptors/interceptors.go @@ -32,6 +32,7 @@ import ( const ( CoreInterceptorsHost = "tekton-triggers-core-interceptors" + ContentType = "application/json" ) // Interceptor is the interface that all interceptors implement. @@ -124,6 +125,9 @@ func Execute(ctx context.Context, client *http.Client, req *triggersv1beta1.Inte if err != nil { return nil, err } + + r.Header.Set("Content-Type", ContentType) + res, err := client.Do(r) if err != nil { return nil, err diff --git a/vendor/github.com/tektoncd/triggers/pkg/reconciler/eventlistener/resources/container.go b/vendor/github.com/tektoncd/triggers/pkg/reconciler/eventlistener/resources/container.go index 5a27b1193..7c50ac1ed 100644 --- a/vendor/github.com/tektoncd/triggers/pkg/reconciler/eventlistener/resources/container.go +++ b/vendor/github.com/tektoncd/triggers/pkg/reconciler/eventlistener/resources/container.go @@ -33,6 +33,12 @@ func MakeContainer(el *v1beta1.EventListener, configAcc reconcilersource.ConfigA if len(el.Spec.NamespaceSelector.MatchNames) != 0 { isMultiNS = true } + for _, triggerGroup := range el.Spec.TriggerGroups { + if len(triggerGroup.TriggerSelector.NamespaceSelector.MatchNames) != 0 { + isMultiNS = true + break + } + } payloadValidation := true if value, ok := el.GetAnnotations()[triggers.PayloadValidationAnnotation]; ok { diff --git a/vendor/github.com/tektoncd/triggers/pkg/reconciler/eventlistener/resources/service.go b/vendor/github.com/tektoncd/triggers/pkg/reconciler/eventlistener/resources/service.go index 6adffd41c..faed4b411 100644 --- a/vendor/github.com/tektoncd/triggers/pkg/reconciler/eventlistener/resources/service.go +++ b/vendor/github.com/tektoncd/triggers/pkg/reconciler/eventlistener/resources/service.go @@ -64,18 +64,25 @@ func MakeService(ctx context.Context, el *v1beta1.EventListener, c Config) *core servicePort = ServicePort(el, c) - return &corev1.Service{ + svc := &corev1.Service{ ObjectMeta: ObjectMeta(el, FilterLabels(ctx, el.Labels), c.StaticResourceLabels), Spec: corev1.ServiceSpec{ Selector: GenerateLabels(el.Name, c.StaticResourceLabels), Type: serviceType, Ports: []corev1.ServicePort{servicePort, metricsPort}}, } + + if el.Spec.Resources.KubernetesResource != nil && el.Spec.Resources.KubernetesResource.ServiceLoadBalancerClass != nil { + svc.Spec.LoadBalancerClass = el.Spec.Resources.KubernetesResource.ServiceLoadBalancerClass + } + + return svc } func ServicePort(el *v1beta1.EventListener, c Config) corev1.ServicePort { var elCert, elKey string + nodePort := int32(0) servicePortName := eventListenerServicePortName servicePort := *c.Port @@ -89,6 +96,9 @@ func ServicePort(el *v1beta1.EventListener, c Config) corev1.ServicePort { } if el.Spec.Resources.KubernetesResource.ServicePort != nil { servicePort = int(*el.Spec.Resources.KubernetesResource.ServicePort) + if el.Spec.Resources.KubernetesResource.ServiceType == corev1.ServiceTypeNodePort { + nodePort = *el.Spec.Resources.KubernetesResource.ServicePort + } } } @@ -112,14 +122,17 @@ func ServicePort(el *v1beta1.EventListener, c Config) corev1.ServicePort { } } - return corev1.ServicePort{ + svc := corev1.ServicePort{ Name: servicePortName, Protocol: corev1.ProtocolTCP, Port: int32(servicePort), TargetPort: intstr.IntOrString{ IntVal: int32(eventListenerContainerPort), }, + NodePort: nodePort, } + + return svc } // ListenerHostname returns the intended hostname for the EventListener service. diff --git a/vendor/github.com/tektoncd/triggers/test/controller.go b/vendor/github.com/tektoncd/triggers/test/controller.go index 231ea2296..c95082f35 100644 --- a/vendor/github.com/tektoncd/triggers/test/controller.go +++ b/vendor/github.com/tektoncd/triggers/test/controller.go @@ -102,7 +102,7 @@ type Assets struct { func init() { // Register a separate fake dynamic client with out schemes. - injection.Fake.RegisterClient(func(ctx context.Context, cfg *rest.Config) context.Context { + injection.Fake.RegisterClient(func(ctx context.Context, _ *rest.Config) context.Context { scheme := runtime.NewScheme() err := servingv1.AddToScheme(scheme) if err != nil { diff --git a/vendor/github.com/tektoncd/triggers/test/e2e-tests-examples.sh b/vendor/github.com/tektoncd/triggers/test/e2e-tests-examples.sh index e5e364a75..966e29cbc 100644 --- a/vendor/github.com/tektoncd/triggers/test/e2e-tests-examples.sh +++ b/vendor/github.com/tektoncd/triggers/test/e2e-tests-examples.sh @@ -121,19 +121,23 @@ sleep 10 tr=$(kubectl get taskruns -A -l triggers.tekton.dev/triggers-eventid=${eventID} -o name) pr=$(kubectl get pipelineruns -A -l triggers.tekton.dev/triggers-eventid=${eventID} -o name) + cm=$(kubectl get configmaps -A -l triggers.tekton.dev/triggers-eventid=${eventID} -o name) - if [ -z "$tr" ] && [ -z "$pr" ] + if [ -z "$tr" ] && [ -z "$pr" ] && [ -z "$cm" ] then err "failed to create taskrun/pipelinerun" kubectl logs -l "eventlistener=${current_example}-listener" exit 1 fi - if [ -z "$tr" ] + if [ -z "$pr" ] then echo "PipelineRun created : $pr" - else + elif [ -z "$tr" ] + then echo "Taskrun created : $tr" + else + echo "Configmap created : $tr" fi kill $port_forward_pid @@ -180,7 +184,7 @@ main() { versions="v1alpha1 v1beta1" # List of examples test will run on examples_v1alpha1="bitbucket-server cron embedded-trigger github gitlab label-selector namespace-selector trigger-ref" - examples_v1beta1="${examples_v1alpha1} slack bitbucket-cloud triggergroups github-add-changed-files-pr github-add-changed-files-push-cel github-owners" + examples_v1beta1="${examples_v1alpha1} slack bitbucket-cloud triggergroups github-add-changed-files-pr github-add-changed-files-push-cel github-owners create-configmap" create_example_pipeline diff --git a/vendor/github.com/tektoncd/triggers/test/gate.go b/vendor/github.com/tektoncd/triggers/test/gate.go index bb7e121dd..58707480d 100644 --- a/vendor/github.com/tektoncd/triggers/test/gate.go +++ b/vendor/github.com/tektoncd/triggers/test/gate.go @@ -29,7 +29,7 @@ func FeatureFlagsToContext(ctx context.Context, flags map[string]string) (contex // the feature-flag configmap. // nolint:unused,deadcode func requireGate(name, value string) func(context.Context, *testing.T, *clients, string) { - return func(ctx context.Context, t *testing.T, c *clients, namespace string) { + return func(ctx context.Context, t *testing.T, c *clients, _ string) { featureFlagsCM, err := c.KubeClient.CoreV1().ConfigMaps(system.Namespace()).Get(ctx, config.GetFeatureFlagsConfigName(), metav1.GetOptions{}) if err != nil { t.Fatalf("Failed to get ConfigMap `%s`: %s", config.GetFeatureFlagsConfigName(), err) diff --git a/vendor/github.com/tektoncd/triggers/test/wait.go b/vendor/github.com/tektoncd/triggers/test/wait.go index 41c43d7d0..0ea2ab93c 100644 --- a/vendor/github.com/tektoncd/triggers/test/wait.go +++ b/vendor/github.com/tektoncd/triggers/test/wait.go @@ -52,7 +52,7 @@ const ( // WaitFor waits for the specified ConditionFunc every internal until the timeout. func WaitFor(waitFunc wait.ConditionFunc) error { - return wait.PollImmediate(interval, timeout, waitFunc) + return wait.PollImmediate(interval, timeout, waitFunc) //nolint:staticcheck } // revive:disable:unused-parameter diff --git a/vendor/modules.txt b/vendor/modules.txt index 35f3032d3..5da5e3433 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1485,8 +1485,8 @@ github.com/tektoncd/pipeline/test/diff # github.com/tektoncd/plumbing v0.0.0-20230907180608-5625252a2de1 ## explicit; go 1.19 github.com/tektoncd/plumbing/scripts -# github.com/tektoncd/triggers v0.26.2 -## explicit; go 1.19 +# github.com/tektoncd/triggers v0.27.0 +## explicit; go 1.21 github.com/tektoncd/triggers/pkg/apis/config github.com/tektoncd/triggers/pkg/apis/triggers github.com/tektoncd/triggers/pkg/apis/triggers/contexts