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 NETWORK_ADDONS to 0.39.1 #651

Merged
merged 5 commits into from
Jun 22, 2020
Merged

Bump NETWORK_ADDONS to 0.39.1 #651

merged 5 commits into from
Jun 22, 2020

Conversation

phoracek
Copy link
Member

Bump NETWORK_ADDONS to 0.39.1

Bump NETWORK_ADDONS to 0.39.1

phoracek added 2 commits June 21, 2020 21:28
@phoracek
pin HCO to operator-sdk v0.17.0 (kubevirt#645)
a2c7ff9 
cluster-network-addons-operator pulls in dependency on operator-sdk
v0.18.0. This depedency is not exercised on context of HCO. However,
since HCO is pinned to Kubernetes v1.16, it has to stay on operator-sdk
v0.17.0 to keep compatibility. This patch makes sure we pin the
dependency version.

Signed-off-by: Petr Horacek <[email protected]>
@phoracek
Bump NETWORK_ADDONS to 0.39.1
45f1f58 
Signed-off-by: Petr Horacek <[email protected]>
@kubevirt-bot kubevirt-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. size/L labels Jun 21, 2020
@ovirt-infra
Copy link

All tests passed

@openshift-ci-robot
Copy link
Collaborator

@phoracek: The /retest command does not accept any targets.
The following commands are available to trigger jobs:

  • /test hco-e2e-aws
  • /test hco-e2e-upgrade-aws
  • /test images

Use /test all to run all jobs.

In response to this:

/retest ci/prow/hco-e2e-upgrade-aws

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.

@openshift-ci-robot
Copy link
Collaborator

@phoracek: The specified target(s) for /test were not found.
The following commands are available to trigger jobs:

  • /test hco-e2e-aws
  • /test hco-e2e-upgrade-aws
  • /test images

Use /test all to run all jobs.

In response to this:

/test ci/prow/hco-e2e-upgrade-aws

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.

@phoracek
Copy link
Member Author

/test hco-e2e-upgrade-aws

@orenc1
Copy link
Collaborator

orenc1 commented Jun 21, 2020

/approve

@kubevirt-bot kubevirt-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 21, 2020
@phoracek
Copy link
Member Author

/test hco-e2e-upgrade-aws

1 similar comment
@nunnatsa
Copy link
Collaborator

/test hco-e2e-upgrade-aws

@nunnatsa nunnatsa mentioned this pull request Jun 22, 2020
Closed
@orenc1
Copy link
Collaborator

orenc1 commented Jun 22, 2020

/test hco-e2e-upgrade-aws

1 similar comment
@nunnatsa
Copy link
Collaborator

/test hco-e2e-upgrade-aws

@nunnatsa
Copy link
Collaborator

/retest

1 similar comment
@phoracek
Copy link
Member Author

/retest

@ovirt-infra
Copy link

All tests passed

@ovirt-infra
Copy link

All tests passed

1 similar comment
@ovirt-infra
Copy link

All tests passed

@ovirt-infra
Copy link

All tests passed

nunnatsa
nunnatsa approved these changes Jun 22, 2020
View reviewed changes
Copy link
Collaborator

@nunnatsa nunnatsa left a comment

Choose a reason for hiding this comment

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

/approve

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nunnatsa, orenc1

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

@nunnatsa
Copy link
Collaborator

/test images

@kubevirt-bot kubevirt-bot merged commit 6bc2dd8 into kubevirt:master Jun 22, 2020
@orenc1
Copy link
Collaborator

orenc1 commented Jun 22, 2020

/cherry-pick release-2.4

@kubevirt-bot
Copy link
Contributor

@orenc1: #651 failed to apply on top of branch "release-2.4":

Applying: Bump NETWORK_ADDONS to 0.39.1
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
A	deploy/olm-catalog/kubevirt-hyperconverged/1.2.0/kubevirt-hyperconverged-operator.v1.2.0.clusterserviceversion.yaml
M	deploy/operator.yaml
M	hack/config
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
Auto-merging hack/config
Auto-merging deploy/operator.yaml
Auto-merging deploy/olm-catalog/kubevirt-hyperconverged/1.1.0/kubevirt-hyperconverged-operator.v1.1.0.clusterserviceversion.yaml
CONFLICT (content): Merge conflict in deploy/olm-catalog/kubevirt-hyperconverged/1.1.0/kubevirt-hyperconverged-operator.v1.1.0.clusterserviceversion.yaml
Patch failed at 0002 Bump NETWORK_ADDONS to 0.39.1

In response to this:

/cherry-pick release-2.4

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.

@nunnatsa nunnatsa mentioned this pull request Jun 22, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nunnatsa nunnatsa nunnatsa approved these changes

@tiraboschi tiraboschi Awaiting requested review from tiraboschi

Assignees

@nunnatsa nunnatsa

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 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.
6 participants
@phoracek @ovirt-infra @openshift-ci-robot @orenc1 @nunnatsa @kubevirt-bot