Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(kubernetes): tolerate an empty manifest in KubernetesDeployManifestOperation #6337

Conversation

dbyron-sf
Copy link
Contributor

in case the result of a bake stage is empty. Without this there's:

java.lang.NullPointerException
	at com.netflix.spinnaker.clouddriver.kubernetes.op.manifest.KubernetesDeployManifestOperation.getManifestsFromDescription(KubernetesDeployManifestOperation.java:234)
	at com.netflix.spinnaker.clouddriver.kubernetes.op.manifest.KubernetesDeployManifestOperation.operate(KubernetesDeployManifestOperation.java:75)
	at com.netflix.spinnaker.clouddriver.kubernetes.op.manifest.KubernetesDeployManifestOperation.operate(KubernetesDeployManifestOperation.java:48)

because KubernetesDeployManifestDescription.getManifestsFromDescription assumes that description.getManifest() never returns null.

…stOperation

in case the result of a bake stage is empty.  Without this there's:

java.lang.NullPointerException
	at com.netflix.spinnaker.clouddriver.kubernetes.op.manifest.KubernetesDeployManifestOperation.getManifestsFromDescription(KubernetesDeployManifestOperation.java:234)
	at com.netflix.spinnaker.clouddriver.kubernetes.op.manifest.KubernetesDeployManifestOperation.operate(KubernetesDeployManifestOperation.java:75)
	at com.netflix.spinnaker.clouddriver.kubernetes.op.manifest.KubernetesDeployManifestOperation.operate(KubernetesDeployManifestOperation.java:48)

because KubernetesDeployManifestDescription.getManifestsFromDescription assumes that description.getManifest() never returns null.
inputManifests = ImmutableList.of(manifest);

// manifest may be null as well, so check
if (manifest != null) {
Copy link
Member

Choose a reason for hiding this comment

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

Hrmm, wondering if shouldn't log "Warning! Input manifest is null and description is null. Something is incorrect on the deployment most likely!" or similar. I'd not have though BOTH would be null... ALSO... won't this immediately fail below on lin 242 with an NPEsince inputManifests would be null in this check?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I forget how this all works with description.getManifest() vs description.getManifests(), but apparently inputManifests isn't null in this case, so things work. If this did end up generating a NullPointerException, we'd have seen it. I have a vague memory that @mattgogerly may know something about this, but I think this change is OK. It's at least an improvement if it doesn't fix everything.

Copy link
Member

Choose a reason for hiding this comment

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

MOSTLY calling out the next line:

inputManifests = inputManifests.stream().filter(Objects::nonNull).collect(Collectors.toList());

inputManifests would be null, triggering an NPE if it got to the point of your null check. ....

Copy link
Member

Choose a reason for hiding this comment

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

I guess if the inputManifests.isEmpty() would allow this to "work" without an NPE... that may be how this is working...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, I figure that's what's happening.

Copy link
Member

Choose a reason for hiding this comment

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

SIGH I hate "it's working through a glitch" situations... but... approving. I could see a "TOOD" to note to fix this... but as long as it works it works... and tests'll catch it hopefully!

@jasonmcintosh jasonmcintosh added the ready to merge Approved and ready for a merge label Jan 23, 2025
@mergify mergify bot added the auto merged Merged automatically by a bot label Jan 23, 2025
@mergify mergify bot merged commit 8c2c388 into spinnaker:master Jan 23, 2025
24 checks passed
@dbyron-sf dbyron-sf deleted the check-for-null-in-KubernetesDeployManifestOperation-getManifestsFromDescription branch January 23, 2025 17:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto merged Merged automatically by a bot ready to merge Approved and ready for a merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants