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: update engine naming regex to allow non digit enging (backport #631) #633

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Aug 22, 2024

ref: longhorn/longhorn#9267

Before v1.4.x, users might have engine name like "XXXX-e-12avc" or "XXXX-e-abcd1"
We change to use "-0", "-1" starting from v1.4.4, v1.5.2
longhorn/longhorn-manager#2180

The previous regex didn't allow "XXXX-e-12avc" which has non digit ending
We should fix it


This is an automatic backport of pull request #631 done by Mergify.

ref: longhorn/longhorn 9267

Signed-off-by: Jack Lin <jack.lin@suse.com>
(cherry picked from commit 4c2672c)

# Conflicts:
#	go.mod
#	go.sum
#	vendor/modules.txt
Copy link
Author

mergify bot commented Aug 22, 2024

Cherry-pick of 4c2672c has failed:

On branch mergify/bp/v1.7.x/pr-631
Your branch is up to date with 'origin/v1.7.x'.

You are currently cherry-picking commit 4c2672c0.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   vendor/github.com/longhorn/go-common-libs/longhorn/longhorn.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   go.sum
	both modified:   vendor/modules.txt

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@derekbit
Copy link
Member

Handled in #632

@derekbit derekbit closed this Aug 22, 2024
@ChanYiLin
Copy link
Contributor

Already created manually
#632

@mergify mergify bot deleted the mergify/bp/v1.7.x/pr-631 branch August 22, 2024 06:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants