Skip to content

Drop unused labels #255

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

Merged
openshift-merge-robot merged 1 commit into from
Apr 2, 2019
Merged

Drop unused labels #255

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 2 additions & 15 deletions pkg/controller/machinehealthcheck/machinehealthcheck_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,30 +331,17 @@ func hasMatchingLabels(machineHealthCheck *healthcheckingv1alpha1.MachineHealthC
}

func isMaster(machine mapiv1.Machine, client client.Client) bool {
machineMasterLabels := []string{
"machine.openshift.io/cluster-api-machine-role",
"machine.openshift.io/cluster-api-machine-type",
"sigs.k8s.io/cluster-api-machine-role",
"sigs.k8s.io/cluster-api-machine-type",
}
nodeMasterLabels := []string{
masterLabels := []string{
Copy link
Copy Markdown

@cynepco3hahue cynepco3hahue Mar 25, 2019

Choose a reason for hiding this comment

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

Does it make sense to check machine labels at all?
IMHO the only proper way is to check node labels that machine reference to.

Copy link
Copy Markdown
Member

@enxebre enxebre Mar 25, 2019

Choose a reason for hiding this comment

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

I agree. @vikaschoudhary16 as part of this effort can we drop labels here https://github.com/openshift/installer/tree/master/pkg/asset/machines/aws
And update https://github.com/openshift/origin/pull/22090/files#r267287918 to fetch from node accordingly cc @ingvagabund @derekwaynecarr

"node-role.kubernetes.io/master",
}

machineLabels := labels.Set(machine.Labels)
for _, masterLabel := range machineMasterLabels {
if machineLabels.Get(masterLabel) == "master" {
return true
}
}

node, err := getNodeFromMachine(machine, client)
if err != nil {
glog.Warningf("Couldn't get node for machine %s", machine.Name)
return false
}
nodeLabels := labels.Set(node.Labels)
for _, masterLabel := range nodeMasterLabels {
for _, masterLabel := range masterLabels {
if nodeLabels.Has(masterLabel) {
return true
}
Expand Down