From f80929174127a60626fb53bf56e3698a74c62995 Mon Sep 17 00:00:00 2001 From: Abhinav Dahiya Date: Tue, 2 Jul 2019 09:18:00 -0700 Subject: [PATCH] manifests/infrastructure.go: drop double assignment for .status.platformType .status.platformType was being set twice by changes in https://github.com/openshift/installer/pull/1930 This move the assignment to single location after the switch. --- pkg/asset/manifests/infrastructure.go | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkg/asset/manifests/infrastructure.go b/pkg/asset/manifests/infrastructure.go index 2a7b7b391d0..09967643c36 100644 --- a/pkg/asset/manifests/infrastructure.go +++ b/pkg/asset/manifests/infrastructure.go @@ -75,35 +75,28 @@ func (i *Infrastructure) Generate(dependencies asset.Parents) error { switch installConfig.Config.Platform.Name() { case aws.Name: - config.Status.Platform = configv1.AWSPlatformType config.Status.PlatformStatus.Type = configv1.AWSPlatformType config.Status.PlatformStatus.AWS = &configv1.AWSPlatformStatus{ Region: installConfig.Config.Platform.AWS.Region, } case azure.Name: - config.Status.Platform = configv1.AzurePlatformType config.Status.PlatformStatus.Type = configv1.AzurePlatformType config.Status.PlatformStatus.Azure = &configv1.AzurePlatformStatus{ ResourceGroupName: fmt.Sprintf("%s-rg", clusterID.InfraID), } case gcp.Name: - config.Status.Platform = configv1.GCPPlatformType config.Status.PlatformStatus.Type = configv1.GCPPlatformType config.Status.PlatformStatus.GCP = &configv1.GCPPlatformStatus{ ProjectID: installConfig.Config.Platform.GCP.ProjectID, Region: installConfig.Config.Platform.GCP.Region, } case libvirt.Name: - config.Status.Platform = configv1.LibvirtPlatformType config.Status.PlatformStatus.Type = configv1.LibvirtPlatformType case none.Name: - config.Status.Platform = configv1.NonePlatformType config.Status.PlatformStatus.Type = configv1.NonePlatformType case openstack.Name: - config.Status.Platform = configv1.OpenStackPlatformType config.Status.PlatformStatus.Type = configv1.OpenStackPlatformType case vsphere.Name: - config.Status.Platform = configv1.VSpherePlatformType config.Status.PlatformStatus.Type = configv1.VSpherePlatformType default: config.Status.PlatformStatus.Type = configv1.NonePlatformType