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

github: Fix bundle version labelling #64

Merged

Conversation

lyarwood
Copy link
Member

@lyarwood lyarwood commented Jun 21, 2023

What this PR does / why we need it:

  • Replace the annotation with a label
  • Avoid merging bundles togther when using yq
  • Remove unnecessary exports of env variables

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 #

Special notes for your reviewer:

Release note:

NONE

@kubevirt-bot kubevirt-bot added release-note-none Denotes a PR that doesn't merit a release note. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels Jun 21, 2023
@lyarwood lyarwood force-pushed the annotate-bundle-with-version-for-ssp branch from 715b2c7 to 6eb3d76 Compare June 21, 2023 13:02
* Replace the annotation with a label
* Avoid merging bundles togther when using yq
* Remove unnecessary exports of env variables
  Note that VERSION remains exported for yq

Signed-off-by: Lee Yarwood <lyarwood@redhat.com>
@lyarwood lyarwood force-pushed the annotate-bundle-with-version-for-ssp branch from 6eb3d76 to a90ed4f Compare June 21, 2023 13:13
@lyarwood
Copy link
Member Author

lyarwood commented Jun 21, 2023

Tested below and now working correctly:

https://github.com/lyarwood/common-instancetypes/releases/tag/v1.2.7

$ curl -Ls https://github.com/lyarwood/common-instancetypes/releases/download/v1.2.7/common-clusterinstancetypes-bundle-v1.2.7.yaml | grep kind | sort | uniq
kind: VirtualMachineClusterInstancetype

$ curl -Ls https://github.com/lyarwood/common-instancetypes/releases/download/v1.2.7/common-clusterinstancetypes-bundle-v1.2.7.yaml | yq '.metadata.labels["instancetype.kubevirt.io/common-instancetypes-version"
]' | sort | uniq
---
v1.2.7

$ curl -Ls https://github.com/lyarwood/common-instancetypes/releases/download/v1.2.7/common-clusterpreferences-bundle-v1.2.7.yaml | grep kind | sort | uniq
kind: VirtualMachineClusterPreference

$ curl -Ls https://github.com/lyarwood/common-instancetypes/releases/download/v1.2.7/common-clusterpreferences-bundle-v1.2.7.yaml | yq '.metadata.labels["instancetype.kubevirt.io/common-instancetypes-version"]'
 | sort | uniq
---
v1.2.7

@lyarwood lyarwood changed the title github: Annotate SSP bundles with common-instancetypes version github: Fix bundle version labelling Jun 21, 2023
@lyarwood lyarwood added this to the v0.3.0 milestone Jun 21, 2023
@@ -16,10 +16,12 @@ jobs:
for f in $(ls *bundle.yaml); do
cp ${f} ${f/\.yaml/-${VERSION}\.yaml}
done

Copy link
Member Author

Choose a reason for hiding this comment

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

FWIW this is just pre-commit cleaning up whitespace that shellcheck somehow missed.

Copy link
Member

@0xFelix 0xFelix left a comment

Choose a reason for hiding this comment

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

/approve
/lgtm

@kubevirt-bot kubevirt-bot added the lgtm Indicates that a PR is ready to be merged. label Jun 21, 2023
@kubevirt-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 0xFelix

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

@kubevirt-bot kubevirt-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 21, 2023
@kubevirt-bot kubevirt-bot merged commit 6570033 into kubevirt:main Jun 21, 2023
3 checks passed
@lyarwood
Copy link
Member Author

/cherry-pick release-0.3

@kubevirt-bot
Copy link
Contributor

@lyarwood: new pull request created: #85

In response to this:

/cherry-pick release-0.3

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

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. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. lgtm Indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/S
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants