Skip to content

Commit 85e1610

Browse files
committed
WIP: Integrate baremetal-operator with machine-api-operator
1 parent 1b52288 commit 85e1610

9 files changed

+566
-8
lines changed

Diff for: install/0000_30_machine-api-operator_01_images.configmap.yaml

+7-1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,11 @@ data:
1212
"clusterAPIControllerLibvirt": "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0",
1313
"clusterAPIControllerBareMetal": "quay.io/openshift/origin-baremetal-machine-controllers:v4.0.0",
1414
"clusterAPIControllerAzure": "quay.io/openshift/origin-azure-machine-controllers:v4.0.0",
15-
"clusterAPIControllerGCP": "quay.io/openshift/origin-gcp-machine-controllers:v4.0.0"
15+
"clusterAPIControllerGCP": "quay.io/openshift/origin-gcp-machine-controllers:v4.0.0",
16+
"baremetalOperator": "quay.io/openshift/origin-baremetal-operator:v4.2.0",
17+
"baremetalIronic": "quay.io/openshift/origin-ironic-image:v4.2.0",
18+
"baremetalIronicInspector": "quay.io/openshift/origin-ironic-inspector-image:v4.2.0",
19+
"baremetalIpaDownloader": "quay.io/openshift/origin-ironic-ipa-downloader:v4.2.0",
20+
"baremetalRhcosDownloader": "quay.io/openshift/origin-ironic-rhcos-downloader:v4.2.0",
21+
"baremetalStaticIpManager": "quay.io/openshift/origin-ironic-static-ip-manager:v4.2.0"
1622
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
apiVersion: apiextensions.k8s.io/v1beta1
2+
kind: CustomResourceDefinition
3+
metadata:
4+
name: baremetalhosts.metal3.io
5+
spec:
6+
group: metal3.io
7+
names:
8+
kind: BareMetalHost
9+
listKind: BareMetalHostList
10+
plural: baremetalhosts
11+
singular: baremetalhost
12+
shortNames:
13+
- bmh
14+
- bmhost
15+
scope: Namespaced
16+
version: v1alpha1
17+
subresources:
18+
status: {}
19+
additionalPrinterColumns:
20+
- JSONPath: .status.operationalStatus
21+
description: Operational status
22+
name: Status
23+
type: string
24+
- JSONPath: .status.provisioning.state
25+
description: Provisioning status
26+
name: Provisioning Status
27+
type: string
28+
- JSONPath: .spec.machineRef.name
29+
description: Machine using this host
30+
name: Machine
31+
type: string
32+
- JSONPath: .spec.bmc.address
33+
description: Address of management controler
34+
name: BMC
35+
type: string
36+
- JSONPath: .status.hardwareProfile
37+
description: The type of hardware detected
38+
name: Hardware Profile
39+
type: string
40+
- JSONPath: .spec.online
41+
description: Whether the host is online or not
42+
name: Online
43+
type: string
44+
- JSONPath: .status.errorMessage
45+
description: Most recent error
46+
name: Error
47+
type: string

0 commit comments

Comments
 (0)