ROX-34386: Backport changes from release branch#171
Open
mtodor wants to merge 2 commits into
Open
Conversation
mtodor
changed the title
Contributor
📝 WalkthroughSummary by CodeRabbit
WalkthroughChangesThe Tekton manifests separate main and release triggers, add CPE labels, and configure release builds. The component pipeline derives Git-based versions for image and Coverity tasks. The Dockerfile adds versioned runtime image metadata. Konflux versioned builds
Estimated code review effort: 3 (Moderate) | ~20 minutes Sequence Diagram(s)sequenceDiagram
participant GitEvent
participant PipelineAsCode
participant PipelineRun
participant basic-component-pipeline
participant determine-version
participant buildah-remote-oci-ta
GitEvent->>PipelineAsCode: push or pull_request event
PipelineAsCode->>PipelineRun: select main or release trigger
PipelineRun->>basic-component-pipeline: start configured pipeline
basic-component-pipeline->>determine-version: provide cloned source
determine-version->>determine-version: run git describe --tags --always
determine-version->>buildah-remote-oci-ta: provide VERSION and combined LABELS
Suggested reviewers: 🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Actionable comments posted: 2
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In @.tekton/acs-mcp-server-pull-request.yaml:
- Around line 57-60: Remove the placeholder extra-labels block from
.tekton/acs-mcp-server-pull-request.yaml lines 57-60,
.tekton/acs-mcp-server-push-main.yaml lines 68-71, and
.tekton/acs-mcp-server-push-release.yaml lines 66-69 so no pipeline publishes
the literal X.Y CPE version.
In @.tekton/basic-component-pipeline.yaml:
- Around line 200-205: Add a suitable limits.cpu value under
computeResources.limits in the shared stepTemplate for the new task steps,
alongside the existing memory limit, so both containers receive CPU limits while
preserving the current CPU request.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Central YAML (inherited), Organization UI (inherited)
Review profile: ASSERTIVE
Plan: Enterprise
Run ID: 86d619d4-8f80-42d5-a90e-ec0c06a95890
📒 Files selected for processing (5)
.tekton/acs-mcp-server-pull-request.yaml.tekton/acs-mcp-server-push-main.yaml.tekton/acs-mcp-server-push-release.yaml.tekton/basic-component-pipeline.yamlkonflux.Dockerfile
Comment on lines
+57
to
+60
| - name: extra-labels | ||
| value: | ||
| # X.Y in the cpe label must be adjusted for every version stream. | ||
| - "cpe=cpe:/a:redhat:agentic_cluster_security_suite:X.Y::el9" |
Contributor
There was a problem hiding this comment.
🗄️ Data Integrity & Integration | 🟠 Major | ⚡ Quick win
Do not publish the literal X.Y CPE version.
The component pipeline forwards these values into image labels, so every affected image reports X.Y rather than a real version stream. This also contradicts the PR objective to exclude version-specific CPE changes from this backport.
.tekton/acs-mcp-server-pull-request.yaml#L57-L60: remove the placeholderextra-labelsblock..tekton/acs-mcp-server-push-main.yaml#L68-L71: remove the placeholderextra-labelsblock..tekton/acs-mcp-server-push-release.yaml#L66-L69: remove the placeholderextra-labelsblock.
📍 Affects 3 files
.tekton/acs-mcp-server-pull-request.yaml#L57-L60(this comment).tekton/acs-mcp-server-push-main.yaml#L68-L71.tekton/acs-mcp-server-push-release.yaml#L66-L69
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In @.tekton/acs-mcp-server-pull-request.yaml around lines 57 - 60, Remove the
placeholder extra-labels block from .tekton/acs-mcp-server-pull-request.yaml
lines 57-60, .tekton/acs-mcp-server-push-main.yaml lines 68-71, and
.tekton/acs-mcp-server-push-release.yaml lines 66-69 so no pipeline publishes
the literal X.Y CPE version.
Comment on lines
+200
to
+205
| computeResources: | ||
| requests: | ||
| cpu: 100m | ||
| memory: 256Mi | ||
| limits: | ||
| memory: 512Mi |
Contributor
There was a problem hiding this comment.
🩺 Stability & Availability | 🟠 Major | ⚡ Quick win
Add a CPU limit to the new task steps.
requests.cpu only reserves capacity; it does not cap usage. stepTemplate applies to both new containers, so add a suitable limits.cpu alongside the memory limit.
Proposed fix
limits:
+ cpu: 500m
memory: 512MiAs per path instructions, .tekton/** requires “Resource limits set on task containers.”
📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| computeResources: | |
| requests: | |
| cpu: 100m | |
| memory: 256Mi | |
| limits: | |
| memory: 512Mi | |
| computeResources: | |
| requests: | |
| cpu: 100m | |
| memory: 256Mi | |
| limits: | |
| cpu: 500m | |
| memory: 512Mi |
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In @.tekton/basic-component-pipeline.yaml around lines 200 - 205, Add a suitable
limits.cpu value under computeResources.limits in the shared stepTemplate for
the new task steps, alongside the existing memory limit, so both containers
receive CPU limits while preserving the current CPU request.
Source: Path instructions
E2E Test ResultsCommit: 67654a9 |
❌ 2 Tests Failed:
View the full list of 2 ❄️ flaky test(s)
To view more test analytics, go to the Test Analytics Dashboard |
mtodor
force-pushed
the
mtodor/ROX-34386-backport-changes-from-release
branch
from
July 24, 2026 09:53
6818169 to
67654a9
Compare
Contributor
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In @.tekton/acs-mcp-server-push-main.yaml:
- Around line 21-27: Remove the pull_request trigger branch from the push
trigger conditions in .tekton/acs-mcp-server-push-main.yaml lines 21-27,
retaining only the main push trigger. Apply the same change in
.tekton/acs-mcp-server-push-release.yaml lines 21-27, retaining the release and
tag push triggers.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Central YAML (inherited), Organization UI (inherited)
Review profile: ASSERTIVE
Plan: Enterprise
Run ID: f66be5cf-29f6-438b-844a-26d5efe2ac34
📒 Files selected for processing (5)
.tekton/acs-mcp-server-pull-request.yaml.tekton/acs-mcp-server-push-main.yaml.tekton/acs-mcp-server-push-release.yaml.tekton/basic-component-pipeline.yamlkonflux.Dockerfile
Comment on lines
+21
to
27
| event == "pull_request" && | ||
| target_branch.matches("^main$") && | ||
| body.action != "ready_for_review" && | ||
| has(body.pull_request) && | ||
| has(body.pull_request.labels) && | ||
| body.pull_request.labels.exists(l, l.name == "konflux-build") | ||
| ) |
Contributor
There was a problem hiding this comment.
🚀 Performance & Scalability | 🟠 Major | ⚡ Quick win
Remove PR triggers from the push PipelineRuns.
A labeled PR targeting main or release-* also matches the dedicated PR PipelineRun, so both pipelines build and push the same revision concurrently.
.tekton/acs-mcp-server-push-main.yaml#L21-L27: remove thepull_requestbranch; retain the main push trigger..tekton/acs-mcp-server-push-release.yaml#L21-L27: remove thepull_requestbranch; retain release and tag push triggers.
📍 Affects 2 files
.tekton/acs-mcp-server-push-main.yaml#L21-L27(this comment).tekton/acs-mcp-server-push-release.yaml#L21-L27
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In @.tekton/acs-mcp-server-push-main.yaml around lines 21 - 27, Remove the
pull_request trigger branch from the push trigger conditions in
.tekton/acs-mcp-server-push-main.yaml lines 21-27, retaining only the main push
trigger. Apply the same change in .tekton/acs-mcp-server-push-release.yaml lines
21-27, retaining the release and tag push triggers.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
This PR backports changes done in release branch.
Note for reviewer
Validation