Skip to content

Commit cfc8c26

Browse files
committed
[apps] Add enum of allowed values to resourcePreset in all applications
It was present in some apps, such as managed kubernetes, but missing in others. bitnami/readme-generator removes enums after re-generating README, so now we patch them back using `yq` in Makefiles. Signed-off-by: Nick Volynkin <[email protected]>
1 parent 4369b03 commit cfc8c26

22 files changed

Lines changed: 168 additions & 25 deletions

‎packages/apps/clickhouse/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ include ../../../scripts/package.mk
55

66
generate:
77
readme-generator -v values.yaml -s values.schema.json -r README.md
8+
yq -i -o json --indent 4 '.properties.resourcesPreset.enum = ["none", "nano", "micro", "small", "medium", "large", "xlarge", "2xlarge"]' values.schema.json
89

910
image:
1011
docker buildx build images/clickhouse-backup \

‎packages/apps/clickhouse/values.schema.json‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,17 @@
8585
"resourcesPreset": {
8686
"type": "string",
8787
"description": "Use a common resources preset when `resources` is not set explicitly.",
88-
"default": "small"
88+
"default": "small",
89+
"enum": [
90+
"none",
91+
"nano",
92+
"micro",
93+
"small",
94+
"medium",
95+
"large",
96+
"xlarge",
97+
"2xlarge"
98+
]
8999
}
90100
}
91-
}
101+
}

‎packages/apps/ferretdb/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ include ../../../scripts/package.mk
22

33
generate:
44
readme-generator -v values.yaml -s values.schema.json -r README.md
5+
yq -i -o json --indent 4 '.properties.resourcesPreset.enum = ["none", "nano", "micro", "small", "medium", "large", "xlarge", "2xlarge"]' values.schema.json

‎packages/apps/ferretdb/values.schema.json‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,17 @@
9090
"resourcesPreset": {
9191
"type": "string",
9292
"description": "Use a common resources preset when `resources` is not set explicitly. (allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge)",
93-
"default": "nano"
93+
"default": "nano",
94+
"enum": [
95+
"none",
96+
"nano",
97+
"micro",
98+
"small",
99+
"medium",
100+
"large",
101+
"xlarge",
102+
"2xlarge"
103+
]
94104
}
95105
}
96-
}
106+
}

‎packages/apps/http-cache/Makefile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ image-nginx:
2323

2424
generate:
2525
readme-generator -v values.yaml -s values.schema.json -r README.md
26+
yq -i -o json --indent 4 '.properties.haproxy.properties.resourcesPreset.enum = ["none", "nano", "micro", "small", "medium", "large", "xlarge", "2xlarge"]' values.schema.json
27+
yq -i -o json --indent 4 '.properties.nginx.properties.resourcesPreset.enum = ["none", "nano", "micro", "small", "medium", "large", "xlarge", "2xlarge"]' values.schema.json
2628

2729
update:
2830
tag=$$(git ls-remote --tags --sort="v:refname" https://github.com/chrislim2888/IP2Location-C-Library | awk -F'[/^]' 'END{print $$3}') && \

‎packages/apps/http-cache/values.schema.json‎

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,17 @@
3333
"resourcesPreset": {
3434
"type": "string",
3535
"description": "Use a common resources preset when `resources` is not set explicitly. (allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge)",
36-
"default": "nano"
36+
"default": "nano",
37+
"enum": [
38+
"none",
39+
"nano",
40+
"micro",
41+
"small",
42+
"medium",
43+
"large",
44+
"xlarge",
45+
"2xlarge"
46+
]
3747
}
3848
}
3949
},
@@ -53,7 +63,17 @@
5363
"resourcesPreset": {
5464
"type": "string",
5565
"description": "Use a common resources preset when `resources` is not set explicitly. (allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge)",
56-
"default": "nano"
66+
"default": "nano",
67+
"enum": [
68+
"none",
69+
"nano",
70+
"micro",
71+
"small",
72+
"medium",
73+
"large",
74+
"xlarge",
75+
"2xlarge"
76+
]
5777
}
5878
}
5979
},
@@ -64,4 +84,4 @@
6484
"items": {}
6585
}
6686
}
67-
}
87+
}

‎packages/apps/kafka/Makefile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@ include ../../../scripts/package.mk
22

33
generate:
44
readme-generator -v values.yaml -s values.schema.json -r README.md
5+
yq -i -o json --indent 4 '.properties.kafka.properties.resourcesPreset.enum = ["none", "nano", "micro", "small", "medium", "large", "xlarge", "2xlarge"]' values.schema.json
6+
yq -i -o json --indent 4 '.properties.zookeeper.properties.resourcesPreset.enum = ["none", "nano", "micro", "small", "medium", "large", "xlarge", "2xlarge"]' values.schema.json

‎packages/apps/kafka/values.schema.json‎

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,17 @@
3333
"resourcesPreset": {
3434
"type": "string",
3535
"description": "Use a common resources preset when `resources` is not set explicitly. (allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge)",
36-
"default": "small"
36+
"default": "small",
37+
"enum": [
38+
"none",
39+
"nano",
40+
"micro",
41+
"small",
42+
"medium",
43+
"large",
44+
"xlarge",
45+
"2xlarge"
46+
]
3747
}
3848
}
3949
},
@@ -63,7 +73,17 @@
6373
"resourcesPreset": {
6474
"type": "string",
6575
"description": "Use a common resources preset when `resources` is not set explicitly. (allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge)",
66-
"default": "small"
76+
"default": "small",
77+
"enum": [
78+
"none",
79+
"nano",
80+
"micro",
81+
"small",
82+
"medium",
83+
"large",
84+
"xlarge",
85+
"2xlarge"
86+
]
6787
}
6888
}
6989
},
@@ -74,4 +94,4 @@
7494
"items": {}
7595
}
7696
}
77-
}
97+
}

‎packages/apps/mysql/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ include ../../../scripts/package.mk
55

66
generate:
77
readme-generator -v values.yaml -s values.schema.json -r README.md
8+
yq -i -o json --indent 4 '.properties.resourcesPreset.enum = ["none", "nano", "micro", "small", "medium", "large", "xlarge", "2xlarge"]' values.schema.json
89

910
image:
1011
docker buildx build images/mariadb-backup \

‎packages/apps/mysql/values.schema.json‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,17 @@
7575
"resourcesPreset": {
7676
"type": "string",
7777
"description": "Use a common resources preset when `resources` is not set explicitly. (allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge)",
78-
"default": "nano"
78+
"default": "nano",
79+
"enum": [
80+
"none",
81+
"nano",
82+
"micro",
83+
"small",
84+
"medium",
85+
"large",
86+
"xlarge",
87+
"2xlarge"
88+
]
7989
}
8090
}
81-
}
91+
}

0 commit comments

Comments
 (0)