Add VirtualMediaViaExternalNetwork flag to the Provisioning CRD

openshift · Jun 23, 2021 · 41c2009 · 41c2009
1 parent 087b018
commit 41c2009
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/api/v1alpha1/provisioning_types.go b/api/v1alpha1/provisioning_types.go
@@ -64,6 +64,7 @@ type ProvisioningSpec struct {
 	// ProvisioningNetworkCIDR is the network on which the
 	// baremetal nodes are provisioned. The provisioningIP and the
 	// IPs in the dhcpRange all come from within this network.
+	// IPv6 networks cannot be larger than a /64.
 	ProvisioningNetworkCIDR string `json:"provisioningNetworkCIDR,omitempty"`
 
 	// ProvisioningDHCPExternal indicates whether the DHCP server
@@ -128,6 +129,16 @@ type ProvisioningSpec struct {
 	// If the boot iso image is already served by an httpd server, setting
 	// this option to http allows to directly provide the image from there.
 	BootIsoSource BootIsoSource `json:"bootIsoSource,omitempty"`
+
+	// VirtualMediaViaExternalNetwork flag when set to "true" allows for workers
+	// to boot via Virtual Media and contact metal3 over the External Network.
+	// When the flag is set to "false" (which is the default), virtual media
+	// deployments can still happen based on the configuration specified in the
+	// ProvisioningNetwork i.e when in Disabled mode, over the External Network
+	// and over Provisioning Network when in Managed mode.
+	// PXE deployments will always use the Provisioning Network and will not be
+	// affected by this flag.
+	VirtualMediaViaExternalNetwork bool `json:"virtualMediaViaExternalNetwork,omitempty"`
 }
 
 // ProvisioningStatus defines the observed state of Provisioning

diff --git a/config/crd/bases/metal3.io_provisionings.yaml b/config/crd/bases/metal3.io_provisionings.yaml
@@ -57,11 +57,14 @@ spec:
                 - Disabled
                 type: string
               provisioningNetworkCIDR:
-                description: ProvisioningNetworkCIDR is the network on which the baremetal nodes are provisioned. The provisioningIP and the IPs in the dhcpRange all come from within this network.
+                description: ProvisioningNetworkCIDR is the network on which the baremetal nodes are provisioned. The provisioningIP and the IPs in the dhcpRange all come from within this network. IPv6 networks cannot be larger than a /64.
                 type: string
               provisioningOSDownloadURL:
                 description: ProvisioningOSDownloadURL is the location from which the OS Image used to boot baremetal host machines can be downloaded by the metal3 cluster.
                 type: string
+              virtualMediaViaExternalNetwork:
+                description: VirtualMediaViaExternalNetwork flag when set to "true" allows for workers to boot via Virtual Media and contact metal3 over the External Network. When the flag is set to "false" (which is the default), virtual media deployments can still happen based on the configuration specified in the ProvisioningNetwork i.e when in Disabled mode, over the External Network and over Provisioning Network when in Managed mode. PXE deployments will always use the Provisioning Network and will not be affected by this flag.
+                type: boolean
               watchAllNamespaces:
                 description: WatchAllNamespaces provides a way to explicitly allow use of this Provisioning configuration across all Namespaces. It is an optional configuration which defaults to false and in that state will be used to provision baremetal hosts in only the openshift-machine-api namespace. When set to true, this provisioning configuration would be used for baremetal hosts across all namespaces.
                 type: boolean

diff --git a/manifests/0000_31_cluster-baremetal-operator_02_metal3provisioning.crd.yaml b/manifests/0000_31_cluster-baremetal-operator_02_metal3provisioning.crd.yaml
@@ -57,11 +57,14 @@ spec:
                 - Disabled
                 type: string
               provisioningNetworkCIDR:
-                description: ProvisioningNetworkCIDR is the network on which the baremetal nodes are provisioned. The provisioningIP and the IPs in the dhcpRange all come from within this network.
+                description: ProvisioningNetworkCIDR is the network on which the baremetal nodes are provisioned. The provisioningIP and the IPs in the dhcpRange all come from within this network. IPv6 networks cannot be larger than a /64.
                 type: string
               provisioningOSDownloadURL:
                 description: ProvisioningOSDownloadURL is the location from which the OS Image used to boot baremetal host machines can be downloaded by the metal3 cluster.
                 type: string
+              virtualMediaViaExternalNetwork:
+                description: VirtualMediaViaExternalNetwork flag when set to "true" allows for workers to boot via Virtual Media and contact metal3 over the External Network. When the flag is set to "false" (which is the default), virtual media deployments can still happen based on the configuration specified in the ProvisioningNetwork i.e when in Disabled mode, over the External Network and over Provisioning Network when in Managed mode. PXE deployments will always use the Provisioning Network and will not be affected by this flag.
+                type: boolean
               watchAllNamespaces:
                 description: WatchAllNamespaces provides a way to explicitly allow use of this Provisioning configuration across all Namespaces. It is an optional configuration which defaults to false and in that state will be used to provision baremetal hosts in only the openshift-machine-api namespace. When set to true, this provisioning configuration would be used for baremetal hosts across all namespaces.
                 type: boolean