Merge pull request openshift#8630 from neisw/revert-8221-1718750149043

Revert openshift#8221 "SPLAT-1553: Added multi vCenter support for capi installer."

Author: openshift-merge-bot[bot]

cmd/openshift-install/main.go

@@ -13,7 +13,6 @@ import (
 	terminal "golang.org/x/term"
 	"k8s.io/klog"
 	klogv2 "k8s.io/klog/v2"
-	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/manager/signals"
 
 	"github.com/openshift/installer/cmd/openshift-install/command"
@@ -34,8 +33,6 @@ func main() {
 	fsv2.Set("stderrthreshold", "4")
 	klogv2.SetOutput(io.Discard)
 
-	ctrl.SetLogger(klogv2.Background())
-
 	installerMain()
 }
 

data/data/install.openshift.io_installconfigs.yaml

@@ -4638,7 +4638,7 @@ spec:
                       - server
                       - user
                       type: object
-                    maxItems: 3
+                    maxItems: 1
                     minItems: 1
                     type: array
                 type: object

pkg/asset/cluster/vsphere/vsphere.go

@@ -9,20 +9,12 @@ import (
 func Metadata(config *types.InstallConfig) *typesvsphere.Metadata {
 	terraformPlatform := "vsphere"
 
-	metadata := &typesvsphere.Metadata{
+	// Since currently we only support a single vCenter
+	// just use the first entry in the VCenters slice.
+	return &typesvsphere.Metadata{
+		VCenter:           config.VSphere.VCenters[0].Server,
+		Username:          config.VSphere.VCenters[0].Username,
+		Password:          config.VSphere.VCenters[0].Password,
 		TerraformPlatform: terraformPlatform,
 	}
-
-	vcenterList := []typesvsphere.VCenters{}
-	for _, vcenter := range config.VSphere.VCenters {
-		vcenterDef := typesvsphere.VCenters{
-			VCenter:  vcenter.Server,
-			Username: vcenter.Username,
-			Password: vcenter.Password,
-		}
-		vcenterList = append(vcenterList, vcenterDef)
-	}
-	metadata.VCenters = vcenterList
-
-	return metadata
 }

pkg/asset/machines/vsphere/capimachines.go

@@ -156,16 +156,6 @@ func GenerateMachines(ctx context.Context, clusterID string, config *types.Insta
 			Object: vsphereMachine,
 		})
 
-		// Need to determine the infrastructure ref since there may be multi vcenters.
-		clusterName := clusterID
-		for index, vcenter := range config.Platform.VSphere.VCenters {
-			if vcenter.Server == providerSpec.Workspace.Server {
-				clusterName = fmt.Sprintf("%v-%d", clusterID, index)
-				break
-			}
-		}
-
-		// Create capi machine for vspheremachine
 		machine := &capi.Machine{
 			ObjectMeta: metav1.ObjectMeta{
 				Namespace: capiutils.Namespace,
@@ -175,7 +165,7 @@ func GenerateMachines(ctx context.Context, clusterID string, config *types.Insta
 				},
 			},
 			Spec: capi.MachineSpec{
-				ClusterName: clusterName,
+				ClusterName: clusterID,
 				Bootstrap: capi.Bootstrap{
 					DataSecretName: ptr.To(fmt.Sprintf("%s-%s", clusterID, role)),
 				},
@@ -225,15 +215,6 @@ func GenerateMachines(ctx context.Context, clusterID string, config *types.Insta
 			Object: bootstrapVSphereMachine,
 		})
 
-		// Need to determine the infrastructure ref since there may be multi vcenters.
-		clusterName := clusterID
-		for index, vcenter := range config.Platform.VSphere.VCenters {
-			if vcenter.Server == bootstrapSpec.Server {
-				clusterName = fmt.Sprintf("%v-%d", clusterID, index)
-				break
-			}
-		}
-
 		bootstrapMachine := &capi.Machine{
 			ObjectMeta: metav1.ObjectMeta{
 				Name: bootstrapVSphereMachine.Name,
@@ -242,7 +223,7 @@ func GenerateMachines(ctx context.Context, clusterID string, config *types.Insta
 				},
 			},
 			Spec: capi.MachineSpec{
-				ClusterName: clusterName,
+				ClusterName: clusterID,
 				Bootstrap: capi.Bootstrap{
 					DataSecretName: ptr.To(fmt.Sprintf("%s-bootstrap", clusterID)),
 				},

pkg/asset/manifests/aws/cluster.go

@@ -276,13 +276,11 @@ func GenerateClusterAssets(ic *installconfig.InstallConfig, clusterID *installco
 
 	return &capiutils.GenerateClusterAssetsOutput{
 		Manifests: manifests,
-		InfrastructureRefs: []*corev1.ObjectReference{
-			{
-				APIVersion: capa.GroupVersion.String(),
-				Kind:       "AWSCluster",
-				Name:       awsCluster.Name,
-				Namespace:  awsCluster.Namespace,
-			},
+		InfrastructureRef: &corev1.ObjectReference{
+			APIVersion: capa.GroupVersion.String(),
+			Kind:       "AWSCluster",
+			Name:       awsCluster.Name,
+			Namespace:  awsCluster.Namespace,
 		},
 	}, nil
 }

pkg/asset/manifests/azure/cluster.go

@@ -175,13 +175,11 @@ func GenerateClusterAssets(installConfig *installconfig.InstallConfig, clusterID
 
 	return &capiutils.GenerateClusterAssetsOutput{
 		Manifests: manifests,
-		InfrastructureRefs: []*corev1.ObjectReference{
-			{
-				APIVersion: capz.GroupVersion.String(),
-				Kind:       "AzureCluster",
-				Name:       azureCluster.Name,
-				Namespace:  azureCluster.Namespace,
-			},
+		InfrastructureRef: &corev1.ObjectReference{
+			APIVersion: capz.GroupVersion.String(),
+			Kind:       "AzureCluster",
+			Name:       azureCluster.Name,
+			Namespace:  azureCluster.Namespace,
 		},
 	}, nil
 }

pkg/asset/manifests/capiutils/manifest.go

@@ -13,8 +13,8 @@ const (
 
 // GenerateClusterAssetsOutput is the output of GenerateClusterAssets.
 type GenerateClusterAssetsOutput struct {
-	Manifests          []*asset.RuntimeFile
-	InfrastructureRefs []*corev1.ObjectReference
+	Manifests         []*asset.RuntimeFile
+	InfrastructureRef *corev1.ObjectReference
 }
 
 // GenerateMachinesOutput is the output of GenerateMachines.

pkg/asset/manifests/cloudproviderconfig.go

@@ -11,7 +11,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/yaml"
 
-	"github.com/openshift/api/features"
 	"github.com/openshift/installer/pkg/asset"
 	"github.com/openshift/installer/pkg/asset/installconfig"
 	ibmcloudmachines "github.com/openshift/installer/pkg/asset/machines/ibmcloud"
@@ -315,15 +314,7 @@ func (cpc *CloudProviderConfig) Generate(dependencies asset.Parents) error {
 		}
 		cm.Data[cloudProviderConfigDataKey] = powervsConfig
 	case vspheretypes.Name:
-		var vsphereConfig string
-		var err error
-		// When we GA multi vcenter, we should only support yaml generation here.
-		if installConfig.Config.EnabledFeatureGates().Enabled(features.FeatureGateVSphereMultiVCenters) {
-			vsphereConfig, err = vspheremanifests.CloudProviderConfigYaml(clusterID.InfraID, installConfig.Config.Platform.VSphere)
-		} else {
-			vsphereConfig, err = vspheremanifests.CloudProviderConfigIni(clusterID.InfraID, installConfig.Config.Platform.VSphere)
-		}
-
+		vsphereConfig, err := vspheremanifests.CloudProviderConfigIni(clusterID.InfraID, installConfig.Config.Platform.VSphere)
 		if err != nil {
 			return errors.Wrap(err, "could not create cloud provider config")
 		}

pkg/asset/manifests/clusterapi/cluster.go

@@ -6,7 +6,6 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -87,6 +86,20 @@ func (c *Cluster) Generate(dependencies asset.Parents) error {
 	namespace.SetGroupVersionKind(corev1.SchemeGroupVersion.WithKind("Namespace"))
 	c.FileList = append(c.FileList, &asset.RuntimeFile{Object: namespace, File: asset.File{Filename: "000_capi-namespace.yaml"}})
 
+	cluster := &clusterv1.Cluster{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      clusterID.InfraID,
+			Namespace: capiutils.Namespace,
+		},
+		Spec: clusterv1.ClusterSpec{
+			ClusterNetwork: &clusterv1.ClusterNetwork{
+				APIServerPort: ptr.To[int32](6443),
+			},
+		},
+	}
+	cluster.SetGroupVersionKind(clusterv1.GroupVersion.WithKind("Cluster"))
+	c.FileList = append(c.FileList, &asset.RuntimeFile{Object: cluster, File: asset.File{Filename: "01_capi-cluster.yaml"}})
+
 	var out *capiutils.GenerateClusterAssetsOutput
 	switch platform := installConfig.Config.Platform.Name(); platform {
 	case awstypes.Name:
@@ -136,28 +149,12 @@ func (c *Cluster) Generate(dependencies asset.Parents) error {
 		return fmt.Errorf("unsupported platform %q", platform)
 	}
 
-	if len(out.InfrastructureRefs) == 0 {
+	// Set the infrastructure reference in the Cluster object.
+	cluster.Spec.InfrastructureRef = out.InfrastructureRef
+	if cluster.Spec.InfrastructureRef == nil {
 		return fmt.Errorf("failed to generate manifests: cluster.Spec.InfrastructureRef was never set")
 	}
 
-	logrus.Infof("Adding clusters...")
-	for index, infra := range out.InfrastructureRefs {
-		cluster := &clusterv1.Cluster{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      infra.Name,
-				Namespace: capiutils.Namespace,
-			},
-			Spec: clusterv1.ClusterSpec{
-				ClusterNetwork: &clusterv1.ClusterNetwork{
-					APIServerPort: ptr.To[int32](6443),
-				},
-			},
-		}
-		cluster.Spec.InfrastructureRef = infra
-		cluster.SetGroupVersionKind(clusterv1.GroupVersion.WithKind("Cluster"))
-		c.FileList = append(c.FileList, &asset.RuntimeFile{Object: cluster, File: asset.File{Filename: fmt.Sprintf("01_capi-cluster-%d.yaml", index)}})
-	}
-
 	// Append the infrastructure manifests.
 	c.FileList = append(c.FileList, out.Manifests...)
 

pkg/asset/manifests/gcp/cluster.go

@@ -133,13 +133,11 @@ func GenerateClusterAssets(installConfig *installconfig.InstallConfig, clusterID
 
 	return &capiutils.GenerateClusterAssetsOutput{
 		Manifests: manifests,
-		InfrastructureRefs: []*corev1.ObjectReference{
-			{
-				APIVersion: capg.GroupVersion.String(),
-				Kind:       "GCPCluster",
-				Name:       gcpCluster.Name,
-				Namespace:  gcpCluster.Namespace,
-			},
+		InfrastructureRef: &corev1.ObjectReference{
+			APIVersion: capg.GroupVersion.String(),
+			Kind:       "GCPCluster",
+			Name:       gcpCluster.Name,
+			Namespace:  gcpCluster.Namespace,
 		},
 	}, nil
 }