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.

Sign up for GitHub

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

Jump to bottom

Bump CDI to v1.13.1 #472

Merged
merged 1 commit into from
Feb 25, 2020
Merged

Bump CDI to v1.13.1 #472

merged 1 commit into from
Feb 25, 2020

Conversation

tiraboschi
Copy link
Member

@tiraboschi tiraboschi commented Feb 25, 2020 •
edited
Loading 

Bump CDI to v1.13.1

Signed-off-by: Simone Tiraboschi [email protected]

@tiraboschi
Bump CDI to v1.13.1
ba58b56 
Signed-off-by: Simone Tiraboschi <[email protected]>
@kubevirt-bot kubevirt-bot added dco-signoff: yes Indicates the PR's author has DCO signed all their commits. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. size/L labels Feb 25, 2020
@kubevirt-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
To complete the pull request process, please assign tiraboschi
You can assign the PR to them by writing /assign @tiraboschi in a comment when ready.

The full list of commands accepted by this bot can be found 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

@nunnatsa
Copy link
Collaborator

/lgtm

@kubevirt-bot kubevirt-bot added the lgtm Indicates that a PR is ready to be merged. label Feb 25, 2020
@orenc1
Copy link
Collaborator

orenc1 commented Feb 25, 2020

@tiraboschi , could you please explain why in order to bump a version of cdi you need also to change CDI's go code under vendor ?
Thanks
/cc @nunnatsa

@tiraboschi
Copy link
Member Author

@tiraboschi , could you please explain why in order to bump a version of cdi you need also to change CDI's go code under vendor ?

because we consume CDI CRD definition as cdiv1alpha1 "kubevirt.io/containerized-data-importer/pkg/apis/core/v1alpha1", see:
https://github.com/kubevirt/hyperconverged-cluster-operator/blob/master/pkg/controller/hyperconverged/hyperconverged_controller.go#L38
and we need its newer version

@kubevirt-bot kubevirt-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Feb 25, 2020
@tiraboschi tiraboschi merged commit 8ea3cae into kubevirt:master Feb 25, 2020
@tiraboschi tiraboschi deleted the cdi_v1.13.1 branch February 25, 2020 16:18
@tiraboschi
Copy link
Member Author

/cherrypick release-2.3

@kubevirt-bot
Copy link
Contributor

@tiraboschi: #472 failed to apply on top of branch "release-2.3":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	deploy/olm-catalog/kubevirt-hyperconverged/1.0.0/kubevirt-hyperconverged-operator.v1.0.0.clusterserviceversion.yaml
M	go.mod
M	go.sum
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
Auto-merging deploy/olm-catalog/kubevirt-hyperconverged/1.0.0/kubevirt-hyperconverged-operator.v1.0.0.clusterserviceversion.yaml
CONFLICT (content): Merge conflict in deploy/olm-catalog/kubevirt-hyperconverged/1.0.0/kubevirt-hyperconverged-operator.v1.0.0.clusterserviceversion.yaml
Patch failed at 0001 Bump CDI to v1.13.1

In response to this:

/cherrypick release-2.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.

@tiraboschi tiraboschi mentioned this pull request Feb 25, 2020
Merged
tiraboschi added a commit that referenced this pull request Feb 26, 2020
@tiraboschi
[release-2.3] Bump CDI to v1.13.1 (#474)
5fe8fa6 
This is a manual cherry-pick of #472

/assign tiraboschi

Signed-off-by: Simone Tiraboschi <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@orenc1 orenc1 orenc1 approved these changes

@nunnatsa nunnatsa Awaiting requested review from nunnatsa

Assignees

@orenc1 orenc1

@nunnatsa nunnatsa

Labels
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 Denotes a PR that will be considered when it comes time to generate release notes. size/L
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@tiraboschi @kubevirt-bot @nunnatsa @orenc1