Skip to content

Commit 5684032

Browse files
Merge pull request #10051 from patrickdillon/prune-tf-pkgs
no-jira: Prune unused terraform packages
2 parents d95c628 + 2794b5d commit 5684032

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+1
-13804
lines changed

go.mod

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ require (
7474
github.com/h2non/filetype v1.0.12
7575
github.com/hashicorp/go-multierror v1.1.1
7676
github.com/hashicorp/go-version v1.7.0
77-
github.com/hashicorp/terraform-exec v0.17.3
7877
github.com/jarcoal/httpmock v1.3.1
7978
github.com/jongio/azidext/go/azidext v0.5.0
8079
github.com/kdomanski/iso9660 v0.2.1
@@ -241,7 +240,6 @@ require (
241240
github.com/hashicorp/errwrap v1.1.0 // indirect
242241
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
243242
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
244-
github.com/hashicorp/terraform-json v0.14.0 // indirect
245243
github.com/hexops/gotextdiff v1.0.3 // indirect
246244
github.com/inconshreveable/mousetrap v1.1.0 // indirect
247245
github.com/itchyny/gojq v0.12.8 // indirect
@@ -301,7 +299,6 @@ require (
301299
github.com/x448/float16 v0.8.4 // indirect
302300
github.com/xlab/treeprint v1.2.0 // indirect
303301
github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
304-
github.com/zclconf/go-cty v1.11.0 // indirect
305302
go.mongodb.org/mongo-driver v1.17.2 // indirect
306303
go.opencensus.io v0.24.0 // indirect
307304
go.opentelemetry.io/auto/sdk v1.1.0 // indirect

go.sum

Lines changed: 0 additions & 52 deletions
Large diffs are not rendered by default.

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
}

pkg/terraform/diagnose.go

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

pkg/terraform/diagnose_test.go

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

pkg/terraform/doc.go

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

0 commit comments

Comments
 (0)