Skip to content

fix: avoid NPE in DeploymentHelper.equalIgnoreHash on templates with no labels - #4900

Merged
kubernetes-prow[bot] merged 1 commit into
kubernetes-client:masterfrom
sureshmelvinsigera:fix/deploymenthelper-npe-no-labels
Sep 8, 2026
Merged

fix: avoid NPE in DeploymentHelper.equalIgnoreHash on templates with no labels#4900
kubernetes-prow[bot] merged 1 commit into
kubernetes-client:masterfrom
sureshmelvinsigera:fix/deploymenthelper-npe-no-labels

Conversation

@sureshmelvinsigera

@sureshmelvinsigera sureshmelvinsigera commented Sep 4, 2026

Copy link
Copy Markdown
Contributor

DeploymentHelper.equalIgnoreHash NPEs when a pod template has no labels (or no metadata at all), both are valid per the k8s API but weren't null-checked. This breaks getAllReplicaSets, which is used for deployment rollout status.

Added null checks before removing the pod-template-hash label, and a fallback for when metadata itself is null. Added a test that repros the old NPE and confirms it's fixed.

@linux-foundation-easycla

linux-foundation-easycla Bot commented Sep 4, 2026 •
edited
Loading

Copy link
Copy Markdown

CLA Signed
The committers listed above are authorized under a signed CLA.

  • ✅ login: sureshmelvinsigera / name: Suresh Sigera (4158a3c)

@kubernetes-prow

kubernetes-prow Bot commented Sep 4, 2026

Copy link
Copy Markdown
Contributor

Welcome @sureshmelvinsigera!

It looks like this is your first PR to kubernetes-client/java 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-client/java has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@kubernetes-prow kubernetes-prow Bot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Sep 4, 2026
@brendandburns

brendandburns commented Sep 4, 2026

Copy link
Copy Markdown
Contributor

Thank you for the PR. Before further review, please remove all whitespace changes, the easiest way to do this is probably to run mvn spotless:apply

Thanks

@sureshmelvinsigera
sureshmelvinsigera force-pushed the fix/deploymenthelper-npe-no-labels branch from 4158a3c to 0003049 Compare September 5, 2026 03:51
@sureshmelvinsigera
fix: avoid NPE in DeploymentHelper.equalIgnoreHash on templates with …
5566ed8 
…no labels

getLabels() and Yaml.dump() can both receive null when a pod template
has no labels/metadata set, which is valid per the k8s API but wasn't
handled here. Added null checks and a regression test.
@sureshmelvinsigera
sureshmelvinsigera force-pushed the fix/deploymenthelper-npe-no-labels branch from 0003049 to 5566ed8 Compare September 5, 2026 03:58
@kubernetes-prow kubernetes-prow Bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Sep 5, 2026
@sureshmelvinsigera

sureshmelvinsigera commented Sep 5, 2026

Copy link
Copy Markdown
Contributor Author

Fixed - IntelliJ had reformatted some unrelated lines on save. Reset the file and reapplied just the two intended edits. Diff is clean now.

@brendandburns

brendandburns commented Sep 8, 2026

Copy link
Copy Markdown
Contributor

/lgtm
/approve

Thanks for fixing the whitespace.

@kubernetes-prow kubernetes-prow Bot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 8, 2026
@kubernetes-prow

kubernetes-prow Bot commented Sep 8, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: brendandburns, sureshmelvinsigera

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:

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

@kubernetes-prow kubernetes-prow Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 8, 2026
@kubernetes-prow
kubernetes-prow Bot merged commit c1a7346 into kubernetes-client:master Sep 8, 2026
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@brendandburns brendandburns Awaiting requested review from brendandburns
@yue9944882 yue9944882 Awaiting requested review from yue9944882

Assignees

@brendandburns brendandburns

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@sureshmelvinsigera @brendandburns