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 issues when verify generation readiness was merged #12698

Merged
merged 1 commit into from Jan 9, 2024

Conversation

mattfarina
Copy link
Collaborator

CI, tests, and building failed after #10920 was merged. This change fixes the issues that were introduced.

What this PR does / why we need it: CI, building, testing, and linting are failing on master due to issues introduced in a PR where CI passed. This change fixes the codebase.

Special notes for your reviewer: The issue here is blocking the release of the RC for Helm 3.14.

If applicable:

  • this PR contains documentation
  • this PR contains unit tests
  • this PR has been tested for backwards compatibility

CI, tests, and building failed after helm#10920 was merged. This change
fixes the issues that were introduced.

Signed-off-by: Matt Farina <matt.farina@suse.com>
@mattfarina mattfarina added this to the 3.14.0 milestone Jan 9, 2024
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jan 9, 2024
Comment on lines -93 to -99
var (
// This defaults to true, otherwise we get to a point where
// things will always return false unless one of the objects
// that manages pods has been hit
ok = true
err error
)
Copy link
Member

Choose a reason for hiding this comment

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

Looking over 10920 I get why we need the rest of the fixes, but can you help clarify this part? Tempted to rubber stamp but just checking on this.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Those variables were used as part of the code that was removed. They are now unused variables so the Go compiler gives an area. The code that uses them is gone.

Copy link
Member

@scottrigby scottrigby left a comment

Choose a reason for hiding this comment

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

Lgtm. Thanks!

@mattfarina mattfarina merged commit 27921d0 into helm:main Jan 9, 2024
6 checks passed
@mattfarina mattfarina deleted the fix-10920 branch January 9, 2024 17:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants