Skip to content

Commit 78a8275

Browse files
committed
CORS-3419: Include baremetal IPI in openshift-installer
Now that we do not dynamically link to libvirt, there is no need to restrict baremetal IPI to the openshift-baremetal-installer binary and it can be included in all builds of the installer.
1 parent 697cf45 commit 78a8275

File tree

6 files changed

+2
-30
lines changed

6 files changed

+2
-30
lines changed

pkg/destroy/baremetal/baremetal.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
//go:build baremetal
2-
// +build baremetal
3-
41
package baremetal
52

63
import (

pkg/destroy/baremetal/register.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
//go:build baremetal
2-
// +build baremetal
3-
41
// Package baremetal provides a cluster-destroyer for bare metal clusters.
52
package baremetal
63

pkg/types/baremetal/validation/libvirt.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
//go:build baremetal
2-
// +build baremetal
3-
41
package validation
52

63
import (
@@ -12,10 +9,6 @@ import (
129
"github.com/sirupsen/logrus"
1310
)
1411

15-
func init() {
16-
interfaceValidator = libvirtInterfaceValidator
17-
}
18-
1912
// libvirtInterfaceValidator fetches the valid interface names from a particular libvirt instance, and returns a closure
2013
// to validate if an interface is found among them
2114
func libvirtInterfaceValidator(libvirtURI string) (func(string) error, error) {

pkg/types/baremetal/validation/platform.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828

2929
type interfaceValidatorFactory func(string) (func(string) error, error)
3030

31-
var interfaceValidator interfaceValidatorFactory
31+
var interfaceValidator interfaceValidatorFactory = libvirtInterfaceValidator
3232

3333
func validateIPinMachineCIDR(vip string, n *types.Networking) error {
3434
var networks []string

pkg/types/installconfig.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ var (
3838
PlatformNames = []string{
3939
aws.Name,
4040
azure.Name,
41+
baremetal.Name,
4142
gcp.Name,
4243
ibmcloud.Name,
4344
nutanix.Name,
@@ -49,7 +50,6 @@ var (
4950
// hidden-but-supported platform names. This list isn't presented
5051
// to the user in the interactive wizard.
5152
HiddenPlatformNames = []string{
52-
baremetal.Name,
5353
external.Name,
5454
none.Name,
5555
}

pkg/types/installconfig_baremetal.go

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)