search

openshift / vertical-pod-autoscaler-operator

An Operator for running the Vertical Pod Autoscaler on OpenShift
Apache License 2.0
27 stars 30 forks source link

Weaken VERSION check to ignore irrelevant parts of release field #91

Closed jupierce closed 3 years ago

jupierce commented 3 years ago

If the Makefile comment is correct, I believe we can ignore the semver release field after -4 or -gXXXXXXX. This will make the operator less sensitive to future release naming changes.

sjenning commented 3 years ago

/lgtm /approve

openshift-ci[bot] commented 3 years ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jupierce, sjenning

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files: - ~~[OWNERS](https://github.com/openshift/vertical-pod-autoscaler-operator/blob/master/OWNERS)~~ [sjenning] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
jupierce commented 3 years ago

/cherry-pick release-4.7

openshift-cherrypick-robot commented 3 years ago

@jupierce: #91 failed to apply on top of branch "release-4.7":

Applying: Permit "assembly.<name>" in release field of VERSION
Using index info to reconstruct a base tree...
M   Makefile
Falling back to patching base and 3-way merge...
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Permit "assembly.<name>" in release field of VERSION
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
In response to [this](https://github.com/openshift/vertical-pod-autoscaler-operator/pull/91#issuecomment-849729422): >/cherry-pick release-4.7 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.