Add user selectable capabilities in installconfig

data/data/install.openshift.io_installconfigs.yaml

@@ -44,6 +44,33 @@ spec:
             required:
             - installationDisk
             type: object
+          capabilities:
+            description: Capabilities configures the installation of optional core
+              cluster components.
+            properties:
+              additionalEnabledCapabilities:
+                description: additionalEnabledCapabilities extends the set of managed
+                  capabilities beyond the baseline defined in baselineCapabilitySet.  The
+                  default is an empty set.
+                items:
+                  description: ClusterVersionCapability enumerates optional, core
+                    cluster components.
+                  enum:
+                  - openshift-samples
+                  type: string
+                type: array
+                x-kubernetes-list-type: atomic
+              baselineCapabilitySet:
+                description: baselineCapabilitySet selects an initial set of optional
+                  capabilities to enable, which can be extended via additionalEnabledCapabilities.  If
+                  unset, the cluster will choose a default, and the default may change
+                  over time. The current default is vCurrent.
+                enum:
+                - None
+                - v4.11
+                - vCurrent
+                type: string
+            type: object
           compute:
             description: Compute is the configuration for the machines that comprise
               the compute nodes.

go.mod

@@ -51,7 +51,7 @@ require (
 	github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.0.0
 	github.com/mitchellh/cli v1.1.2
 	github.com/openshift-metal3/terraform-provider-ironic v0.2.7
-	github.com/openshift/api v0.0.0-20220124143425-d74727069f6f
+	github.com/openshift/api v0.0.0-20220208222216-7e3ffb09accd
 	github.com/openshift/client-go v0.0.0-20211025111749-96ca2abfc56c
 	github.com/openshift/cloud-credential-operator v0.0.0-20200316201045-d10080b52c9e
 	github.com/openshift/cluster-api-provider-baremetal v0.0.0-20210924143856-c2d3ece4da38

go.sum

@@ -1518,8 +1518,8 @@ github.com/openshift/api v0.0.0-20210816181336-8ff39b776da3/go.mod h1:x81TFA31x1
 github.com/openshift/api v0.0.0-20211025104849-a11323ccb6ea/go.mod h1:RsQCVJu4qhUawxxDP7pGlwU3IA4F01wYm3qKEu29Su8=
 github.com/openshift/api v0.0.0-20211108165917-be1be0e89115/go.mod h1:RsQCVJu4qhUawxxDP7pGlwU3IA4F01wYm3qKEu29Su8=
 github.com/openshift/api v0.0.0-20211209135129-c58d9f695577/go.mod h1:DoslCwtqUpr3d/gsbq4ZlkaMEdYqKxuypsDjorcHhME=
-github.com/openshift/api v0.0.0-20220124143425-d74727069f6f h1:iOTv1WudhVm2UsoST+L+ZrA5A9w57h9vmQsdlBuqG6g=
-github.com/openshift/api v0.0.0-20220124143425-d74727069f6f/go.mod h1:F/eU6jgr6Q2VhMu1mSpMmygxAELd7+BUxs3NHZ25jV4=
+github.com/openshift/api v0.0.0-20220208222216-7e3ffb09accd h1:EaCz2jR4vZvtTBGXBLD4V3Lwg96DDAK+wsZvS8+1+EE=
+github.com/openshift/api v0.0.0-20220208222216-7e3ffb09accd/go.mod h1:F/eU6jgr6Q2VhMu1mSpMmygxAELd7+BUxs3NHZ25jV4=
 github.com/openshift/baremetal-operator v0.0.0-20220128094204-28771f489634 h1:HMxwhxQKSamgM3RpvbUwUKrnD39fEAWrEYaueTHVRmY=
 github.com/openshift/baremetal-operator v0.0.0-20220128094204-28771f489634/go.mod h1:fKoRJ8B07os5e+LFLvhFSS2g8nTODZW/J5jKw4dsQ18=
 github.com/openshift/baremetal-operator/apis v0.0.0-20220128094204-28771f489634 h1:TfLz0GbuVWt0bKNK+71JeYHIAemjcnE1fAVgqMgw2Ac=

pkg/explain/printer_test.go

@@ -31,6 +31,9 @@ func Test_PrintFields(t *testing.T) {
     bootstrapInPlace <object>
       BootstrapInPlace is the configuration for installing a single node with bootstrap in place installation.
 
+    capabilities <object>
+      Capabilities configures the installation of optional core cluster components.
+
     compute <[]object>
       Compute is the configuration for the machines that comprise the compute nodes.
       MachinePool is a pool of machines to be installed.

pkg/types/installconfig.go

@@ -4,6 +4,9 @@ import (
 	"fmt"
 	"strings"
 
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	configv1 "github.com/openshift/api/config/v1"
 	"github.com/openshift/installer/pkg/ipnet"
 	"github.com/openshift/installer/pkg/types/alibabacloud"
 	"github.com/openshift/installer/pkg/types/aws"
@@ -16,7 +19,6 @@ import (
 	"github.com/openshift/installer/pkg/types/openstack"
 	"github.com/openshift/installer/pkg/types/ovirt"
 	"github.com/openshift/installer/pkg/types/vsphere"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 const (
@@ -154,6 +156,10 @@ type InstallConfig struct {
 	// BootstrapInPlace is the configuration for installing a single node
 	// with bootstrap in place installation.
 	BootstrapInPlace *BootstrapInPlace `json:"bootstrapInPlace,omitempty"`
+
+	// Capabilities configures the installation of optional core cluster components.
+	// +optional
+	Capabilities *configv1.ClusterVersionCapabilitiesSpec `json:"capabilities,omitempty"`
 }
 
 // ClusterDomain returns the DNS domain that all records for a cluster must belong to.