Skip to content

Crds #100

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
Merged
openshift-merge-robot merged 8 commits into from
Oct 23, 2018
Merged

Crds #100

openshift-merge-robot merged 8 commits into from
Oct 23, 2018

Conversation

@enxebre
Copy link
Member

@enxebre enxebre commented Oct 18, 2018

Drop aggregated server in favour of CRDs
Points to CRDs custom actuator image
TODO:
update libvirt image
update aws image

@enxebre enxebre added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 18, 2018
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 18, 2018
@openshift-ci-robot openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Oct 18, 2018
@paulfantom
Copy link
Contributor

paulfantom commented Oct 18, 2018

@enxebre into master branch?

@enxebre
Copy link
Member Author

enxebre commented Oct 18, 2018 •
edited
Loading

CI system seems unavailable.. @paulfantom yes this goes against master. It has to point to the version of the actuators using CRDs, so this becomes part of the release payload pointing to those specific images.
After that we merge the actuators into master so then the image stream for those gets updated
Then we can create a final PR here for putting back the the actuator images so the release payload will get the content from the image stream which will contain the CRD code

@enxebre
Copy link
Member Author

enxebre commented Oct 19, 2018 •
edited
Loading

/test all

@enxebre enxebre mentioned this pull request Oct 19, 2018
Merged
@enxebre
Copy link
Member Author

enxebre commented Oct 19, 2018

/test e2e-aws

@enxebre
Copy link
Member Author

enxebre commented Oct 19, 2018

/test images

@enxebre enxebre added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 19, 2018
@enxebre enxebre removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 23, 2018
@vikaschoudhary16
Copy link
Contributor

vikaschoudhary16 commented Oct 23, 2018

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 23, 2018
ingvagabund
ingvagabund reviewed Oct 23, 2018
View reviewed changes
Copy link
Member

@ingvagabund ingvagabund left a comment

Choose a reason for hiding this comment

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

Worth to put all image tag changes into a single commit.

pkg/operator/sync.go
// }
// }
//}
func (optr *Operator) syncCustomResourceDefinitions(config render.OperatorConfig) error {
Copy link
Member

@ingvagabund ingvagabund Oct 23, 2018

Choose a reason for hiding this comment

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

Worth extending the e2e to test a manifest gets re-render after deletion.

install/0000_50_machine-api-operator_01_images.configmap.yaml
namespace: openshift-cluster-api
data:
images.json: '{"clusterAPIControllerAWS": "registry.svc.ci.openshift.org/openshift/aws-machine-controllers:crd", "clusterAPIControllerManagerAWS": "registry.svc.ci.openshift.org/openshift/aws-machine-controllers:crd", "clusterAPIControllerOpenStack": "docker.io/openshift/origin-openstack-machine-controllers:v4.0.0", "clusterAPIControllerManagerOpenStack": "docker.io/openshift/origin-openstack-machine-controllers:v4.0.0", "clusterAPIControllerManagerLibvirt": "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0", "clusterAPIControllerLibvirt": "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0"}'
images.json: '{"clusterAPIControllerAWS": "registry.svc.ci.openshift.org/openshift/aws-machine-controllers:crd", "clusterAPIControllerManagerAWS": "registry.svc.ci.openshift.org/openshift/aws-machine-controllers:crd", "clusterAPIControllerOpenStack": "docker.io/openshift/origin-openstack-machine-controllers:v4.0.0", "clusterAPIControllerManagerOpenStack": "docker.io/openshift/origin-openstack-machine-controllers:v4.0.0", "clusterAPIControllerManagerLibvirt": "registry.svc.ci.openshift.org/openshift/libvirt-machine-controllers:crd", "clusterAPIControllerLibvirt": "registry.svc.ci.openshift.org/openshift/libvirt-machine-controllers:crd"}'
Copy link
Member

@ingvagabund ingvagabund Oct 23, 2018

Choose a reason for hiding this comment

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

Here as well:

machine-api-operator/tests/e2e/manifests/images.configmap.yaml

Lines 10 to 11 in 3a9961e

"clusterAPIControllerManagerLibvirt": "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0",
"clusterAPIControllerLibvirt": "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0"

Copy link
Member Author

@enxebre enxebre Oct 23, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

thanks! fyi that does not have any effect, libvirt is not being tested here. We need to add framework like testing in this repo. After merging this we need to wait for it to be part of the payload.
Then we can get the aws crd pr green.
And then we need to put the real images name here back to 4.0.0

@ingvagabund
Copy link
Member

ingvagabund commented Oct 23, 2018

Not related to the PR but we need to deploy the nodelink-controller in upcoming PR as well.

@ingvagabund
Copy link
Member

ingvagabund commented Oct 23, 2018

/approve

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Oct 23, 2018

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ingvagabund

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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 Oct 23, 2018
@openshift-merge-robot openshift-merge-robot merged commit d7368ff into openshift:master Oct 23, 2018
This was referenced Oct 23, 2018
Merged
Merged
ingvagabund pushed a commit to ingvagabund/machine-api-operator that referenced this pull request Jul 11, 2019
@openshift-merge-robot
Merge pull request openshift#100 from ingvagabund/update-to-status-up…
9914957 
…date

CRD update to status update
germanparente pushed a commit to germanparente/machine-api-operator that referenced this pull request Sep 23, 2025
@openshift-merge-robot
Merge pull request openshift#100 from alexander-demichev/fixhandler
bf14aef 
Add spot instance label to machine spec
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ingvagabund ingvagabund ingvagabund approved these changes

@frobware frobware Awaiting requested review from frobware

Assignees

@vikaschoudhary16 vikaschoudhary16

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. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@enxebre @paulfantom @vikaschoudhary16 @ingvagabund @openshift-ci-robot @openshift-merge-robot