Add multi-architecture IPA support and configurable 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

@@ -24,6 +24,14 @@ replacements:
     name: serving-cert
     version: v1
   targets:
+  - fieldPaths:
+    - .metadata.annotations.[cert-manager.io/inject-ca-from]
+    options:
+      create: true
+      delimiter: /
+      index: 0
+    select:
+      kind: MutatingWebhookConfiguration
   - fieldPaths:
     - .metadata.annotations.[cert-manager.io/inject-ca-from]
     options:
@@ -47,6 +55,14 @@ replacements:
     name: serving-cert
     version: v1
   targets:
+  - fieldPaths:
+    - .metadata.annotations.[cert-manager.io/inject-ca-from]
+    options:
+      create: true
+      delimiter: /
+      index: 1
+    select:
+      kind: MutatingWebhookConfiguration
   - fieldPaths:
     - .metadata.annotations.[cert-manager.io/inject-ca-from]
     options:

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

@@ -1,6 +1,20 @@
 # This patch add annotation to admission webhook config and
 # the variables CERTIFICATE_NAMESPACE and CERTIFICATE_NAME will be substituted by kustomize.
 apiVersion: admissionregistration.k8s.io/v1
+kind: MutatingWebhookConfiguration
+metadata:
+  labels:
+    app.kubernetes.io/name: mutatingwebhookconfiguration
+    app.kubernetes.io/instance: mutating-webhook-configuration
+    app.kubernetes.io/component: webhook
+    app.kubernetes.io/created-by: ironic-standalone-operator
+    app.kubernetes.io/part-of: ironic-standalone-operator
+    app.kubernetes.io/managed-by: kustomize
+  name: mutating-webhook-configuration
+  annotations:
+    cert-manager.io/inject-ca-from: CERTIFICATE_NAMESPACE/CERTIFICATE_NAME
+---
+apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
 metadata:
   labels:

config/default/kustomization.yaml

@@ -4,11 +4,18 @@ nameReference:
 - kind: Service
   version: v1
   fieldSpecs:
+  - kind: MutatingWebhookConfiguration
+    group: admissionregistration.k8s.io
+    path: webhooks/clientConfig/service/name
   - kind: ValidatingWebhookConfiguration
     group: admissionregistration.k8s.io
     path: webhooks/clientConfig/service/name
 
 namespace:
+- kind: MutatingWebhookConfiguration
+  group: admissionregistration.k8s.io
+  path: webhooks/clientConfig/service/namespace
+  create: true
 - kind: ValidatingWebhookConfiguration
   group: admissionregistration.k8s.io
   path: webhooks/clientConfig/service/namespace

config/default/webhookcainjection_patch.yaml

@@ -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