kvm/theia: fixup resilient schema

  You cannot expand properties with  since it expects
  to be an object or boolean.

  Revert to use allOf back, however set additionalProperties true,
  so the schemas are mutually partially valid.

  Other solutions might too verbose or too restrictive to the use
  case (or simply invalid).

software/kvm/instance-kvm-resilient-input-schema.json

@@ -2,9 +2,14 @@
   "type": "object",
   "$schema": "https://json-schema.org/draft/2020-12/schema#",
   "description": "Parameters to instantiate resilient KVM",
-  "additionalProperties": false,
+  "allOf": [
+    {
+      "$ref": "./instance-kvm-input-schema.json#",
+      "additionalProperties": true,
+    },
+    {
+      "additionalProperties": true,
       "properties": {
-    "$ref": "./instance-kvm-input-schema.json#/properties",
         "resilient-clone-number": {
           "title": "Amount of backup(s) to create",
           "description": "Amount of backup(s) to create. Each backup consists of a Pull Backup Server and a clone.",
@@ -56,4 +61,6 @@
           "optional": true
         }
       }
+    }
+  ]
 }

software/theia/instance-input-schema.json

@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-06/schema#",
   "type": "object",
   "description": "Parameters to instantiate Theia",
-  "additionalProperties": false,
+  "unevaluatedProperties": false,
   "properties": {
     "autorun": {
       "title": "Automatically Run Software/Instance",

software/theia/instance-resilient-input-schema.json

@@ -3,6 +3,11 @@
   "type": "object",
   "description": "Parameters to instantiate resilient Theia",
   "additionalProperties": false,
+  "allOf": [
+    {
+      "$ref": "./instance-input-schema.json#"
+    }
+  ],
   "properties": {
     "resilient-clone-number": {
       "title": "Amount of backup(s) to create",
@@ -55,7 +60,7 @@
       "type": "string",
       "default": "2W",
       "optional": true
-    },
-    "$ref": "./instance-input-schema.json#/properties"
     }
+  },
+  "unevaluatedProperties": false
 }