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

[OCPCLOUD-815] Use MachineSet controller from MAO image #546

Merged
merged 2 commits into from Apr 2, 2020

Conversation

JoelSpeed
Copy link
Contributor

This changes the image for the MachineSet controller deployed in the machine-api-controllers deployment to use the machine-api-operator image instead of the provider image.

Also adds tests to check the output of maoConfigFromInfrastructure as this was not previously tested

@@ -9,6 +9,7 @@ require (
github.com/google/uuid v1.1.1
github.com/hashicorp/golang-lru v0.5.3 // indirect
github.com/imdario/mergo v0.3.8 // indirect
github.com/onsi/gomega v1.8.1
Copy link
Member

Choose a reason for hiding this comment

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

:face_with_raised_eyebrow:

@enxebre
Copy link
Member

enxebre commented Apr 2, 2020

shall we include a commit to rename the binary in the kube deployment, the Dockerfile and the Make file? e.g manager -> machineSet

@JoelSpeed
Copy link
Contributor Author

@enxebre Renaming seems good, have added another commit to rename to machineset-controller, PTAL

@enxebre
Copy link
Member

enxebre commented Apr 2, 2020

/approve

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: enxebre

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-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 2, 2020
@openshift-ci-robot
Copy link
Contributor

@JoelSpeed: The following tests failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/prow/e2e-azure 8229b4e link /test e2e-azure
ci/prow/e2e-aws-scaleup-rhel7 8229b4e link /test e2e-aws-scaleup-rhel7

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

Copy link
Contributor

@elmiko elmiko left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 2, 2020
@openshift-merge-robot openshift-merge-robot merged commit a52b81d into openshift:master Apr 2, 2020
@JoelSpeed JoelSpeed deleted the mao-machineset branch April 3, 2020 09:45
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. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants