Skip to content

Commit 2182ef6

Browse files
gilesknapgilesknap
committed
move schema out of packaged chart. Helm does not treat it correctly
1 parent a149b7d commit 2182ef6

File tree

5 files changed

+158
-170
lines changed

5 files changed

+158
-170
lines changed

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ repos:
3333
- Charts/fastcs/values.yaml
3434
- --no-additional-properties
3535
- -o
36-
- Charts/fastcs/values.schema.json
36+
- schemas/fastcs-values.schema.json
3737

3838
- repo: https://github.com/losisin/helm-values-schema-json
3939
rev: v2.2.1

‎Charts/fastcs/values.schema.json‎

Lines changed: 0 additions & 157 deletions
This file was deleted.

‎schemas/fastcs-service-values.yaml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,3 @@
99
# fast cs schema appears under the subchart fastcs
1010
# @schema $ref: fastcs-values.schema.json
1111
fastcs: {}
12-
13-
# Because fastcs and ioc-instance will share the same global values file
14-
# we must also allow ioc-instance to be defined here but do not use it in
15-
# fastcs itself.
16-
#
17-
# @schema required:false;additionalProperties:true
18-
ioc-instance: {}

‎schemas/fastcs-service.schema.json‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66
"$ref": "fastcs-values.schema.json",
77
"type": "object",
88
"additionalProperties": false
9-
},
10-
"ioc-instance": {
11-
"type": "object",
12-
"additionalProperties": true
139
}
1410
},
1511
"additionalProperties": false

‎schemas/fastcs-values.schema.json‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎schemas/fastcs-values.schema.json‎

Lines changed: 157 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,157 @@
1+
{
2+
"$schema": "https://json-schema.org/draft/2020-12/schema",
3+
"type": "object",
4+
"properties": {
5+
"affinity": {
6+
"$ref": "https://kubernetesjsonschema.dev/v1.18.1/_definitions.json#/definitions/io.k8s.api.core.v1.Affinity",
7+
"type": "object",
8+
"additionalProperties": false
9+
},
10+
"args": {
11+
"description": "command args to pass to the production container",
12+
"type": "array"
13+
},
14+
"autostart": {
15+
"description": "editable and autostart are used for debugging and development in-cluster",
16+
"type": "boolean"
17+
},
18+
"baseIp": {
19+
"description": "CIDR for services addresses.",
20+
"type": "string",
21+
"pattern": "^(\\d{1,3}\\.){3}\\d{1,3}\\/\\d{1,2}$"
22+
},
23+
"ca_server_port": {
24+
"description": "service port for Channel Access",
25+
"type": "integer"
26+
},
27+
"clusterIP": {
28+
"description": "Override for the cluster IP - only needed if allocateIpFromName clashes",
29+
"type": "null",
30+
"pattern": "^(\\d{1,3}\\.){3}\\d{1,3}$"
31+
},
32+
"command": {
33+
"description": "command to run for the production container",
34+
"type": "array"
35+
},
36+
"debugCommand": {
37+
"description": "command to run for the debugging (non- autostart) container",
38+
"type": "array",
39+
"items": {
40+
"type": "string"
41+
}
42+
},
43+
"editable": {
44+
"description": "editable and autostart are used for debugging and development in-cluster",
45+
"type": "boolean"
46+
},
47+
"extraContainers": {
48+
"type": "array"
49+
},
50+
"hostNetwork": {
51+
"description": "enable host networking for the pod",
52+
"type": "boolean"
53+
},
54+
"image": {
55+
"description": "container image URI",
56+
"type": "object",
57+
"properties": {
58+
"pullPolicy": {
59+
"type": "string"
60+
},
61+
"repository": {
62+
"type": "string"
63+
},
64+
"tag": {
65+
"type": "string"
66+
}
67+
},
68+
"additionalProperties": false
69+
},
70+
"initCommand": {
71+
"description": "command to run in the init container for editable mode",
72+
"type": "array",
73+
"items": {
74+
"type": "string"
75+
}
76+
},
77+
"iocConfig": {
78+
"description": "path to the location of config folder (defaults to be the same as C++ IOCs)",
79+
"type": "string"
80+
},
81+
"livenessProbe": {
82+
"$ref": "https://kubernetesjsonschema.dev/v1.18.1/_definitions.json#/definitions/io.k8s.api.core.v1.Probe",
83+
"type": "object",
84+
"additionalProperties": false
85+
},
86+
"nodeSelector": {
87+
"type": [
88+
"object",
89+
"null"
90+
],
91+
"additionalProperties": false
92+
},
93+
"podAnnotations": {
94+
"description": "Add annotations to the pod",
95+
"type": "object",
96+
"additionalProperties": false
97+
},
98+
"podLabels": {
99+
"description": "Add labels to the pod",
100+
"type": "object",
101+
"additionalProperties": false
102+
},
103+
"podSecurityContext": {
104+
"$ref": "https://kubernetesjsonschema.dev/v1.18.1/_definitions.json#/definitions/io.k8s.api.core.v1.SecurityContext",
105+
"type": "object",
106+
"additionalProperties": false
107+
},
108+
"pva_server_port": {
109+
"description": "service port for PV Access",
110+
"type": "integer"
111+
},
112+
"readinessProbe": {
113+
"$ref": "https://kubernetesjsonschema.dev/v1.18.1/_definitions.json#/definitions/io.k8s.api.core.v1.Probe",
114+
"type": "object",
115+
"additionalProperties": false
116+
},
117+
"resources": {
118+
"$ref": "https://kubernetesjsonschema.dev/v1.18.1/_definitions.json#/definitions/io.k8s.api.core.v1.ResourceRequirements",
119+
"type": "object",
120+
"additionalProperties": false
121+
},
122+
"securityContext": {
123+
"$ref": "https://kubernetesjsonschema.dev/v1.18.1/_definitions.json#/definitions/io.k8s.api.core.v1.SecurityContext",
124+
"type": "object",
125+
"additionalProperties": false
126+
},
127+
"service": {
128+
"description": "The service will be configured for Channel Access and PVA.",
129+
"type": "object",
130+
"properties": {
131+
"ca_port": {
132+
"type": "integer"
133+
},
134+
"pva_port": {
135+
"type": "integer"
136+
},
137+
"type": {
138+
"type": "string"
139+
}
140+
},
141+
"additionalProperties": false
142+
},
143+
"tolerations": {
144+
"$ref": "https://kubernetesjsonschema.dev/v1.18.1/_definitions.json#/definitions/io.k8s.api.core.v1.Toleration",
145+
"type": "array"
146+
},
147+
"volumeMounts": {
148+
"$ref": "https://kubernetesjsonschema.dev/v1.18.1/_definitions.json#/definitions/io.k8s.api.core.v1.VolumeMount",
149+
"type": "array"
150+
},
151+
"volumes": {
152+
"$ref": "https://kubernetesjsonschema.dev/v1.18.1/_definitions.json#/definitions/io.k8s.api.core.v1.Volume",
153+
"type": "array"
154+
}
155+
},
156+
"additionalProperties": false
157+
}

0 commit comments

Comments
 (0)