Merge pull request #354 from mumesan/osprh-11617

Pass bootable image URL to metal3 <JIRA: OSPRH-11617>

Author: openshift-merge-bot[bot]

api/bases/baremetal.openstack.org_openstackbaremetalsets.yaml

@@ -55,11 +55,13 @@ spec:
             properties:
               agentImageUrl:
                 description: AgentImageURL - Container image URL for the sidecar container
-                  that discovers provisioning network IPs
+                  that discovers provisioning network IPs. Ignored when osImageDeploymentType
+                  is PassThrough.
                 type: string
               apacheImageUrl:
                 description: ApacheImageURL - Container image URL for the main container
-                  that serves the downloaded OS qcow2 image (osImage)
+                  that serves the downloaded OS qcow2 image (osImage). Ignored when
+                  osImageDeploymentType is PassThrough.
                 type: string
               automatedCleaningMode:
                 default: metadata
@@ -282,12 +284,23 @@ spec:
                     type: object
                 type: object
               osContainerImageUrl:
-                description: OSContainerImageURL - Container image URL for init with
-                  the OS qcow2 image (osImage)
+                description: OSContainerImageURL - When osImageDeploymentType is SelfExtracting,
+                  container image URL for init with the OS qcow2 image (osImage).
+                  When osImageDeploymentType is PassThrough this can be any image
+                  URL which the underlying Metal3 instance supports.
                 type: string
               osImage:
                 default: edpm-hardened-uefi.qcow2
-                description: OSImage - OS qcow2 image Name
+                description: OSImage - OS qcow2 image Name. Ignored when osImageDeploymentType
+                  is PassThrough.
+                type: string
+              osImageDeploymentType:
+                default: SelfExtracting
+                description: OSImageDeploymentType - Whether the OS image deployment
+                  is self-extracting or pass-through based
+                enum:
+                - SelfExtracting
+                - PassThrough
                 type: string
               passwordSecret:
                 description: |-
@@ -307,18 +320,21 @@ spec:
                 x-kubernetes-map-type: atomic
               provisionServerName:
                 description: ProvisionServerName - Optional. Existing OpenStackProvisionServer
-                  to use, else one would be created.
+                  to use, else one would be created. Ignored when osImageDeploymentType
+                  is PassThrough.
                 type: string
               provisionServerNodeSelector:
                 additionalProperties:
                   type: string
                 description: ProvisonServerNodeSelector to target subset of worker
-                  nodes running provision server
+                  nodes running provision server, ignored when osImageDeploymentType
+                  is PassThrough.
                 type: object
               provisioningInterface:
                 description: ProvisioningInterface - Optional. If not provided along
                   with ProvisionServerName, it would be discovered from CBO.  This
-                  is the provisioning interface on the OCP masters/workers.
+                  is the provisioning interface on the OCP masters/workers. Ignored
+                  when osImageDeploymentType is PassThrough.
                 type: string
             required:
             - cloudUserName

api/v1beta1/openstackbaremetalset_types.go

@@ -39,6 +39,10 @@ type BondConfig struct {
 	BondOptions map[string]string `json:"bondOptions,omitempty"`
 }
 
+// OSImageDeploymentType specifies the type of OS image deployment
+// +kubebuilder:validation:Enum=SelfExtracting;PassThrough
+type OSImageDeploymentType string
+
 // InstanceSpec Instance specific attributes
 type InstanceSpec struct {
 	// +kubebuilder:validation:Optional
@@ -71,32 +75,42 @@ const (
 	CleaningModeMetadata AutomatedCleaningMode = "metadata"
 )
 
+// Allowed OS image deployment types
+const (
+	OSImageDeploymentTypeSelfExtracting OSImageDeploymentType = "SelfExtracting"
+	OSImageDeploymentTypePassThrough    OSImageDeploymentType = "PassThrough"
+)
+
 type OpenStackBaremetalSetTemplateSpec struct {
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default=edpm-hardened-uefi.qcow2
-	// OSImage - OS qcow2 image Name
+	// OSImage - OS qcow2 image Name. Ignored when osImageDeploymentType is PassThrough.
 	OSImage string `json:"osImage"`
 	// +kubebuilder:validation:Optional
-	// OSContainerImageURL - Container image URL for init with the OS qcow2 image (osImage)
+	// OSContainerImageURL - When osImageDeploymentType is SelfExtracting, container image URL for init with the OS qcow2 image (osImage). When osImageDeploymentType is PassThrough this can be any image URL which the underlying Metal3 instance supports.
 	OSContainerImageURL string `json:"osContainerImageUrl,omitempty"`
 	// +kubebuilder:validation:Optional
-	// ApacheImageURL - Container image URL for the main container that serves the downloaded OS qcow2 image (osImage)
+	// +kubebuilder:default=SelfExtracting
+	// OSImageDeploymentType - Whether the OS image deployment is self-extracting or pass-through based
+	OSImageDeploymentType OSImageDeploymentType `json:"osImageDeploymentType"`
+	// +kubebuilder:validation:Optional
+	// ApacheImageURL - Container image URL for the main container that serves the downloaded OS qcow2 image (osImage). Ignored when osImageDeploymentType is PassThrough.
 	ApacheImageURL string `json:"apacheImageUrl,omitempty"`
 	// +kubebuilder:validation:Optional
-	// AgentImageURL - Container image URL for the sidecar container that discovers provisioning network IPs
+	// AgentImageURL - Container image URL for the sidecar container that discovers provisioning network IPs. Ignored when osImageDeploymentType is PassThrough.
 	AgentImageURL string `json:"agentImageUrl,omitempty"`
 	// When set to disabled, automated cleaning will be avoided
 	// during provisioning and deprovisioning.
 	// +kubebuilder:default=metadata
 	// +kubebuilder:validation:Optional
 	AutomatedCleaningMode AutomatedCleaningMode `json:"automatedCleaningMode"`
-	// ProvisionServerName - Optional. Existing OpenStackProvisionServer to use, else one would be created.
+	// ProvisionServerName - Optional. Existing OpenStackProvisionServer to use, else one would be created. Ignored when osImageDeploymentType is PassThrough.
 	// +kubebuilder:validation:Optional
 	ProvisionServerName string `json:"provisionServerName,omitempty"`
 	// +kubebuilder:validation:Optional
-	// ProvisonServerNodeSelector to target subset of worker nodes running provision server
+	// ProvisonServerNodeSelector to target subset of worker nodes running provision server, ignored when osImageDeploymentType is PassThrough.
 	ProvisonServerNodeSelector map[string]string `json:"provisionServerNodeSelector,omitempty"`
-	// ProvisioningInterface - Optional. If not provided along with ProvisionServerName, it would be discovered from CBO.  This is the provisioning interface on the OCP masters/workers.
+	// ProvisioningInterface - Optional. If not provided along with ProvisionServerName, it would be discovered from CBO.  This is the provisioning interface on the OCP masters/workers. Ignored when osImageDeploymentType is PassThrough.
 	// +kubebuilder:validation:Optional
 	ProvisioningInterface string `json:"provisioningInterface,omitempty"`
 	// DeploymentSSHSecret - Name of secret holding the cloud-admin ssh keys

config/crd/bases/baremetal.openstack.org_openstackbaremetalsets.yaml

@@ -55,11 +55,13 @@ spec:
             properties:
               agentImageUrl:
                 description: AgentImageURL - Container image URL for the sidecar container
-                  that discovers provisioning network IPs
+                  that discovers provisioning network IPs. Ignored when osImageDeploymentType
+                  is PassThrough.
                 type: string
               apacheImageUrl:
                 description: ApacheImageURL - Container image URL for the main container
-                  that serves the downloaded OS qcow2 image (osImage)
+                  that serves the downloaded OS qcow2 image (osImage). Ignored when
+                  osImageDeploymentType is PassThrough.
                 type: string
               automatedCleaningMode:
                 default: metadata
@@ -282,12 +284,23 @@ spec:
                     type: object
                 type: object
               osContainerImageUrl:
-                description: OSContainerImageURL - Container image URL for init with
-                  the OS qcow2 image (osImage)
+                description: OSContainerImageURL - When osImageDeploymentType is SelfExtracting,
+                  container image URL for init with the OS qcow2 image (osImage).
+                  When osImageDeploymentType is PassThrough this can be any image
+                  URL which the underlying Metal3 instance supports.
                 type: string
               osImage:
                 default: edpm-hardened-uefi.qcow2
-                description: OSImage - OS qcow2 image Name
+                description: OSImage - OS qcow2 image Name. Ignored when osImageDeploymentType
+                  is PassThrough.
+                type: string
+              osImageDeploymentType:
+                default: SelfExtracting
+                description: OSImageDeploymentType - Whether the OS image deployment
+                  is self-extracting or pass-through based
+                enum:
+                - SelfExtracting
+                - PassThrough
                 type: string
               passwordSecret:
                 description: |-
@@ -307,18 +320,21 @@ spec:
                 x-kubernetes-map-type: atomic
               provisionServerName:
                 description: ProvisionServerName - Optional. Existing OpenStackProvisionServer
-                  to use, else one would be created.
+                  to use, else one would be created. Ignored when osImageDeploymentType
+                  is PassThrough.
                 type: string
               provisionServerNodeSelector:
                 additionalProperties:
                   type: string
                 description: ProvisonServerNodeSelector to target subset of worker
-                  nodes running provision server
+                  nodes running provision server, ignored when osImageDeploymentType
+                  is PassThrough.
                 type: object
               provisioningInterface:
                 description: ProvisioningInterface - Optional. If not provided along
                   with ProvisionServerName, it would be discovered from CBO.  This
-                  is the provisioning interface on the OCP masters/workers.
+                  is the provisioning interface on the OCP masters/workers. Ignored
+                  when osImageDeploymentType is PassThrough.
                 type: string
             required:
             - cloudUserName

config/samples/baremetal_v1beta1_openstackbaremetalset.yaml

@@ -1,13 +1,16 @@
+# SelfExtracting deployment using qcow2
 apiVersion: baremetal.openstack.org/v1beta1
 kind: OpenStackBaremetalSet
 metadata:
-  name: openstackbaremetalset
+  name: openstackbaremetalset-selfextracting
 spec:
   # Define how many BaremetalHosts are desired to be provisioned and assign
   # a control plane IP to them
   baremetalHosts:
     compute-0: 172.22.0.100/24
     compute-1: 172.22.0.101/24
+  # SelfExtracting Deployment using qcow2
+  osImageDeploymentType: SelfExtracting
   # The image to install on the provisioned nodes
   osImage: edpm-hardened-uefi.qcow2
   # provisionServerName: openstack  # uncomment if you pre-deploy a separate OsProvServer (use its name for the value)
@@ -20,3 +23,25 @@ spec:
   # An optional secret holding a data entry called "NodeRootPassword"
   # This will be set as the root password on all provisioned BaremetalHosts
   passwordSecret: baremetalset-password-secret
+
+---
+# PassThrough deployment using direct container URL passing
+apiVersion: baremetal.openstack.org/v1beta1
+kind: OpenStackBaremetalSet
+metadata:
+  name: openstackbaremetalset-passthrough
+spec:
+  # Define how many BaremetalHosts are desired to be provisioned and assign
+  # a control plane IP to them
+  baremetalHosts:
+    compute-0: 172.22.0.100/24
+    compute-1: 172.22.0.101/24
+  # PassThrough deployment using direct container URL passing
+  osImageDeploymentType: PassThrough
+  osContainerImageUrl: quay.io/podified-antelope-centos9/edpm-hardened-uefi:current-podified
+  # The secret containing the SSH pub key to place on the provisioned nodes
+  deploymentSSHSecret: baremetalset-deploy-secret
+  domainName: osptest.openstack.org
+  ctlplaneInterface: enp1s0
+  ctlplaneGateway: 172.22.0.3
+  passwordSecret: baremetalset-password-secret