Skip to content

Commit d27d01d

Browse files
committed
pkg/infrastructure: remove terraform references
Updates the infrastructure provider switch to remove outdated references to Terraform. The only remaining references were for platforms that do not support infrastructure provisioning: oVirt which is retired and none/external which do not support IPI and should return an error in this case.
1 parent e064c5f commit d27d01d

File tree

1 file changed

+1
-14
lines changed

1 file changed

+1
-14
lines changed

pkg/infrastructure/platform/platform.go

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,14 @@ import (
1717
openstackcapi "github.com/openshift/installer/pkg/infrastructure/openstack/clusterapi"
1818
powervscapi "github.com/openshift/installer/pkg/infrastructure/powervs/clusterapi"
1919
vspherecapi "github.com/openshift/installer/pkg/infrastructure/vsphere/clusterapi"
20-
"github.com/openshift/installer/pkg/terraform"
21-
"github.com/openshift/installer/pkg/terraform/stages/ovirt"
2220
awstypes "github.com/openshift/installer/pkg/types/aws"
2321
azuretypes "github.com/openshift/installer/pkg/types/azure"
2422
baremetaltypes "github.com/openshift/installer/pkg/types/baremetal"
25-
externaltypes "github.com/openshift/installer/pkg/types/external"
2623
"github.com/openshift/installer/pkg/types/featuregates"
2724
gcptypes "github.com/openshift/installer/pkg/types/gcp"
2825
ibmcloudtypes "github.com/openshift/installer/pkg/types/ibmcloud"
29-
nonetypes "github.com/openshift/installer/pkg/types/none"
3026
nutanixtypes "github.com/openshift/installer/pkg/types/nutanix"
3127
openstacktypes "github.com/openshift/installer/pkg/types/openstack"
32-
ovirttypes "github.com/openshift/installer/pkg/types/ovirt"
3328
powervstypes "github.com/openshift/installer/pkg/types/powervs"
3429
vspheretypes "github.com/openshift/installer/pkg/types/vsphere"
3530
)
@@ -55,16 +50,8 @@ func ProviderForPlatform(platform string, fg featuregates.FeatureGate) (infrastr
5550
return clusterapi.InitializeProvider(&powervscapi.Provider{}), nil
5651
case openstacktypes.Name:
5752
return clusterapi.InitializeProvider(openstackcapi.Provider{}), nil
58-
case ovirttypes.Name:
59-
return terraform.InitializeProvider(ovirt.PlatformStages), nil
6053
case vspheretypes.Name:
6154
return clusterapi.InitializeProvider(vspherecapi.Provider{}), nil
62-
case nonetypes.Name:
63-
// terraform is not used when the platform is "none"
64-
return terraform.InitializeProvider([]terraform.Stage{}), nil
65-
case externaltypes.Name:
66-
// terraform is not used when the platform is "external"
67-
return terraform.InitializeProvider([]terraform.Stage{}), nil
6855
}
69-
return nil, fmt.Errorf("unsupported platform %q", platform)
56+
return nil, fmt.Errorf("platform %q does not support automated infrastructure provisioning", platform)
7057
}

0 commit comments

Comments
 (0)