[release-4.21] OCPBUGS-105505: fix(upsert): add desired-state hash to detect spec field removals by muraee · Pull Request #9268 · openshift/hypershift

muraee · 2026-08-10T15:03:11Z

manual backport of #7713

DeepDerivative treats nil/empty fields as "don't care", making it impossible to detect when spec fields like nodeSelector, tolerations, or container args are explicitly removed. This has been a recurring class of bugs (e.g., OCPBUGS-65879). Add a SHA-256 hash of the desired manifest state as a lightweight annotation (~64 bytes). On each reconcile the hash is computed before metadata merging and compared against the stored value. When they differ, an update is forced — catching removals that DeepDerivative misses. This replaces the earlier full-JSON last-applied-configuration approach (PR openshift#7713) which was held due to etcd size explosion at fleet scale and security concerns from embedding Secret data in annotations. A hash has none of these costs. DeepDerivative is retained as a fallback for drift detection, and the existing label-count removal workaround is preserved since hash- based detection cannot drive three-way metadata merges. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

regenerate fixtures with desired-state-hash annotation

openshift-merge-bot · 2026-08-10T15:03:14Z

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: LGTM mode

openshift-ci-robot · 2026-08-10T15:03:17Z

@muraee: This pull request references Jira Issue OCPBUGS-105505, which is invalid:

expected dependent Jira Issue OCPBUGS-105421 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is MODIFIED instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

manual backport of #7713

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.

coderabbitai · 2026-08-10T15:03:20Z

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: 660dec6c-acc9-4ddd-ac1f-cec3809f3efd

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

🔍 Trigger review

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

openshift-ci · 2026-08-10T15:03:50Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: muraee

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [muraee]

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

muraee · 2026-08-10T15:04:05Z

/jira refresh

openshift-ci-robot · 2026-08-10T15:04:11Z

@muraee: This pull request references Jira Issue OCPBUGS-105505, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.21.z) matches configured target version for branch (4.21.z)
bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
release note text is set and does not match the template
dependent bug Jira Issue OCPBUGS-105421 is in the state Release Pending (Done), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
dependent Jira Issue OCPBUGS-105421 targets the "4.22.0" version, which is one of the valid target versions: 4.22.0
bug has dependents

Requesting review from QA contact:
/cc @ropatil010

Details

In response to this:

/jira refresh

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.

openshift-merge-bot · 2026-08-10T16:01:38Z

Scheduling required tests:
/test verify-deps

muraee · 2026-08-10T16:08:52Z

/verified bypass

openshift-ci-robot · 2026-08-10T16:09:04Z

@muraee: The verified label has been added.

Details

In response to this:

/verified bypass

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.

openshift-merge-bot · 2026-08-10T17:26:58Z

/retest-required

Remaining retests: 0 against base HEAD 04c25e5 and 2 for PR HEAD b56d20f in total

muraee · 2026-08-11T15:59:22Z

/retest-required

openshift-merge-bot · 2026-08-11T17:24:56Z

/retest-required

Remaining retests: 0 against base HEAD 9b020a0 and 1 for PR HEAD b56d20f in total

openshift-merge-bot · 2026-08-11T22:27:36Z

/retest-required

Remaining retests: 0 against base HEAD 4298ee0 and 0 for PR HEAD b56d20f in total

openshift-merge-bot · 2026-08-12T03:25:10Z

/hold

Revision b56d20f was retested 3 times: holding

openshift-ci · 2026-08-12T05:02:32Z

@muraee: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-aks	`b56d20f`	link	unknown	`/test e2e-aks`
ci/prow/e2e-azure-aks-external-oidc	`b56d20f`	link	unknown	`/test e2e-azure-aks-external-oidc`

Full PR test history. Your PR dashboard.

Details

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 kubernetes-sigs/prow repository. I understand the commands that are listed here.

muraee · 2026-08-12T09:54:04Z

/retest-required

muraee and others added 2 commits August 10, 2026 16:52

chore(testdata): regenerate fixtures with desired-state-hash annotation

b56d20f

regenerate fixtures with desired-state-hash annotation

openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Aug 10, 2026

openshift-ci Bot added the do-not-merge/needs-area label Aug 10, 2026

openshift-ci Bot requested review from devguyio and sjenning August 10, 2026 15:03

openshift-ci Bot added the area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release label Aug 10, 2026

openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Aug 10, 2026

openshift-ci Bot requested a review from ropatil010 August 10, 2026 15:04

csrwng added the lgtm Indicates that a PR is ready to be merged. label Aug 10, 2026

csrwng added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Aug 10, 2026

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Aug 10, 2026

openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 12, 2026

Uh oh!

Conversation

muraee commented Aug 10, 2026

Uh oh!

openshift-merge-bot Bot commented Aug 10, 2026

Uh oh!

openshift-ci-robot commented Aug 10, 2026

Uh oh!

coderabbitai Bot commented Aug 10, 2026

Review skipped

Uh oh!

openshift-ci Bot commented Aug 10, 2026

Uh oh!

muraee commented Aug 10, 2026

Uh oh!

openshift-ci-robot commented Aug 10, 2026

Uh oh!

openshift-merge-bot Bot commented Aug 10, 2026

Uh oh!

muraee commented Aug 10, 2026

Uh oh!

openshift-ci-robot commented Aug 10, 2026

Uh oh!

openshift-merge-bot Bot commented Aug 10, 2026

Uh oh!

muraee commented Aug 11, 2026

Uh oh!

openshift-merge-bot Bot commented Aug 11, 2026

Uh oh!

openshift-merge-bot Bot commented Aug 11, 2026

Uh oh!

openshift-merge-bot Bot commented Aug 12, 2026

Uh oh!

openshift-ci Bot commented Aug 12, 2026

Uh oh!

muraee commented Aug 12, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants