Add multi-architecture IPA support and configurable httpd probes

Signed-off-by: s3rj1k <[email protected]>

Author: s3rj1k

api/v1alpha1/ironic_types.go

@@ -171,6 +171,28 @@ type Networking struct {
 
 // DeployRamdisk defines IPA ramdisk settings.
 type DeployRamdisk struct {
+	// DeployKernel sets DEPLOY_KERNEL URL for the IPA kernel.
+	// Example: "file:///shared/html/images/ironic-python-agent.kernel"
+	// +optional
+	DeployKernel string `json:"deployKernel,omitempty"`
+
+	// DeployKernelByArch sets DEPLOY_KERNEL_BY_ARCH for multi-architecture support.
+	// Format: arch1:url1,arch2:url2
+	// Example: "x86_64:file:///shared/html/images/ipa.x86_64.kernel,aarch64:file:///shared/html/images/ipa.arm64.kernel"
+	// +optional
+	DeployKernelByArch string `json:"deployKernelByArch,omitempty"`
+
+	// DeployRamdisk sets DEPLOY_RAMDISK URL for the IPA ramdisk.
+	// Example: "file:///shared/html/images/ironic-python-agent.initramfs"
+	// +optional
+	DeployRamdisk string `json:"deployRamdisk,omitempty"`
+
+	// DeployRamdiskByArch sets DEPLOY_RAMDISK_BY_ARCH for multi-architecture support.
+	// Format: arch1:url1,arch2:url2
+	// Example: "x86_64:file:///shared/html/images/ipa.x86_64.initramfs,aarch64:file:///shared/html/images/ipa.arm64.initramfs"
+	// +optional
+	DeployRamdiskByArch string `json:"deployRamdiskByArch,omitempty"`
+
 	// DisableDownloader tells the operator not to start the IPA downloader as the init container.
 	// The user will be responsible for providing the right image to BareMetal Operator.
 	// +optional
@@ -181,6 +203,16 @@ type DeployRamdisk struct {
 	// +optional
 	ExtraKernelParams string `json:"extraKernelParams,omitempty"`
 
+	// LivenessProbe configures the httpd container liveness probe.
+	// If not set, defaults to checking /images/ironic-python-agent.kernel exists.
+	// +optional
+	LivenessProbe *corev1.Probe `json:"livenessProbe,omitempty"`
+
+	// ReadinessProbe configures the httpd container readiness probe.
+	// If not set, defaults to checking /images/ironic-python-agent.kernel exists.
+	// +optional
+	ReadinessProbe *corev1.Probe `json:"readinessProbe,omitempty"`
+
 	// SSHKey is the contents of the public key to inject into the ramdisk for debugging purposes.
 	// +optional
 	SSHKey string `json:"sshKey,omitempty"`

api/v1alpha1/zz_generated.deepcopy.go

@@ -1,5 +1,31 @@
 ---
 apiVersion: admissionregistration.k8s.io/v1
+kind: MutatingWebhookConfiguration
+metadata:
+  name: mutating-webhook-configuration
+webhooks:
+- admissionReviewVersions:
+  - v1
+  clientConfig:
+    service:
+      name: webhook-service
+      namespace: system
+      path: /mutate-ironic-metal3-io-v1alpha1-ironic
+  failurePolicy: Fail
+  name: mutate-ironic.ironic.metal3.io
+  rules:
+  - apiGroups:
+    - ironic.metal3.io
+    apiVersions:
+    - v1alpha1
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - ironics
+  sideEffects: None
+---
+apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
 metadata:
   name: validating-webhook-configuration

config/crd/bases/ironic.metal3.io_ironics.yaml

@@ -19,55 +19,100 @@ package v1alpha1
 import (
 	"context"
 	"fmt"
+	"net/url"
 
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
 	metal3api "github.com/metal3-io/ironic-standalone-operator/api/v1alpha1"
-	validation "github.com/metal3-io/ironic-standalone-operator/pkg/ironic"
+	"github.com/metal3-io/ironic-standalone-operator/pkg/ironic"
 )
 
+var deployBaseURL = url.URL{
+	Scheme: "file",
+	Path:   "/shared/html",
+}
+
 // log is for logging in this package.
 var ironiclog = logf.Log.WithName("webhooks").WithName("Ironic")
 
 func SetupIronicWebhookWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewWebhookManagedBy(mgr).
 		For(&metal3api.Ironic{}).
+		WithDefaulter(&IronicCustomDefaulter{}).
 		WithValidator(&IronicCustomValidator{}).
 		Complete()
 }
 
+// +kubebuilder:webhook:path=/mutate-ironic-metal3-io-v1alpha1-ironic,mutating=true,failurePolicy=fail,sideEffects=None,groups=ironic.metal3.io,resources=ironics,verbs=create;update,versions=v1alpha1,name=mutate-ironic.ironic.metal3.io,admissionReviewVersions=v1
+
+type IronicCustomDefaulter struct{}
+
+// Default implements webhook.Defaulter.
+func (r *IronicCustomDefaulter) Default(_ context.Context, obj runtime.Object) error {
+	ir, ok := obj.(*metal3api.Ironic)
+	if !ok {
+		return fmt.Errorf("expected an Ironic, got %T", obj)
+	}
+
+	ironiclog.Info("default", "name", ir.Name)
+
+	// Set default DeployKernel if neither DeployKernel nor DeployKernelByArch is set
+	if ir.Spec.DeployRamdisk.DeployKernel == "" && ir.Spec.DeployRamdisk.DeployKernelByArch == "" {
+		ir.Spec.DeployRamdisk.DeployKernel = deployBaseURL.JoinPath(ironic.DefaultKernelPath).String()
+	}
+
+	// Set default DeployRamdisk if neither DeployRamdisk nor DeployRamdiskByArch is set
+	if ir.Spec.DeployRamdisk.DeployRamdisk == "" && ir.Spec.DeployRamdisk.DeployRamdiskByArch == "" {
+		ir.Spec.DeployRamdisk.DeployRamdisk = deployBaseURL.JoinPath(ironic.DefaultRamdiskPath).String()
+	}
+
+	// Set default probes when using default IPA paths (not multi-arch)
+	if ir.Spec.DeployRamdisk.DeployKernelByArch == "" && ir.Spec.DeployRamdisk.DeployRamdiskByArch == "" {
+		defaultProbe := ironic.BuildDefaultHttpdProbe(&ir.Spec)
+
+		if ir.Spec.DeployRamdisk.LivenessProbe == nil {
+			ir.Spec.DeployRamdisk.LivenessProbe = defaultProbe
+		}
+		if ir.Spec.DeployRamdisk.ReadinessProbe == nil {
+			ir.Spec.DeployRamdisk.ReadinessProbe = defaultProbe
+		}
+	}
+
+	return nil
+}
+
 // +kubebuilder:webhook:path=/validate-ironic-metal3-io-v1alpha1-ironic,mutating=false,failurePolicy=fail,sideEffects=None,groups=ironic.metal3.io,resources=ironics,verbs=create;update,versions=v1alpha1,name=validate-ironic.ironic.metal3.io,admissionReviewVersions=v1
 
 type IronicCustomValidator struct{}
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type.
 func (r *IronicCustomValidator) ValidateCreate(_ context.Context, obj runtime.Object) (admission.Warnings, error) {
-	ironic, ok := obj.(*metal3api.Ironic)
+	ir, ok := obj.(*metal3api.Ironic)
 	if !ok {
 		return nil, fmt.Errorf("expected an Ironic, got %T", obj)
 	}
 
-	ironiclog.Info("validate create", "name", ironic.Name)
-	return nil, validation.ValidateIronic(&ironic.Spec, nil)
+	ironiclog.Info("validate create", "name", ir.Name)
+	return nil, ironic.ValidateIronic(&ir.Spec, nil)
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type.
 func (r *IronicCustomValidator) ValidateUpdate(_ context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) {
-	ironic, ok := newObj.(*metal3api.Ironic)
+	ir, ok := newObj.(*metal3api.Ironic)
 	if !ok {
 		return nil, fmt.Errorf("expected an Ironic for newObj, got %T", newObj)
 	}
 
-	oldIronic, ok := oldObj.(*metal3api.Ironic)
+	oldIr, ok := oldObj.(*metal3api.Ironic)
 	if !ok {
 		return nil, fmt.Errorf("expected an Ironic for oldObj, got %T", oldObj)
 	}
 
-	ironiclog.Info("validate update", "name", ironic.Name)
-	return nil, validation.ValidateIronic(&ironic.Spec, &oldIronic.Spec)
+	ironiclog.Info("validate update", "name", ir.Name)
+	return nil, ironic.ValidateIronic(&ir.Spec, &oldIr.Spec)
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type.