Skip to content

Commit 9fc99ee

Browse files
lexfreilexfrei
committed
chore(etcd): regenerate values.schema.json and cozyrd manifest
Run 'make generate' under packages/extra/etcd to refresh the JSON schema and the corresponding ResourceDefinition YAML after adding backup and resources fields. Matches cozyvalues-gen v1.3.0 output used by the pre-commit CI check. Assisted-By: Claude <[email protected]> Signed-off-by: Aleksei Sviridkin <[email protected]>
1 parent 6deca1b commit 9fc99ee

2 files changed

Lines changed: 60 additions & 60 deletions

File tree

‎packages/extra/etcd/values.schema.json‎

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,65 @@
22
"title": "Chart Values",
33
"type": "object",
44
"properties": {
5+
"size": {
6+
"description": "Persistent Volume size.",
7+
"default": "4Gi",
8+
"pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
9+
"anyOf": [
10+
{
11+
"type": "integer"
12+
},
13+
{
14+
"type": "string"
15+
}
16+
],
17+
"x-kubernetes-int-or-string": true
18+
},
19+
"storageClass": {
20+
"description": "StorageClass used to store the data.",
21+
"type": "string",
22+
"default": ""
23+
},
24+
"replicas": {
25+
"description": "Number of etcd replicas.",
26+
"type": "integer",
27+
"default": 3
28+
},
29+
"resources": {
30+
"description": "Resource configuration for etcd.",
31+
"type": "object",
32+
"default": {},
33+
"properties": {
34+
"cpu": {
35+
"description": "Number of CPU cores allocated.",
36+
"default": "1000m",
37+
"pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
38+
"anyOf": [
39+
{
40+
"type": "integer"
41+
},
42+
{
43+
"type": "string"
44+
}
45+
],
46+
"x-kubernetes-int-or-string": true
47+
},
48+
"memory": {
49+
"description": "Amount of memory allocated.",
50+
"default": "512Mi",
51+
"pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
52+
"anyOf": [
53+
{
54+
"type": "integer"
55+
},
56+
{
57+
"type": "string"
58+
}
59+
],
60+
"x-kubernetes-int-or-string": true
61+
}
62+
}
63+
},
564
"backup": {
665
"description": "Backup configuration.",
766
"type": "object",
@@ -58,65 +117,6 @@
58117
"default": 3
59118
}
60119
}
61-
},
62-
"replicas": {
63-
"description": "Number of etcd replicas.",
64-
"type": "integer",
65-
"default": 3
66-
},
67-
"resources": {
68-
"description": "Resource configuration for etcd.",
69-
"type": "object",
70-
"default": {},
71-
"properties": {
72-
"cpu": {
73-
"description": "Number of CPU cores allocated.",
74-
"default": "1000m",
75-
"pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
76-
"anyOf": [
77-
{
78-
"type": "integer"
79-
},
80-
{
81-
"type": "string"
82-
}
83-
],
84-
"x-kubernetes-int-or-string": true
85-
},
86-
"memory": {
87-
"description": "Amount of memory allocated.",
88-
"default": "512Mi",
89-
"pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
90-
"anyOf": [
91-
{
92-
"type": "integer"
93-
},
94-
{
95-
"type": "string"
96-
}
97-
],
98-
"x-kubernetes-int-or-string": true
99-
}
100-
}
101-
},
102-
"size": {
103-
"description": "Persistent Volume size.",
104-
"default": "4Gi",
105-
"pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
106-
"anyOf": [
107-
{
108-
"type": "integer"
109-
},
110-
{
111-
"type": "string"
112-
}
113-
],
114-
"x-kubernetes-int-or-string": true
115-
},
116-
"storageClass": {
117-
"description": "StorageClass used to store the data.",
118-
"type": "string",
119-
"default": ""
120120
}
121121
}
122122
}

‎packages/system/etcd-rd/cozyrds/etcd.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ spec:
88
plural: etcds
99
singular: etcd
1010
openAPISchema: |-
11-
{"title":"Chart Values","type":"object","properties":{"backup":{"description":"Backup configuration.","type":"object","default":{},"properties":{"destinationPath":{"description":"Destination path for backups (e.g. s3://bucket/path/).","type":"string","default":""},"enabled":{"description":"Enable scheduled S3 backups.","type":"boolean","default":false},"endpointURL":{"description":"S3 endpoint URL for uploads.","type":"string","default":""},"failedJobsHistoryLimit":{"description":"Number of failed backup jobs to retain.","type":"integer","default":1},"forcePathStyle":{"description":"Use path-style S3 URLs (required for MinIO and most S3-compatible providers).","type":"boolean","default":true},"region":{"description":"S3 region.","type":"string","default":""},"s3AccessKey":{"description":"Access key for S3 authentication.","type":"string","default":""},"s3SecretKey":{"description":"Secret key for S3 authentication.","type":"string","default":""},"schedule":{"description":"Cron schedule for automated backups.","type":"string","default":"0 2 * * *"},"successfulJobsHistoryLimit":{"description":"Number of successful backup jobs to retain.","type":"integer","default":3}}},"replicas":{"description":"Number of etcd replicas.","type":"integer","default":3},"resources":{"description":"Resource configuration for etcd.","type":"object","default":{},"properties":{"cpu":{"description":"Number of CPU cores allocated.","default":"1000m","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Amount of memory allocated.","default":"512Mi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"size":{"description":"Persistent Volume size.","default":"4Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"storageClass":{"description":"StorageClass used to store the data.","type":"string","default":""}}}
11+
{"title":"Chart Values","type":"object","properties":{"size":{"description":"Persistent Volume size.","default":"4Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"storageClass":{"description":"StorageClass used to store the data.","type":"string","default":""},"replicas":{"description":"Number of etcd replicas.","type":"integer","default":3},"resources":{"description":"Resource configuration for etcd.","type":"object","default":{},"properties":{"cpu":{"description":"Number of CPU cores allocated.","default":"1000m","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Amount of memory allocated.","default":"512Mi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"backup":{"description":"Backup configuration.","type":"object","default":{},"properties":{"destinationPath":{"description":"Destination path for backups (e.g. s3://bucket/path/).","type":"string","default":""},"enabled":{"description":"Enable scheduled S3 backups.","type":"boolean","default":false},"endpointURL":{"description":"S3 endpoint URL for uploads.","type":"string","default":""},"failedJobsHistoryLimit":{"description":"Number of failed backup jobs to retain.","type":"integer","default":1},"forcePathStyle":{"description":"Use path-style S3 URLs (required for MinIO and most S3-compatible providers).","type":"boolean","default":true},"region":{"description":"S3 region.","type":"string","default":""},"s3AccessKey":{"description":"Access key for S3 authentication.","type":"string","default":""},"s3SecretKey":{"description":"Secret key for S3 authentication.","type":"string","default":""},"schedule":{"description":"Cron schedule for automated backups.","type":"string","default":"0 2 * * *"},"successfulJobsHistoryLimit":{"description":"Number of successful backup jobs to retain.","type":"integer","default":3}}}}}
1212
release:
1313
prefix: ""
1414
labels:

0 commit comments

Comments
 (0)