Skip to content
Open
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
RELEASED_VERSIONS @stackrox/collector-team
RELEASED_VERSIONS.unsupported @stackrox/collector-team

# The RHTAP maintainers for ACS review all changes related to the Konflux pipelines, such as new
# pipelines, parameter changes or automated task updates as well as Dockerfile updates.
# rhacs-bot auto-approves MintMaker PRs for automated task and security updates.
**/konflux.*Dockerfile @stackrox/rhtap-maintainers @rhacs-bot
/.tekton/ @stackrox/rhtap-maintainers @rhacs-bot
rpms.* @stackrox/rhtap-maintainers @rhacs-bot
.github/renovate.json5 @stackrox/rhtap-maintainers
# The Konflux maintainers for ACS review all changes related to the Konflux pipelines, Dockerfiles, etc.
# Release engineers need to merge MintMaker PRs at the time of release.
# rhacs-bot needs ability to auto-approve MintMaker PRs for automated task and security updates.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# rhacs-bot needs ability to auto-approve MintMaker PRs for automated task and security updates.
# rhacs-bot needs the ability to auto-approve MintMaker PRs for automated task and security updates.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated the comment.

**/konflux.*Dockerfile @stackrox/konflux-maintainers-no-email @stackrox/release-mgmt-no-email @rhacs-bot
/.tekton/ @stackrox/konflux-maintainers-no-email @stackrox/release-mgmt-no-email @rhacs-bot
rpms.* @stackrox/konflux-maintainers-no-email @stackrox/release-mgmt-no-email @rhacs-bot
.github/renovate.json5 @stackrox/konflux-maintainers
2 changes: 1 addition & 1 deletion .github/workflows/auto-approve.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: auto-merge

on:
pull_request_target:
pull_request:
types:
- labeled

Expand Down
30 changes: 30 additions & 0 deletions .github/workflows/tag-more-reviewers.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Tag more reviewers

on:
pull_request:
types:
- review_requested

jobs:
tag-konflux-maintainers:
# We have lots of PR traffic from MintMaker (acting as `red-hat-konflux[bot]`), and so it's unsustainable to go
# through these emails every day. Therefore, the notifications are disabled for `konflux-maintainers-no-email`
# team that's set as owner in CODEOWNERS for the Konflux stuff.
# At the same time, we want to be notified when humans, not the bot, request reviews (which happens automatically
# again through CODEOWNERS) for the Konflux-related files. This job invites `konflux-maintainers` team for review
# for such cases.
if: |
github.event.requested_team.name == 'konflux-maintainers-no-email' &&
github.event.pull_request.user.login != 'red-hat-konflux[bot]'
env:
GH_TOKEN: ${{ secrets.RHACS_BOT_GITHUB_TOKEN }}
runs-on: ubuntu-latest
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know this is probably fine, but do we want to pin this to 24.04?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Inept joke: it depends if you mean "my royal we" or by "we" you mean the Collector team.

I see that the runner is indeed pinned to ubuntu-24.04 in all jobs but these:

24.04 is fine for another three years (2029-04-25) when its Maintenance & Security Support cycle ends. Not sure what happens after.

In case of this job, there's nothing specific used from the OS so it could practically be any ubuntu flavor that GitHub provides. Therefore, the question is to you as the Collector team whether you'd prefer me to make the runner consistent here and whether you'd like me to also address that in add-new-pr-to-oss-triaging.yml and auto-approve.yml.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, some time ago we run into a problem when the ubuntu-latest runner got updated from underneath us from 22.04 to 24.04, so suddenly had failing jobs and having to debug this is not really fun. So I am more concerned about a silent upgrade to 26.04 from breaking the workflow than I am from 24.04 going out of support or getting removed as a runner altogether.

That said, given the workflow just runs gh, latest is probably fine as I said and you can leave it as is if you want.

Copy link
Contributor Author

@msugakov msugakov Nov 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am more concerned about a silent upgrade to 26.04 from breaking the workflow than I am from 24.04 going out of support or getting removed as a runner altogether.

Understood. Pinned versions in all three workflows.

steps:
- name: Tag Konflux Maintainers for review
run: |
exec gh api \
--method POST \
-H "Accept: application/vnd.github+json" \
-H "X-GitHub-Api-Version: 2022-11-28" \
"/repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/requested_reviewers" \
--input - <<< '{ "team_reviewers": [ "konflux-maintainers" ] }'
69 changes: 48 additions & 21 deletions .tekton/collector-component-pipeline.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,22 @@ apiVersion: tekton.dev/v1
kind: Pipeline
metadata:
name: collector-component-pipeline

spec:

finally:

- name: slack-notification
params:
- name: message
value: ':x: `{{event_type}}` pipeline for <https://console.redhat.com/application-pipeline/workspaces/rh-acs/applications/acs/pipelineruns/$(context.pipelineRun.name)|$(context.pipelineRun.name)> (`$(params.output-image-repo)`, revision <$(params.git-url)/commit/$(params.revision)|$(params.revision)>) has failed.'
- name: key-name
value: 'acs-konflux-notifications'
when:
# Run when any task has Failed
# Run when any task has Failed
- input: $(tasks.status)
operator: in
values: ["Failed"]
values: [ "Failed" ]
taskRef:
params:
- name: name
Expand All @@ -24,6 +27,7 @@ spec:
- name: kind
value: task
resolver: bundles

- name: show-sbom
params:
- name: IMAGE_URL
Expand All @@ -37,6 +41,7 @@ spec:
- name: kind
value: task
resolver: bundles

- name: post-metric-end
params:
- name: AGGREGATE_TASKS_STATUS
Expand All @@ -50,6 +55,7 @@ spec:
- name: kind
value: task
resolver: bundles

params:
- description: Source Repository URL
name: git-url
Expand Down Expand Up @@ -125,6 +131,7 @@ spec:
on the cluster: https://konflux.pages.redhat.com/docs/users/getting-started/multi-platform-builds.html
name: build-platforms
type: array

results:
- description: ""
name: IMAGE_URL
Expand All @@ -138,17 +145,20 @@ spec:
- description: ""
name: CHAINS-GIT_COMMIT
value: $(tasks.clone-repository.results.commit)

workspaces:
- name: git-auth

tasks:

- name: post-metric-start
taskRef: *post-bigquery-metrics-ref
- name: init
params:
- name: image-url
# We can't provide a StackRox-style tag because it is not known at this time (requires cloning source, etc.)
# As a workaround, we still provide a unique tag that's based on a revision in order for this task to comply with
# its expected input. We later actually add this tag on a built image with the apply-index-image-tag task.
# We can't provide a StackRox-style tag because it is not known at this time (requires cloning source, etc.)
# As a workaround, we still provide a unique tag that's based on a revision in order for this task to comply with
# its expected input. We later actually add this tag on a built image with the apply-index-image-tag task.
value: $(params.output-image-repo):konflux-$(params.revision)
- name: rebuild
value: $(params.rebuild)
Expand All @@ -161,6 +171,7 @@ spec:
- name: kind
value: task
resolver: bundles

- name: clone-repository
params:
- name: url
Expand Down Expand Up @@ -189,10 +200,11 @@ spec:
when:
- input: $(tasks.init.results.build)
operator: in
values: ["true"]
values: [ "true" ]
workspaces:
- name: basic-auth
workspace: git-auth

- name: determine-image-expiration
params:
- name: DEFAULT_IMAGE_EXPIRES_AFTER
Expand All @@ -208,6 +220,7 @@ spec:
- name: kind
value: task
resolver: bundles

- name: determine-image-tag
params:
- name: TAG_SUFFIX
Expand All @@ -223,6 +236,7 @@ spec:
- name: kind
value: task
resolver: bundles

- name: prefetch-dependencies
params:
- name: input
Expand All @@ -235,7 +249,7 @@ spec:
value: $(params.oci-artifact-expires-after)
- name: ACTIVATION_KEY
value: subscription-manager-activation-key-prod
# Required for the RPM prefetching support.
# Required for the RPM prefetching support.
- name: dev-package-managers
value: "true"
taskRef:
Expand All @@ -250,6 +264,7 @@ spec:
workspaces:
- name: git-basic-auth
workspace: git-auth

- name: build-images
matrix:
params:
Expand Down Expand Up @@ -285,7 +300,7 @@ spec:
- name: BUILDAH_FORMAT
value: $(params.buildah-format)
- name: LABELS
value: ["$(params.extra-labels[*])"]
value: [ "$(params.extra-labels[*])" ]
- name: BUILD_TIMESTAMP
value: "$(tasks.clone-repository.results.commit-timestamp)"
taskRef:
Expand All @@ -300,8 +315,9 @@ spec:
when:
- input: $(tasks.init.results.build)
operator: in
values: ["true"]
values: [ "true" ]
timeout: 1h30m0s

- name: build-image-index
params:
- name: IMAGE
Expand All @@ -328,7 +344,8 @@ spec:
when:
- input: $(tasks.init.results.build)
operator: in
values: ["true"]
values: [ "true" ]

- name: apply-index-image-tag
params:
- name: IMAGE_URL
Expand All @@ -350,7 +367,8 @@ spec:
when:
- input: $(tasks.init.results.build)
operator: in
values: ["true"]
values: [ "true" ]

- name: build-source-image
params:
- name: BINARY_IMAGE
Expand All @@ -373,10 +391,11 @@ spec:
when:
- input: $(tasks.init.results.build)
operator: in
values: ["true"]
values: [ "true" ]
- input: $(params.build-source-image)
operator: in
values: ["true"]
values: [ "true" ]

- name: deprecated-base-image-check
params:
- name: IMAGE_URL
Expand All @@ -395,7 +414,8 @@ spec:
when:
- input: $(params.skip-checks)
operator: in
values: ["false"]
values: [ "false" ]

- name: clair-scan
matrix:
params:
Expand All @@ -419,7 +439,8 @@ spec:
when:
- input: $(params.skip-checks)
operator: in
values: ["false"]
values: [ "false" ]

- name: ecosystem-cert-preflight-checks
matrix:
params:
Expand All @@ -441,7 +462,8 @@ spec:
when:
- input: $(params.skip-checks)
operator: in
values: ["false"]
values: [ "false" ]

- name: sast-shell-check
params:
- name: image-digest
Expand All @@ -464,7 +486,8 @@ spec:
when:
- input: $(params.skip-checks)
operator: in
values: ["false"]
values: [ "false" ]

- name: sast-unicode-check
params:
- name: image-digest
Expand All @@ -487,7 +510,8 @@ spec:
when:
- input: $(params.skip-checks)
operator: in
values: ["false"]
values: [ "false" ]

- name: sast-snyk-check
params:
- name: SOURCE_ARTIFACT
Expand All @@ -510,7 +534,8 @@ spec:
when:
- input: $(params.skip-checks)
operator: in
values: ["false"]
values: [ "false" ]

- name: clamav-scan
matrix:
params:
Expand All @@ -534,7 +559,8 @@ spec:
when:
- input: $(params.skip-checks)
operator: in
values: ["false"]
values: [ "false" ]

- name: rpms-signature-scan
params:
- name: image-digest
Expand All @@ -553,7 +579,8 @@ spec:
when:
- input: $(params.skip-checks)
operator: in
values: ["false"]
values: [ "false" ]

- name: push-dockerfile
params:
- name: IMAGE
Expand Down
Loading