Skip to content

Commit 29de47a

Browse files
Merge pull request #137 from jacobweinstock/simplify-json-schema
Simplify json schema; update readme
2 parents 1a26103 + 1ace57a commit 29de47a

File tree

6 files changed

+30
-752
lines changed

6 files changed

+30
-752
lines changed

tinkerbell/hegel/values.schema.json

Lines changed: 5 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -2,67 +2,6 @@
22
"$schema": "http://json-schema.org/draft-04/schema#",
33
"type": "object",
44
"properties": {
5-
"deploy": {
6-
"type": "boolean"
7-
},
8-
"name": {
9-
"type": "string"
10-
},
11-
"image": {
12-
"type": "string"
13-
},
14-
"imagePullPolicy": {
15-
"type": "string"
16-
},
17-
"replicas": {
18-
"type": "integer"
19-
},
20-
"service": {
21-
"type": "object",
22-
"properties": {
23-
"port": {
24-
"type": "integer"
25-
}
26-
}
27-
},
28-
"deployment": {
29-
"type": "object",
30-
"properties": {
31-
"port": {
32-
"type": "integer"
33-
},
34-
"portName": {
35-
"type": "string"
36-
}
37-
}
38-
},
39-
"resources": {
40-
"type": "object",
41-
"properties": {
42-
"limits": {
43-
"type": "object",
44-
"properties": {
45-
"cpu": {
46-
"type": "string"
47-
},
48-
"memory": {
49-
"type": "string"
50-
}
51-
}
52-
},
53-
"requests": {
54-
"type": "object",
55-
"properties": {
56-
"cpu": {
57-
"type": "string"
58-
},
59-
"memory": {
60-
"type": "string"
61-
}
62-
}
63-
}
64-
}
65-
},
665
"rbac": {
676
"type": "object",
687
"properties": {
@@ -78,23 +17,13 @@
7817
}
7918
}
8019
},
81-
"nodeSelector": {
82-
"type": "object"
83-
},
8420
"trustedProxies": {
8521
"type": "array",
86-
"items": {}
87-
},
88-
"singleNodeClusterConfig": {
89-
"type": "object",
90-
"properties": {
91-
"controlPlaneTolerationsEnabled": {
92-
"type": "boolean"
93-
},
94-
"nodeAffinityWeight": {
95-
"type": "integer"
96-
}
97-
}
22+
"items": {
23+
"type": "string",
24+
"description": "Specifies one or more IPv4 addresses expressed using CIDR notation.",
25+
"pattern": "^([0-9]{1,3}\\.){3}[0-9]{1,3}(\/([0-9]|[1-2][0-9]|3[0-2]))?$"
26+
}
9827
}
9928
}
10029
}

tinkerbell/rufio/values.schema.json

Lines changed: 0 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -2,75 +2,6 @@
22
"$schema": "http://json-schema.org/draft-04/schema#",
33
"type": "object",
44
"properties": {
5-
"deploy": {
6-
"type": "boolean"
7-
},
8-
"name": {
9-
"type": "string"
10-
},
11-
"image": {
12-
"type": "string"
13-
},
14-
"imagePullPolicy": {
15-
"type": "string"
16-
},
17-
"resources": {
18-
"type": "object",
19-
"properties": {
20-
"requests": {
21-
"type": "object",
22-
"properties": {
23-
"cpu": {
24-
"type": "string"
25-
},
26-
"memory": {
27-
"type": "string"
28-
}
29-
}
30-
},
31-
"limits": {
32-
"type": "object",
33-
"properties": {
34-
"cpu": {
35-
"type": "string"
36-
},
37-
"memory": {
38-
"type": "string"
39-
}
40-
}
41-
}
42-
}
43-
},
44-
"additionalArgs": {
45-
"type": "array",
46-
"items": {}
47-
},
48-
"serviceAccountName": {
49-
"type": "string"
50-
},
51-
"rufioLeaderElectionRoleName": {
52-
"type": "string"
53-
},
54-
"rufioLeaderElectionRoleBindingName": {
55-
"type": "string"
56-
},
57-
"nodeSelector": {
58-
"type": "object"
59-
},
60-
"hostNetwork": {
61-
"type": "boolean"
62-
},
63-
"singleNodeClusterConfig": {
64-
"type": "object",
65-
"properties": {
66-
"controlPlaneTolerationsEnabled": {
67-
"type": "boolean"
68-
},
69-
"nodeAffinityWeight": {
70-
"type": "integer"
71-
}
72-
}
73-
},
745
"rbac": {
756
"type": "object",
767
"properties": {

0 commit comments

Comments
 (0)