libvirt: Reverse default firmware logic

The packer build doesn't want a custom firmware, so we can't easily keep the default to be ovmf. Instead reverse the logic and set it as blank unless provided. In order to preserve the existing behaviour set the kustomization.yaml with the old default and update the packer e2e testing to comment it out Signed-off-by: stevenhorsman <[email protected]>
confidential-containers · Nov 22, 2024 · 29286c4 · 29286c4
1 parent 1e0206f
commit 29286c4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/.github/workflows/e2e_libvirt.yaml b/.github/workflows/e2e_libvirt.yaml
@@ -131,6 +131,18 @@ jobs:
           curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" | \
             sudo bash -s /usr/local/bin
 
+# For the legacy packer approach we don't want to use the default firmware, so comment it out
+      - name: Set blank firmware for packer libvirt tests
+        if: ${{ !inputs.oras }}
+        run: |
+          pushd "install/overlays/libvirt"
+          sed -i 's/\(- LIBVIRT_FIRMWARE=.*\)/#\1/g' kustomization.yaml
+          # Print for debugging
+          echo "::group::Kustomization.yaml"
+          cat kustomization.yaml
+          echo "::endgroup::"
+          popd
+
       - name: Update kustomization configuration
         run: |
           pushd "install/overlays/libvirt"

diff --git a/src/cloud-api-adaptor/install/overlays/libvirt/kustomization.yaml b/src/cloud-api-adaptor/install/overlays/libvirt/kustomization.yaml
@@ -25,8 +25,8 @@ configMapGenerator:
   - DISABLECVM="true" # set as false to enable confidential VM
   - SECURE_COMMS="false" # set as true to enable Secure Comms
   - INITDATA="" # set default initdata for podvm
+  - LIBVIRT_FIRMWARE="/usr/share/edk2/ovmf/OVMF_CODE.fd" # Set if you want to change the firmware path, or comment to unset.
   #- LIBVIRT_LAUNCH_SECURITY="" #sev or s390-pv
-  #- LIBVIRT_FIRMWARE="" # Uncomment and set if you want to change the firmware path. Defaults to /usr/share/edk2/ovmf/OVMF_CODE.fd
   #- LIBVIRT_VOL_NAME="" # Uncomment and set if you want to use a specific volume name. Defaults to podvm-base.qcow2
   #- PAUSE_IMAGE="" # Uncomment and set if you want to use a specific pause image
   #- VXLAN_PORT="" # Uncomment and set if you want to use a specific vxlan port. Defaults to 4789

diff --git a/src/cloud-providers/libvirt/manager.go b/src/cloud-providers/libvirt/manager.go
@@ -22,7 +22,7 @@ const (
 	defaultDataDir        = "/var/lib/libvirt/images"
 	defaultVolName        = "podvm-base.qcow2"
 	defaultLaunchSecurity = ""
-	defaultFirmware       = "/usr/share/edk2/ovmf/OVMF_CODE.fd"
+	defaultFirmware       = ""
 )
 
 func init() {