Skip to content

HYPERFLEET-869 - feat: update e2e repository to new sentinel config schema#67

Open
rh-amarin wants to merge 1 commit intoopenshift-hyperfleet:mainfrom
rh-amarin:update-config
Open

HYPERFLEET-869 - feat: update e2e repository to new sentinel config schema#67
rh-amarin wants to merge 1 commit intoopenshift-hyperfleet:mainfrom
rh-amarin:update-config

Conversation

@rh-amarin
Copy link
Copy Markdown
Contributor

@rh-amarin rh-amarin commented Mar 31, 2026

https://redhat.atlassian.net/browse/HYPERFLEET-869

Updates the sentinel deployment script to use the new config.clients.hyperfleetApi.baseUrl
Helm value path introduced by HYPERFLEET-549, replacing the old config.hyperfleetApi.baseUrl

Context

HYPERFLEET-549 adopted the HyperFleet Configuration Standard in the Sentinel service, which
restructured the config schema — moving hyperfleetApi under a clients grouping. HYPERFLEET-866
aligned the infra Helm chart default values accordingly. This PR keeps the e2e deploy scripts in
sync with that change.

Test plan

  • Deploy Sentinel (clusters and nodepools) using the updated script in an E2E environment
  • Confirm Sentinel pods reach healthy state and communicate with the HyperFleet API
  • Run a tier0 E2E test suite to verify no regressions

Summary by CodeRabbit

  • Chores
    • Updated deployment configuration to move API and broker settings under client-specific config keys so installer uses the new configuration structure.
    • Minor installer script formatting and parsing tweaks to improve robustness of adapter discovery and installation output.

@openshift-ci openshift-ci bot requested review from ciaranRoche and mbrudnoy March 31, 2026 19:45
@openshift-ci
Copy link
Copy Markdown

openshift-ci bot commented Mar 31, 2026

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign xueli181114 for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@coderabbitai
Copy link
Copy Markdown

coderabbitai bot commented Mar 31, 2026

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 3f1d9334-a2b9-4ab0-96d0-99f5e3e5f96e

📥 Commits

Reviewing files that changed from the base of the PR and between c515953 and f2f332a.

📒 Files selected for processing (2)
  • deploy-scripts/lib/adapter.sh
  • deploy-scripts/lib/sentinel.sh
🚧 Files skipped from review as they are similar to previous changes (1)
  • deploy-scripts/lib/sentinel.sh

Walkthrough

Helm chart configuration keys were adjusted in deployment scripts. In deploy-scripts/lib/sentinel.sh, API and broker settings were moved from config.hyperfleetApi.baseUrl and top-level broker.* to config.clients.hyperfleetApi.baseUrl and config.clients.broker.* respectively, and the dry-run log was updated. In deploy-scripts/lib/adapter.sh, Google Pub/Sub broker.googlepubsub.* keys were moved to config.clients.broker.googlepubsub.*, minor here-string/IFS formatting tweaks and whitespace cleanup were applied. No functional control-flow changes were introduced.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

🚥 Pre-merge checks | ✅ 2 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 44.44% which is insufficient. The required threshold is 80.00%. Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (2 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately describes the primary change: updating e2e repository scripts to align with the new sentinel config schema by moving config paths under clients grouping.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands and usage tips.

--set "image.repository=${SENTINEL_IMAGE_REPO}"
--set "image.tag=${SENTINEL_IMAGE_TAG}"
--set "config.hyperfleetApi.baseUrl=${api_url}"
--set "config.clients.hyperfleetApi.baseUrl=${api_url}"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Category: JIRA

The JIRA ticket HYPERFLEET-869 lists 5 acceptance criteria but this PR only addresses the config.clients.hyperfleetApi.baseUrl path change. The remaining items are still using old config paths:

  1. Broker config (lines 58-60) — still uses broker.type, broker.googlepubsub.projectId, broker.googlepubsub.createTopicIfMissing. Per the ticket, these should move to config.clients.broker.*
  2. messageData block (lines 68-70) — config.messageData.owner_references.* should be removed per the ticket ("messageData block no longer part of Sentinel config")
  3. resourceType (line 57) — config.resourceType should be replaced by config.sentinel.name
  4. sentinel nameconfig.sentinel.name should be set to hyperfleet-sentinel-clusters or hyperfleet-sentinel-nodepools depending on resource type

Are these being addressed in a separate PR, or should they be included here?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

The ticket was wrong for points 2, 3 and 4. I changed it

The sentinel PR itself was also wrong, since helm values for broker were at root level and not under config.clients.broker, now they are

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants