Skip to content

Commit

Permalink
Add core interceptors image to created images
Browse files Browse the repository at this point in the history
This is necessary since out release pipeline compares the expected list of
images (provided as image output resources) to the actual list of images
created by ko.

Fixes tektoncd#894

Signed-off-by: Dibyo Mukherjee <[email protected]>
  • Loading branch information
dibyom authored and tekton-robot committed Jan 12, 2021
1 parent 7d49df4 commit ec5fb07
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 0 deletions.
3 changes: 3 additions & 0 deletions tekton/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ spec:
type: image
- name: builtEventListenerSinkImage
type: image
- name: builtCoreInterceptorsImage
type: image
- name: notification
type: cloudEvent
steps:
Expand Down Expand Up @@ -114,6 +116,7 @@ spec:
$(inputs.params.imageRegistry)/$(inputs.params.pathToProject)/$(outputs.resources.builtControllerImage.url):$(inputs.params.versionTag)
$(inputs.params.imageRegistry)/$(inputs.params.pathToProject)/$(outputs.resources.builtWebhookImage.url):$(inputs.params.versionTag)
$(inputs.params.imageRegistry)/$(inputs.params.pathToProject)/$(outputs.resources.builtEventListenerSinkImage.url):$(inputs.params.versionTag)
$(inputs.params.imageRegistry)/$(inputs.params.pathToProject)/$(outputs.resources.builtCoreInterceptorsImage.url):$(inputs.params.versionTag)
)
# Parse the built images from the release.yaml generated by ko
BUILT_IMAGES=( $(/workspace/go/src/github.com/tektoncd/triggers/tekton/koparse/koparse.py --path /workspace/output/bucket/previous/$(inputs.params.versionTag)/release.yaml --base $(inputs.params.imageRegistry)/$(inputs.params.pathToProject) --images ${IMAGES[@]}) )
Expand Down
1 change: 1 addition & 0 deletions tekton/release-cheat-sheet.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ the triggers repo, a terminal window and a text editor.
--resource=builtEventListenerSinkImage=event-listener-sink-image \
--resource=builtControllerImage=triggers-controller-image \
--resource=builtWebhookImage=triggers-webhook-image \
--resource=builtCoreInterceptorsImage=core-interceptors-image \
--resource=notification=post-release-trigger \
triggers-release
```
Expand Down
4 changes: 4 additions & 0 deletions tekton/release-pipeline.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ spec:
type: image
- name: builtEventListenerSinkImage
type: image
- name: builtCoreInterceptorsImage
type: image
- name: notification
type: cloudEvent
tasks:
Expand Down Expand Up @@ -72,5 +74,7 @@ spec:
resource: builtWebhookImage
- name: builtEventListenerSinkImage
resource: builtEventListenerSinkImage
- name: builtCoreInterceptorsImage
resource: builtCoreInterceptorsImage
- name: notification
resource: notification
11 changes: 11 additions & 0 deletions tekton/resources.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,17 @@ spec:
params:
- name: url
value: cmd/eventlistenersink # Registry is provided via parameter, this is a hack see #569
---
apiVersion: tekton.dev/v1alpha1
kind: PipelineResource
metadata:
name: core-interceptors-image
spec:
type: image
params:
- name: url
value: cmd/interceptors # Registry is provided via parameter, this is a hack see #569

# ---
# apiVersion: tekton.dev/v1alpha1
# kind: PipelineResource
Expand Down

0 comments on commit ec5fb07

Please sign in to comment.