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

Bug 1810400: Port CAPO to MAO API #90

Merged
merged 2 commits into from May 1, 2020
Merged

Bug 1810400: Port CAPO to MAO API #90

merged 2 commits into from May 1, 2020

Conversation

Fedosin
Copy link

@Fedosin Fedosin commented Apr 29, 2020

cluster-api has been moved to: http://github.com/openshift/machine-api-operator so we have to update the dependencies accordingly to allow node draining.

Along with it we stopped using deprecated dep tool to manage dependencies, and switched to go modules.

@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. label Apr 29, 2020
@openshift-ci-robot
Copy link

@Fedosin: This pull request references Bugzilla bug 1810400, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.5.0) matches configured target release for branch (4.5.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1810400: Port CAPO to MAO API

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 openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Apr 29, 2020
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 29, 2020
@Fedosin Fedosin force-pushed the port_to_mao branch 5 times, most recently from 1539525 to 15b41d2 Compare April 29, 2020 22:23
@Fedosin
Copy link
Author

Fedosin commented Apr 30, 2020

/retest

@iamemilio
Copy link

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 30, 2020
@openshift-bot
Copy link

/retest

Please review the full test history for this PR and help us cut down flakes.

9 similar comments
@openshift-bot
Copy link

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Apr 30, 2020
Fedosin and others added 2 commits May 1, 2020 01:04
@Fedosin
Port CAPO to MAO API
89f97bc 
Co-authored-by: Emilio Garcia <egarcia@redhat.com>
@Fedosin
Use go mod
545ea33 
Co-authored-by: Mike Fedosin <mfedosin@redhat.com>
@iamemilio
Copy link

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label May 1, 2020
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Fedosin, iamemilio

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

@openshift-merge-robot openshift-merge-robot merged commit daa2ecd into openshift:master May 1, 2020
@openshift-ci-robot
Copy link

@Fedosin: All pull requests linked via external trackers have merged: openshift/cluster-api-provider-openstack#90. Bugzilla bug 1810400 has been moved to the MODIFIED state.

In response to this:

Bug 1810400: Port CAPO to MAO API

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.

@iamemilio
Copy link

/cherry-pick release-4.4

@openshift-cherrypick-robot
Copy link

@iamemilio: #90 failed to apply on top of branch "release-4.4":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	pkg/cloud/openstack/clients/machineservice.go
A	pkg/cloud/openstack/clients/utils.go
M	pkg/cloud/openstack/machine/actuator.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/cloud/openstack/machine/actuator.go
CONFLICT (content): Merge conflict in pkg/cloud/openstack/machine/actuator.go
Removing pkg/cloud/openstack/cluster/actuator.go
CONFLICT (modify/delete): pkg/cloud/openstack/clients/utils.go deleted in HEAD and modified in Port CAPO to MAO API. Version Port CAPO to MAO API of pkg/cloud/openstack/clients/utils.go left in tree.
Auto-merging pkg/cloud/openstack/clients/machineservice.go
CONFLICT (content): Merge conflict in pkg/cloud/openstack/clients/machineservice.go
Patch failed at 0001 Port CAPO to MAO API

In response to this:

/cherry-pick release-4.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.

@Fedosin Fedosin mentioned this pull request Jun 5, 2020
Merged
@EmilienM EmilienM mentioned this pull request Jan 31, 2023
Closed
pierreprinetti pushed a commit to shiftstack/cluster-api-provider-openstack that referenced this pull request Apr 22, 2024
@iamemilio @pierreprinetti
Enables users to select which provider os they want to use in the gen…
3f339b0 
…erate-yaml script (openshift#90)

Referencing: openshift#88

:)
pierreprinetti pushed a commit to shiftstack/cluster-api-provider-openstack that referenced this pull request Apr 22, 2024
@hidekazuna @pierreprinetti
Fix README.md (openshift#105)
b6975c2 
* Fix README.md

Required option --provider-os was added to generate-yaml.sh in openshift#90.
This patch fixes Cluster Creation section in README.md.

* Apply suggestions from code review

Co-Authored-By: hidekazuna <hidekazuna@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pierreprinetti pierreprinetti Awaiting requested review from pierreprinetti

@tomassedovic tomassedovic Awaiting requested review from tomassedovic

Assignees

@iamemilio iamemilio

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@Fedosin @openshift-ci-robot @iamemilio @openshift-bot @openshift-cherrypick-robot @openshift-merge-robot