Skip to content

fix(operator): rename skyhook -> nodewright in operator error and log text - #476

Merged
lockwobr merged 2 commits into
mainfrom
fix/403-text-rename
Aug 14, 2026
Merged

fix(operator): rename skyhook -> nodewright in operator error and log text#476
lockwobr merged 2 commits into
mainfrom
fix/403-text-rename

Conversation

@lockwobr

Copy link
Copy Markdown
Collaborator

Closes #403. Supersedes #414.

Finishes the operator's user-visible text rename. #410 landed part 1 (event and condition text); this PR carries part 2 (fmt.Errorf text) and part 3 (log messages and keys).

Credit

The part 2 commit is @mohityadav8's, authored by them and preserved as such. I re-applied their original commit (f88c4079, from before the merge-ups) onto current main rather than patching their merged-up branch, because that is what makes the defect below go away by construction. Part 3 is mine.

What #414 hit, and why this branch is not affected

@ayuskauskas found in #414 (comment) that #414's reconcileLegacyLabeledWorkloads was a partial revert of #380, not a rename. The f49c695a merge of main@84df6448 resolved a conflict in favour of the branch's pre-#380 side and dropped three things: the two-key legacy ConfigMap sweep, the reparentToNodeWright call, and changed = true after a successful Update.

Cherry-picking the pre-merge commit means that resolution never enters this history. The one conflict that did arise (the same function) was resolved by keeping main's code and re-applying only the string edit on top, so git diff origin/main -- operator/internal/controller/skyhook_controller.go is text-only. All three dropped pieces are present.

Two observability breaks, deliberate

Renaming the structured-log key and the event source component is not cosmetic, so calling them out rather than letting them surprise someone:

  • A log query matching skyhook=<name> needs to become nodewright=<name>.
  • kubectl get events --field-selector source=skyhook-controller needs source=nodewright-controller.

Nothing else about the event surface changed; #410 already renamed the messages themselves.

Out of scope, unchanged on purpose

Go identifiers (SkyhookReconciler, wrapper.SkyhookNode, filenames), the agent contract surfaces (SKYHOOK_RESOURCE_ID, /skyhook-package/*, /var/lib/skyhook), the legacy migration shims and the legacy Skyhook webhook, whose text genuinely refers to skyhook.nvidia.com resources, the deprecated skyhook_* metrics (owned by #462), and the CLI.

A sweep over operator/ confirms every surviving skyhook literal falls into one of those buckets.

Testing

make unit-tests: 13 suites, 851 specs, 0 failures. make manifests generate produces no drift. No test or chainsaw file asserts on any renamed string.

Note for whoever merges

#459 touches 5 of the 7 files here. Whichever lands second needs a re-resolve, and the resolution is the exact trap that broke #414, so it is worth taking main's side and re-applying the string edits rather than accepting either side wholesale.

mohityadav8 and others added 2 commits August 14, 2026 15:19
Part 2/3 of #403 -- error text surfaced to callers via wrapped errors. Event/condition text landed in PR1, log messages/keys are PR3.

Refs #403

Signed-off-by: Mohit Yadav <ymohit799057@gmail.com>
Third and last part of #403, after the event text (#410) and the
fmt.Errorf text in the preceding commit. Covers the log messages, the
"skyhook" structured-log key, the ready-condition logger name, and the
event source component.

Two of these are observability breaks rather than cosmetics, so they are
called out rather than swept in silently: a log query matching
skyhook=<name> now needs nodewright=<name>, and
--field-selector source=skyhook-controller now needs
source=nodewright-controller.

Deliberately unchanged: Go identifiers, the agent contract surfaces
(SKYHOOK_* env vars, /skyhook-package mounts), the legacy migration
shims and the legacy Skyhook webhook, whose text genuinely refers to
skyhook.nvidia.com resources, the deprecated skyhook_* metrics, and the
CLI.

Closes #403

Signed-off-by: Brian Lockwood <lockwobr@gmail.com>
@lockwobr
lockwobr requested a review from a team August 14, 2026 22:22
@github-actions github-actions Bot added component/operator Skyhook operator (controller-manager) component/ci CI workflows, GitHub Actions, and repo tooling labels Aug 14, 2026
@coderabbitai

coderabbitai Bot commented Aug 14, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: ASSERTIVE

Plan: Enterprise

Run ID: 2ff30b8d-2a22-41fc-8132-38513402b940

📥 Commits

Reviewing files that changed from the base of the PR and between 877cc48 and f12524a.

📒 Files selected for processing (6)
  • operator/cmd/manager/main.go
  • operator/internal/controller/cluster_state_v2.go
  • operator/internal/controller/event_handler.go
  • operator/internal/controller/skyhook_controller.go
  • operator/internal/controller/suite_test.go
  • operator/internal/dal/dal.go

📝 Walkthrough

Walkthrough

The operator now uses NodeWright and nodewright terminology in controller setup, event recorder registration, logs, and error messages. Controller behavior and control flow remain unchanged. DAL retrieval errors and cluster-state diagnostics also use the updated resource name.

Estimated code review effort: 1 (Trivial) | ~3 minutes

Merge Risk: ⚪ Minimal · up to f1252

This PR completes a localized rename of operator-facing errors and logs; no actionable merge-blocking risk remains beyond normal checks and review.

Suggested reviewers: rice-riley, ayuskauskas

🚥 Pre-merge checks | ✅ 3 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Linked Issues check ⚠️ Warning The PR addresses the requested operator error and log text renames, but it does not record the structured-log key change in operator/CHANGELOG.md. Document the structured-log key change from skyhook to nodewright in operator/CHANGELOG.md as required by issue #403.
✅ Passed checks (3 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly summarizes the operator text rename from skyhook to nodewright.
Description check ✅ Passed The description directly explains the operator text rename, scope, observability changes, exclusions, and testing.
Out of Scope Changes check ✅ Passed The changes are limited to operator-facing error text, log text, log keys, and event source naming within the linked issue scope.
✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch fix/403-text-rename

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

@lockwobr
lockwobr enabled auto-merge (squash) August 14, 2026 22:25
@lockwobr
lockwobr merged commit 1e67fdc into main Aug 14, 2026
34 checks passed
@lockwobr
lockwobr deleted the fix/403-text-rename branch August 14, 2026 22:31
@coveralls

Copy link
Copy Markdown

Coverage Report for CI Build 31846374805

Warning

Build has drifted: This PR's base is out of sync with its target branch, so coverage data may include unrelated changes.
Quick fix: rebase this PR. Learn more →

Coverage decreased (-0.02%) to 78.917%

Details

  • Coverage decreased (-0.02%) from the base build.
  • Patch coverage: 20 uncovered changes across 4 files (10 of 30 lines covered, 33.33%).
  • 8 coverage regressions across 1 file.

Uncovered Changes

File Changed Covered %
operator/internal/controller/skyhook_controller.go 18 5 27.78%
operator/internal/controller/cluster_state_v2.go 6 3 50.0%
operator/cmd/manager/main.go 3 1 33.33%
operator/internal/dal/dal.go 2 0 0.0%
Total (5 files) 30 10 33.33%

Coverage Regressions

8 previously-covered lines in 1 file lost coverage.

File Lines Losing Coverage Coverage
operator/internal/controller/skyhook_controller.go 8 83.85%

Coverage Stats

Coverage Status
Relevant Lines: 13077
Covered Lines: 10320
Line Coverage: 78.92%
Coverage Strength: 7.84 hits per line

💛 - Coveralls

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

Labels

component/ci CI workflows, GitHub Actions, and repo tooling component/operator Skyhook operator (controller-manager)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Rename skyhook -> nodewright in operator event, log, and error text

4 participants