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

add explicit machineset label #519

Merged
merged 1 commit into from
Oct 24, 2018

Conversation

enxebre
Copy link
Member

@enxebre enxebre commented Oct 23, 2018

Add explicit machineset name for matchLabel selector
This is being consistent with the machineset name https://github.com/openshift/installer/pull/519/files#diff-a416ed747e927b21b9c26916a1129cdfR46
To reduce possible side effects for machines matching more than one owner label
https://github.com/kubernetes-sigs/cluster-api/blob/master/pkg/controller/machineset/controller.go#L304

@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Oct 23, 2018
Copy link
Contributor

@staebler staebler left a comment

Choose a reason for hiding this comment

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

Please add a description to the PR and improve the commit message (https://github.com/openshift/installer/blob/master/CONTRIBUTING.md).

@@ -53,12 +53,12 @@ items:
replicas: {{$instance.Replicas}}
selector:
matchLabels:
sigs.k8s.io/cluster-api-machineset: worker
sigs.k8s.io/cluster-api-machineset: {{$c.ClusterName}}-worker-{{$index}}
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we really want to use the index here? This implies that the order of the worker machine pools in the install config is important, which I don't think that it is. Shouldn't we be using the name of the machine pool from the install config instead?

Copy link
Member Author

Choose a reason for hiding this comment

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

Hey @staebler this is just being consistent with the machineset name https://github.com/openshift/installer/pull/519/files#diff-a416ed747e927b21b9c26916a1129cdfR46
To reduce possible side effects for machines matching more than one owner label
https://github.com/kubernetes-sigs/cluster-api/blob/master/pkg/controller/machineset/controller.go#L304

Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not sure what the purpose of having a name in the install-config.yml for each worker machine pool is if we are not going to use it for the name of the machine set.

@enxebre
Copy link
Member Author

enxebre commented Oct 23, 2018

ping @abhinavdahiya @csrwng

Copy link
Contributor

@abhinavdahiya abhinavdahiya left a comment

Choose a reason for hiding this comment

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

@enxebre can you also make sure this is correct for other objects... Like the master, libvirt worker, openstack worker.

@csrwng
Copy link
Contributor

csrwng commented Oct 23, 2018

It's not needed on masters because there's no machineset for them, but yes it should be changed in libvirt and openstack for workers

@openshift-ci-robot openshift-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Oct 23, 2018
@enxebre
Copy link
Member Author

enxebre commented Oct 23, 2018

Not sure about the CI error. I'm seeing same here openshift/cluster-api-provider-aws#81
CI logs look like machines come up but they don't become nodes. Deploying installer locally all seems ok

@enxebre
Copy link
Member Author

enxebre commented Oct 24, 2018

/test e2e-aws

1 similar comment
@enxebre
Copy link
Member Author

enxebre commented Oct 24, 2018

/test e2e-aws

@abhinavdahiya
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 24, 2018
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abhinavdahiya, 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 Oct 24, 2018
@openshift-merge-robot openshift-merge-robot merged commit f6171bb into openshift:master Oct 24, 2018
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. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants