Skip to content

chore: update helm-values-schema to v2.3.1 #1320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ZohebShaikh merged 6 commits into from
Jan 6, 2026
Merged

chore: update helm-values-schema to v2.3.1 #1320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d7b278f
Update helm-values-schema
ZohebShaikh Jan 5, 2026
49ca17e
move generate_config_schema to config.py
ZohebShaikh Jan 5, 2026
e93306f
Make change smaller
ZohebShaikh Jan 5, 2026
2ab4f44
fix test
ZohebShaikh Jan 5, 2026
e34d103
Merge branch 'main' into update-helm-schema
ZohebShaikh Jan 5, 2026
20ccef4
Merge branch 'main' into update-helm-schema
ZohebShaikh Jan 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/_tox.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
uses: astral-sh/setup-uv@v7

- name: Install helm plugins
run: helm plugin install https://github.com/losisin/helm-values-schema-json.git --version 2.2.1
run: helm plugin install https://github.com/losisin/helm-values-schema-json.git --version 2.3.1

- name: Run tox
run: uv run --locked tox -e ${{ inputs.tox }}
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ repos:
- --chart-search-root=helm

- repo: https://github.com/losisin/helm-values-schema-json
rev: v2.2.1
rev: v2.3.1
hooks:
- id: helm-schema
args:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ RUN curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/s
chmod 700 get_helm.sh; \
./get_helm.sh; \
rm get_helm.sh
RUN helm plugin install https://github.com/losisin/helm-values-schema-json.git --version 2.2.1
RUN helm plugin install https://github.com/losisin/helm-values-schema-json.git --version 2.3.1

# The build stage installs the context into the venv
FROM developer AS build
Expand Down
1 change: 0 additions & 1 deletion helm/blueapi/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ A Helm chart deploying a worker pod that runs Bluesky plans
| debug.suspend | bool | `false` | If enabled does not start the service on startup This allows connecting to the pod and starting the service manually to allow debugging on the cluster |
| extraEnvVars | list | `[]` | Additional envVars to mount to the pod |
| fullnameOverride | string | `""` | |
| global | object | `{}` | Not used, but must be present for validation when using as a dependency of another chart |
| hostNetwork | bool | `false` | May be needed for EPICS depending on gateway configuration |
| image.pullPolicy | string | `"IfNotPresent"` | |
| image.repository | string | `"ghcr.io/diamondlightsource/blueapi"` | To use a container image that extends the blueapi one, set it here |
Expand Down
98 changes: 58 additions & 40 deletions helm/blueapi/config_schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
"password"
],
"title": "BasicAuthentication",
"type": "object"
"type": "object",
"$id": "BasicAuthentication"
},
"CORSConfig": {
"additionalProperties": false,
Expand Down Expand Up @@ -62,7 +63,8 @@
"origins"
],
"title": "CORSConfig",
"type": "object"
"type": "object",
"$id": "CORSConfig"
},
"DeviceManagerSource": {
"additionalProperties": false,
Expand Down Expand Up @@ -95,7 +97,8 @@
"module"
],
"title": "DeviceManagerSource",
"type": "object"
"type": "object",
"$id": "DeviceManagerSource"
},
"DeviceSource": {
"additionalProperties": false,
Expand All @@ -116,7 +119,8 @@
"module"
],
"title": "DeviceSource",
"type": "object"
"type": "object",
"$id": "DeviceSource"
},
"DodalSource": {
"additionalProperties": false,
Expand All @@ -143,7 +147,8 @@
"module"
],
"title": "DodalSource",
"type": "object"
"type": "object",
"$id": "DodalSource"
},
"EnvironmentConfig": {
"additionalProperties": false,
Expand All @@ -163,38 +168,38 @@
"items": {
"discriminator": {
"mapping": {
"deviceFunctions": "#/$defs/DeviceSource",
"deviceManager": "#/$defs/DeviceManagerSource",
"dodal": "#/$defs/DodalSource",
"planFunctions": "#/$defs/PlanSource"
"deviceFunctions": "DeviceSource",
"deviceManager": "DeviceManagerSource",
"dodal": "DodalSource",
"planFunctions": "PlanSource"
},
"propertyName": "kind"
},
"oneOf": [
{
"$ref": "#/$defs/PlanSource"
"$ref": "PlanSource"
},
{
"$ref": "#/$defs/DeviceSource"
"$ref": "DeviceSource"
},
{
"$ref": "#/$defs/DodalSource"
"$ref": "DodalSource"
},
{
"$ref": "#/$defs/DeviceManagerSource"
"$ref": "DeviceManagerSource"
}
]
},
"title": "Sources",
"type": "array"
},
"events": {
"$ref": "#/$defs/WorkerEventConfig"
"$ref": "WorkerEventConfig"
},
"metadata": {
"anyOf": [
{
"$ref": "#/$defs/MetadataConfig"
"$ref": "MetadataConfig"
},
{
"type": "null"
Expand All @@ -204,7 +209,8 @@
}
},
"title": "EnvironmentConfig",
"type": "object"
"type": "object",
"$id": "EnvironmentConfig"
},
"GraylogConfig": {
"additionalProperties": false,
Expand All @@ -223,7 +229,8 @@
}
},
"title": "GraylogConfig",
"type": "object"
"type": "object",
"$id": "GraylogConfig"
},
"LoggingConfig": {
"additionalProperties": false,
Expand All @@ -242,15 +249,16 @@
"type": "string"
},
"graylog": {
"$ref": "#/$defs/GraylogConfig",
"$ref": "GraylogConfig",
"default": {
"enabled": false,
"url": "tcp://localhost:5555"
}
}
},
"title": "LoggingConfig",
"type": "object"
"type": "object",
"$id": "LoggingConfig"
},
"MetadataConfig": {
"additionalProperties": false,
Expand All @@ -264,7 +272,8 @@
"instrument"
],
"title": "MetadataConfig",
"type": "object"
"type": "object",
"$id": "MetadataConfig"
},
"NumtrackerConfig": {
"additionalProperties": false,
Expand All @@ -284,7 +293,8 @@
}
},
"title": "NumtrackerConfig",
"type": "object"
"type": "object",
"$id": "NumtrackerConfig"
},
"OIDCConfig": {
"additionalProperties": false,
Expand Down Expand Up @@ -317,7 +327,8 @@
"client_id"
],
"title": "OIDCConfig",
"type": "object"
"type": "object",
"$id": "OIDCConfig"
},
"PlanSource": {
"additionalProperties": false,
Expand All @@ -338,7 +349,8 @@
"module"
],
"title": "PlanSource",
"type": "object"
"type": "object",
"$id": "PlanSource"
},
"RestConfig": {
"additionalProperties": false,
Expand All @@ -354,7 +366,7 @@
"cors": {
"anyOf": [
{
"$ref": "#/$defs/CORSConfig"
"$ref": "CORSConfig"
},
{
"type": "null"
Expand All @@ -364,7 +376,8 @@
}
},
"title": "RestConfig",
"type": "object"
"type": "object",
"$id": "RestConfig"
},
"ScratchConfig": {
"additionalProperties": false,
Expand Down Expand Up @@ -392,14 +405,15 @@
"repositories": {
"description": "Details of repositories to be cloned and imported into blueapi",
"items": {
"$ref": "#/$defs/ScratchRepository"
"$ref": "ScratchRepository"
},
"title": "Repositories",
"type": "array"
}
},
"title": "ScratchConfig",
"type": "object"
"type": "object",
"$id": "ScratchConfig"
},
"ScratchRepository": {
"additionalProperties": false,
Expand All @@ -418,7 +432,8 @@
}
},
"title": "ScratchRepository",
"type": "object"
"type": "object",
"$id": "ScratchRepository"
},
"StompConfig": {
"additionalProperties": false,
Expand All @@ -440,7 +455,7 @@
"auth": {
"anyOf": [
{
"$ref": "#/$defs/BasicAuthentication"
"$ref": "BasicAuthentication"
},
{
"type": "null"
Expand All @@ -451,7 +466,8 @@
}
},
"title": "StompConfig",
"type": "object"
"type": "object",
"$id": "StompConfig"
},
"TiledConfig": {
"additionalProperties": false,
Expand Down Expand Up @@ -484,7 +500,8 @@
}
},
"title": "TiledConfig",
"type": "object"
"type": "object",
"$id": "TiledConfig"
},
"WorkerEventConfig": {
"additionalProperties": false,
Expand All @@ -497,31 +514,32 @@
}
},
"title": "WorkerEventConfig",
"type": "object"
"type": "object",
"$id": "WorkerEventConfig"
}
},
"additionalProperties": false,
"description": "Config for the worker application as a whole. Root of\nconfig tree.",
"properties": {
"stomp": {
"$ref": "#/$defs/StompConfig"
"$ref": "StompConfig"
},
"tiled": {
"$ref": "#/$defs/TiledConfig"
"$ref": "TiledConfig"
},
"env": {
"$ref": "#/$defs/EnvironmentConfig"
"$ref": "EnvironmentConfig"
},
"logging": {
"$ref": "#/$defs/LoggingConfig"
"$ref": "LoggingConfig"
},
"api": {
"$ref": "#/$defs/RestConfig"
"$ref": "RestConfig"
},
"scratch": {
"anyOf": [
{
"$ref": "#/$defs/ScratchConfig"
"$ref": "ScratchConfig"
},
{
"type": "null"
Expand All @@ -532,7 +550,7 @@
"oidc": {
"anyOf": [
{
"$ref": "#/$defs/OIDCConfig"
"$ref": "OIDCConfig"
},
{
"type": "null"
Expand All @@ -556,7 +574,7 @@
"numtracker": {
"anyOf": [
{
"$ref": "#/$defs/NumtrackerConfig"
"$ref": "NumtrackerConfig"
},
{
"type": "null"
Expand Down
Loading