Merge pull request #9806 from hamzy/PowerVC-add-new-type

MULTIARCH-5358: PowerVC: Add new platform for PowerVC

Author: openshift-merge-bot[bot]

OWNERS_ALIASES

@@ -33,6 +33,16 @@ aliases:
     - mandre
     - pierreprinetti
     - stephenfin
+  powervc-approvers:
+    - hamzy
+    - mjturek
+    - prb112
+    - Prashanth684
+  powervc-reviewers:
+    - hamzy
+    - mjturek
+    - prb112
+    - Prashanth684
   powervs-approvers:
     - clnperez
     - mkumatag

cmd/openshift-install/destroy.go

@@ -25,6 +25,7 @@ import (
 	_ "github.com/openshift/installer/pkg/destroy/nutanix"
 	_ "github.com/openshift/installer/pkg/destroy/openstack"
 	_ "github.com/openshift/installer/pkg/destroy/ovirt"
+	_ "github.com/openshift/installer/pkg/destroy/powervc"
 	_ "github.com/openshift/installer/pkg/destroy/powervs"
 	_ "github.com/openshift/installer/pkg/destroy/vsphere"
 )

data/data/install.openshift.io_installconfigs.yaml

@@ -0,0 +1,3 @@
+# PowerVC Platform Customization
+
+PowerVC is based on OpenStack and shares many similarities.  So some of the documents would be helpful here.  However, there are major differences.  Please see [this](../powervc/powervc.md) document for more information.

docs/user/openstack/powervc.md

@@ -0,0 +1,72 @@
+# PowerVC Platform Customization
+
+Beyond the [platform-agnostic `install-config.yaml` properties](../customization.md#platform-customization), the installer supports additional, PowerVC-specific properties.
+
+## Table of Contents
+
+- [Example](#example)
+
+## Example
+
+An example `install-config.yaml` is shown below.
+
+```yaml
+apiVersion: v1
+baseDomain: domain.net
+compute:
+- architecture: ppc64le
+  hyperthreading: Enabled
+  name: worker
+  platform:
+    powervc:
+      zones:
+        - s1022
+  replicas: 3
+controlPlane:
+  architecture: ppc64le
+  hyperthreading: Enabled
+  name: master
+  platform:
+    powervc:
+      zones:
+        - s1022
+  replicas: 3
+metadata:
+  name: rdr-openstack
+networking:
+  clusterNetwork:
+  - cidr: 10.116.0.0/14
+    hostPrefix: 23
+  machineNetwork:
+  - cidr: 10.130.32.0/20
+  networkType: OVNKubernetes
+  serviceNetwork:
+  - 172.30.0.0/16
+platform:
+  powervc:
+    loadBalancer:
+      type: UserManaged
+    apiVIPs:
+    - 10.130.41.250
+    cloud: cloud-name
+    clusterOSImage: rhcos-9.6.20250826-1-openstack-ppc64le
+    defaultMachinePlatform:
+      type: flavor
+    ingressVIPs:
+    - 10.130.41.250
+    controlPlanePort:
+      fixedIPs:
+        - subnet:
+            id: deadbeef-0000-1111-2222-cafefade1234
+credentialsMode: Passthrough
+pullSecret: '{"auths": ...}'
+sshKey: ssh-ed25519 AAAA...
+```
+
+`loadBalancer` can only be of type `UserManaged`.  This means that the user must create a HAProxy server
+which acts as a load balancer.  It must be updated during the cluster creation as new VMs are created.  Both
+`apiVIPs` and `ingressVIPs` should be the same HAProxy server IP.
+
+`clusterOSImage` is an image created in advance by the `powervc-image` tool.  The source can only be a `ova.gz`
+
+`credentialsMode` can only be `Passthrough`.

docs/user/powervc/powervc.md

@@ -18,6 +18,7 @@ import (
 	"github.com/openshift/installer/pkg/asset/cluster/nutanix"
 	"github.com/openshift/installer/pkg/asset/cluster/openstack"
 	"github.com/openshift/installer/pkg/asset/cluster/ovirt"
+	"github.com/openshift/installer/pkg/asset/cluster/powervc"
 	"github.com/openshift/installer/pkg/asset/cluster/powervs"
 	"github.com/openshift/installer/pkg/asset/cluster/vsphere"
 	"github.com/openshift/installer/pkg/asset/ignition/bootstrap"
@@ -34,6 +35,7 @@ import (
 	nutanixtypes "github.com/openshift/installer/pkg/types/nutanix"
 	openstacktypes "github.com/openshift/installer/pkg/types/openstack"
 	ovirttypes "github.com/openshift/installer/pkg/types/ovirt"
+	powervctypes "github.com/openshift/installer/pkg/types/powervc"
 	powervstypes "github.com/openshift/installer/pkg/types/powervs"
 	vspheretypes "github.com/openshift/installer/pkg/types/vsphere"
 )
@@ -97,6 +99,8 @@ func (m *Metadata) Generate(_ context.Context, parents asset.Parents) (err error
 		metadata.ClusterPlatformMetadata.Ovirt = ovirt.Metadata(installConfig.Config)
 	case vspheretypes.Name:
 		metadata.ClusterPlatformMetadata.VSphere = vsphere.Metadata(installConfig.Config)
+	case powervctypes.Name:
+		metadata.ClusterPlatformMetadata.PowerVC = powervc.Metadata(clusterID.InfraID, installConfig.Config)
 	case powervstypes.Name:
 		metadata.ClusterPlatformMetadata.PowerVS, err = powervs.Metadata(installConfig.Config, installConfig.PowerVS)
 		if err != nil {

pkg/asset/cluster/metadata.go

@@ -0,0 +1,16 @@
+package powervc
+
+import (
+	"github.com/openshift/installer/pkg/types"
+	"github.com/openshift/installer/pkg/types/powervc"
+)
+
+// Metadata converts an install configuration to PowerVC metadata.
+func Metadata(infraID string, config *types.InstallConfig) *powervc.Metadata {
+	return &powervc.Metadata{
+		Cloud: config.Platform.PowerVC.Cloud,
+		Identifier: map[string]string{
+			"openshiftClusterID": infraID,
+		},
+	}
+}

pkg/asset/cluster/powervc/powervc.go

@@ -57,6 +57,7 @@ import (
 	"github.com/openshift/installer/pkg/types/nutanix"
 	"github.com/openshift/installer/pkg/types/openstack"
 	"github.com/openshift/installer/pkg/types/ovirt"
+	"github.com/openshift/installer/pkg/types/powervc"
 	"github.com/openshift/installer/pkg/types/powervs"
 	"github.com/openshift/installer/pkg/types/vsphere"
 	ibmcloudprovider "github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1"
@@ -746,7 +747,7 @@ func (t *TerraformVariables) Generate(ctx context.Context, parents asset.Parents
 			Filename: TfPlatformVarsFileName,
 			Data:     data,
 		})
-	case openstack.Name:
+	case openstack.Name, powervc.Name:
 		data, err = openstacktfvars.TFVars(
 			ctx,
 			installConfig,

pkg/asset/cluster/tfvars/tfvars.go

@@ -17,6 +17,7 @@ import (
 	nutanixtypes "github.com/openshift/installer/pkg/types/nutanix"
 	openstacktypes "github.com/openshift/installer/pkg/types/openstack"
 	ovirttypes "github.com/openshift/installer/pkg/types/ovirt"
+	powervctypes "github.com/openshift/installer/pkg/types/powervc"
 	vspheretypes "github.com/openshift/installer/pkg/types/vsphere"
 )
 
@@ -38,7 +39,7 @@ func pointerIgnitionConfig(installConfig *types.InstallConfig, rootCA []byte, ro
 		if len(installConfig.Nutanix.APIVIPs) > 0 {
 			ignitionHost = net.JoinHostPort(installConfig.Nutanix.APIVIPs[0], "22623")
 		}
-	case openstacktypes.Name:
+	case openstacktypes.Name, powervctypes.Name:
 		ignitionHost = net.JoinHostPort(installConfig.OpenStack.APIVIPs[0], "22623")
 	case ovirttypes.Name:
 		ignitionHost = net.JoinHostPort(installConfig.Ovirt.APIVIPs[0], "22623")

pkg/asset/ignition/machine/node.go

@@ -16,6 +16,7 @@ import (
 	icnutanix "github.com/openshift/installer/pkg/asset/installconfig/nutanix"
 	icopenstack "github.com/openshift/installer/pkg/asset/installconfig/openstack"
 	icovirt "github.com/openshift/installer/pkg/asset/installconfig/ovirt"
+	icpowervc "github.com/openshift/installer/pkg/asset/installconfig/powervc"
 	icpowervs "github.com/openshift/installer/pkg/asset/installconfig/powervs"
 	icvsphere "github.com/openshift/installer/pkg/asset/installconfig/vsphere"
 	"github.com/openshift/installer/pkg/types"
@@ -98,6 +99,7 @@ func (a *InstallConfig) Generate(ctx context.Context, parents asset.Parents) err
 	a.Config.BareMetal = platform.BareMetal
 	a.Config.Ovirt = platform.Ovirt
 	a.Config.PowerVS = platform.PowerVS
+	a.Config.PowerVC = platform.PowerVC
 	a.Config.Nutanix = platform.Nutanix
 
 	defaults.SetInstallConfigDefaults(a.Config)
@@ -235,6 +237,13 @@ func (a *InstallConfig) platformValidation(ctx context.Context) error {
 	if a.Config.Platform.Ovirt != nil {
 		return icovirt.Validate(a.Config)
 	}
+	// Since PowerVC is a thin platform, allow it to fall through so that it can also test the OpenStack case.
+	if a.Config.Platform.PowerVC != nil {
+		err := icpowervc.Validate(a.Config)
+		if err != nil {
+			return err
+		}
+	}
 	if a.Config.Platform.OpenStack != nil {
 		return icopenstack.Validate(ctx, a.Config)
 	}