feat: add support for extraContainers and nativeSidecarContainers#553
feat: add support for extraContainers and nativeSidecarContainers#553kaixi-wang wants to merge 19 commits into
Conversation
|
Important Review skippedAuto incremental reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Pro Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
WalkthroughThis pull request adds telemetry overlay support to Docker deployments by documenting the feature, extending environment templates with telemetry configuration variables, and introducing comprehensive test coverage for telemetry Compose configurations. Additionally, it extends RBAC permissions to allow pod log access. Changes
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~20 minutes Poem
🚥 Pre-merge checks | ✅ 3 | ❌ 2❌ Failed checks (2 warnings)
✅ Passed checks (3 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
There was a problem hiding this comment.
🧹 Nitpick comments (2)
docker/README.md (1)
649-658: Add one concrete compose command example for overlay order.Line 653-Line 654 says to layer
compose.telemetry.yaml, but a command snippet would reduce operator guesswork.Suggested README snippet
### Telemetry FiftyOne Enterprise ships an optional telemetry overlay that exposes live per-service metrics (CPU, memory, FDs, thread counts) and tailed logs on the Settings → Metrics page. Enable by layering `compose.telemetry.yaml` onto your existing compose invocation. + +Example: + +```shell +docker compose \ + -f compose.yaml \ + -f compose.telemetry.yaml \ + -f compose.override.yaml \ + up -d +```🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@docker/README.md` around lines 649 - 658, The Telemetry section in docker/README.md instructs users to layer compose.telemetry.yaml but lacks a concrete docker compose command; add a short example command showing overlay order (using compose.yaml then compose.telemetry.yaml then compose.override.yaml) under the "Telemetry" heading so operators can copy-paste a working invocation; place the snippet immediately after the sentence mentioning `compose.telemetry.yaml` and label it as a shell example for clarity.tests/unit/compose/docker-compose-internal-auth_test.go (1)
227-259: Add override-image test cases for telemetry env customization.Current cases validate defaults (
redis:7-alpine,voxel51/telemetry-sidecar:latest) but not env-driven overrides. Adding one override case forTELEMETRY_REDIS_IMAGEandTELEMETRY_SIDECAR_IMAGEwould harden regression coverage.🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@tests/unit/compose/docker-compose-internal-auth_test.go` around lines 227 - 259, Add test cases that verify env-driven image overrides by duplicating the existing telemetry cases ("telemetryRedis", "telemetrySidecarFiftyoneApp", "telemetrySidecarTeamsApi", "telemetrySidecarTeamsDo") but include an override .env file in the dotEnvFiles slice and change the expected image strings to the custom values from TELEMETRY_REDIS_IMAGE and TELEMETRY_SIDECAR_IMAGE; update the table entries that currently use internalAuthComposeTelemetryFile and s.dotEnvFiles to append the new override env file (the file that sets TELEMETRY_REDIS_IMAGE / TELEMETRY_SIDECAR_IMAGE) and set the expected image to the override value so the test asserts env-driven customization.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Nitpick comments:
In `@docker/README.md`:
- Around line 649-658: The Telemetry section in docker/README.md instructs users
to layer compose.telemetry.yaml but lacks a concrete docker compose command; add
a short example command showing overlay order (using compose.yaml then
compose.telemetry.yaml then compose.override.yaml) under the "Telemetry" heading
so operators can copy-paste a working invocation; place the snippet immediately
after the sentence mentioning `compose.telemetry.yaml` and label it as a shell
example for clarity.
In `@tests/unit/compose/docker-compose-internal-auth_test.go`:
- Around line 227-259: Add test cases that verify env-driven image overrides by
duplicating the existing telemetry cases ("telemetryRedis",
"telemetrySidecarFiftyoneApp", "telemetrySidecarTeamsApi",
"telemetrySidecarTeamsDo") but include an override .env file in the dotEnvFiles
slice and change the expected image strings to the custom values from
TELEMETRY_REDIS_IMAGE and TELEMETRY_SIDECAR_IMAGE; update the table entries that
currently use internalAuthComposeTelemetryFile and s.dotEnvFiles to append the
new override env file (the file that sets TELEMETRY_REDIS_IMAGE /
TELEMETRY_SIDECAR_IMAGE) and set the expected image to the override value so the
test asserts env-driven customization.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: CHILL
Plan: Pro
Run ID: da97c372-0939-4bd2-b515-cdb3ec767500
⛔ Files ignored due to path filters (5)
helm/fiftyone-teams-app/templates/api-deployment.yamlis excluded by!**/*.yamlhelm/fiftyone-teams-app/templates/api-role.yamlis excluded by!**/*.yamlhelm/fiftyone-teams-app/templates/app-deployment.yamlis excluded by!**/*.yamlhelm/fiftyone-teams-app/templates/delegated-operator-instance-deployment.yamlis excluded by!**/*.yamlhelm/fiftyone-teams-app/templates/plugins-deployment.yamlis excluded by!**/*.yaml
📒 Files selected for processing (6)
docker/README.mddocker/internal-auth/env.templatedocker/legacy-auth/env.templatetests/unit/compose/docker-compose-internal-auth_test.gotests/unit/compose/docker-compose-legacy-auth_test.gotests/unit/helm/api-role_test.go
mo-getter
left a comment
There was a problem hiding this comment.
It's looking good! Please note, we'll want to target the next release branch (which doesn't exist yet), and I'd also like to do a bit of hands-on testing before we merge.
But this is awesome stuff! Thanks for doing all of this.
|
closing in favor of #566 |
Rationale
Review Priority
Changes
Checklist
Testing