MGMT-15047: use installer to deploy on external platform

Use the installer to deploy the external platform, and cleanup the
previous hack.
Remove the feature set as the external platform is now stable.

internal/installcfg/installcfg.go

@@ -11,6 +11,7 @@ type Platform struct {
 	None      *PlatformNone                   `yaml:"none,omitempty"`
 	Vsphere   *VsphereInstallConfigPlatform   `yaml:"vsphere,omitempty"`
 	Nutanix   *NutanixInstallConfigPlatform   `yaml:"nutanix,omitempty"`
+	External  *ExternalInstallConfigPlatform  `yaml:"external,omitempty"`
 }
 
 type Host struct {
@@ -127,6 +128,10 @@ type NutanixPrismElement struct {
 	Name                           string          `yaml:"name"`
 }
 
+type ExternalInstallConfigPlatform struct {
+	PlatformName string `yaml:"platformName"`
+}
+
 type PlatformNone struct {
 }
 

internal/provider/external/ignition.go

@@ -1,66 +1,13 @@
 package external
 
 import (
-	"fmt"
-	"os"
-	"path/filepath"
-
 	"github.com/openshift/assisted-service/internal/common"
-	"github.com/pkg/errors"
-)
-
-// Workaround as openshift installer does not support the external platform.
-// The trick is to generate the manifests with platform=none and patch
-// the insfrastructure object with the external platform.
-const (
-	clusterInfraPatchTemplate = `---
-- op: replace
-  path: /spec/platformSpec
-  value:
-    type: External
-    external:
-      platformName: %s
-- op: replace
-  path: /status/platform
-  value: External
-- op: replace
-  path: /status/platformStatus
-  value:
-    type: External
-    external:
-      cloudControllerManager:
-        state: External`
 )
 
 func (p externalProvider) PreCreateManifestsHook(cluster *common.Cluster, envVars *[]string, workDir string) error {
 	return nil
 }
 
 func (p externalProvider) PostCreateManifestsHook(cluster *common.Cluster, envVars *[]string, workDir string) error {
-
-	platformName := string(p.platformType)
-	clusterInfraPatch := fmt.Sprintf(clusterInfraPatchTemplate, platformName)
-
-	p.Log.Infof("Patching Infrastructure CR with external platform: platformName=%s", platformName)
-
-	infraManifest := filepath.Join(workDir, "manifests", "cluster-infrastructure-02-config.yml")
-	data, err := os.ReadFile(infraManifest)
-	if err != nil {
-		return errors.Wrapf(err, "failed to read Infrastructure Manifest \"%s\"", infraManifest)
-	}
-	p.Log.Infof("read the infrastructure manifest at %s", infraManifest)
-
-	data, err = common.ApplyYamlPatch(data, []byte(clusterInfraPatch))
-	if err != nil {
-		return errors.Wrapf(err, "failed to patch Infrastructure Manifest \"%s\"", infraManifest)
-	}
-	p.Log.Infof("applied the yaml patch to the infrastructure manifest at %s: \n %s", infraManifest, string(data[:]))
-
-	err = os.WriteFile(infraManifest, data, 0600)
-	if err != nil {
-		return errors.Wrapf(err, "failed to write Infrastructure Manifest \"%s\"", infraManifest)
-	}
-	p.Log.Infof("wrote the resulting infrastructure manifest at %s", infraManifest)
-
 	return nil
 }

internal/provider/external/installConfig.go

@@ -2,7 +2,6 @@ package external
 
 import (
 	"github.com/go-openapi/swag"
-	configv1 "github.com/openshift/api/config/v1"
 	"github.com/openshift/assisted-service/internal/common"
 	"github.com/openshift/assisted-service/internal/host/hostutil"
 	"github.com/openshift/assisted-service/internal/installcfg"
@@ -11,14 +10,12 @@ import (
 )
 
 func (p externalProvider) AddPlatformToInstallConfig(cfg *installcfg.InstallerConfigBaremetal, cluster *common.Cluster) error {
-	// workaround until openshift installer supports external platform
 	cfg.Platform = installcfg.Platform{
-		None: &installcfg.PlatformNone{},
+		External: &installcfg.ExternalInstallConfigPlatform{
+			PlatformName: string(p.Name()),
+		},
 	}
 
-	// Enable feature set "TechPreviewNoUpgrade" in order to access External platform feature
-	cfg.FeatureSet = configv1.TechPreviewNoUpgrade
-
 	cfg.Networking.MachineNetwork = provider.GetMachineNetworkForUserManagedNetworking(p.Log, cluster)
 	if cluster.NetworkType != nil {
 		cfg.Networking.NetworkType = swag.StringValue(cluster.NetworkType)

internal/provider/registry/registry_test.go

@@ -11,7 +11,6 @@ import (
 	"github.com/google/uuid"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	configv1 "github.com/openshift/api/config/v1"
 	"github.com/openshift/assisted-service/internal/common"
 	"github.com/openshift/assisted-service/internal/installcfg"
 	"github.com/openshift/assisted-service/internal/provider/vsphere"
@@ -406,7 +405,7 @@ var _ = Describe("Test AddPlatformToInstallConfig", func() {
 	})
 
 	Context("oci", func() {
-		It("should set platform to none and featureset to TechPreviewNoUpgrade", func() {
+		It("should set platform name to oci", func() {
 			cfg := getInstallerConfigBaremetal()
 			hosts := make([]*models.Host, 0)
 			hosts = append(hosts, createHost(true, models.HostStatusKnown, getBaremetalInventoryStr("hostname0", "bootMode", true, false)))
@@ -417,8 +416,8 @@ var _ = Describe("Test AddPlatformToInstallConfig", func() {
 			cluster := createClusterFromHosts(hosts)
 			err := providerRegistry.AddPlatformToInstallConfig(models.PlatformTypeOci, &cfg, &cluster)
 			Expect(err).To(BeNil())
-			Expect(cfg.Platform.None).ToNot(BeNil())
-			Expect(cfg.FeatureSet).To(Equal(configv1.TechPreviewNoUpgrade))
+			Expect(cfg.Platform.External).ToNot(BeNil())
+			Expect(cfg.Platform.External.PlatformName).To(Equal(string(models.PlatformTypeOci)))
 		})
 	})
 })