Merge pull request #137 from jacobweinstock/simplify-json-schema

Simplify json schema; update readme
tinkerbell · Oct 25, 2024 · 29de47a · 29de47a
2 parents 1a26103 + 1ace57a
commit 29de47a
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 752 deletions.
diff --git a/tinkerbell/hegel/values.schema.json b/tinkerbell/hegel/values.schema.json
@@ -2,67 +2,6 @@
     "$schema": "http://json-schema.org/draft-04/schema#",
     "type": "object",
     "properties": {
-      "deploy": {
-        "type": "boolean"
-      },
-      "name": {
-        "type": "string"
-      },
-      "image": {
-        "type": "string"
-      },
-      "imagePullPolicy": {
-        "type": "string"
-      },
-      "replicas": {
-        "type": "integer"
-      },
-      "service": {
-        "type": "object",
-        "properties": {
-          "port": {
-            "type": "integer"
-          }
-        }
-      },
-      "deployment": {
-        "type": "object",
-        "properties": {
-          "port": {
-            "type": "integer"
-          },
-          "portName": {
-            "type": "string"
-          }
-        }
-      },
-      "resources": {
-        "type": "object",
-        "properties": {
-          "limits": {
-            "type": "object",
-            "properties": {
-              "cpu": {
-                "type": "string"
-              },
-              "memory": {
-                "type": "string"
-              }
-            }
-          },
-          "requests": {
-            "type": "object",
-            "properties": {
-              "cpu": {
-                "type": "string"
-              },
-              "memory": {
-                "type": "string"
-              }
-            }
-          }
-        }
-      },
       "rbac": {
         "type": "object",
         "properties": {
@@ -78,23 +17,13 @@
           }
         }
       },
-      "nodeSelector": {
-        "type": "object"
-      },
       "trustedProxies": {
         "type": "array",
-        "items": {}
-      },
-      "singleNodeClusterConfig": {
-        "type": "object",
-        "properties": {
-          "controlPlaneTolerationsEnabled": {
-            "type": "boolean"
-          },
-          "nodeAffinityWeight": {
-            "type": "integer"
-          }
-        }
+        "items": {
+          "type": "string",
+          "description": "Specifies one or more IPv4 addresses expressed using CIDR notation.",
+          "pattern": "^([0-9]{1,3}\\.){3}[0-9]{1,3}(\/([0-9]|[1-2][0-9]|3[0-2]))?$"
+      }
       }
     }
   }
diff --git a/tinkerbell/rufio/values.schema.json b/tinkerbell/rufio/values.schema.json
@@ -2,75 +2,6 @@
     "$schema": "http://json-schema.org/draft-04/schema#",
     "type": "object",
     "properties": {
-      "deploy": {
-        "type": "boolean"
-      },
-      "name": {
-        "type": "string"
-      },
-      "image": {
-        "type": "string"
-      },
-      "imagePullPolicy": {
-        "type": "string"
-      },
-      "resources": {
-        "type": "object",
-        "properties": {
-          "requests": {
-            "type": "object",
-            "properties": {
-              "cpu": {
-                "type": "string"
-              },
-              "memory": {
-                "type": "string"
-              }
-            }
-          },
-          "limits": {
-            "type": "object",
-            "properties": {
-              "cpu": {
-                "type": "string"
-              },
-              "memory": {
-                "type": "string"
-              }
-            }
-          }
-        }
-      },
-      "additionalArgs": {
-        "type": "array",
-        "items": {}
-      },
-      "serviceAccountName": {
-        "type": "string"
-      },
-      "rufioLeaderElectionRoleName": {
-        "type": "string"
-      },
-      "rufioLeaderElectionRoleBindingName": {
-        "type": "string"
-      },
-      "nodeSelector": {
-        "type": "object"
-      },
-      "hostNetwork": {
-        "type": "boolean"
-      },
-      "singleNodeClusterConfig": {
-        "type": "object",
-        "properties": {
-          "controlPlaneTolerationsEnabled": {
-            "type": "boolean"
-          },
-          "nodeAffinityWeight": {
-            "type": "integer"
-          }
-        }
-      },
       "rbac": {
         "type": "object",
         "properties": {