Add IBM Power VS: types

OWNERS_ALIASES

@@ -33,6 +33,15 @@ aliases:
     - mdbooth
     - pierreprinetti
     - stephenfin
+  powervs-approvers:
+    - clnperez
+    - mkumatag
+    - Prashanth684
+  powervs-reviewers:
+    - clnperez
+    - mkumatag
+    - Prashanth684
+    - mjturek
   vsphere-approvers:
     - dav1x
     - jcpowermac

data/data/install.openshift.io_installconfigs.yaml

@@ -469,6 +469,36 @@ spec:
                           - high_performance
                           type: string
                       type: object
+                    powervs:
+                      description: PowerVS is the configuration used when installing
+                        on IBM Power VS.
+                      properties:
+                        memory:
+                          description: Memory defines the memory in GB for the instance.
+                          type: string
+                        procType:
+                          description: ProcType defines the processor sharing model
+                            for the instance. Must be one of {capped, dedicated, shared}.
+                          enum:
+                          - ""
+                          - capped
+                          - dedicated
+                          - shared
+                          type: string
+                        processors:
+                          description: Processors defines the processing units for
+                            the instance.
+                          type: string
+                        sysType:
+                          description: SysType defines the system type for instance.
+                          type: string
+                        volumeIDs:
+                          description: VolumeIDs is the list of volumes attached to
+                            the instance.
+                          items:
+                            type: string
+                          type: array
+                      type: object
                     vsphere:
                       description: VSphere is the configuration used when installing
                         on vSphere.
@@ -929,6 +959,36 @@ spec:
                         - high_performance
                         type: string
                     type: object
+                  powervs:
+                    description: PowerVS is the configuration used when installing
+                      on IBM Power VS.
+                    properties:
+                      memory:
+                        description: Memory defines the memory in GB for the instance.
+                        type: string
+                      procType:
+                        description: ProcType defines the processor sharing model
+                          for the instance. Must be one of {capped, dedicated, shared}.
+                        enum:
+                        - ""
+                        - capped
+                        - dedicated
+                        - shared
+                        type: string
+                      processors:
+                        description: Processors defines the processing units for the
+                          instance.
+                        type: string
+                      sysType:
+                        description: SysType defines the system type for instance.
+                        type: string
+                      volumeIDs:
+                        description: VolumeIDs is the list of volumes attached to
+                          the instance.
+                        items:
+                          type: string
+                        type: array
+                    type: object
                   vsphere:
                     description: VSphere is the configuration used when installing
                       on vSphere.
@@ -981,7 +1041,7 @@ spec:
               values. For all other platforms, the field must not be set. AWS: \"Mint\",
               \"Passthrough\", \"Manual\" Azure: \"Mint\", \"Passthrough\", \"Manual\"
               AzureStack: \"Manual\" GCP: \"Mint\", \"Passthrough\", \"Manual\" IBMCloud:
-              \"Manual\" AlibabaCloud: \"Manual\""
+              \"Manual\" AlibabaCloud: \"Manual\" PowerVS: \"Manual\""
             enum:
             - ""
             - Mint
@@ -2159,6 +2219,92 @@ spec:
                 - ovirt_cluster_id
                 - ovirt_storage_domain_id
                 type: object
+              powervs:
+                description: PowerVS is the configuration used when installing on
+                  Power VS.
+                properties:
+                  clusterOSImage:
+                    description: ClusterOSImage is a pre-created Power VS boot image
+                      that overrides the default image for cluster nodes.
+                    type: string
+                  defaultMachinePlatform:
+                    description: DefaultMachinePlatform is the default configuration
+                      used when installing on Power VS for machine pools which do
+                      not define their own platform configuration.
+                    properties:
+                      memory:
+                        description: Memory defines the memory in GB for the instance.
+                        type: string
+                      procType:
+                        description: ProcType defines the processor sharing model
+                          for the instance. Must be one of {capped, dedicated, shared}.
+                        enum:
+                        - ""
+                        - capped
+                        - dedicated
+                        - shared
+                        type: string
+                      processors:
+                        description: Processors defines the processing units for the
+                          instance.
+                        type: string
+                      sysType:
+                        description: SysType defines the system type for instance.
+                        type: string
+                      volumeIDs:
+                        description: VolumeIDs is the list of volumes attached to
+                          the instance.
+                        items:
+                          type: string
+                        type: array
+                    type: object
+                  powervsResourceGroup:
+                    description: PowerVSResourceGroup is the resource group in which
+                      Power VS resources will be created.
+                    type: string
+                  pvsNetworkName:
+                    description: PVSNetworkName specifies an existing network within
+                      the Power VS Service Instance.
+                    type: string
+                  region:
+                    description: Region specifies the IBM Cloud colo region where
+                      the cluster will be created.
+                    type: string
+                  serviceInstanceID:
+                    description: ServiceInstanceID is the ID of the Power IAAS instance
+                      created from the IBM Cloud Catalog
+                    type: string
+                  subnets:
+                    description: Subnets specifies existing subnets (by ID) where
+                      cluster resources will be created.  Leave unset to have the
+                      installer create subnets in a new VPC on your behalf.
+                    items:
+                      type: string
+                    type: array
+                  userID:
+                    description: UserID is the login for the user's IBM Cloud account.
+                    type: string
+                  vpc:
+                    description: VPC is a VPC inside IBM Cloud. Needed in order to
+                      create VPC Load Balancers.
+                    type: string
+                  vpcRegion:
+                    description: VPCRegion specifies the IBM Cloud region in which
+                      to create VPC resources. Leave unset to allow installer to select
+                      the closest VPC region.
+                    type: string
+                  zone:
+                    description: Zone specifies the IBM Cloud colo region where the
+                      cluster will be created. At this time, only single-zone clusters
+                      are supported.
+                    type: string
+                required:
+                - powervsResourceGroup
+                - region
+                - serviceInstanceID
+                - userID
+                - zone
+                type: object
               vsphere:
                 description: VSphere is the configuration used when installing on
                   vSphere.

pkg/explain/printer_test.go

@@ -43,7 +43,7 @@ func Test_PrintFields(t *testing.T) {
       CredentialsMode is used to explicitly set the mode with which CredentialRequests are satisfied. 
  If this field is set, then the installer will not attempt to query the cloud permissions before attempting installation. If the field is not set or empty, then the installer will perform its normal verification that the credentials provided are sufficient to perform an installation. 
  There are three possible values for this field, but the valid values are dependent upon the platform being used. "Mint": create new credentials with a subset of the overall permissions for each CredentialsRequest "Passthrough": copy the credentials with all of the overall permissions for each CredentialsRequest "Manual": CredentialsRequests must be handled manually by the user 
- For each of the following platforms, the field can set to the specified values. For all other platforms, the field must not be set. AWS: "Mint", "Passthrough", "Manual" Azure: "Mint", "Passthrough", "Manual" AzureStack: "Manual" GCP: "Mint", "Passthrough", "Manual" IBMCloud: "Manual" AlibabaCloud: "Manual"
+ For each of the following platforms, the field can set to the specified values. For all other platforms, the field must not be set. AWS: "Mint", "Passthrough", "Manual" Azure: "Mint", "Passthrough", "Manual" AzureStack: "Manual" GCP: "Mint", "Passthrough", "Manual" IBMCloud: "Manual" AlibabaCloud: "Manual" PowerVS: "Manual"
 
     fips <boolean>
       Default: false
@@ -114,6 +114,9 @@ func Test_PrintFields(t *testing.T) {
     ovirt <object>
       Ovirt is the configuration used when installing on oVirt.
 
+    powervs <object>
+      PowerVS is the configuration used when installing on Power VS.
+
     vsphere <object>
       VSphere is the configuration used when installing on vSphere.`,
 	}, {

pkg/types/clustermetadata.go

@@ -10,6 +10,7 @@ import (
 	"github.com/openshift/installer/pkg/types/libvirt"
 	"github.com/openshift/installer/pkg/types/openstack"
 	"github.com/openshift/installer/pkg/types/ovirt"
+	"github.com/openshift/installer/pkg/types/powervs"
 	"github.com/openshift/installer/pkg/types/vsphere"
 )
 
@@ -36,6 +37,7 @@ type ClusterPlatformMetadata struct {
 	IBMCloud     *ibmcloud.Metadata     `json:"ibmcloud,omitempty"`
 	BareMetal    *baremetal.Metadata    `json:"baremetal,omitempty"`
 	Ovirt        *ovirt.Metadata        `json:"ovirt,omitempty"`
+	PowerVS      *powervs.Metadata      `json:"powervs,omitempty"`
 	VSphere      *vsphere.Metadata      `json:"vsphere,omitempty"`
 }
 
@@ -73,6 +75,9 @@ func (cpm *ClusterPlatformMetadata) Platform() string {
 	if cpm.Ovirt != nil {
 		return ovirt.Name
 	}
+	if cpm.PowerVS != nil {
+		return powervs.Name
+	}
 	if cpm.VSphere != nil {
 		return vsphere.Name
 	}

pkg/types/defaults/installconfig.go

@@ -14,6 +14,7 @@ import (
 	nonedefaults "github.com/openshift/installer/pkg/types/none/defaults"
 	openstackdefaults "github.com/openshift/installer/pkg/types/openstack/defaults"
 	ovirtdefaults "github.com/openshift/installer/pkg/types/ovirt/defaults"
+	powervsdefaults "github.com/openshift/installer/pkg/types/powervs/defaults"
 	vspheredefaults "github.com/openshift/installer/pkg/types/vsphere/defaults"
 )
 
@@ -105,6 +106,8 @@ func SetInstallConfigDefaults(c *types.InstallConfig) {
 		for i := range c.Compute {
 			ovirtdefaults.SetComputeDefaults(c.Platform.Ovirt, &c.Compute[i])
 		}
+	case c.Platform.PowerVS != nil:
+		powervsdefaults.SetPlatformDefaults(c.Platform.PowerVS)
 	case c.Platform.None != nil:
 		nonedefaults.SetPlatformDefaults(c.Platform.None)
 	}

pkg/types/installconfig.go

@@ -15,6 +15,7 @@ import (
 	"github.com/openshift/installer/pkg/types/none"
 	"github.com/openshift/installer/pkg/types/openstack"
 	"github.com/openshift/installer/pkg/types/ovirt"
+	"github.com/openshift/installer/pkg/types/powervs"
 	"github.com/openshift/installer/pkg/types/vsphere"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -39,6 +40,7 @@ var (
 		ibmcloud.Name,
 		openstack.Name,
 		ovirt.Name,
+		powervs.Name,
 		vsphere.Name,
 	}
 	// HiddenPlatformNames is a slice with all the
@@ -148,6 +150,7 @@ type InstallConfig struct {
 	// GCP: "Mint", "Passthrough", "Manual"
 	// IBMCloud: "Manual"
 	// AlibabaCloud: "Manual"
+	// PowerVS: "Manual"
 	// +optional
 	CredentialsMode CredentialsMode `json:"credentialsMode,omitempty"`
 
@@ -205,6 +208,10 @@ type Platform struct {
 	// +optional
 	OpenStack *openstack.Platform `json:"openstack,omitempty"`
 
+	// PowerVS is the configuration used when installing on Power VS.
+	// +optional
+	PowerVS *powervs.Platform `json:"powervs,omitempty"`
+
 	// VSphere is the configuration used when installing on vSphere.
 	// +optional
 	VSphere *vsphere.Platform `json:"vsphere,omitempty"`
@@ -243,6 +250,8 @@ func (p *Platform) Name() string {
 		return vsphere.Name
 	case p.Ovirt != nil:
 		return ovirt.Name
+	case p.PowerVS != nil:
+		return powervs.Name
 	default:
 		return ""
 	}

pkg/types/machinepools.go

@@ -10,6 +10,7 @@ import (
 	"github.com/openshift/installer/pkg/types/libvirt"
 	"github.com/openshift/installer/pkg/types/openstack"
 	"github.com/openshift/installer/pkg/types/ovirt"
+	"github.com/openshift/installer/pkg/types/powervs"
 	"github.com/openshift/installer/pkg/types/vsphere"
 )
 
@@ -100,6 +101,9 @@ type MachinePoolPlatform struct {
 
 	// Ovirt is the configuration used when installing on oVirt.
 	Ovirt *ovirt.MachinePool `json:"ovirt,omitempty"`
+
+	// PowerVS is the configuration used when installing on IBM Power VS.
+	PowerVS *powervs.MachinePool `json:"powervs,omitempty"`
 }
 
 // Name returns a string representation of the platform (e.g. "aws" if
@@ -129,6 +133,8 @@ func (p *MachinePoolPlatform) Name() string {
 		return vsphere.Name
 	case p.Ovirt != nil:
 		return ovirt.Name
+	case p.PowerVS != nil:
+		return powervs.Name
 	default:
 		return ""
 	}

pkg/types/powervs/OWNERS

@@ -0,0 +1,7 @@
+# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md
+# This file just uses aliases defined in OWNERS_ALIASES.
+
+approvers:
+  - powervs-approvers
+reviewers:
+  - powervs-reviewers

pkg/types/powervs/defaults/platform.go

@@ -0,0 +1,9 @@
+package defaults
+
+import (
+	"github.com/openshift/installer/pkg/types/powervs"
+)
+
+// SetPlatformDefaults sets the defaults for the platform.
+func SetPlatformDefaults(p *powervs.Platform) {
+}

pkg/types/powervs/doc.go

@@ -0,0 +1,6 @@
+// Package powervs contains Power VS-specific structures for installer
+// configuration and management.
+package powervs
+
+// Name is name for the Power VS platform.
+const Name string = "powervs"