Skip to content

Commit 65b8d1f

Browse files
committed
fix(rabbitmq): right-size the default resources preset to s1.nano
Signed-off-by: Yan Bondarenko <[email protected]>
1 parent dc2e427 commit 65b8d1f

7 files changed

Lines changed: 71 additions & 15 deletions

File tree

‎api/apps/v1alpha1/rabbitmq/types.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/apps/rabbitmq/Makefile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
include ../../../hack/package.mk
22

3+
.PHONY: test
4+
test:
5+
helm unittest .
6+
37
generate:
48
cozyvalues-gen -m 'rabbitmq' -v values.yaml -s values.schema.json -r README.md -g ../../../api/apps/v1alpha1/rabbitmq/types.go
59
../../../hack/update-crd.sh

‎packages/apps/rabbitmq/README.md‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ The service utilizes official RabbitMQ operator. This ensures the reliability an
2121
| `resources` | Explicit CPU and memory configuration for each RabbitMQ replica. When omitted, the preset defined in `resourcesPreset` is applied. | `object` | `{}` |
2222
| `resources.cpu` | CPU available to each replica. | `quantity` | `""` |
2323
| `resources.memory` | Memory (RAM) available to each replica. | `quantity` | `""` |
24-
| `resourcesPreset` | Default sizing preset used when `resources` is omitted. | `string` | `t1.nano` |
24+
| `resourcesPreset` | Default sizing preset used when `resources` is omitted. | `string` | `s1.nano` |
2525
| `size` | Persistent Volume Claim size available for application data. | `quantity` | `10Gi` |
2626
| `storageClass` | StorageClass used to store the data. | `string` | `""` |
2727
| `external` | Enable external access from outside the cluster. | `bool` | `false` |
@@ -56,13 +56,6 @@ resources:
5656
`resourcesPreset` sets named CPU and memory configurations for each replica.
5757
This setting is ignored if the corresponding `resources` value is set.
5858

59-
| Preset name | CPU | memory |
60-
|-------------|--------|---------|
61-
| `nano` | `100m` | `128Mi` |
62-
| `micro` | `250m` | `256Mi` |
63-
| `small` | `500m` | `512Mi` |
64-
| `medium` | `500m` | `1Gi` |
65-
| `large` | `1` | `2Gi` |
66-
| `xlarge` | `2` | `4Gi` |
67-
| `2xlarge` | `4` | `8Gi` |
59+
Presets follow a cloud-style `<series>.<size>` naming convention. Five series cover the full CPU-to-memory ratio range (`t1` 1:0.5, `c1` 1:1, `s1` 1:2, `u1` 1:4, `m1` 1:8) and each series ships eight sizes (`nano` through `4xlarge`). The legacy flat names (`nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`) remain accepted as deprecated aliases of their 1:1 instance-type equivalents.
6860

61+
See [`docs/operations/resource-presets.md`](../../../docs/operations/resource-presets.md) for the full size matrix and the legacy-to-instance-type mapping.
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
suite: RabbitMQ default resources
2+
3+
templates:
4+
- templates/rabbitmq.yaml
5+
6+
tests:
7+
- it: defaults each RabbitMQ replica to the s1.nano preset
8+
release:
9+
name: rabbitmq-test
10+
namespace: tenant-test
11+
asserts:
12+
- equal:
13+
path: spec.resources.limits.cpu
14+
value: 250m
15+
- equal:
16+
path: spec.resources.limits.memory
17+
value: 512Mi
18+
- equal:
19+
path: spec.resources.requests.cpu
20+
value: "0.025"
21+
- equal:
22+
path: spec.resources.requests.memory
23+
value: "536870912"
24+
25+
- it: preserves t1.nano as an explicit backward-compatible override
26+
release:
27+
name: rabbitmq-test
28+
namespace: tenant-test
29+
set:
30+
resourcesPreset: t1.nano
31+
asserts:
32+
- equal:
33+
path: spec.resources.limits.cpu
34+
value: 250m
35+
- equal:
36+
path: spec.resources.limits.memory
37+
value: 128Mi
38+
39+
- it: prefers explicit resources over the default preset
40+
release:
41+
name: rabbitmq-test
42+
namespace: tenant-test
43+
set:
44+
resources:
45+
cpu: 700m
46+
memory: 2Gi
47+
asserts:
48+
- equal:
49+
path: spec.resources.limits.cpu
50+
value: 700m
51+
- equal:
52+
path: spec.resources.limits.memory
53+
value: 2Gi
54+
- equal:
55+
path: spec.resources.requests.cpu
56+
value: "0.07"
57+
- equal:
58+
path: spec.resources.requests.memory
59+
value: "2147483648"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"resourcesPreset": {
4444
"description": "Default sizing preset used when `resources` is omitted.",
4545
"type": "string",
46-
"default": "t1.nano",
46+
"default": "s1.nano",
4747
"enum": [
4848
"t1.nano",
4949
"t1.micro",

‎packages/apps/rabbitmq/values.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ replicas: 3
6161
## @param {Resources} [resources] - Explicit CPU and memory configuration for each RabbitMQ replica. When omitted, the preset defined in `resourcesPreset` is applied.
6262
resources: {}
6363

64-
## @param {ResourcesPreset} resourcesPreset="t1.nano" - Default sizing preset used when `resources` is omitted.
65-
resourcesPreset: "t1.nano"
64+
## @param {ResourcesPreset} resourcesPreset="s1.nano" - Default sizing preset used when `resources` is omitted.
65+
resourcesPreset: "s1.nano"
6666

6767
## @param {quantity} size - Persistent Volume Claim size available for application data.
6868
size: 10Gi

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

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)