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

Exclude commas when pulling the tag out of the git export-subst format string #61068

Merged
merged 1 commit into from Mar 13, 2018

Conversation

ixdy
Copy link
Member

@ixdy ixdy commented Mar 12, 2018

What this PR does / why we need it: the version tag is not guaranteed to be the last item in the ref names substituted into the format string, so we need to be sure not to match on the trailing comma.

For example, v1.9.3 was exported with HEAD -> release-1.9, tag: v1.9.3, origin/release-1.9, where we only want to match v1.9.3, not v1.9.3,.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #61029, though we need to backport this to all active branches.

Release note:

NONE

/assign @david-mcmahon
/priority important-soon

@ixdy ixdy added this to the v1.10 milestone Mar 12, 2018
@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Mar 12, 2018
@ixdy
Copy link
Member Author

ixdy commented Mar 12, 2018

/kind bug
/sig release

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. sig/release Categorizes an issue or PR as relevant to SIG Release. labels Mar 12, 2018
@david-mcmahon
Copy link
Contributor

/approve
/lgtm

Thanks @ixdy.

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 12, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: david-mcmahon, ixdy

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:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@krzyzacy
Copy link
Member

/status approved-for-milestone

@k8s-github-robot
Copy link

[MILESTONENOTIFIER] Milestone Pull Request: Up-to-date for process

@david-mcmahon @ixdy

Pull Request Labels
  • sig/release: Pull Request will be escalated to these SIGs if needed.
  • priority/important-soon: Escalate to the pull request owners and SIG owner; move out of milestone after several unsuccessful escalation attempts.
  • kind/bug: Fixes a bug discovered during the current release.
Help

@krzyzacy
Copy link
Member

cc @jdumars

@k8s-github-robot
Copy link

/test all [submit-queue is verifying that this PR is safe to merge]

@k8s-github-robot
Copy link

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions here.

k8s-github-robot pushed a commit that referenced this pull request Mar 14, 2018
…pstream-release-1.8

Automatic merge from submit-queue.

Automated cherry pick of #61068: Exclude commas when pulling the tag out of the git

Cherry pick of #61068 on release-1.8.

#61068: Exclude commas when pulling the tag out of the git
k8s-github-robot pushed a commit that referenced this pull request Mar 16, 2018
…pstream-release-1.9

Automatic merge from submit-queue.

Automated cherry pick of #61068: Exclude commas when pulling the tag out of the git

Cherry pick of #61068 on release-1.9.

#61068: Exclude commas when pulling the tag out of the git
k8s-github-robot pushed a commit that referenced this pull request Mar 16, 2018
…pstream-release-1.7

Automatic merge from submit-queue.

Automated cherry pick of #61068: Exclude commas when pulling the tag out of the git

Cherry pick of #61068 on release-1.7.

#61068: Exclude commas when pulling the tag out of the git
@ixdy ixdy deleted the git-export-subst-tag-fix branch May 15, 2018 23:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note-none Denotes a PR that doesn't merit a release note. sig/release Categorizes an issue or PR as relevant to SIG Release. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

KUBE_GIT_VERSION contains extraneous comma when building from git archive source.tgz
5 participants