Skip to content
This repository was archived by the owner on Apr 28, 2020. It is now read-only.

Commit 657b7a4

Browse files
Jiri Tomaseksuomiy
authored andcommitted
Update selector to get machine role (#379)
* Update selector to get machine role * rename getHostRole selector to getMachineRole * move the getMachineRole to machine selectors * fix the label to identify machine role * add tests for machine selectors
1 parent 67b1a22 commit 657b7a4

File tree

7 files changed

+26
-7
lines changed

7 files changed

+26
-7
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { getHostRole } from '../../selectors';
1+
import { getMachineRole } from '../../selectors';
22
import { DASHES } from '../../constants';
33

4-
export const BaremetalHostRole = ({ machine }) => getHostRole(machine) || DASHES;
4+
export const BaremetalHostRole = ({ machine }) => getMachineRole(machine) || DASHES;

src/components/BareMetalHosts/fixtures/BaremetalHostRole.fixture.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export default [
88
machine: {
99
metadata: {
1010
labels: {
11-
'machine.openshift.io/cluster-api-machine-role': 'worker',
11+
'sigs.k8s.io/cluster-api-machine-role': 'worker',
1212
},
1313
},
1414
},

src/selectors/host/selectors.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@ import { get } from 'lodash';
22

33
export const getOperationalStatus = host => get(host, 'status.operationalStatus');
44
export const getProvisioningState = host => get(host, 'status.provisioning.state');
5-
6-
export const getHostRole = hostMachine =>
7-
get(hostMachine, ['metadata', 'labels', 'machine.openshift.io/cluster-api-machine-role']);
8-
95
export const getHostMachineName = host => get(host, 'spec.machineRef.name');
106
export const getHostBmcAddress = host => get(host, 'spec.bmc.address');
117
export const getHostErrorMessage = host => get(host, 'status.errorMessage');
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
export default [
2+
{
3+
machine: {
4+
metadata: {
5+
labels: {
6+
'sigs.k8s.io/cluster-api-machine-role': 'worker',
7+
},
8+
},
9+
},
10+
},
11+
];

src/selectors/machine/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
export * from './combined';
2+
export * from './selectors';

src/selectors/machine/selectors.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import { get } from 'lodash';
2+
3+
export const getMachineRole = machine => get(machine, ['metadata', 'labels', 'sigs.k8s.io/cluster-api-machine-role']);
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import fixtures from '../fixtures/selectors.fixture';
2+
import { getMachineRole } from '../selectors';
3+
4+
describe('getMachineRole selector', () => {
5+
it('returns machine role', () => {
6+
expect(getMachineRole(fixtures[0].machine)).toEqual('worker');
7+
});
8+
});

0 commit comments

Comments
 (0)