Skip to content

Update yaml globs for Helm to support common chart structures#21692

Merged
cburroughs merged 6 commits intopantsbuild:mainfrom
frekw:fix/yaml-globs
Jan 31, 2025
Merged

Update yaml globs for Helm to support common chart structures#21692
cburroughs merged 6 commits intopantsbuild:mainfrom
frekw:fix/yaml-globs

Conversation

@frekw
Copy link
Copy Markdown
Contributor

@frekw frekw commented Nov 26, 2024

Minor fix, but this bit my colleague the other day and had him pretty confused as to why his chart was broken, so I thought I'd fix it upstream.

@lilatomic lilatomic added needs-cherrypick [CI] category:bugfix Bug fixes for released features backend: Helm Helm backend-related issues labels Nov 28, 2024
@lilatomic lilatomic added this to the 2.23.x milestone Nov 28, 2024
@lilatomic
Copy link
Copy Markdown
Contributor

Thanks for the fix! Can you please also add an entry to the changelog in "docs/notes/2.25.x.md" under the Helm section?

I've also marked this MR for packporting

Copy link
Copy Markdown
Contributor

@lilatomic lilatomic left a comment

Choose a reason for hiding this comment

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

Tested and looks good!

@cburroughs
Copy link
Copy Markdown
Contributor

I'm going to go ahead and add a brief doc note. Thank you for your contribution!

@cburroughs cburroughs enabled auto-merge (squash) January 31, 2025 17:46
@cburroughs cburroughs merged commit 390416b into pantsbuild:main Jan 31, 2025
@WorkerPants
Copy link
Copy Markdown
Member

I tried to automatically cherry-pick this change back to each relevant milestone, so that it is available in those older releases of Pants.

✔️ 2.23.x

Successfully opened #21897.

✔️ 2.24.x

Successfully opened #21896.

❌ 2.25.x

I was unable to cherry-pick this PR to 2.25.x, likely due to merge-conflicts.

Steps to Cherry-Pick locally

To resolve:

  1. (Ensure your git working directory is clean)
  2. Run the following script to reproduce the merge-conflicts:
    git fetch https://github.com/pantsbuild/pants main \
      && git fetch https://github.com/pantsbuild/pants 2.25.x \
      && git checkout -b cherry-pick-21692-to-2.25.x FETCH_HEAD \
      && git cherry-pick 390416b46864ef463945980fc98266a7f8443c9b
  3. Fix the merge conflicts and commit the changes
  4. Run build-support/cherry_pick/make_pr.sh "21692" "2.25.x"

Please note that I cannot re-run CI if a job fails. Please work with your PR approver(s) to re-run CI if necessary.


When you're done manually cherry-picking, please remove the needs-cherrypick label on this PR.

Thanks again for your contributions!

🤖 Beep Boop here's my run link

@WorkerPants WorkerPants added the auto-cherry-picking-failed [CI] Auto Cherry-Picking Failed label Jan 31, 2025
@cburroughs
Copy link
Copy Markdown
Contributor

Whoops, didn't mean to cheery pick

@benjyw benjyw removed needs-cherrypick [CI] auto-cherry-picking-failed [CI] Auto Cherry-Picking Failed labels May 25, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backend: Helm Helm backend-related issues category:bugfix Bug fixes for released features

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants