diff --git a/packages/apps/clickhouse/Chart.yaml b/packages/apps/clickhouse/Chart.yaml index 9692c075..e9509471 100644 --- a/packages/apps/clickhouse/Chart.yaml +++ b/packages/apps/clickhouse/Chart.yaml @@ -16,7 +16,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.11.0 +version: 0.11.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/packages/apps/clickhouse/Makefile b/packages/apps/clickhouse/Makefile index 8ee89141..12502f8f 100644 --- a/packages/apps/clickhouse/Makefile +++ b/packages/apps/clickhouse/Makefile @@ -1,11 +1,12 @@ CLICKHOUSE_BACKUP_TAG = $(shell awk '$$0 ~ /^version:/ {print $$2}' Chart.yaml) +PRESET_ENUM := ["nano","micro","small","medium","large","xlarge","2xlarge"] include ../../../scripts/common-envs.mk include ../../../scripts/package.mk generate: readme-generator -v values.yaml -s values.schema.json -r README.md - yq -i -o json --indent 4 '.properties.resourcesPreset.enum = ["none", "nano", "micro", "small", "medium", "large", "xlarge", "2xlarge"]' values.schema.json + yq -i -o json --indent 4 '.properties.resourcesPreset.enum = $(PRESET_ENUM)' values.schema.json image: docker buildx build images/clickhouse-backup \ diff --git a/packages/apps/clickhouse/README.md b/packages/apps/clickhouse/README.md index c4ab62ba..1896e0e2 100644 --- a/packages/apps/clickhouse/README.md +++ b/packages/apps/clickhouse/README.md @@ -51,7 +51,7 @@ For more details, read [Restic: Effective Backup from Stdin](https://blog.aenix. | `backup.s3SecretKey` | Secret key for S3, used for authentication | `ju3eum4dekeich9ahM1te8waeGai0oog` | | `backup.resticPassword` | Password for Restic backup encryption | `ChaXoveekoh6eigh4siesheeda2quai0` | | `resources` | Explicit CPU and memory configuration for each ClickHouse replica. When left empty, the preset defined in `resourcesPreset` is applied. | `{}` | -| `resourcesPreset` | Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge. | `small` | +| `resourcesPreset` | Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge. | `small` | ## Parameter examples and reference diff --git a/packages/apps/clickhouse/values.schema.json b/packages/apps/clickhouse/values.schema.json index ddc88b97..8f471332 100644 --- a/packages/apps/clickhouse/values.schema.json +++ b/packages/apps/clickhouse/values.schema.json @@ -84,10 +84,9 @@ }, "resourcesPreset": { "type": "string", - "description": "Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge.", + "description": "Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge.", "default": "small", "enum": [ - "none", "nano", "micro", "small", diff --git a/packages/apps/clickhouse/values.yaml b/packages/apps/clickhouse/values.yaml index 2ddfbbb2..5c7d7341 100644 --- a/packages/apps/clickhouse/values.yaml +++ b/packages/apps/clickhouse/values.yaml @@ -53,5 +53,5 @@ resources: {} # cpu: 4000m # memory: 4Gi -## @param resourcesPreset Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge. +## @param resourcesPreset Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge. resourcesPreset: "small" diff --git a/packages/apps/ferretdb/Chart.yaml b/packages/apps/ferretdb/Chart.yaml index cde9f1f1..5c0e9a49 100644 --- a/packages/apps/ferretdb/Chart.yaml +++ b/packages/apps/ferretdb/Chart.yaml @@ -16,7 +16,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.8.0 +version: 0.8.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/packages/apps/ferretdb/Makefile b/packages/apps/ferretdb/Makefile index e4057cb4..9e32d0b0 100644 --- a/packages/apps/ferretdb/Makefile +++ b/packages/apps/ferretdb/Makefile @@ -1,5 +1,6 @@ include ../../../scripts/package.mk +PRESET_ENUM := ["nano","micro","small","medium","large","xlarge","2xlarge"] generate: readme-generator -v values.yaml -s values.schema.json -r README.md - yq -i -o json --indent 4 '.properties.resourcesPreset.enum = ["none", "nano", "micro", "small", "medium", "large", "xlarge", "2xlarge"]' values.schema.json + yq -i -o json --indent 4 '.properties.resourcesPreset.enum = $(PRESET_ENUM)' values.schema.json diff --git a/packages/apps/ferretdb/README.md b/packages/apps/ferretdb/README.md index bdd2fd39..386d44ae 100644 --- a/packages/apps/ferretdb/README.md +++ b/packages/apps/ferretdb/README.md @@ -36,7 +36,7 @@ Internally, FerretDB service is backed by Postgres. | `backup.s3SecretKey` | The secret key for S3, used for authentication | `ju3eum4dekeich9ahM1te8waeGai0oog` | | `backup.resticPassword` | The password for Restic backup encryption | `ChaXoveekoh6eigh4siesheeda2quai0` | | `resources` | Explicit CPU and memory configuration for each FerretDB replica. When left empty, the preset defined in `resourcesPreset` is applied. | `{}` | -| `resourcesPreset` | Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge. | `nano` | +| `resourcesPreset` | Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge. | `nano` | diff --git a/packages/apps/ferretdb/values.schema.json b/packages/apps/ferretdb/values.schema.json index de59c190..fd7235f8 100644 --- a/packages/apps/ferretdb/values.schema.json +++ b/packages/apps/ferretdb/values.schema.json @@ -89,10 +89,9 @@ }, "resourcesPreset": { "type": "string", - "description": "Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge.", + "description": "Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge.", "default": "nano", "enum": [ - "none", "nano", "micro", "small", diff --git a/packages/apps/ferretdb/values.yaml b/packages/apps/ferretdb/values.yaml index c1f1356e..e596d898 100644 --- a/packages/apps/ferretdb/values.yaml +++ b/packages/apps/ferretdb/values.yaml @@ -55,5 +55,5 @@ resources: {} # cpu: 4000m # memory: 4Gi -## @param resourcesPreset Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge. +## @param resourcesPreset Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge. resourcesPreset: "nano" diff --git a/packages/apps/http-cache/Chart.yaml b/packages/apps/http-cache/Chart.yaml index 8d788564..43ba0ae3 100644 --- a/packages/apps/http-cache/Chart.yaml +++ b/packages/apps/http-cache/Chart.yaml @@ -16,7 +16,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.6.0 +version: 0.6.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/packages/apps/http-cache/Makefile b/packages/apps/http-cache/Makefile index a118e386..4e7c60df 100644 --- a/packages/apps/http-cache/Makefile +++ b/packages/apps/http-cache/Makefile @@ -1,4 +1,5 @@ NGINX_CACHE_TAG = $(shell awk '$$1 == "version:" {print $$2}' Chart.yaml) +PRESET_ENUM := ["nano","micro","small","medium","large","xlarge","2xlarge"] include ../../../scripts/common-envs.mk include ../../../scripts/package.mk @@ -23,8 +24,8 @@ image-nginx: generate: readme-generator -v values.yaml -s values.schema.json -r README.md - yq -i -o json --indent 4 '.properties.haproxy.properties.resourcesPreset.enum = ["none", "nano", "micro", "small", "medium", "large", "xlarge", "2xlarge"]' values.schema.json - yq -i -o json --indent 4 '.properties.nginx.properties.resourcesPreset.enum = ["none", "nano", "micro", "small", "medium", "large", "xlarge", "2xlarge"]' values.schema.json + yq -i -o json --indent 4 '.properties.haproxy.properties.resourcesPreset.enum = $(PRESET_ENUM)' values.schema.json + yq -i -o json --indent 4 '.properties.nginx.properties.resourcesPreset.enum = $(PRESET_ENUM)' values.schema.json update: tag=$$(git ls-remote --tags --sort="v:refname" https://github.com/chrislim2888/IP2Location-C-Library | awk -F'[/^]' 'END{print $$3}') && \ diff --git a/packages/apps/http-cache/README.md b/packages/apps/http-cache/README.md index 0a3cb0af..188b00b0 100644 --- a/packages/apps/http-cache/README.md +++ b/packages/apps/http-cache/README.md @@ -68,9 +68,9 @@ The deployment architecture is illustrated in the diagram below: | `haproxy.replicas` | Number of HAProxy replicas | `2` | | `nginx.replicas` | Number of Nginx replicas | `2` | | `haproxy.resources` | Explicit CPU and memory configuration for each HAProxy replica. When left empty, the preset defined in `resourcesPreset` is applied. | `{}` | -| `haproxy.resourcesPreset` | Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge. | `nano` | +| `haproxy.resourcesPreset` | Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge. | `nano` | | `nginx.resources` | Explicit CPU and memory configuration for each nginx replica. When left empty, the preset defined in `resourcesPreset` is applied. | `{}` | -| `nginx.resourcesPreset` | Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge. | `nano` | +| `nginx.resourcesPreset` | Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge. | `nano` | ### Configuration parameters diff --git a/packages/apps/http-cache/values.schema.json b/packages/apps/http-cache/values.schema.json index c624c8b5..99eda009 100644 --- a/packages/apps/http-cache/values.schema.json +++ b/packages/apps/http-cache/values.schema.json @@ -32,10 +32,9 @@ }, "resourcesPreset": { "type": "string", - "description": "Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge.", + "description": "Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge.", "default": "nano", "enum": [ - "none", "nano", "micro", "small", @@ -62,10 +61,9 @@ }, "resourcesPreset": { "type": "string", - "description": "Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge.", + "description": "Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge.", "default": "nano", "enum": [ - "none", "nano", "micro", "small", diff --git a/packages/apps/http-cache/values.yaml b/packages/apps/http-cache/values.yaml index d6d05b06..d353b3d0 100644 --- a/packages/apps/http-cache/values.yaml +++ b/packages/apps/http-cache/values.yaml @@ -18,7 +18,7 @@ haproxy: # cpu: 4000m # memory: 4Gi - ## @param haproxy.resourcesPreset Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge. + ## @param haproxy.resourcesPreset Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge. resourcesPreset: "nano" nginx: replicas: 2 @@ -28,7 +28,7 @@ nginx: # cpu: 4000m # memory: 4Gi - ## @param nginx.resourcesPreset Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge. + ## @param nginx.resourcesPreset Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge. resourcesPreset: "nano" ## @section Configuration parameters diff --git a/packages/apps/kafka/Chart.yaml b/packages/apps/kafka/Chart.yaml index f609f238..edfea302 100644 --- a/packages/apps/kafka/Chart.yaml +++ b/packages/apps/kafka/Chart.yaml @@ -16,7 +16,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.8.0 +version: 0.8.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/packages/apps/kafka/Makefile b/packages/apps/kafka/Makefile index e3d2547e..f76bb46a 100644 --- a/packages/apps/kafka/Makefile +++ b/packages/apps/kafka/Makefile @@ -1,6 +1,7 @@ include ../../../scripts/package.mk +PRESET_ENUM := ["nano","micro","small","medium","large","xlarge","2xlarge"] generate: readme-generator -v values.yaml -s values.schema.json -r README.md - yq -i -o json --indent 4 '.properties.kafka.properties.resourcesPreset.enum = ["none", "nano", "micro", "small", "medium", "large", "xlarge", "2xlarge"]' values.schema.json - yq -i -o json --indent 4 '.properties.zookeeper.properties.resourcesPreset.enum = ["none", "nano", "micro", "small", "medium", "large", "xlarge", "2xlarge"]' values.schema.json + yq -i -o json --indent 4 '.properties.kafka.properties.resourcesPreset.enum = $(PRESET_ENUM)' values.schema.json + yq -i -o json --indent 4 '.properties.zookeeper.properties.resourcesPreset.enum = $(PRESET_ENUM)' values.schema.json diff --git a/packages/apps/kafka/README.md b/packages/apps/kafka/README.md index 15eca05f..96135af4 100644 --- a/packages/apps/kafka/README.md +++ b/packages/apps/kafka/README.md @@ -14,9 +14,9 @@ | `zookeeper.replicas` | Number of ZooKeeper replicas | `3` | | `zookeeper.storageClass` | StorageClass used to store the ZooKeeper data | `""` | | `kafka.resources` | Explicit CPU and memory configuration for each Kafka replica. When left empty, the preset defined in `resourcesPreset` is applied. | `{}` | -| `kafka.resourcesPreset` | Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge. | `small` | +| `kafka.resourcesPreset` | Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge. | `small` | | `zookeeper.resources` | Explicit CPU and memory configuration for each Zookeeper replica. When left empty, the preset defined in `resourcesPreset` is applied. | `{}` | -| `zookeeper.resourcesPreset` | Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge. | `small` | +| `zookeeper.resourcesPreset` | Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge. | `small` | ### Configuration parameters diff --git a/packages/apps/kafka/values.schema.json b/packages/apps/kafka/values.schema.json index 64fe7cf7..5082ffd1 100644 --- a/packages/apps/kafka/values.schema.json +++ b/packages/apps/kafka/values.schema.json @@ -32,10 +32,9 @@ }, "resourcesPreset": { "type": "string", - "description": "Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge.", + "description": "Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge.", "default": "small", "enum": [ - "none", "nano", "micro", "small", @@ -72,10 +71,9 @@ }, "resourcesPreset": { "type": "string", - "description": "Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge.", + "description": "Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge.", "default": "small", "enum": [ - "none", "nano", "micro", "small", diff --git a/packages/apps/kafka/values.yaml b/packages/apps/kafka/values.yaml index e8204655..102ba3f0 100644 --- a/packages/apps/kafka/values.yaml +++ b/packages/apps/kafka/values.yaml @@ -19,7 +19,7 @@ kafka: # resources: # cpu: 4000m # memory: 4Gi - ## @param kafka.resourcesPreset Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge. + ## @param kafka.resourcesPreset Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge. resourcesPreset: "small" zookeeper: @@ -31,7 +31,7 @@ zookeeper: # resources: # cpu: 4000m # memory: 4Gi - ## @param zookeeper.resourcesPreset Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge. + ## @param zookeeper.resourcesPreset Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge. resourcesPreset: "small" ## @section Configuration parameters diff --git a/packages/apps/kubernetes/Makefile b/packages/apps/kubernetes/Makefile index 7d61cb37..7cd8410c 100644 --- a/packages/apps/kubernetes/Makefile +++ b/packages/apps/kubernetes/Makefile @@ -1,5 +1,6 @@ KUBERNETES_VERSION = v1.32 KUBERNETES_PKG_TAG = $(shell awk '$$1 == "version:" {print $$2}' Chart.yaml) +PRESET_ENUM := ["nano","micro","small","medium","large","xlarge","2xlarge"] include ../../../scripts/common-envs.mk include ../../../scripts/package.mk @@ -8,10 +9,10 @@ generate: readme-generator -v values.yaml -s values.schema.json -r README.md yq -o=json -i '.properties.version.enum = (load("files/versions.yaml") | keys)' values.schema.json yq -o json -i '.properties.addons.properties.ingressNginx.properties.exposeMethod.enum = ["Proxied","LoadBalancer"]' values.schema.json - yq -o json -i '.properties.controlPlane.properties.apiServer.properties.resourcesPreset.enum = ["none","nano","micro","small","medium","large","xlarge","2xlarge"]' values.schema.json - yq -o json -i '.properties.controlPlane.properties.controllerManager.properties.resourcesPreset.enum = ["none","nano","micro","small","medium","large","xlarge","2xlarge"]' values.schema.json - yq -o json -i '.properties.controlPlane.properties.scheduler.properties.resourcesPreset.enum = ["none","nano","micro","small","medium","large","xlarge","2xlarge"]' values.schema.json - yq -o json -i '.properties.controlPlane.properties.konnectivity.properties.server.properties.resourcesPreset.enum = ["none","nano","micro","small","medium","large","xlarge","2xlarge"]' values.schema.json + yq -o json -i '.properties.controlPlane.properties.apiServer.properties.resourcesPreset.enum = $(PRESET_ENUM)' values.schema.json + yq -o json -i '.properties.controlPlane.properties.controllerManager.properties.resourcesPreset.enum = $(PRESET_ENUM)' values.schema.json + yq -o json -i '.properties.controlPlane.properties.scheduler.properties.resourcesPreset.enum = $(PRESET_ENUM)' values.schema.json + yq -o json -i '.properties.controlPlane.properties.konnectivity.properties.server.properties.resourcesPreset.enum = $(PRESET_ENUM)' values.schema.json image: image-ubuntu-container-disk image-kubevirt-cloud-provider image-kubevirt-csi-driver image-cluster-autoscaler diff --git a/packages/apps/kubernetes/README.md b/packages/apps/kubernetes/README.md index 66f93c09..d885de11 100644 --- a/packages/apps/kubernetes/README.md +++ b/packages/apps/kubernetes/README.md @@ -116,13 +116,13 @@ See the reference for components utilized in this service: | Name | Description | Value | | -------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- | -------- | | `controlPlane.apiServer.resources` | Explicit CPU and memory configuration for the API Server. When left empty, the preset defined in `resourcesPreset` is applied. | `{}` | -| `controlPlane.apiServer.resourcesPreset` | Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge. | `medium` | +| `controlPlane.apiServer.resourcesPreset` | Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge. | `medium` | | `controlPlane.controllerManager.resources` | Explicit CPU and memory configuration for the Controller Manager. When left empty, the preset defined in `resourcesPreset` is applied. | `{}` | -| `controlPlane.controllerManager.resourcesPreset` | Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge. | `micro` | +| `controlPlane.controllerManager.resourcesPreset` | Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge. | `micro` | | `controlPlane.scheduler.resources` | Explicit CPU and memory configuration for the Scheduler. When left empty, the preset defined in `resourcesPreset` is applied. | `{}` | -| `controlPlane.scheduler.resourcesPreset` | Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge. | `micro` | +| `controlPlane.scheduler.resourcesPreset` | Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge. | `micro` | | `controlPlane.konnectivity.server.resources` | Explicit CPU and memory configuration for Konnectivity. When left empty, the preset defined in `resourcesPreset` is applied. | `{}` | -| `controlPlane.konnectivity.server.resourcesPreset` | Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge. | `micro` | +| `controlPlane.konnectivity.server.resourcesPreset` | Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge. | `micro` | ## Parameter examples and reference diff --git a/packages/apps/kubernetes/values.schema.json b/packages/apps/kubernetes/values.schema.json index 7473e00e..a8f22efc 100644 --- a/packages/apps/kubernetes/values.schema.json +++ b/packages/apps/kubernetes/values.schema.json @@ -25,10 +25,9 @@ }, "resourcesPreset": { "type": "string", - "description": "Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge.", + "description": "Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge.", "default": "medium", "enum": [ - "none", "nano", "micro", "small", @@ -50,10 +49,9 @@ }, "resourcesPreset": { "type": "string", - "description": "Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge.", + "description": "Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge.", "default": "micro", "enum": [ - "none", "nano", "micro", "small", @@ -75,10 +73,9 @@ }, "resourcesPreset": { "type": "string", - "description": "Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge.", + "description": "Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge.", "default": "micro", "enum": [ - "none", "nano", "micro", "small", @@ -103,10 +100,9 @@ }, "resourcesPreset": { "type": "string", - "description": "Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge.", + "description": "Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge.", "default": "micro", "enum": [ - "none", "nano", "micro", "small", diff --git a/packages/apps/kubernetes/values.yaml b/packages/apps/kubernetes/values.yaml index c3a846c6..10f0159e 100644 --- a/packages/apps/kubernetes/values.yaml +++ b/packages/apps/kubernetes/values.yaml @@ -123,7 +123,7 @@ controlPlane: apiServer: ## @param controlPlane.apiServer.resources Explicit CPU and memory configuration for the API Server. When left empty, the preset defined in `resourcesPreset` is applied. - ## @param controlPlane.apiServer.resourcesPreset Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge. + ## @param controlPlane.apiServer.resourcesPreset Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge. ## e.g: ## resources: ## cpu: 4000m @@ -134,19 +134,19 @@ controlPlane: controllerManager: ## @param controlPlane.controllerManager.resources Explicit CPU and memory configuration for the Controller Manager. When left empty, the preset defined in `resourcesPreset` is applied. - ## @param controlPlane.controllerManager.resourcesPreset Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge. + ## @param controlPlane.controllerManager.resourcesPreset Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge. resourcesPreset: "micro" resources: {} scheduler: ## @param controlPlane.scheduler.resources Explicit CPU and memory configuration for the Scheduler. When left empty, the preset defined in `resourcesPreset` is applied. - ## @param controlPlane.scheduler.resourcesPreset Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge. + ## @param controlPlane.scheduler.resourcesPreset Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge. resourcesPreset: "micro" resources: {} konnectivity: server: ## @param controlPlane.konnectivity.server.resources Explicit CPU and memory configuration for Konnectivity. When left empty, the preset defined in `resourcesPreset` is applied. - ## @param controlPlane.konnectivity.server.resourcesPreset Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge. + ## @param controlPlane.konnectivity.server.resourcesPreset Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge. resourcesPreset: "micro" resources: {} diff --git a/packages/apps/mysql/Chart.yaml b/packages/apps/mysql/Chart.yaml index 449fb6a4..6783f645 100644 --- a/packages/apps/mysql/Chart.yaml +++ b/packages/apps/mysql/Chart.yaml @@ -16,7 +16,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.9.0 +version: 0.9.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/packages/apps/mysql/Makefile b/packages/apps/mysql/Makefile index c458e263..8f38e115 100644 --- a/packages/apps/mysql/Makefile +++ b/packages/apps/mysql/Makefile @@ -1,11 +1,12 @@ MARIADB_BACKUP_TAG = $(shell awk '$$1 == "version:" {print $$2}' Chart.yaml) +PRESET_ENUM := ["nano","micro","small","medium","large","xlarge","2xlarge"] include ../../../scripts/common-envs.mk include ../../../scripts/package.mk generate: readme-generator -v values.yaml -s values.schema.json -r README.md - yq -i -o json --indent 4 '.properties.resourcesPreset.enum = ["none", "nano", "micro", "small", "medium", "large", "xlarge", "2xlarge"]' values.schema.json + yq -i -o json --indent 4 '.properties.resourcesPreset.enum = $(PRESET_ENUM)' values.schema.json image: docker buildx build images/mariadb-backup \ diff --git a/packages/apps/mysql/README.md b/packages/apps/mysql/README.md index 53c9b218..48eed4a2 100644 --- a/packages/apps/mysql/README.md +++ b/packages/apps/mysql/README.md @@ -95,7 +95,7 @@ more details: | `backup.s3SecretKey` | The secret key for S3, used for authentication | `ju3eum4dekeich9ahM1te8waeGai0oog` | | `backup.resticPassword` | The password for Restic backup encryption | `ChaXoveekoh6eigh4siesheeda2quai0` | | `resources` | Explicit CPU and memory configuration for each MariaDB replica. When left empty, the preset defined in `resourcesPreset` is applied. | `{}` | -| `resourcesPreset` | Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge. | `nano` | +| `resourcesPreset` | Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge. | `nano` | ## Parameter examples and reference diff --git a/packages/apps/mysql/values.schema.json b/packages/apps/mysql/values.schema.json index a183f764..6b5ef0ae 100644 --- a/packages/apps/mysql/values.schema.json +++ b/packages/apps/mysql/values.schema.json @@ -74,10 +74,9 @@ }, "resourcesPreset": { "type": "string", - "description": "Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge.", + "description": "Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge.", "default": "nano", "enum": [ - "none", "nano", "micro", "small", diff --git a/packages/apps/mysql/values.yaml b/packages/apps/mysql/values.yaml index 1e74e340..acc6f532 100644 --- a/packages/apps/mysql/values.yaml +++ b/packages/apps/mysql/values.yaml @@ -61,5 +61,5 @@ resources: {} # cpu: 4000m # memory: 4Gi -## @param resourcesPreset Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge. +## @param resourcesPreset Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge. resourcesPreset: "nano" diff --git a/packages/apps/nats/Chart.yaml b/packages/apps/nats/Chart.yaml index 882bf345..417f17b8 100644 --- a/packages/apps/nats/Chart.yaml +++ b/packages/apps/nats/Chart.yaml @@ -16,7 +16,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.8.0 +version: 0.8.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/packages/apps/nats/Makefile b/packages/apps/nats/Makefile index e4057cb4..9e32d0b0 100644 --- a/packages/apps/nats/Makefile +++ b/packages/apps/nats/Makefile @@ -1,5 +1,6 @@ include ../../../scripts/package.mk +PRESET_ENUM := ["nano","micro","small","medium","large","xlarge","2xlarge"] generate: readme-generator -v values.yaml -s values.schema.json -r README.md - yq -i -o json --indent 4 '.properties.resourcesPreset.enum = ["none", "nano", "micro", "small", "medium", "large", "xlarge", "2xlarge"]' values.schema.json + yq -i -o json --indent 4 '.properties.resourcesPreset.enum = $(PRESET_ENUM)' values.schema.json diff --git a/packages/apps/nats/README.md b/packages/apps/nats/README.md index 01c2d835..0249b518 100644 --- a/packages/apps/nats/README.md +++ b/packages/apps/nats/README.md @@ -18,7 +18,7 @@ It provides a data layer for cloud native applications, IoT messaging, and micro | `config.merge` | Additional configuration to merge into NATS config | `{}` | | `config.resolver` | Additional configuration to merge into NATS config | `{}` | | `resources` | Explicit CPU and memory configuration for each NATS replica. When left empty, the preset defined in `resourcesPreset` is applied. | `{}` | -| `resourcesPreset` | Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge. | `nano` | +| `resourcesPreset` | Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge. | `nano` | ## Parameter examples and reference diff --git a/packages/apps/nats/templates/nats.yaml b/packages/apps/nats/templates/nats.yaml index 75956b56..0823e56b 100644 --- a/packages/apps/nats/templates/nats.yaml +++ b/packages/apps/nats/templates/nats.yaml @@ -49,9 +49,6 @@ spec: resources: {{- include "cozy-lib.resources.defaultingSanitize" (list .Values.resourcesPreset .Values.resources $) | nindent 22 }} fullnameOverride: {{ .Release.Name }} config: - cluster: - routeURLs: - k8sClusterDomain: {{ $clusterDomain }} {{- if or (gt (len $passwords) 0) (gt (len .Values.config.merge) 0) }} merge: {{- if gt (len $passwords) 0 }} @@ -73,6 +70,8 @@ spec: {{- end }} cluster: enabled: true + routeURLs: + k8sClusterDomain: {{ $clusterDomain }} replicas: {{ .Values.replicas }} monitor: enabled: true diff --git a/packages/apps/nats/values.schema.json b/packages/apps/nats/values.schema.json index 5d67d1c8..ece5062d 100644 --- a/packages/apps/nats/values.schema.json +++ b/packages/apps/nats/values.schema.json @@ -54,10 +54,9 @@ }, "resourcesPreset": { "type": "string", - "description": "Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge.", + "description": "Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge.", "default": "nano", "enum": [ - "none", "nano", "micro", "small", diff --git a/packages/apps/nats/values.yaml b/packages/apps/nats/values.yaml index 41b5021f..8dc02d1d 100644 --- a/packages/apps/nats/values.yaml +++ b/packages/apps/nats/values.yaml @@ -68,5 +68,5 @@ resources: {} # cpu: 4000m # memory: 4Gi -## @param resourcesPreset Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge. +## @param resourcesPreset Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge. resourcesPreset: "nano" diff --git a/packages/apps/postgres/Chart.yaml b/packages/apps/postgres/Chart.yaml index 4ae93148..6ce3846f 100644 --- a/packages/apps/postgres/Chart.yaml +++ b/packages/apps/postgres/Chart.yaml @@ -16,7 +16,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.17.1 +version: 0.17.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/packages/apps/postgres/Makefile b/packages/apps/postgres/Makefile index e4057cb4..9e32d0b0 100644 --- a/packages/apps/postgres/Makefile +++ b/packages/apps/postgres/Makefile @@ -1,5 +1,6 @@ include ../../../scripts/package.mk +PRESET_ENUM := ["nano","micro","small","medium","large","xlarge","2xlarge"] generate: readme-generator -v values.yaml -s values.schema.json -r README.md - yq -i -o json --indent 4 '.properties.resourcesPreset.enum = ["none", "nano", "micro", "small", "medium", "large", "xlarge", "2xlarge"]' values.schema.json + yq -i -o json --indent 4 '.properties.resourcesPreset.enum = $(PRESET_ENUM)' values.schema.json diff --git a/packages/apps/postgres/README.md b/packages/apps/postgres/README.md index de808210..9d9dd00c 100644 --- a/packages/apps/postgres/README.md +++ b/packages/apps/postgres/README.md @@ -103,7 +103,7 @@ See: | `bootstrap.recoveryTime` | Timestamp (PITR) up to which recovery will proceed, expressed in RFC 3339 format. If left empty, will restore latest | `""` | | `bootstrap.oldName` | Name of database cluster before deleting | `""` | | `resources` | Explicit CPU and memory configuration for each PostgreSQL replica. When left empty, the preset defined in `resourcesPreset` is applied. | `{}` | -| `resourcesPreset` | Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge. | `micro` | +| `resourcesPreset` | Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge. | `micro` | ## Parameter examples and reference diff --git a/packages/apps/postgres/values.schema.json b/packages/apps/postgres/values.schema.json index 2774de7a..f4f1a625 100644 --- a/packages/apps/postgres/values.schema.json +++ b/packages/apps/postgres/values.schema.json @@ -124,10 +124,9 @@ }, "resourcesPreset": { "type": "string", - "description": "Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge.", + "description": "Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge.", "default": "micro", "enum": [ - "none", "nano", "micro", "small", diff --git a/packages/apps/postgres/values.yaml b/packages/apps/postgres/values.yaml index 58de27fc..43eac383 100644 --- a/packages/apps/postgres/values.yaml +++ b/packages/apps/postgres/values.yaml @@ -93,5 +93,5 @@ resources: {} # cpu: 4000m # memory: 4Gi -## @param resourcesPreset Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge. +## @param resourcesPreset Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge. resourcesPreset: "micro" diff --git a/packages/apps/rabbitmq/Chart.yaml b/packages/apps/rabbitmq/Chart.yaml index 41c0ea20..abc5a24e 100644 --- a/packages/apps/rabbitmq/Chart.yaml +++ b/packages/apps/rabbitmq/Chart.yaml @@ -16,7 +16,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.8.0 +version: 0.8.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/packages/apps/rabbitmq/Makefile b/packages/apps/rabbitmq/Makefile index e4057cb4..9e32d0b0 100644 --- a/packages/apps/rabbitmq/Makefile +++ b/packages/apps/rabbitmq/Makefile @@ -1,5 +1,6 @@ include ../../../scripts/package.mk +PRESET_ENUM := ["nano","micro","small","medium","large","xlarge","2xlarge"] generate: readme-generator -v values.yaml -s values.schema.json -r README.md - yq -i -o json --indent 4 '.properties.resourcesPreset.enum = ["none", "nano", "micro", "small", "medium", "large", "xlarge", "2xlarge"]' values.schema.json + yq -i -o json --indent 4 '.properties.resourcesPreset.enum = $(PRESET_ENUM)' values.schema.json diff --git a/packages/apps/rabbitmq/README.md b/packages/apps/rabbitmq/README.md index cd65fb61..34f0d8c1 100644 --- a/packages/apps/rabbitmq/README.md +++ b/packages/apps/rabbitmq/README.md @@ -27,7 +27,7 @@ The service utilizes official RabbitMQ operator. This ensures the reliability an | `users` | Users configuration | `{}` | | `vhosts` | Virtual Hosts configuration | `{}` | | `resources` | Explicit CPU and memory configuration for each RabbitMQ replica. When left empty, the preset defined in `resourcesPreset` is applied. | `{}` | -| `resourcesPreset` | Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge. | `nano` | +| `resourcesPreset` | Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge. | `nano` | ## Parameter examples and reference diff --git a/packages/apps/rabbitmq/values.schema.json b/packages/apps/rabbitmq/values.schema.json index 2e40482d..74f13a3c 100644 --- a/packages/apps/rabbitmq/values.schema.json +++ b/packages/apps/rabbitmq/values.schema.json @@ -34,10 +34,9 @@ }, "resourcesPreset": { "type": "string", - "description": "Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge.", + "description": "Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge.", "default": "nano", "enum": [ - "none", "nano", "micro", "small", diff --git a/packages/apps/rabbitmq/values.yaml b/packages/apps/rabbitmq/values.yaml index c6df1725..b649f873 100644 --- a/packages/apps/rabbitmq/values.yaml +++ b/packages/apps/rabbitmq/values.yaml @@ -46,5 +46,5 @@ resources: {} # cpu: 4000m # memory: 4Gi -## @param resourcesPreset Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge. +## @param resourcesPreset Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge. resourcesPreset: "nano" diff --git a/packages/apps/redis/Chart.yaml b/packages/apps/redis/Chart.yaml index 94294f91..de116d43 100644 --- a/packages/apps/redis/Chart.yaml +++ b/packages/apps/redis/Chart.yaml @@ -16,7 +16,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.9.0 +version: 0.9.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/packages/apps/redis/Makefile b/packages/apps/redis/Makefile index e4057cb4..9e32d0b0 100644 --- a/packages/apps/redis/Makefile +++ b/packages/apps/redis/Makefile @@ -1,5 +1,6 @@ include ../../../scripts/package.mk +PRESET_ENUM := ["nano","micro","small","medium","large","xlarge","2xlarge"] generate: readme-generator -v values.yaml -s values.schema.json -r README.md - yq -i -o json --indent 4 '.properties.resourcesPreset.enum = ["none", "nano", "micro", "small", "medium", "large", "xlarge", "2xlarge"]' values.schema.json + yq -i -o json --indent 4 '.properties.resourcesPreset.enum = $(PRESET_ENUM)' values.schema.json diff --git a/packages/apps/redis/README.md b/packages/apps/redis/README.md index f7a13513..822f4808 100644 --- a/packages/apps/redis/README.md +++ b/packages/apps/redis/README.md @@ -21,7 +21,7 @@ Service utilizes the Spotahome Redis Operator for efficient management and orche | `storageClass` | StorageClass used to store the data | `""` | | `authEnabled` | Enable password generation | `true` | | `resources` | Explicit CPU and memory configuration for each Redis replica. When left empty, the preset defined in `resourcesPreset` is applied. | `{}` | -| `resourcesPreset` | Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge. | `nano` | +| `resourcesPreset` | Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge. | `nano` | ## Parameter examples and reference diff --git a/packages/apps/redis/values.schema.json b/packages/apps/redis/values.schema.json index 17e05c1a..f774384d 100644 --- a/packages/apps/redis/values.schema.json +++ b/packages/apps/redis/values.schema.json @@ -34,10 +34,9 @@ }, "resourcesPreset": { "type": "string", - "description": "Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge.", + "description": "Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge.", "default": "nano", "enum": [ - "none", "nano", "micro", "small", diff --git a/packages/apps/redis/values.yaml b/packages/apps/redis/values.yaml index 439e2029..602cf3bc 100644 --- a/packages/apps/redis/values.yaml +++ b/packages/apps/redis/values.yaml @@ -18,5 +18,5 @@ resources: {} # cpu: 4000m # memory: 4Gi -## @param resourcesPreset Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge. +## @param resourcesPreset Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge. resourcesPreset: "nano" diff --git a/packages/apps/tcp-balancer/Chart.yaml b/packages/apps/tcp-balancer/Chart.yaml index 5d2c65cf..f76597bc 100644 --- a/packages/apps/tcp-balancer/Chart.yaml +++ b/packages/apps/tcp-balancer/Chart.yaml @@ -16,7 +16,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.5.0 +version: 0.5.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/packages/apps/tcp-balancer/Makefile b/packages/apps/tcp-balancer/Makefile index 6c4fa835..68176ba4 100644 --- a/packages/apps/tcp-balancer/Makefile +++ b/packages/apps/tcp-balancer/Makefile @@ -1,7 +1,8 @@ include ../../../scripts/package.mk +PRESET_ENUM := ["nano","micro","small","medium","large","xlarge","2xlarge"] generate: readme-generator -v values.yaml -s values.schema.json -r README.md yq -i -o json --indent 2 '.properties.httpAndHttps.properties.mode.enum = ["tcp","tcp-with-proxy"]' values.schema.json - yq -i -o json --indent 2 '.properties.resourcesPreset.enum = ["none", "nano", "micro", "small", "medium", "large", "xlarge", "2xlarge"]' values.schema.json + yq -i -o json --indent 2 '.properties.resourcesPreset.enum = $(PRESET_ENUM)' values.schema.json rm -f values.schema.json.tmp diff --git a/packages/apps/tcp-balancer/README.md b/packages/apps/tcp-balancer/README.md index 94dfd72e..3f85fb70 100644 --- a/packages/apps/tcp-balancer/README.md +++ b/packages/apps/tcp-balancer/README.md @@ -28,7 +28,7 @@ Managed TCP Load Balancer Service efficiently utilizes HAProxy for load balancin | `whitelistHTTP` | Secure HTTP by enabling client networks whitelisting | `false` | | `whitelist` | List of client networks | `[]` | | `resources` | Explicit CPU and memory configuration for each TCP Balancer replica. When left empty, the preset defined in `resourcesPreset` is applied. | `{}` | -| `resourcesPreset` | Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge. | `nano` | +| `resourcesPreset` | Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge. | `nano` | ## Parameter examples and reference diff --git a/packages/apps/tcp-balancer/values.schema.json b/packages/apps/tcp-balancer/values.schema.json index 908a72c5..e063e5c4 100644 --- a/packages/apps/tcp-balancer/values.schema.json +++ b/packages/apps/tcp-balancer/values.schema.json @@ -65,10 +65,9 @@ }, "resourcesPreset": { "type": "string", - "description": "Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge.", + "description": "Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge.", "default": "nano", "enum": [ - "none", "nano", "micro", "small", diff --git a/packages/apps/tcp-balancer/values.yaml b/packages/apps/tcp-balancer/values.yaml index 17ede5ce..47ee3b61 100644 --- a/packages/apps/tcp-balancer/values.yaml +++ b/packages/apps/tcp-balancer/values.yaml @@ -50,5 +50,5 @@ resources: {} # cpu: 4000m # memory: 4Gi -## @param resourcesPreset Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge. +## @param resourcesPreset Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge. resourcesPreset: "nano" diff --git a/packages/apps/versions_map b/packages/apps/versions_map index ac7b8afe..57e4711b 100644 --- a/packages/apps/versions_map +++ b/packages/apps/versions_map @@ -14,7 +14,8 @@ clickhouse 0.9.0 6130f43d clickhouse 0.9.2 632224a3 clickhouse 0.10.0 6358fd7a clickhouse 0.10.1 4369b031 -clickhouse 0.11.0 HEAD +clickhouse 0.11.0 08cb7c0f +clickhouse 0.11.1 HEAD ferretdb 0.1.0 e9716091 ferretdb 0.1.1 91b0499a ferretdb 0.2.0 6c5cf5bf @@ -27,7 +28,8 @@ ferretdb 0.6.0 6130f43d ferretdb 0.6.1 632224a3 ferretdb 0.7.0 62cb694d ferretdb 0.7.1 4369b031 -ferretdb 0.8.0 HEAD +ferretdb 0.8.0 08cb7c0f +ferretdb 0.8.1 HEAD http-cache 0.1.0 263e47be http-cache 0.2.0 53f2365e http-cache 0.3.0 6c5cf5bf @@ -36,7 +38,8 @@ http-cache 0.4.0 93bdf411 http-cache 0.5.0 6130f43d http-cache 0.5.1 62cb694d http-cache 0.5.2 4369b031 -http-cache 0.6.0 HEAD +http-cache 0.6.0 08cb7c0f +http-cache 0.6.1 HEAD kafka 0.1.0 f7eaab0a kafka 0.2.0 c0685f43 kafka 0.2.1 dfbc210b @@ -52,7 +55,8 @@ kafka 0.6.0 6130f43d kafka 0.6.1 632224a3 kafka 0.7.0 6358fd7a kafka 0.7.1 4369b031 -kafka 0.8.0 HEAD +kafka 0.8.0 08cb7c0f +kafka 0.8.1 HEAD kubernetes 0.24.0 62cb694d kubernetes 0.25.0 70f82667 kubernetes 0.26.0 HEAD @@ -69,7 +73,8 @@ mysql 0.7.0 6130f43d mysql 0.7.1 632224a3 mysql 0.8.0 62cb694d mysql 0.8.1 4369b031 -mysql 0.9.0 HEAD +mysql 0.9.0 08cb7c0f +mysql 0.9.1 HEAD nats 0.1.0 e9716091 nats 0.2.0 6c5cf5bf nats 0.3.0 78366f19 @@ -81,7 +86,8 @@ nats 0.6.0 6130f43d nats 0.6.1 632224a3 nats 0.7.0 62cb694d nats 0.7.1 4369b031 -nats 0.8.0 HEAD +nats 0.8.0 08cb7c0f +nats 0.8.1 HEAD postgres 0.1.0 263e47be postgres 0.2.0 53f2365e postgres 0.2.1 d7cfa53c @@ -102,7 +108,10 @@ postgres 0.12.0 6130f43d postgres 0.12.1 632224a3 postgres 0.14.0 62cb694d postgres 0.15.1 4369b031 -postgres 0.16.0 HEAD +postgres 0.16.0 70f82667 +postgres 0.17.0 acd4663a +postgres 0.17.1 08cb7c0f +postgres 0.17.2 HEAD rabbitmq 0.1.0 263e47be rabbitmq 0.2.0 53f2365e rabbitmq 0.3.0 6c5cf5bf @@ -115,7 +124,8 @@ rabbitmq 0.5.0 93bdf411 rabbitmq 0.6.0 632224a3 rabbitmq 0.7.0 62cb694d rabbitmq 0.7.1 4369b031 -rabbitmq 0.8.0 HEAD +rabbitmq 0.8.0 08cb7c0f +rabbitmq 0.8.1 HEAD redis 0.1.1 263e47be redis 0.2.0 53f2365e redis 0.3.0 6c5cf5bf @@ -127,14 +137,16 @@ redis 0.7.0 6130f43d redis 0.7.1 632224a3 redis 0.8.0 62cb694d redis 0.8.1 4369b031 -redis 0.9.0 HEAD +redis 0.9.0 08cb7c0f +redis 0.9.1 HEAD tcp-balancer 0.1.0 263e47be tcp-balancer 0.2.0 53f2365e tcp-balancer 0.3.0 93bdf411 tcp-balancer 0.4.0 6130f43d tcp-balancer 0.4.1 62cb694d tcp-balancer 0.4.2 4369b031 -tcp-balancer 0.5.0 HEAD +tcp-balancer 0.5.0 08cb7c0f +tcp-balancer 0.5.1 HEAD tenant 1.10.0 4369b031 tenant 1.11.0 HEAD virtual-machine 0.1.4 f2015d65 @@ -181,4 +193,5 @@ vpn 0.5.0 6130f43d vpn 0.5.1 632224a3 vpn 0.6.1 62cb694d vpn 0.6.2 4369b031 -vpn 0.7.0 HEAD +vpn 0.7.0 08cb7c0f +vpn 0.7.1 HEAD diff --git a/packages/apps/vpn/Chart.yaml b/packages/apps/vpn/Chart.yaml index 2ee979e4..fb551870 100644 --- a/packages/apps/vpn/Chart.yaml +++ b/packages/apps/vpn/Chart.yaml @@ -16,7 +16,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.7.0 +version: 0.7.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/packages/apps/vpn/Makefile b/packages/apps/vpn/Makefile index e4057cb4..9e32d0b0 100644 --- a/packages/apps/vpn/Makefile +++ b/packages/apps/vpn/Makefile @@ -1,5 +1,6 @@ include ../../../scripts/package.mk +PRESET_ENUM := ["nano","micro","small","medium","large","xlarge","2xlarge"] generate: readme-generator -v values.yaml -s values.schema.json -r README.md - yq -i -o json --indent 4 '.properties.resourcesPreset.enum = ["none", "nano", "micro", "small", "medium", "large", "xlarge", "2xlarge"]' values.schema.json + yq -i -o json --indent 4 '.properties.resourcesPreset.enum = $(PRESET_ENUM)' values.schema.json diff --git a/packages/apps/vpn/README.md b/packages/apps/vpn/README.md index 562db3de..691738c0 100644 --- a/packages/apps/vpn/README.md +++ b/packages/apps/vpn/README.md @@ -32,7 +32,7 @@ Furthermore, Shadowbox is compatible with standard Shadowsocks clients, providin | `users` | Users configuration | `{}` | | `externalIPs` | List of externalIPs for service. Optional. If not specified will use LoadBalancer service by default. | `[]` | | `resources` | Explicit CPU and memory configuration for each VPN server replica. When left empty, the preset defined in `resourcesPreset` is applied. | `{}` | -| `resourcesPreset` | Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge. | `nano` | +| `resourcesPreset` | Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge. | `nano` | ## Parameter examples and reference diff --git a/packages/apps/vpn/values.schema.json b/packages/apps/vpn/values.schema.json index 13921381..0fb124f6 100644 --- a/packages/apps/vpn/values.schema.json +++ b/packages/apps/vpn/values.schema.json @@ -32,10 +32,9 @@ }, "resourcesPreset": { "type": "string", - "description": "Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge.", + "description": "Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge.", "default": "nano", "enum": [ - "none", "nano", "micro", "small", diff --git a/packages/apps/vpn/values.yaml b/packages/apps/vpn/values.yaml index 9af5f6f2..14df4880 100644 --- a/packages/apps/vpn/values.yaml +++ b/packages/apps/vpn/values.yaml @@ -35,5 +35,5 @@ resources: {} # cpu: 4000m # memory: 4Gi -## @param resourcesPreset Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge. +## @param resourcesPreset Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge. resourcesPreset: "nano" diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/security-configmap.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/security-configmap.yaml index 884fe6bb..6f229c59 100644 --- a/packages/system/seaweedfs/charts/seaweedfs/templates/security-configmap.yaml +++ b/packages/system/seaweedfs/charts/seaweedfs/templates/security-configmap.yaml @@ -10,6 +10,8 @@ metadata: app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/instance: {{ .Release.Name }} data: + {{- $existing := (lookup "v1" "ConfigMap" .Release.Namespace (printf "%s-security-config" (include "seaweedfs.name" .))) }} + {{- $securityConfig := fromToml (dig "data" "security.toml" "" $existing) }} security.toml: |- # this file is read by master, volume server, and filer @@ -17,7 +19,7 @@ data: # the jwt signing key is read by master and volume server # a jwt expires in 10 seconds [jwt.signing] - key = "{{ randAlphaNum 10 | b64enc }}" + key = "{{ dig "jwt" "signing" "key" (randAlphaNum 10 | b64enc) $securityConfig }}" {{- end }} {{- if .Values.global.securityConfig.jwtSigning.volumeRead }} @@ -25,7 +27,7 @@ data: # - the Master server generates the JWT, which can be used to read a certain file on a volume server # - the Volume server validates the JWT on reading [jwt.signing.read] - key = "{{ randAlphaNum 10 | b64enc }}" + key = "{{ dig "jwt" "signing" "read" "key" (randAlphaNum 10 | b64enc) $securityConfig }}" {{- end }} {{- if .Values.global.securityConfig.jwtSigning.filerWrite }} @@ -34,7 +36,7 @@ data: # - the Filer server validates the JWT on writing # the jwt defaults to expire after 10 seconds. [jwt.filer_signing] - key = "{{ randAlphaNum 10 | b64enc }}" + key = "{{ dig "jwt" "filer_signing" "key" (randAlphaNum 10 | b64enc) $securityConfig }}" {{- end }} {{- if .Values.global.securityConfig.jwtSigning.filerRead }} @@ -43,7 +45,7 @@ data: # - the Filer server validates the JWT on writing # the jwt defaults to expire after 10 seconds. [jwt.filer_signing.read] - key = "{{ randAlphaNum 10 | b64enc }}" + key = "{{ dig "jwt" "filer_signing" "read" "key" (randAlphaNum 10 | b64enc) $securityConfig }}" {{- end }} # all grpc tls authentications are mutual