[release-4.17] OCPBUGS-43897: Revendor assisted service external platform oci

go.mod

@@ -246,6 +246,7 @@ require (
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.1.0 // indirect
 	github.com/opencontainers/runtime-spec v1.2.0 // indirect
+	github.com/openshift/assisted-service v1.0.10-0.20230830164851-6573b5d7021d // indirect
 	github.com/openshift/custom-resource-status v1.1.2 // indirect
 	github.com/openshift/machine-api-operator v0.2.1-0.20240722145313-3a817c78946a // indirect
 	github.com/opentracing/opentracing-go v1.2.0 // indirect
@@ -261,6 +262,7 @@ require (
 	github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect
 	github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace // indirect
 	github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
+	github.com/thoas/go-funk v0.9.3 // indirect
 	github.com/xlab/treeprint v1.2.0 // indirect
 	github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
 	github.com/zclconf/go-cty v1.11.0 // indirect
@@ -313,11 +315,11 @@ replace (
 
 replace sigs.k8s.io/cluster-api-provider-ibmcloud => sigs.k8s.io/cluster-api-provider-ibmcloud v0.9.0-alpha.0.0.20240913094112-c6bcd313bce0
 
-replace github.com/openshift/assisted-service/api => github.com/openshift/assisted-service/api v0.0.0-20230831114549-1922eda29cf8
+replace github.com/openshift/assisted-service/api => github.com/openshift/assisted-service/api v0.0.0-20231215152050-d41f53691d6e
 
-replace github.com/openshift/assisted-service/client => github.com/openshift/assisted-service/client v0.0.0-20230831114549-1922eda29cf8
+replace github.com/openshift/assisted-service/client => github.com/openshift/assisted-service/client v0.0.0-20231215152050-d41f53691d6e
 
-replace github.com/openshift/assisted-service/models => github.com/openshift/assisted-service/models v0.0.0-20230831114549-1922eda29cf8
+replace github.com/openshift/assisted-service/models => github.com/openshift/assisted-service/models v0.0.0-20231215152050-d41f53691d6e
 
 // https://issues.redhat.com/browse/OCPBUGS-8119
 // https://issues.redhat.com/browse/OCPBUGS-27507

go.sum

@@ -768,12 +768,14 @@ github.com/openshift/api v0.0.0-20240809035623-d6942fb7294e h1:gEw+Gxu4r3g9WAYOI
 github.com/openshift/api v0.0.0-20240809035623-d6942fb7294e/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM=
 github.com/openshift/assisted-image-service v0.0.0-20240607085136-02df2e56dde6 h1:U6ve+dnHlHhAELoxX+rdFOHVhoaYl0l9qtxwYtsO6C0=
 github.com/openshift/assisted-image-service v0.0.0-20240607085136-02df2e56dde6/go.mod h1:o2H5VwQhUD8P6XsK6dRmKpCCJqVvv12KJQZBXmcCXCU=
-github.com/openshift/assisted-service/api v0.0.0-20230831114549-1922eda29cf8 h1:+fZLKbycDo4JeLwPGVSAgf2XPaJGLM341l9ZfrrlxG0=
-github.com/openshift/assisted-service/api v0.0.0-20230831114549-1922eda29cf8/go.mod h1:PmMnbVno5ocinfELDdKOaatvT5ucJLrau+fjHQNeCiY=
-github.com/openshift/assisted-service/client v0.0.0-20230831114549-1922eda29cf8 h1:9NpCGby6O44BlWqWCbd8wcN4QwBebR8McQGrjTwhlzQ=
-github.com/openshift/assisted-service/client v0.0.0-20230831114549-1922eda29cf8/go.mod h1:k0S4WqxFuMBJYyinCgHjtWoEnE6/R2OyakW60MUHPYQ=
-github.com/openshift/assisted-service/models v0.0.0-20230831114549-1922eda29cf8 h1:lQO/vwmLX4kSmZitusnqdq9KbuW402DWkcmR0CJfgBI=
-github.com/openshift/assisted-service/models v0.0.0-20230831114549-1922eda29cf8/go.mod h1:ImkG1jQgM72erhLaZtWqEn0g0Y8AYUOxLR/HgvlPi2Y=
+github.com/openshift/assisted-service v1.0.10-0.20230830164851-6573b5d7021d h1:CKw2Y4EdaFsMoqAdr2Tq0nlYTaaXmCRdP0gOu7pN64U=
+github.com/openshift/assisted-service v1.0.10-0.20230830164851-6573b5d7021d/go.mod h1:1J9kimemAdpLZVb3yLDEGmzwK0DXZ4/x6POeEog8A+4=
+github.com/openshift/assisted-service/api v0.0.0-20231215152050-d41f53691d6e h1:YpFedWNg2Y5gkqw3M2FN45iyGUiIzg8yvPjteEnL8gU=
+github.com/openshift/assisted-service/api v0.0.0-20231215152050-d41f53691d6e/go.mod h1:beaoSFvU8GCXwVb11vgQEGdPGSko+CQCSIYHc04if5Y=
+github.com/openshift/assisted-service/client v0.0.0-20231215152050-d41f53691d6e h1:4e9xSfRoM0msjSjzx7kbLJ9xNQ24/YdZrni3798zthE=
+github.com/openshift/assisted-service/client v0.0.0-20231215152050-d41f53691d6e/go.mod h1:L0Q77cX4nqrxpFjvkcMSFNSm4vNvKrIXgZc8vxxDHuE=
+github.com/openshift/assisted-service/models v0.0.0-20231215152050-d41f53691d6e h1:UDlcixue45RaW9dOsPFDwffMQu9kGm2EdBvLXCm1584=
+github.com/openshift/assisted-service/models v0.0.0-20231215152050-d41f53691d6e/go.mod h1:k18+EZ03irOyyZ+bYrnWVOr0mLgCNw8rkHY4c+GuIK4=
 github.com/openshift/baremetal-operator/apis v0.0.0-20231128154154-6736c9b9c6c8 h1:f5nZJ4mB9Rf1epInmKoqDJGdoHyqZwHCiaE/OH4Yx84=
 github.com/openshift/baremetal-operator/apis v0.0.0-20231128154154-6736c9b9c6c8/go.mod h1:CvKrrnAcvvtrZIc9y9WaqWmJhK0AJ9sWnh+VP4d7jcM=
 github.com/openshift/baremetal-operator/pkg/hardwareutils v0.0.0-20231128154154-6736c9b9c6c8 h1:38vY9w7dXqB7tI9g1GCUnpahNDyBbp9Yylq+BQ154YE=
@@ -900,6 +902,8 @@ github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 h1:kdXcSzyDtse
 github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
 github.com/thedevsaddam/retry v0.0.0-20200324223450-9769a859cc6d h1:U8ZUZKRBI+Xgo3QWD/alCQ2vIysyl0Efx8yCJWPdaGQ=
 github.com/thedevsaddam/retry v0.0.0-20200324223450-9769a859cc6d/go.mod h1:2rz2mY+1qEXG47loLDkV+ZJHGFwmhax5rOTpP+5aR80=
+github.com/thoas/go-funk v0.9.3 h1:7+nAEx3kn5ZJcnDm2Bh23N2yOtweO14bi//dvRtgLpw=
+github.com/thoas/go-funk v0.9.3/go.mod h1:+IWnUfUmFO1+WVYQWQtIJHeRRdaIyyYglZN7xzUPe4Q=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=

pkg/asset/agent/image/agentartifacts.go

@@ -9,11 +9,11 @@ import (
 	"strings"
 
 	"github.com/openshift/assisted-image-service/pkg/isoeditor"
-	"github.com/openshift/assisted-service/models"
 	"github.com/openshift/installer/pkg/asset"
 	config "github.com/openshift/installer/pkg/asset/agent/agentconfig"
 	"github.com/openshift/installer/pkg/asset/agent/manifests"
 	"github.com/openshift/installer/pkg/asset/agent/mirror"
+	external "github.com/openshift/installer/pkg/types/external"
 )
 
 const (
@@ -76,7 +76,7 @@ func (a *AgentArtifacts) Generate(_ context.Context, dependencies asset.Parents)
 	}
 
 	var agentTuiFiles []string
-	if agentClusterInstall.GetExternalPlatformName() != string(models.PlatformTypeOci) {
+	if agentClusterInstall.GetExternalPlatformName() != external.ExternalPlatformNameOci {
 		agentTuiFiles, err = a.fetchAgentTuiFiles(agentManifests.ClusterImageSet.Spec.ReleaseImage, agentManifests.GetPullSecretData(), registriesConf.MirrorConfig)
 		if err != nil {
 			return err

pkg/asset/agent/image/kargs.go

@@ -7,11 +7,11 @@ import (
 	"github.com/sirupsen/logrus"
 
 	hiveext "github.com/openshift/assisted-service/api/hiveextension/v1beta1"
-	"github.com/openshift/assisted-service/models"
 	"github.com/openshift/installer/pkg/asset"
 	"github.com/openshift/installer/pkg/asset/agent/joiner"
 	"github.com/openshift/installer/pkg/asset/agent/manifests"
 	"github.com/openshift/installer/pkg/asset/agent/workflow"
+	external "github.com/openshift/installer/pkg/types/external"
 )
 
 // Kargs is an Asset that generates the additional kernel args.
@@ -40,8 +40,8 @@ func (a *Kargs) Generate(_ context.Context, dependencies asset.Parents) error {
 	case workflow.AgentWorkflowTypeInstall:
 		a.fips = agentClusterInstall.FIPSEnabled()
 		// Add kernel args for external oci platform
-		if agentClusterInstall.GetExternalPlatformName() == string(models.PlatformTypeOci) {
-			logrus.Debugf("Added kernel args to enable serial console for %s %s platform", hiveext.ExternalPlatformType, string(models.PlatformTypeOci))
+		if agentClusterInstall.GetExternalPlatformName() == external.ExternalPlatformNameOci {
+			logrus.Debugf("Added kernel args to enable serial console for %s %s platform", hiveext.ExternalPlatformType, external.ExternalPlatformNameOci)
 			a.consoleArgs = " console=ttyS0"
 		}
 

pkg/asset/agent/installconfig.go

@@ -10,7 +10,6 @@ import (
 	"k8s.io/apimachinery/pkg/util/validation/field"
 
 	configv1 "github.com/openshift/api/config/v1"
-	"github.com/openshift/assisted-service/models"
 	"github.com/openshift/installer/pkg/asset"
 	"github.com/openshift/installer/pkg/asset/installconfig"
 	"github.com/openshift/installer/pkg/asset/releaseimage"
@@ -133,10 +132,10 @@ func (a *OptionalInstallConfig) validatePlatformsByName(installConfig *types.Ins
 	var allErrs field.ErrorList
 
 	if installConfig.Platform.Name() == external.Name {
-		if installConfig.Platform.External.PlatformName == string(models.PlatformTypeOci) &&
+		if installConfig.Platform.External.PlatformName == external.ExternalPlatformNameOci &&
 			installConfig.Platform.External.CloudControllerManager != external.CloudControllerManagerTypeExternal {
 			fieldPath := field.NewPath("Platform", "External", "CloudControllerManager")
-			allErrs = append(allErrs, field.Invalid(fieldPath, installConfig.Platform.External.CloudControllerManager, fmt.Sprintf("When using external %s platform, %s must be set to %s", string(models.PlatformTypeOci), fieldPath, external.CloudControllerManagerTypeExternal)))
+			allErrs = append(allErrs, field.Invalid(fieldPath, installConfig.Platform.External.CloudControllerManager, fmt.Sprintf("When using external %s platform, %s must be set to %s", external.ExternalPlatformNameOci, fieldPath, external.CloudControllerManagerTypeExternal)))
 		}
 	}
 

pkg/asset/agent/manifests/agentclusterinstall_test.go

@@ -14,7 +14,6 @@ import (
 
 	configv1 "github.com/openshift/api/config/v1"
 	hiveext "github.com/openshift/assisted-service/api/hiveextension/v1beta1"
-	"github.com/openshift/assisted-service/models"
 	hivev1 "github.com/openshift/hive/apis/hive/v1"
 	"github.com/openshift/installer/pkg/asset"
 	"github.com/openshift/installer/pkg/asset/agent"
@@ -104,7 +103,7 @@ func TestAgentClusterInstall_Generate(t *testing.T) {
 	installConfigWExternalOCIPlatform := getValidOptionalInstallConfig()
 	installConfigWExternalOCIPlatform.Config.Platform = types.Platform{
 		External: &externaltype.Platform{
-			PlatformName:           string(models.PlatformTypeOci),
+			PlatformName:           externaltype.ExternalPlatformNameOci,
 			CloudControllerManager: externaltype.CloudControllerManagerTypeExternal,
 		},
 	}
@@ -118,7 +117,7 @@ func TestAgentClusterInstall_Generate(t *testing.T) {
 	goodExternalOCIPlatformACI.Spec.Networking.UserManagedNetworking = &val
 	goodExternalOCIPlatformACI.Spec.PlatformType = hiveext.ExternalPlatformType
 	goodExternalOCIPlatformACI.Spec.ExternalPlatformSpec = &hiveext.ExternalPlatformSpec{
-		PlatformName: string(models.PlatformTypeOci),
+		PlatformName: externaltype.ExternalPlatformNameOci,
 	}
 	goodExternalOCIPlatformACI.SetAnnotations(map[string]string{
 		installConfigOverrides: `{"platform":{"external":{"platformName":"oci","cloudControllerManager":"External"}}}`,
@@ -405,7 +404,7 @@ spec:
 					IngressVIP:   "192.168.111.4",
 					PlatformType: hiveext.ExternalPlatformType,
 					ExternalPlatformSpec: &hiveext.ExternalPlatformSpec{
-						PlatformName: string(models.PlatformTypeOci),
+						PlatformName: externaltype.ExternalPlatformNameOci,
 					},
 					ClusterDeploymentRef: corev1.LocalObjectReference{
 						Name: "ostest",

pkg/types/external/platform.go

@@ -9,6 +9,9 @@ const (
 
 	// CloudControllerManagerTypeNone specifies that no cloud provider is to be configured.
 	CloudControllerManagerTypeNone = ""
+
+	// ExternalPlatformNameOci specifies oci platform.
+	ExternalPlatformNameOci = "oci"
 )
 
 // Platform stores configuration related to external cloud providers.