mnl/VM-Operator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 4 Wiki Activity Actions

Merge remote-tracking branch 'origin/main' into testing

Browse source
This commit is contained in:
Michael Lipp 2024-11-12 22:56:06 +01:00
commit 5ec7f58bbd
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
org.jdrupes.vmoperator.runner.qemu/resources/org/jdrupes/vmoperator/runner/qemu/defaults.yaml
View file

@ -8,6 +8,9 @@
- "/usr/share/edk2/ovmf/OVMF_CODE.fd" - "/usr/share/edk2/ovmf/OVMF_CODE.fd"
- "/usr/share/edk2/x64/OVMF_CODE.fd" - "/usr/share/edk2/x64/OVMF_CODE.fd"
- "/usr/share/OVMF/OVMF_CODE.fd" - "/usr/share/OVMF/OVMF_CODE.fd"
# Use 4M version as fallback (if smaller version not available)
- "/usr/share/edk2/ovmf-4m/OVMF_CODE.fd"
- "/usr/share/edk2/x64/OVMF_CODE.4m.fd"
"vars": "vars":
- "/usr/share/edk2/ovmf/OVMF_VARS.fd" - "/usr/share/edk2/ovmf/OVMF_VARS.fd"
- "/usr/share/edk2/x64/OVMF_VARS.fd" - "/usr/share/edk2/x64/OVMF_VARS.fd"

5
org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Runner.java
View file

@ -204,7 +204,7 @@ public class Runner extends Component {
private static final String FW_VARS = "fw-vars.fd"; private static final String FW_VARS = "fw-vars.fd";
private static int exitStatus; private static int exitStatus;
private EventPipeline rep; private final EventPipeline rep = newEventPipeline();
private final ObjectMapper yamlMapper = new ObjectMapper(YAMLFactory private final ObjectMapper yamlMapper = new ObjectMapper(YAMLFactory
.builder().disable(YAMLGenerator.Feature.WRITE_DOC_START_MARKER) .builder().disable(YAMLGenerator.Feature.WRITE_DOC_START_MARKER)
.build()); .build());
@ -446,8 +446,7 @@ public class Runner extends Component {
// https://github.com/kubernetes-client/java/issues/100 // https://github.com/kubernetes-client/java/issues/100
io.kubernetes.client.openapi.Configuration.setDefaultApiClient(null); io.kubernetes.client.openapi.Configuration.setDefaultApiClient(null);
// Prepare specific event pipeline to avoid concurrency. // Provide specific event pipeline to avoid concurrency.
rep = newEventPipeline();
event.setAssociated(EventPipeline.class, rep); event.setAssociated(EventPipeline.class, rep);
try { try {
// Store process id // Store process id