Merge pull request openshift#8610 from r4f4/remove-terraform-libvirt

OCPBUGS-35523: remove terraform libvirt from the installer

Author: openshift-merge-bot[bot]

cmd/openshift-install/destroy.go

@@ -22,7 +22,6 @@ import (
 	_ "github.com/openshift/installer/pkg/destroy/baremetal"
 	_ "github.com/openshift/installer/pkg/destroy/gcp"
 	_ "github.com/openshift/installer/pkg/destroy/ibmcloud"
-	_ "github.com/openshift/installer/pkg/destroy/libvirt"
 	_ "github.com/openshift/installer/pkg/destroy/nutanix"
 	_ "github.com/openshift/installer/pkg/destroy/openstack"
 	_ "github.com/openshift/installer/pkg/destroy/ovirt"

data/data/install.openshift.io_installconfigs.yaml

@@ -649,10 +649,6 @@ spec:
                             type: string
                           type: array
                       type: object
-                    libvirt:
-                      description: Libvirt is the configuration used when installing
-                        on libvirt.
-                      type: object
                     nutanix:
                       description: Nutanix is the configuration used when installing
                         on Nutanix.
@@ -1561,10 +1557,6 @@ spec:
                           type: string
                         type: array
                     type: object
-                  libvirt:
-                    description: Libvirt is the configuration used when installing
-                      on libvirt.
-                    type: object
                   nutanix:
                     description: Nutanix is the configuration used when installing
                       on Nutanix.
@@ -2099,8 +2091,8 @@ spec:
                 description: MachineNetwork is the list of IP address pools for machines.
                   This field replaces MachineCIDR, and if set MachineCIDR must be
                   empty or match the first entry in the list. Default is 10.0.0.0/16
-                  for all platforms other than libvirt and Power VS. For libvirt,
-                  the default is 192.168.126.0/24. For Power VS, the default is 192.168.0.0/24.
+                  for all platforms other than Power VS. For Power VS, the default
+                  is 192.168.0.0/24.
                 items:
                   description: MachineNetworkEntry is a single IP address block for
                     node IP blocks.
@@ -3385,51 +3377,6 @@ spec:
                 required:
                 - region
                 type: object
-              libvirt:
-                description: Libvirt is the configuration used when installing on
-                  libvirt.
-                properties:
-                  URI:
-                    default: qemu+tcp://192.168.122.1/system
-                    description: URI is the identifier for the libvirtd connection.  It
-                      must be reachable from both the host (where the installer is
-                      run) and the cluster (where the cluster-API controller pod will
-                      be running). Default is qemu+tcp://192.168.122.1/system
-                    type: string
-                  defaultMachinePlatform:
-                    description: DefaultMachinePlatform is the default configuration
-                      used when installing on libvirt for machine pools which do not
-                      define their own platform configuration. Default will set the
-                      image field to the latest RHCOS image.
-                    type: object
-                  network:
-                    description: Network
-                    properties:
-                      dnsmasqOptions:
-                        description: DnsmasqOptions is the dnsmasq options to be used
-                          when installing on libvirt.
-                        items:
-                          description: DnsmasqOption contains the name and value of
-                            the option to configure in the libvirt network.
-                          properties:
-                            name:
-                              description: The dnsmasq option name. A full list of
-                                options and an explanation for each can be found in
-                                /etc/dnsmasq.conf
-                              type: string
-                            value:
-                              description: The value that is being set for the particular
-                                option.
-                              type: string
-                          type: object
-                        type: array
-                      if:
-                        default: tt0
-                        description: The interface make used for the network. Default
-                          is tt0.
-                        type: string
-                    type: object
-                type: object
               none:
                 description: None is the empty configuration used when installing
                   on an unsupported platform.

pkg/asset/cluster/libvirt/OWNERS

@@ -12,7 +12,6 @@ import (
 	"github.com/openshift/installer/pkg/asset/cluster/baremetal"
 	"github.com/openshift/installer/pkg/asset/cluster/gcp"
 	"github.com/openshift/installer/pkg/asset/cluster/ibmcloud"
-	"github.com/openshift/installer/pkg/asset/cluster/libvirt"
 	clustermetadata "github.com/openshift/installer/pkg/asset/cluster/metadata"
 	"github.com/openshift/installer/pkg/asset/cluster/nutanix"
 	"github.com/openshift/installer/pkg/asset/cluster/openstack"
@@ -29,7 +28,6 @@ import (
 	"github.com/openshift/installer/pkg/types/featuregates"
 	gcptypes "github.com/openshift/installer/pkg/types/gcp"
 	ibmcloudtypes "github.com/openshift/installer/pkg/types/ibmcloud"
-	libvirttypes "github.com/openshift/installer/pkg/types/libvirt"
 	nonetypes "github.com/openshift/installer/pkg/types/none"
 	nutanixtypes "github.com/openshift/installer/pkg/types/nutanix"
 	openstacktypes "github.com/openshift/installer/pkg/types/openstack"
@@ -83,8 +81,6 @@ func (m *Metadata) Generate(parents asset.Parents) (err error) {
 	switch installConfig.Config.Platform.Name() {
 	case awstypes.Name:
 		metadata.ClusterPlatformMetadata.AWS = aws.Metadata(clusterID.UUID, clusterID.InfraID, installConfig.Config)
-	case libvirttypes.Name:
-		metadata.ClusterPlatformMetadata.Libvirt = libvirt.Metadata(installConfig.Config)
 	case openstacktypes.Name:
 		metadata.ClusterPlatformMetadata.OpenStack = openstack.Metadata(clusterID.InfraID, installConfig.Config)
 	case azuretypes.Name:

pkg/asset/cluster/libvirt/libvirt.go

@@ -21,7 +21,6 @@ import (
 	configv1 "github.com/openshift/api/config/v1"
 	machinev1 "github.com/openshift/api/machine/v1"
 	machinev1beta1 "github.com/openshift/api/machine/v1beta1"
-	libvirtprovider "github.com/openshift/cluster-api-provider-libvirt/pkg/apis/libvirtproviderconfig/v1beta1"
 	ovirtprovider "github.com/openshift/cluster-api-provider-ovirt/pkg/apis/ovirtprovider/v1beta1"
 	"github.com/openshift/installer/pkg/asset"
 	"github.com/openshift/installer/pkg/asset/ignition"
@@ -47,7 +46,6 @@ import (
 	baremetaltfvars "github.com/openshift/installer/pkg/tfvars/baremetal"
 	gcptfvars "github.com/openshift/installer/pkg/tfvars/gcp"
 	ibmcloudtfvars "github.com/openshift/installer/pkg/tfvars/ibmcloud"
-	libvirttfvars "github.com/openshift/installer/pkg/tfvars/libvirt"
 	nutanixtfvars "github.com/openshift/installer/pkg/tfvars/nutanix"
 	openstacktfvars "github.com/openshift/installer/pkg/tfvars/openstack"
 	ovirttfvars "github.com/openshift/installer/pkg/tfvars/ovirt"
@@ -59,7 +57,6 @@ import (
 	"github.com/openshift/installer/pkg/types/external"
 	"github.com/openshift/installer/pkg/types/gcp"
 	"github.com/openshift/installer/pkg/types/ibmcloud"
-	"github.com/openshift/installer/pkg/types/libvirt"
 	"github.com/openshift/installer/pkg/types/none"
 	"github.com/openshift/installer/pkg/types/nutanix"
 	"github.com/openshift/installer/pkg/types/openstack"
@@ -754,38 +751,6 @@ func (t *TerraformVariables) Generate(parents asset.Parents) error {
 			Filename: TfPlatformVarsFileName,
 			Data:     data,
 		})
-	case libvirt.Name:
-		masters, err := mastersAsset.Machines()
-		if err != nil {
-			return err
-		}
-		// convert options list to a list of mappings which can be consumed by terraform
-		var dnsmasqoptions []map[string]string
-		for _, option := range installConfig.Config.Platform.Libvirt.Network.DnsmasqOptions {
-			dnsmasqoptions = append(dnsmasqoptions,
-				map[string]string{
-					"option_name":  option.Name,
-					"option_value": option.Value})
-		}
-
-		data, err = libvirttfvars.TFVars(
-			libvirttfvars.TFVarsSources{
-				MasterConfig:   masters[0].Spec.ProviderSpec.Value.Object.(*libvirtprovider.LibvirtMachineProviderConfig),
-				OsImage:        string(*rhcosImage),
-				MachineCIDR:    &installConfig.Config.Networking.MachineNetwork[0].CIDR.IPNet,
-				Bridge:         installConfig.Config.Platform.Libvirt.Network.IfName,
-				MasterCount:    masterCount,
-				Architecture:   installConfig.Config.ControlPlane.Architecture,
-				DnsmasqOptions: dnsmasqoptions,
-			},
-		)
-		if err != nil {
-			return errors.Wrapf(err, "failed to get %s Terraform variables", platform)
-		}
-		t.FileList = append(t.FileList, &asset.File{
-			Filename: TfPlatformVarsFileName,
-			Data:     data,
-		})
 	case openstack.Name:
 		data, err = openstacktfvars.TFVars(
 			installConfig,

pkg/asset/cluster/metadata.go

@@ -89,7 +89,6 @@ func (a *InstallConfig) Generate(parents asset.Parents) error {
 	}
 
 	a.Config.AWS = platform.AWS
-	a.Config.Libvirt = platform.Libvirt
 	a.Config.None = platform.None
 	a.Config.OpenStack = platform.OpenStack
 	a.Config.VSphere = platform.VSphere

pkg/asset/cluster/tfvars/tfvars.go

@@ -14,7 +14,6 @@ import (
 	baremetalconfig "github.com/openshift/installer/pkg/asset/installconfig/baremetal"
 	gcpconfig "github.com/openshift/installer/pkg/asset/installconfig/gcp"
 	ibmcloudconfig "github.com/openshift/installer/pkg/asset/installconfig/ibmcloud"
-	libvirtconfig "github.com/openshift/installer/pkg/asset/installconfig/libvirt"
 	nutanixconfig "github.com/openshift/installer/pkg/asset/installconfig/nutanix"
 	openstackconfig "github.com/openshift/installer/pkg/asset/installconfig/openstack"
 	powervsconfig "github.com/openshift/installer/pkg/asset/installconfig/powervs"
@@ -26,7 +25,6 @@ import (
 	"github.com/openshift/installer/pkg/types/external"
 	"github.com/openshift/installer/pkg/types/gcp"
 	"github.com/openshift/installer/pkg/types/ibmcloud"
-	"github.com/openshift/installer/pkg/types/libvirt"
 	"github.com/openshift/installer/pkg/types/none"
 	"github.com/openshift/installer/pkg/types/nutanix"
 	"github.com/openshift/installer/pkg/types/openstack"
@@ -81,11 +79,6 @@ func (a *platform) Generate(asset.Parents) error {
 		if err != nil {
 			return err
 		}
-	case libvirt.Name:
-		a.Libvirt, err = libvirtconfig.Platform()
-		if err != nil {
-			return err
-		}
 	case external.Name:
 		a.External = &external.Platform{}
 	case none.Name: