OLS-3509: Regenerate bundle with OTEL collector related image#1832
OLS-3509: Regenerate bundle with OTEL collector related image#1832blublinsky wants to merge 1 commit into
Conversation
openshift-ci-robot
added
the
jira/valid-reference
|
@blublinsky: This pull request references OLS-3509 which is a valid jira issue. DetailsIn response to this:
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 openshift-eng/jira-lifecycle-plugin repository. |
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Path: .coderabbit.yaml Review profile: CHILL Plan: Enterprise Run ID: ⛔ Files ignored due to path filters (3)
📒 Files selected for processing (9)
🚧 Files skipped from review as they are similar to previous changes (7)
📝 WalkthroughWalkthroughThe operator’s OTEL Collector image defaults and deployment wiring are updated, audit and replica descriptors are expanded, and bundle generation metadata and tooling are refreshed. ChangesOTEL Collector and bundle update
Estimated code review effort: 3 (Moderate) | ~20 minutes Possibly related PRs
Suggested reviewers: 🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
Makefile (1)
380-386: 🩺 Stability & Availability | 🟡 Minor | ⚡ Quick winAdd the
-fflag tocurlto fail fast on HTTP errors.If the download URL returns an HTTP error (e.g., a 404 due to an invalid
OPERATOR_SDK_VERSION),curlwithout-fwill silently download the HTML error page and write it to$(OPERATOR_SDK). This results in a corrupted binary that causes cryptic syntax errors later during execution, requiring manual cleanup of the file to recover. Adding-f(or--fail) ensures thecurlcommand exits immediately on HTTP errors, stopping the Make recipe.🔧 Proposed fix
@{ \ set -e ;\ mkdir -p $(dir $(OPERATOR_SDK)) ;\ OS=$(shell go env GOOS) && ARCH=$(shell go env GOARCH) && \ - curl -sSLo $(OPERATOR_SDK) https://github.com/operator-framework/operator-sdk/releases/download/$(OPERATOR_SDK_VERSION)/operator-sdk_$${OS}_$${ARCH} ;\ + curl -sSLf -o $(OPERATOR_SDK) https://github.com/operator-framework/operator-sdk/releases/download/$(OPERATOR_SDK_VERSION)/operator-sdk_$${OS}_$${ARCH} ;\ chmod +x $(OPERATOR_SDK) ;\ }🤖 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 `@Makefile` around lines 380 - 386, Update the curl invocation in the operator SDK download recipe to include the fail-on-HTTP-error option, while preserving the existing silent and error-reporting behavior and download destination.
🤖 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.
Outside diff comments:
In `@Makefile`:
- Around line 380-386: Update the curl invocation in the operator SDK download
recipe to include the fail-on-HTTP-error option, while preserving the existing
silent and error-reporting behavior and download destination.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Path: .coderabbit.yaml
Review profile: CHILL
Plan: Enterprise
Run ID: 434d5a55-c071-4da4-ace0-34f027f2f47b
⛔ Files ignored due to path filters (3)
bundle/manifests/ols.openshift.io_olsconfigs.yamlis excluded by!bundle/manifests/ols.openshift.io_olsconfigs.yamlconfig/crd/bases/ols.openshift.io_olsconfigs.yamlis excluded by!config/crd/bases/**related_images.jsonis excluded by!related_images.json
📒 Files selected for processing (9)
.ai/spec/what/templog.mdMakefileapi/v1alpha1/olsconfig_types.gobundle.Dockerfilebundle/manifests/lightspeed-operator.clusterserviceversion.yamlconfig/default/deployment-patch.yamlconfig/manifests/bases/lightspeed-operator.clusterserviceversion.yamlhack/bundle.Dockerfileinternal/controller/utils/constants.go
| agenticConsoleUIImageFallback = "quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-agentic-console:main" | ||
| alertsAdapterImageFallback = "quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-agentic-alerts-adapter:main" | ||
| otelCollectorImageFallback = "quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-otel-postgres-collector:main" | ||
| otelCollectorImageFallback = "quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/lightspeed-otel-collector:0a1798f2dbeebd36b83a9339b7e02fa015dbab61" |
There was a problem hiding this comment.
we can add :main tag to ols-otel-collector also
There was a problem hiding this comment.
Thanks @vimalk78 — agreed. Updated otelCollectorImageFallback to use :main, same as agentic-console and alerts-adapter.
:main is not on Quay for otel-collector yet (only git-SHA tags today), but matching the convention keeps the fallback ready once Konflux tagging is in place. The bundle still uses the digest pin from related_images.json.
vimalk78
left a comment
vimalk78
left a comment
There was a problem hiding this comment.
AI Review — PR #1832 (OLS-3509 bundle follow-up)
Score: 97/100 · Jira mode · Round 1
Bundle regeneration looks clean: version alignment at 1.1.2 across all files, image digests match between related_images.json and CSV, CRD schemas consistent, --otel-collector-image properly wired through deployment-patch. Pinning make bundle to bin/operator-sdk v1.36.1 is a good fix.
Should-fix: Inconsistent otel-collector fallback image tag
internal/controller/utils/constants.go:500 — otelCollectorImageFallback uses a commit SHA (0a1798f2dbeebd36b83a9339b7e02fa015dbab61) as the tag, while all other fallbacks use :main:
agenticConsoleUIImageFallback = "...lightspeed-agentic-console:main"
alertsAdapterImageFallback = "...lightspeed-agentic-alerts-adapter:main"
otelCollectorImageFallback = "...lightspeed-otel-collector:0a1798f2dbeebd36b83a9339b7e02fa015dbab61" // ← SHA, not :main
rhokpImageFallback = "...rhokp-rhel9:latest"The SHA appears copy-pasted from the revision field in related_images.json. If the SHA-tagged image is garbage-collected from the registry, local development without related_images.json will break. Consider using :main to match the pattern.
🤖 Generated with Claude Code
blublinsky
force-pushed
the
audit-crd-bundle
branch
from
d7ddee1 to
aee56ed
Compare
|
/lgtm |
|
@blublinsky: The following test failed, say
Full PR test history. Your PR dashboard. DetailsInstructions 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-sigs/prow repository. I understand the commands that are listed here. |
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: blublinsky The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
Bot
added
the
approved
3 participants
Description
Summary
Follow-up to #1830 (OLS-3509): regenerate the OLM bundle so it matches the merged audit/OTEL CRD and operator wiring.
lightspeed-otel-collectortorelated_images.json(pinned revision/digest,operator_arg: otel-collector-image)--otel-collector-imagethrough deployment-patch → CSV deployment args andspec.relatedImagesaudit.logging,audit.tracingEndpoint,ols.auditEventsEnabled,ols.deployment.otelCollector)make bundletobin/operator-sdkv1.36.1 (avoid Homebrew SDK stamping wrong builder version)Config.ReplicasCSV/CRD description to include OTEL CollectorRelated work
lightspeed-otel-collector:4317once collector is deployedType of change
Related Tickets & Documents
https://redhat.atlassian.net/browse/OLS-3509
https://redhat.atlassian.net/browse/OLS-3509
Checklist before requesting a review
Testing
Summary by CodeRabbit