introduce token-proxy

Signed-off-by: Andrei Kvapil <kvapss@gmail.com>

.github/workflows/pre-commit.yml

@@ -28,7 +28,7 @@ jobs:
 
       - name: Install generate
         run: |
-          curl -sSL https://github.com/cozystack/cozyvalues-gen/releases/download/v0.8.5/cozyvalues-gen-linux-amd64.tar.gz | tar -xzvf- -C /usr/local/bin/ cozyvalues-gen
+          curl -sSL https://github.com/cozystack/readme-generator-for-helm/releases/download/v1.0.0/readme-generator-for-helm-linux-amd64.tar.gz | tar -xzvf- -C /usr/local/bin/ readme-generator-for-helm
 
       - name: Run pre-commit hooks
         run: |

.github/workflows/pull-requests.yaml

@@ -269,7 +269,6 @@ jobs:
 
   test_apps:
     strategy:
-      fail-fast: false
       matrix: ${{ fromJson(needs.detect_test_matrix.outputs.matrix) }}
     name: Test ${{ matrix.app }}
     runs-on: [self-hosted]

cmd/cozystack-controller/main.go

@@ -206,14 +206,6 @@ func main() {
 		os.Exit(1)
 	}
 
-	if err = (&controller.CozystackResourceDefinitionReconciler{
-		Client: mgr.GetClient(),
-		Scheme: mgr.GetScheme(),
-	}).SetupWithManager(mgr); err != nil {
-		setupLog.Error(err, "unable to create controller", "controller", "CozystackResourceDefinitionReconciler")
-		os.Exit(1)
-	}
-
 	// +kubebuilder:scaffold:builder
 
 	if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {

cmd/token-proxy/Dockerfile

@@ -0,0 +1,15 @@
+FROM golang:1.24-alpine as builder
+
+ARG TARGETOS
+ARG TARGETARCH
+
+COPY main.go go.mod go.sum /src/
+WORKDIR /src
+
+RUN go build -o /token-proxy -ldflags '-extldflags "-static" -w -s' main.go
+
+FROM scratch
+
+COPY --from=builder /token-proxy /token-proxy
+
+ENTRYPOINT ["/token-proxy"]

cmd/token-proxy/example_args.yaml

@@ -0,0 +1,8 @@
+args:
+- --upstream=http://incloud-web-nginx.incloud-web.svc:8080
+- --http-address=0.0.0.0:8000
+- --cookie-refresh=1h
+- --cookie-name=kc-access
+- --cookie-secure=true
+- --cookie-secret=$(OAUTH2_PROXY_COOKIE_SECRET)
+- --token-check-url=http://incloud-web-nginx.incloud-web.svc:8080/api/clusters/cozydev4/k8s/apis/core.cozystack.io/v1alpha1/tenantnamespaces

cmd/token-proxy/go.mod

@@ -0,0 +1,8 @@
+module token-proxy
+
+go 1.24.0
+
+require (
+	github.com/golang-jwt/jwt/v5 v5.3.0
+	github.com/gorilla/securecookie v1.1.2
+)

cmd/token-proxy/go.sum

@@ -0,0 +1,6 @@
+github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo=
+github.com/golang-jwt/jwt/v5 v5.3.0/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
+github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
+github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kXD8ePA=
+github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pwzwo4h3eOamfo=

cmd/token-proxy/main.go

@@ -0,0 +1,259 @@
+package main
+
+import (
+	"encoding/base64"
+	"encoding/json"
+	"flag"
+	"fmt"
+	"html/template"
+	"log"
+	"net/http"
+	"net/http/httputil"
+	"net/url"
+	"os"
+	"path"
+	"strings"
+	"time"
+
+	"github.com/golang-jwt/jwt/v5"
+	"github.com/gorilla/securecookie"
+)
+
+/* ----------------------------- flags ------------------------------------ */
+
+var (
+	upstream, httpAddr, proxyPrefix string
+	cookieName, cookieSecretB64     string
+	cookieSecure                    bool
+	cookieRefresh                   time.Duration
+	tokenCheckURL                   string
+)
+
+func init() {
+	flag.StringVar(&upstream, "upstream", "", "Upstream URL to proxy to (required)")
+	flag.StringVar(&httpAddr, "http-address", "0.0.0.0:8000", "Listen address")
+	flag.StringVar(&proxyPrefix, "proxy-prefix", "/oauth2", "URL prefix for control endpoints")
+
+	flag.StringVar(&cookieName, "cookie-name", "_oauth2_proxy_0", "Cookie name")
+	flag.StringVar(&cookieSecretB64, "cookie-secret", "", "Base64-encoded cookie secret")
+	flag.BoolVar(&cookieSecure, "cookie-secure", false, "Set Secure flag on cookie")
+	flag.DurationVar(&cookieRefresh, "cookie-refresh", 0, "Cookie refresh interval (e.g. 1h)")
+	flag.StringVar(&tokenCheckURL, "token-check-url", "", "URL for external token validation")
+}
+
+/* ----------------------------- templates -------------------------------- */
+
+var loginTmpl = template.Must(template.New("login").Parse(`
+<!doctype html><html><head><title>Login</title></head>
+<body>
+	<h2>Enter ServiceAccount / OIDC token</h2>
+	{{if .Err}}<p style="color:red">{{.Err}}</p>{{end}}
+	<form method="POST" action="{{.Action}}">
+		<input style="width:420px" name="token" placeholder="Paste token" autofocus/>
+		<button type="submit">Login</button>
+	</form>
+</body></html>`))
+
+/* ----------------------------- helpers ---------------------------------- */
+
+func decodeJWT(raw string) jwt.MapClaims {
+	tkn, _ := jwt.Parse(raw, nil)
+	if c, ok := tkn.Claims.(jwt.MapClaims); ok {
+		return c
+	}
+	return jwt.MapClaims{}
+}
+
+func externalTokenCheck(raw string) error {
+	if tokenCheckURL == "" {
+		return nil
+	}
+	req, _ := http.NewRequest(http.MethodGet, tokenCheckURL, nil)
+	req.Header.Set("Authorization", "Bearer "+raw)
+	cli := &http.Client{Timeout: 5 * time.Second}
+	resp, err := cli.Do(req)
+	if err != nil {
+		return err
+	}
+	resp.Body.Close()
+	if resp.StatusCode != http.StatusOK {
+		return fmt.Errorf("status %d", resp.StatusCode)
+	}
+	return nil
+}
+
+func encodeSession(sc *securecookie.SecureCookie, token string, exp, issued int64) (string, error) {
+	v := map[string]interface{}{
+		"access_token": token,
+		"expires":      exp,
+		"issued":       issued,
+	}
+	return sc.Encode(cookieName, v)
+}
+
+/* ----------------------------- main ------------------------------------- */
+
+func main() {
+	flag.Parse()
+	if upstream == "" {
+		log.Fatal("--upstream is required")
+	}
+	upURL, err := url.Parse(upstream)
+	if err != nil {
+		log.Fatalf("invalid upstream url: %v", err)
+	}
+
+	if cookieSecretB64 == "" {
+		cookieSecretB64 = os.Getenv("COOKIE_SECRET")
+	}
+	if cookieSecretB64 == "" {
+		log.Fatal("--cookie-secret or $COOKIE_SECRET is required")
+	}
+	secret, err := base64.StdEncoding.DecodeString(cookieSecretB64)
+	if err != nil {
+		log.Fatalf("cookie-secret: %v", err)
+	}
+	sc := securecookie.New(secret, nil)
+
+	// control paths
+	signIn := path.Join(proxyPrefix, "sign_in")
+	signOut := path.Join(proxyPrefix, "sign_out")
+	userInfo := path.Join(proxyPrefix, "userinfo")
+
+	proxy := httputil.NewSingleHostReverseProxy(upURL)
+
+	/* ------------------------- /sign_in ---------------------------------- */
+
+	http.HandleFunc(signIn, func(w http.ResponseWriter, r *http.Request) {
+		switch r.Method {
+		case http.MethodGet:
+			_ = loginTmpl.Execute(w, struct {
+				Action string
+				Err    string
+			}{Action: signIn})
+		case http.MethodPost:
+			token := strings.TrimSpace(r.FormValue("token"))
+			if token == "" {
+				_ = loginTmpl.Execute(w, struct {
+					Action string
+					Err    string
+				}{Action: signIn, Err: "Token required"})
+				return
+			}
+			if err := externalTokenCheck(token); err != nil {
+				_ = loginTmpl.Execute(w, struct {
+					Action string
+					Err    string
+				}{Action: signIn, Err: "Invalid token"})
+				return
+			}
+
+			exp := time.Now().Add(24 * time.Hour).Unix()
+			claims := decodeJWT(token)
+			if v, ok := claims["exp"].(float64); ok {
+				exp = int64(v)
+			}
+			session, _ := encodeSession(sc, token, exp, time.Now().Unix())
+			http.SetCookie(w, &http.Cookie{
+				Name:     cookieName,
+				Value:    session,
+				Path:     "/",
+				Expires:  time.Unix(exp, 0),
+				Secure:   cookieSecure,
+				HttpOnly: true,
+				SameSite: http.SameSiteLaxMode,
+			})
+			http.Redirect(w, r, "/", http.StatusSeeOther)
+		}
+	})
+
+	/* ------------------------- /sign_out --------------------------------- */
+
+	http.HandleFunc(signOut, func(w http.ResponseWriter, r *http.Request) {
+		http.SetCookie(w, &http.Cookie{
+			Name:     cookieName,
+			Value:    "",
+			Path:     "/",
+			MaxAge:   -1,
+			Secure:   cookieSecure,
+			HttpOnly: true,
+		})
+		http.Redirect(w, r, signIn, http.StatusSeeOther)
+	})
+
+	/* ------------------------- /userinfo --------------------------------- */
+
+	http.HandleFunc(userInfo, func(w http.ResponseWriter, r *http.Request) {
+		c, err := r.Cookie(cookieName)
+		if err != nil {
+			http.Error(w, "unauthorized", http.StatusUnauthorized)
+			return
+		}
+		var sess map[string]interface{}
+		if err := sc.Decode(cookieName, c.Value, &sess); err != nil {
+			http.Error(w, "unauthorized", http.StatusUnauthorized)
+			return
+		}
+		token, _ := sess["access_token"].(string)
+		claims := decodeJWT(token)
+
+		out := map[string]interface{}{
+			"token":                 token,
+			"sub":                   claims["sub"],
+			"email":                 claims["email"],
+			"preferred_username":    claims["preferred_username"],
+			"groups":                claims["groups"],
+			"expires":               sess["expires"],
+			"issued":                sess["issued"],
+			"cookie_refresh_enable": cookieRefresh > 0,
+		}
+		w.Header().Set("Content-Type", "application/json")
+		_ = json.NewEncoder(w).Encode(out)
+	})
+
+	/* ----------------------------- proxy --------------------------------- */
+
+	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+		c, err := r.Cookie(cookieName)
+		if err != nil {
+			http.Redirect(w, r, signIn, http.StatusFound)
+			return
+		}
+		var sess map[string]interface{}
+		if err := sc.Decode(cookieName, c.Value, &sess); err != nil {
+			http.Redirect(w, r, signIn, http.StatusFound)
+			return
+		}
+		token, _ := sess["access_token"].(string)
+		if token == "" {
+			http.Redirect(w, r, signIn, http.StatusFound)
+			return
+		}
+
+		// cookie refresh
+		if cookieRefresh > 0 {
+			if issued, ok := sess["issued"].(float64); ok {
+				if time.Since(time.Unix(int64(issued), 0)) > cookieRefresh {
+					enc, _ := encodeSession(sc, token, int64(sess["expires"].(float64)), time.Now().Unix())
+					http.SetCookie(w, &http.Cookie{
+						Name:     cookieName,
+						Value:    enc,
+						Path:     "/",
+						Expires:  time.Unix(int64(sess["expires"].(float64)), 0),
+						Secure:   cookieSecure,
+						HttpOnly: true,
+						SameSite: http.SameSiteLaxMode,
+					})
+				}
+			}
+		}
+
+		r.Header.Set("Authorization", "Bearer "+token)
+		proxy.ServeHTTP(w, r)
+	})
+
+	log.Printf("Listening on %s → %s (control prefix %s)", httpAddr, upURL, proxyPrefix)
+	if err := http.ListenAndServe(httpAddr, nil); err != nil {
+		log.Fatal(err)
+	}
+}

hack/cozytest.sh

@@ -24,7 +24,7 @@ run_one() {
 
   echo "╭ » Run test: $title"
   START=$(date +%s)
-  skip_next="+ $fn"
+  skip_next="+ $fn"      # первую строку трассировки с именем функции пропустим
 
   {
     (
@@ -83,11 +83,11 @@ awk '
     }
     printf("### %s\n", title)
     printf("%s() {\n", fname)
-    print "  set -e"
+    print "  set -e"           # ошибка → падение теста
     next
   }
   /^}$/ {
-    print "  return 0"
+    print "  return 0"         # если автор не сделал exit 1 — тест ОК
     print "}"
     next
   }

hack/e2e-apps/clickhouse.bats

@@ -27,10 +27,6 @@ spec:
     s3AccessKey: oobaiRus9pah8PhohL1ThaeTa4UVa7gu
     s3SecretKey: ju3eum4dekeich9ahM1te8waeGai0oog
     resticPassword: ChaXoveekoh6eigh4siesheeda2quai0
-  clickhouseKeeper:
-    enabled: true
-    resourcesPreset: "micro"
-    size: "1Gi"
   resources: {}
   resourcesPreset: "nano"
 EOF

hack/e2e-apps/run-kubernetes.sh

@@ -57,6 +57,9 @@ spec:
       instanceType: u1.medium
       maxReplicas: 10
       minReplicas: 0
+      resources:
+        cpu: ""
+        memory: ""
       roles:
       - ingress-nginx
   storageClass: replicated

hack/e2e-apps/virtualmachine.bats

@@ -20,7 +20,9 @@ spec:
     storage: 5Gi
     storageClass: replicated
   gpus: []
-  resources: {}
+  resources:
+    cpu: ""
+    memory: ""
   sshKeys:
   - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPht0dPk5qQ+54g1hSX7A6AUxXJW5T6n/3d7Ga2F8gTF
     test@test

hack/e2e-apps/vminstance.bats

@@ -42,6 +42,9 @@ spec:
   disks:
     - name: $diskName
   gpus: []
+  resources:
+    cpu: ""
+    memory: ""
   sshKeys:
   - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPht0dPk5qQ+54g1hSX7A6AUxXJW5T6n/3d7Ga2F8gTF
     test@test

hack/e2e-prepare-cluster.bats

@@ -82,7 +82,7 @@ EOF
   for i in 1 2 3; do
     cp nocloud-amd64.raw srv${i}/system.img
     qemu-img resize srv${i}/system.img 50G
-    qemu-img create srv${i}/data.img 200G
+    qemu-img create srv${i}/data.img 100G
   done
 }
 
@@ -136,25 +136,25 @@ machine:
     mirrors:
       docker.io:
         endpoints:
-        - https://dockerio.nexus.aenix.org
+        - https://dockerio.nexus.lllamnyp.su
       cr.fluentbit.io:
         endpoints:
-        - https://fluentbit.nexus.aenix.org
+        - https://fluentbit.nexus.lllamnyp.su
       docker-registry3.mariadb.com:
         endpoints:
-        - https://mariadb.nexus.aenix.org
+        - https://mariadb.nexus.lllamnyp.su
       gcr.io:
         endpoints:
-        - https://gcr.nexus.aenix.org
+        - https://gcr.nexus.lllamnyp.su
       ghcr.io:
         endpoints:
-        - https://ghcr.nexus.aenix.org
+        - https://ghcr.nexus.lllamnyp.su
       quay.io:
         endpoints:
-        - https://quay.nexus.aenix.org
+        - https://quay.nexus.lllamnyp.su
       registry.k8s.io:
         endpoints:
-        - https://k8s.nexus.aenix.org
+        - https://k8s.nexus.lllamnyp.su
   files:
   - content: |
       [plugins]

internal/controller/cozystackresource_controller.go

@@ -1,117 +0,0 @@
-package controller
-
-import (
-	"context"
-	"sync"
-	"time"
-
-	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
-	appsv1 "k8s.io/api/apps/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/types"
-	ctrl "sigs.k8s.io/controller-runtime"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/handler"
-	"sigs.k8s.io/controller-runtime/pkg/log"
-	"sigs.k8s.io/controller-runtime/pkg/reconcile"
-)
-
-type CozystackResourceDefinitionReconciler struct {
-	client.Client
-	Scheme *runtime.Scheme
-
-	// Configurable debounce duration
-	Debounce time.Duration
-
-	// Internal state for debouncing
-	mu          sync.Mutex
-	lastEvent   time.Time // Time of last CRUD event on CozystackResourceDefinition
-	lastHandled time.Time // Last time the Deployment was actually restarted
-}
-
-// Reconcile handles the logic to restart the target Deployment only once,
-// even if multiple events occur close together
-func (r *CozystackResourceDefinitionReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
-	log := log.FromContext(ctx)
-
-	// Only respond to our target deployment
-	if req.Namespace != "cozy-system" || req.Name != "cozystack-api" {
-		return ctrl.Result{}, nil
-	}
-
-	r.mu.Lock()
-	le := r.lastEvent
-	lh := r.lastHandled
-	debounce := r.Debounce
-	r.mu.Unlock()
-
-	if debounce <= 0 {
-		debounce = 5 * time.Second
-	}
-
-	// No events received yet — nothing to do
-	if le.IsZero() {
-		return ctrl.Result{}, nil
-	}
-
-	// Wait until the debounce duration has passed since the last event
-	if d := time.Since(le); d < debounce {
-		return ctrl.Result{RequeueAfter: debounce - d}, nil
-	}
-
-	// Already handled this event — skip restart
-	if !lh.Before(le) {
-		return ctrl.Result{}, nil
-	}
-
-	// Perform the restart by patching the deployment annotation
-	deploy := &appsv1.Deployment{}
-	if err := r.Get(ctx, types.NamespacedName{Namespace: "cozy-system", Name: "cozystack-api"}, deploy); err != nil {
-		log.Error(err, "Failed to get Deployment cozy-system/cozystack-api")
-		return ctrl.Result{}, client.IgnoreNotFound(err)
-	}
-
-	patch := client.MergeFrom(deploy.DeepCopy())
-	if deploy.Spec.Template.Annotations == nil {
-		deploy.Spec.Template.Annotations = make(map[string]string)
-	}
-	deploy.Spec.Template.Annotations["kubectl.kubernetes.io/restartedAt"] = time.Now().Format(time.RFC3339)
-
-	if err := r.Patch(ctx, deploy, patch); err != nil {
-		log.Error(err, "Failed to patch Deployment annotation")
-		return ctrl.Result{}, err
-	}
-
-	// Mark this event as handled
-	r.mu.Lock()
-	r.lastHandled = le
-	r.mu.Unlock()
-
-	log.Info("Deployment cozy-system/cozystack-api successfully restarted")
-	return ctrl.Result{}, nil
-}
-
-// SetupWithManager configures how the controller listens to events
-func (r *CozystackResourceDefinitionReconciler) SetupWithManager(mgr ctrl.Manager) error {
-	if r.Debounce == 0 {
-		r.Debounce = 5 * time.Second
-	}
-
-	return ctrl.NewControllerManagedBy(mgr).
-		Named("cozystack-restart-controller").
-		Watches(
-			&cozyv1alpha1.CozystackResourceDefinition{},
-			handler.EnqueueRequestsFromMapFunc(func(ctx context.Context, obj client.Object) []reconcile.Request {
-				r.mu.Lock()
-				r.lastEvent = time.Now()
-				r.mu.Unlock()
-				return []reconcile.Request{{
-					NamespacedName: types.NamespacedName{
-						Namespace: "cozy-system",
-						Name:      "cozystack-api",
-					},
-				}}
-			}),
-		).
-		Complete(r)
-}

internal/controller/system_helm_reconciler.go

@@ -33,7 +33,6 @@ const requestedAt = "reconcile.fluxcd.io/requestedAt"
 
 func (r *CozystackConfigReconciler) Reconcile(ctx context.Context, _ ctrl.Request) (ctrl.Result, error) {
 	log := log.FromContext(ctx)
-	time.Sleep(2 * time.Second)
 
 	digest, err := r.computeDigest(ctx)
 	if err != nil {

internal/controller/tenant_helm_reconciler.go

@@ -26,7 +26,6 @@ type TenantHelmReconciler struct {
 
 func (r *TenantHelmReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	logger := log.FromContext(ctx)
-	time.Sleep(2 * time.Second)
 
 	hr := &helmv2.HelmRelease{}
 	if err := r.Get(ctx, req.NamespacedName, hr); err != nil {

packages/apps/README.md

@@ -4,5 +4,6 @@
 cd packages/core/installer
 make image-cozystack REGISTRY=YOUR_CUSTOM_REGISTRY
 make apply
+kubectl delete pod dashboard-redis-master-0 -n cozy-dashboard
 kubectl delete po -l app=source-controller -n cozy-fluxcd
 ```

packages/apps/bucket/Makefile

@@ -1,5 +1,4 @@
 include ../../../scripts/package.mk
 
 generate:
-	cozyvalues-gen -v values.yaml -s values.schema.json -r README.md
-	yq -o json -i '.properties = {}' values.schema.json
+	readme-generator-for-helm -v values.yaml -s values.schema.json -r README.md

packages/apps/bucket/values.schema.json

@@ -1,5 +1,5 @@
 {
-  "title": "Chart Values",
-  "type": "object",
-  "properties": {}
-}
+    "properties": {},
+    "title": "Chart Values",
+    "type": "object"
+}

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.13.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

packages/apps/clickhouse/Makefile

@@ -1,10 +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:
-	cozyvalues-gen -v values.yaml -s values.schema.json -r README.md
+	readme-generator-for-helm -v values.yaml -s values.schema.json -r README.md
+	yq -i -o json --indent 4 '.properties.resourcesPreset.enum = $(PRESET_ENUM)' values.schema.json
 
 image:
 	docker buildx build images/clickhouse-backup \

packages/apps/clickhouse/README.md

@@ -23,54 +23,35 @@ For more details, read [Restic: Effective Backup from Stdin](https://blog.aenix.
 
 ### Common parameters
 
-| Name               | Description                                                                                                                               | Type        | Value   |
-| ------------------ | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------- | ------- |
-| `replicas`         | Number of Clickhouse replicas                                                                                                             | `int`       | `2`     |
-| `shards`           | Number of Clickhouse shards                                                                                                               | `int`       | `1`     |
-| `resources`        | Explicit CPU and memory configuration for each Clickhouse replica. When left empty, the preset defined in `resourcesPreset` is applied.   | `*object`   | `{}`    |
-| `resources.cpu`    | CPU available to each replica                                                                                                             | `*quantity` | `null`  |
-| `resources.memory` | Memory (RAM) available to each replica                                                                                                    | `*quantity` | `null`  |
-| `resourcesPreset`  | Default sizing preset used when `resources` is omitted. Allowed values: `nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`. | `string`    | `small` |
-| `size`             | Persistent Volume Claim size, available for application data                                                                              | `quantity`  | `10Gi`  |
-| `storageClass`     | StorageClass used to store the data                                                                                                       | `string`    | `""`    |
-
+| Name              | Description                                                                                                                             | Value   |
+| ----------------- | --------------------------------------------------------------------------------------------------------------------------------------- | ------- |
+| `replicas`        | Number of Clickhouse replicas                                                                                                           | `2`     |
+| `shards`          | Number of Clickhouse shards                                                                                                             | `1`     |
+| `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: nano, micro, small, medium, large, xlarge, 2xlarge.             | `small` |
+| `size`            | Persistent Volume Claim size, available for application data                                                                            | `10Gi`  |
+| `storageClass`    | StorageClass used to store the application data                                                                                         | `""`    |
 
 ### Application-specific parameters
 
-| Name                   | Description                                                  | Type                | Value   |
-| ---------------------- | ------------------------------------------------------------ | ------------------- | ------- |
-| `logStorageSize`       | Size of Persistent Volume for logs                           | `quantity`          | `2Gi`   |
-| `logTTL`               | TTL (expiration time) for `query_log` and `query_thread_log` | `int`               | `15`    |
-| `users`                | Users configuration                                          | `map[string]object` | `{...}` |
-| `users[name].password` | Password for the user                                        | `*string`           | `null`  |
-| `users[name].readonly` | User is `readonly`, default is `false`.                      | `*bool`             | `null`  |
-
+| Name             | Description                                              | Value |
+| ---------------- | -------------------------------------------------------- | ----- |
+| `logStorageSize` | Size of Persistent Volume for logs                       | `2Gi` |
+| `logTTL`         | TTL (expiration time) for query_log and query_thread_log | `15`  |
+| `users`          | Users configuration                                      | `{}`  |
 
 ### Backup parameters
 
-| Name                     | Description                                    | Type     | Value                                                  |
-| ------------------------ | ---------------------------------------------- | -------- | ------------------------------------------------------ |
-| `backup`                 | Backup configuration                           | `object` | `{}`                                                   |
-| `backup.enabled`         | Enable regular backups, default is `false`     | `bool`   | `false`                                                |
-| `backup.s3Region`        | AWS S3 region where backups are stored         | `string` | `us-east-1`                                            |
-| `backup.s3Bucket`        | S3 bucket used for storing backups             | `string` | `s3.example.org/clickhouse-backups`                    |
-| `backup.schedule`        | Cron schedule for automated backups            | `string` | `0 2 * * *`                                            |
-| `backup.cleanupStrategy` | Retention strategy for cleaning up old backups | `string` | `--keep-last=3 --keep-daily=3 --keep-within-weekly=1m` |
-| `backup.s3AccessKey`     | Access key for S3, used for authentication     | `string` | `<your-access-key>`                                    |
-| `backup.s3SecretKey`     | Secret key for S3, used for authentication     | `string` | `<your-secret-key>`                                    |
-| `backup.resticPassword`  | Password for Restic backup encryption          | `string` | `<password>`                                           |
-
-
-### Clickhouse Keeper parameters
-
-| Name                               | Description                                                                                                                               | Type        | Value   |
-| ---------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------- | ------- |
-| `clickhouseKeeper`                 | Clickhouse Keeper configuration                                                                                                           | `*object`   | `{}`    |
-| `clickhouseKeeper.enabled`         | Deploy ClickHouse Keeper for cluster coordination                                                                                         | `*bool`     | `true`  |
-| `clickhouseKeeper.size`            | Persistent Volume Claim size, available for application data                                                                              | `*quantity` | `1Gi`   |
-| `clickhouseKeeper.resourcesPreset` | Default sizing preset used when `resources` is omitted. Allowed values: `nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`. | `string`    | `micro` |
-| `clickhouseKeeper.replicas`        | Number of Keeper replicas                                                                                                                 | `*int`      | `3`     |
-
+| Name                     | Description                                    | Value                                                  |
+| ------------------------ | ---------------------------------------------- | ------------------------------------------------------ |
+| `backup.enabled`         | Enable periodic backups                        | `false`                                                |
+| `backup.s3Region`        | AWS S3 region where backups are stored         | `us-east-1`                                            |
+| `backup.s3Bucket`        | S3 bucket used for storing backups             | `s3.example.org/clickhouse-backups`                    |
+| `backup.schedule`        | Cron schedule for automated backups            | `0 2 * * *`                                            |
+| `backup.cleanupStrategy` | Retention strategy for cleaning up old backups | `--keep-last=3 --keep-daily=3 --keep-within-weekly=1m` |
+| `backup.s3AccessKey`     | Access key for S3, used for authentication     | `oobaiRus9pah8PhohL1ThaeTa4UVa7gu`                     |
+| `backup.s3SecretKey`     | Secret key for S3, used for authentication     | `ju3eum4dekeich9ahM1te8waeGai0oog`                     |
+| `backup.resticPassword`  | Password for Restic backup encryption          | `ChaXoveekoh6eigh4siesheeda2quai0`                     |
 
 ## Parameter examples and reference
 

packages/apps/clickhouse/images/clickhouse-backup.tag

@@ -1 +1 @@
-ghcr.io/cozystack/cozystack/clickhouse-backup:0.13.0@sha256:3faf7a4cebf390b9053763107482de175aa0fdb88c1e77424fd81100b1c3a205
+ghcr.io/cozystack/cozystack/clickhouse-backup:0.11.1@sha256:3faf7a4cebf390b9053763107482de175aa0fdb88c1e77424fd81100b1c3a205

packages/apps/clickhouse/templates/chkeeper.yaml

@@ -1,96 +0,0 @@
-{{- $cozyConfig := lookup "v1" "ConfigMap" "cozy-system" "cozystack" }}
-{{- $clusterDomain := (index $cozyConfig.data "cluster-domain") | default "cozy.local" }}
-
-{{- if .Values.clickhouseKeeper.enabled }}
-apiVersion: "clickhouse-keeper.altinity.com/v1"
-kind: "ClickHouseKeeperInstallation"
-metadata:
-  name: "{{ .Release.Name }}-keeper"
-  annotations:
-    prometheus.io/port: "7000"
-    prometheus.io/scrape: "true"
-spec:
-  namespaceDomainPattern: "%s.svc.{{ $clusterDomain }}"
-  configuration:
-    clusters:
-      - name: "cluster1"
-        layout:
-          replicasCount: {{ .Values.clickhouseKeeper.replicas }}
-    settings:
-      logger/level: "trace"
-      logger/console: "true"
-      listen_host: "0.0.0.0"
-      keeper_server/four_letter_word_white_list: "*"
-      keeper_server/coordination_settings/raft_logs_level: "information"
-      prometheus/endpoint: "/metrics"
-      prometheus/port: "7000"
-      prometheus/metrics: "true"
-      prometheus/events: "true"
-      prometheus/asynchronous_metrics: "true"
-      prometheus/status_info: "false"
-
-  defaults:
-    templates:
-      # Templates are specified as default for all clusters
-      podTemplate: default
-      dataVolumeClaimTemplate: default
-
-  templates:
-    podTemplates:
-      - name: default
-        metadata:
-          labels:
-            app: "{{ .Release.Name }}-keeper"
-          annotations:
-            prometheus.io/port: "7000"
-            prometheus.io/scrape: "true"
-        spec:
-          affinity:
-            podAntiAffinity:
-              requiredDuringSchedulingIgnoredDuringExecution:
-                - labelSelector:
-                    matchExpressions:
-                      - key: "app"
-                        operator: In
-                        values:
-                          - "{{ .Release.Name }}-keeper"
-                  topologyKey: "kubernetes.io/hostname"
-          containers:
-            - name: clickhouse-keeper
-              imagePullPolicy: IfNotPresent
-              image: clickhouse/clickhouse-keeper:24.9.2.42
-              resources: {{- include "cozy-lib.resources.defaultingSanitize" (list .Values.clickhouseKeeper.resourcesPreset .Values.resources $) | nindent 20 }}  
-          securityContext:
-            fsGroup: 101
-
-    volumeClaimTemplates:
-      - name: default
-        spec:
-          accessModes:
-            - ReadWriteOnce
-          resources:
-            requests:
-              storage: "{{ .Values.clickhouseKeeper.size }}"
----
-apiVersion: operator.victoriametrics.com/v1beta1
-kind: VMPodScrape
-metadata:
-  name: {{ .Release.Name }}-keeper
-  namespace: {{ .Release.Namespace }}
-spec:
-  selector:
-    matchLabels:
-      app: {{ .Release.Name }}-keeper
-  namespaceSelector:
-    matchNames:
-      - {{ .Release.Namespace }}
-  podMetricsEndpoints:
-    - port: metrics
-      path: /metrics
-      interval: 30s
-      scheme: http
-      relabelConfigs:
-        - action: replace
-          sourceLabels: [__meta_kubernetes_pod_node_name]
-          targetLabel: instance
-{{- end }}

packages/apps/clickhouse/templates/clickhouse.yaml

@@ -91,18 +91,6 @@ spec:
         layout:
           shardsCount: {{ .Values.shards }}
           replicasCount: {{ .Values.replicas }}
-    {{- if .Values.clickhouseKeeper.enabled }}
-    zookeeper:
-      nodes:
-        {{- $replicas := int .Values.clickhouseKeeper.replicas }}
-        {{- $release := .Release.Name }}
-        {{- $namespace := .Release.Namespace }}
-        {{- $clusterDomain := .Values.clusterDomain }}
-        {{- range $i := until $replicas }}
-        - host: "chk-{{ $release }}-keeper-cluster1-0-{{ $i }}.{{ $namespace }}.svc.{{ $clusterDomain }}"
-          port: 2181
-        {{- end }}
-    {{- end }}
   templates:
     volumeClaimTemplates:
       - name: data-volume-template

packages/apps/clickhouse/templates/dashboard-resourcemap.yaml

@@ -23,9 +23,6 @@ rules:
   - workloadmonitors
   resourceNames:
   - {{ .Release.Name }}
-  {{- if .Values.clickhouseKeeper.enabled }}
-  - {{ .Release.Name }}-keeper
-  {{- end }}
   verbs: ["get", "list", "watch"]
 ---
 kind: RoleBinding

packages/apps/clickhouse/templates/workloadmonitor.yaml

@@ -11,18 +11,3 @@ spec:
   selector:
     app.kubernetes.io/instance: {{ $.Release.Name }}
   version: {{ $.Chart.Version }}
-{{- if .Values.clickhouseKeeper.enabled }}
----
-apiVersion: cozystack.io/v1alpha1
-kind: WorkloadMonitor
-metadata:
-  name: {{ $.Release.Name }}-keeper
-spec:
-  replicas: {{ .Values.clickhouseKeeper.replicas }}
-  minReplicas: 1
-  kind: clickhouse
-  type: clickhouse
-  selector:
-    app: {{ $.Release.Name }}-keeper
-  version: {{ $.Chart.Version }}
-{{- end }}

packages/apps/clickhouse/values.schema.json

@@ -1,237 +1,100 @@
 {
-  "title": "Chart Values",
-  "type": "object",
-  "properties": {
-    "backup": {
-      "description": "Backup configuration",
-      "type": "object",
-      "default": {
-        "cleanupStrategy": "--keep-last=3 --keep-daily=3 --keep-within-weekly=1m",
-        "enabled": false,
-        "resticPassword": "\u003cpassword\u003e",
-        "s3AccessKey": "\u003cyour-access-key\u003e",
-        "s3Bucket": "s3.example.org/clickhouse-backups",
-        "s3Region": "us-east-1",
-        "s3SecretKey": "\u003cyour-secret-key\u003e",
-        "schedule": "0 2 * * *"
-      },
-      "required": [
-        "cleanupStrategy",
-        "enabled",
-        "resticPassword",
-        "s3AccessKey",
-        "s3Bucket",
-        "s3Region",
-        "s3SecretKey",
-        "schedule"
-      ],
-      "properties": {
-        "cleanupStrategy": {
-          "description": "Retention strategy for cleaning up old backups",
-          "type": "string",
-          "default": "--keep-last=3 --keep-daily=3 --keep-within-weekly=1m"
+    "properties": {
+        "backup": {
+            "properties": {
+                "cleanupStrategy": {
+                    "default": "--keep-last=3 --keep-daily=3 --keep-within-weekly=1m",
+                    "description": "Retention strategy for cleaning up old backups",
+                    "type": "string"
+                },
+                "enabled": {
+                    "default": false,
+                    "description": "Enable periodic backups",
+                    "type": "boolean"
+                },
+                "resticPassword": {
+                    "default": "ChaXoveekoh6eigh4siesheeda2quai0",
+                    "description": "Password for Restic backup encryption",
+                    "type": "string"
+                },
+                "s3AccessKey": {
+                    "default": "oobaiRus9pah8PhohL1ThaeTa4UVa7gu",
+                    "description": "Access key for S3, used for authentication",
+                    "type": "string"
+                },
+                "s3Bucket": {
+                    "default": "s3.example.org/clickhouse-backups",
+                    "description": "S3 bucket used for storing backups",
+                    "type": "string"
+                },
+                "s3Region": {
+                    "default": "us-east-1",
+                    "description": "AWS S3 region where backups are stored",
+                    "type": "string"
+                },
+                "s3SecretKey": {
+                    "default": "ju3eum4dekeich9ahM1te8waeGai0oog",
+                    "description": "Secret key for S3, used for authentication",
+                    "type": "string"
+                },
+                "schedule": {
+                    "default": "0 2 * * *",
+                    "description": "Cron schedule for automated backups",
+                    "type": "string"
+                }
+            },
+            "type": "object"
         },
-        "enabled": {
-          "description": "Enable regular backups, default is `false`",
-          "type": "boolean",
-          "default": false
+        "logStorageSize": {
+            "default": "2Gi",
+            "description": "Size of Persistent Volume for logs",
+            "type": "string"
         },
-        "resticPassword": {
-          "description": "Password for Restic backup encryption",
-          "type": "string",
-          "default": "\u003cpassword\u003e"
-        },
-        "s3AccessKey": {
-          "description": "Access key for S3, used for authentication",
-          "type": "string",
-          "default": "\u003cyour-access-key\u003e"
-        },
-        "s3Bucket": {
-          "description": "S3 bucket used for storing backups",
-          "type": "string",
-          "default": "s3.example.org/clickhouse-backups"
-        },
-        "s3Region": {
-          "description": "AWS S3 region where backups are stored",
-          "type": "string",
-          "default": "us-east-1"
-        },
-        "s3SecretKey": {
-          "description": "Secret key for S3, used for authentication",
-          "type": "string",
-          "default": "\u003cyour-secret-key\u003e"
-        },
-        "schedule": {
-          "description": "Cron schedule for automated backups",
-          "type": "string",
-          "default": "0 2 * * *"
-        }
-      }
-    },
-    "clickhouseKeeper": {
-      "description": "Clickhouse Keeper configuration",
-      "type": "object",
-      "default": {
-        "enabled": true,
-        "replicas": 3,
-        "resourcesPreset": "micro",
-        "size": "1Gi"
-      },
-      "required": [
-        "resourcesPreset"
-      ],
-      "properties": {
-        "enabled": {
-          "description": "Deploy ClickHouse Keeper for cluster coordination",
-          "type": "boolean",
-          "default": true
+        "logTTL": {
+            "default": 15,
+            "description": "TTL (expiration time) for query_log and query_thread_log",
+            "type": "number"
         },
         "replicas": {
-          "description": "Number of Keeper replicas",
-          "type": "integer",
-          "default": 3
+            "default": 2,
+            "description": "Number of Clickhouse replicas",
+            "type": "number"
+        },
+        "resources": {
+            "default": {},
+            "description": "Explicit CPU and memory configuration for each ClickHouse replica. When left empty, the preset defined in `resourcesPreset` is applied.",
+            "type": "object"
         },
         "resourcesPreset": {
-          "description": "Default sizing preset used when `resources` is omitted. Allowed values: `nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`.",
-          "type": "string",
-          "default": "micro",
-          "enum": [
-            "nano",
-            "micro",
-            "small",
-            "medium",
-            "large",
-            "xlarge",
-            "2xlarge"
-          ]
+            "default": "small",
+            "description": "Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge.",
+            "type": "string",
+            "enum": [
+                "nano",
+                "micro",
+                "small",
+                "medium",
+                "large",
+                "xlarge",
+                "2xlarge"
+            ]
+        },
+        "shards": {
+            "default": 1,
+            "description": "Number of Clickhouse shards",
+            "type": "number"
         },
         "size": {
-          "description": "Persistent Volume Claim size, available for application data",
-          "default": "1Gi",
-          "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
-        }
-      }
-    },
-    "logStorageSize": {
-      "description": "Size of Persistent Volume for logs",
-      "default": "2Gi",
-      "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
-    },
-    "logTTL": {
-      "description": "TTL (expiration time) for `query_log` and `query_thread_log`",
-      "type": "integer",
-      "default": 15
-    },
-    "replicas": {
-      "description": "Number of Clickhouse replicas",
-      "type": "integer",
-      "default": 2
-    },
-    "resources": {
-      "description": "Explicit CPU and memory configuration for each Clickhouse replica. When left empty, the preset defined in `resourcesPreset` is applied.",
-      "type": "object",
-      "default": {},
-      "properties": {
-        "cpu": {
-          "description": "CPU available to each replica",
-          "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": "Memory (RAM) available to each replica",
-          "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
-        }
-      }
-    },
-    "resourcesPreset": {
-      "description": "Default sizing preset used when `resources` is omitted. Allowed values: `nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`.",
-      "type": "string",
-      "default": "small",
-      "enum": [
-        "nano",
-        "micro",
-        "small",
-        "medium",
-        "large",
-        "xlarge",
-        "2xlarge"
-      ]
-    },
-    "shards": {
-      "description": "Number of Clickhouse shards",
-      "type": "integer",
-      "default": 1
-    },
-    "size": {
-      "description": "Persistent Volume Claim size, available for application data",
-      "default": "10Gi",
-      "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"
-    },
-    "users": {
-      "description": "Users configuration",
-      "type": "object",
-      "default": {},
-      "additionalProperties": {
-        "type": "object",
-        "properties": {
-          "password": {
-            "description": "Password for the user",
+            "default": "10Gi",
+            "description": "Persistent Volume Claim size, available for application data",
+            "type": "string"
+        },
+        "storageClass": {
+            "default": "",
+            "description": "StorageClass used to store the application data",
             "type": "string"
-          },
-          "readonly": {
-            "description": "User is `readonly`, default is `false`.",
-            "type": "boolean"
-          }
         }
-      }
-    }
-  }
-}
+    },
+    "title": "Chart Values",
+    "type": "object"
+}

packages/apps/clickhouse/values.yaml

@@ -1,36 +1,30 @@
 ## @section Common parameters
 ##
-## @param replicas {int} Number of Clickhouse replicas
+## @param replicas Number of Clickhouse replicas
 replicas: 2
-## @param shards {int} Number of Clickhouse shards
+## @param shards Number of Clickhouse shards
 shards: 1
-## @param resources {*resources} Explicit CPU and memory configuration for each Clickhouse replica. When left empty, the preset defined in `resourcesPreset` is applied.
-## @field resources.cpu {*quantity} CPU available to each replica
-## @field resources.memory {*quantity} Memory (RAM) available to each replica
+## @param resources Explicit CPU and memory configuration for each ClickHouse replica. When left empty, the preset defined in `resourcesPreset` is applied.
+resources: {}
 #  resources:
 #    cpu: 4000m
 #    memory: 4Gi
-resources: {}
 
-
-
-## @param resourcesPreset {string enum:"nano,micro,small,medium,large,xlarge,2xlarge"} Default sizing preset used when `resources` is omitted. Allowed values: `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"
-## @param size {quantity} Persistent Volume Claim size, available for application data
+## @param size Persistent Volume Claim size, available for application data
 size: 10Gi
-## @param storageClass {string} StorageClass used to store the data
+## @param storageClass StorageClass used to store the application data
 storageClass: ""
 
 
 ## @section Application-specific parameters
 ##
-## @param logStorageSize {quantity} Size of Persistent Volume for logs
+## @param logStorageSize Size of Persistent Volume for logs
 logStorageSize: 2Gi
-## @param logTTL {int} TTL (expiration time) for `query_log` and `query_thread_log`
+## @param logTTL TTL (expiration time) for query_log and query_thread_log
 logTTL: 15
-## @param users {map[string]user} Users configuration
-## @field user.password {*string} Password for the user
-## @field user.readonly {*bool} User is `readonly`, default is `false`.
+## @param users [object] Users configuration
 ## Example:
 ## users:
 ##   user1:
@@ -44,34 +38,21 @@ users: {}
 
 ## @section Backup parameters
 
-## @param backup {backup} Backup configuration
-## @field backup.enabled {bool} Enable regular backups, default is `false`
-## @field backup.s3Region {string} AWS S3 region where backups are stored
-## @field backup.s3Bucket {string} S3 bucket used for storing backups
-## @field backup.schedule {string} Cron schedule for automated backups
-## @field backup.cleanupStrategy {string} Retention strategy for cleaning up old backups
-## @field backup.s3AccessKey {string} Access key for S3, used for authentication
-## @field backup.s3SecretKey {string} Secret key for S3, used for authentication
-## @field backup.resticPassword {string} Password for Restic backup encryption
+## @param backup.enabled Enable periodic backups
+## @param backup.s3Region AWS S3 region where backups are stored
+## @param backup.s3Bucket S3 bucket used for storing backups
+## @param backup.schedule Cron schedule for automated backups
+## @param backup.cleanupStrategy Retention strategy for cleaning up old backups
+## @param backup.s3AccessKey Access key for S3, used for authentication
+## @param backup.s3SecretKey Secret key for S3, used for authentication
+## @param backup.resticPassword Password for Restic backup encryption
 backup:
   enabled: false
   s3Region: us-east-1
-  s3Bucket: "s3.example.org/clickhouse-backups"
+  s3Bucket: s3.example.org/clickhouse-backups
   schedule: "0 2 * * *"
   cleanupStrategy: "--keep-last=3 --keep-daily=3 --keep-within-weekly=1m"
-  s3AccessKey: "<your-access-key>"
-  s3SecretKey: "<your-secret-key>"
-  resticPassword: "<password>"
+  s3AccessKey: oobaiRus9pah8PhohL1ThaeTa4UVa7gu
+  s3SecretKey: ju3eum4dekeich9ahM1te8waeGai0oog
+  resticPassword: ChaXoveekoh6eigh4siesheeda2quai0
 
-
-## @section Clickhouse Keeper parameters
-## @param clickhouseKeeper {*clickhouseKeeper} Clickhouse Keeper configuration
-## @field clickhouseKeeper.enabled {*bool} Deploy ClickHouse Keeper for cluster coordination
-## @field clickhouseKeeper.size {*quantity} Persistent Volume Claim size, available for application data
-## @field clickhouseKeeper.resourcesPreset {string enum:"nano,micro,small,medium,large,xlarge,2xlarge"} Default sizing preset used when `resources` is omitted. Allowed values: `nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`.
-## @field clickhouseKeeper.replicas {*int} Number of Keeper replicas
-clickhouseKeeper:
-  enabled: true
-  size: 1Gi
-  resourcesPreset: micro
-  replicas: 3

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: 1.1.0
+version: 1.0.0
 
 # 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

packages/apps/ferretdb/Makefile

@@ -1,7 +1,9 @@
 include ../../../scripts/package.mk
+PRESET_ENUM := ["nano","micro","small","medium","large","xlarge","2xlarge"]
 
 generate:
-	cozyvalues-gen -v values.yaml -s values.schema.json -r README.md
+	readme-generator-for-helm -v values.yaml -s values.schema.json -r README.md
+	yq -i -o json --indent 4 '.properties.resourcesPreset.enum = $(PRESET_ENUM)' values.schema.json
 
 update:
 	tag=$$(git ls-remote --tags --sort="v:refname" https://github.com/FerretDB/FerretDB | awk -F'[/^]' '{sub("^v", "", $$3)} END{print $$3}') && \

packages/apps/ferretdb/README.md

@@ -8,52 +8,42 @@ Internally, FerretDB service is backed by Postgres.
 
 ### Common parameters
 
-| Name               | Description                                                                                                                               | Type        | Value   |
-| ------------------ | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------- | ------- |
-| `replicas`         | Number of replicas                                                                                                                        | `int`       | `2`     |
-| `resources`        | Explicit CPU and memory configuration for each FerretDB replica. When left empty, the preset defined in `resourcesPreset` is applied.     | `*object`   | `{}`    |
-| `resources.cpu`    | CPU available to each replica                                                                                                             | `*quantity` | `null`  |
-| `resources.memory` | Memory (RAM) available to each replica                                                                                                    | `*quantity` | `null`  |
-| `resourcesPreset`  | Default sizing preset used when `resources` is omitted. Allowed values: `nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`. | `string`    | `micro` |
-| `size`             | Persistent Volume Claim size, available for application data                                                                              | `quantity`  | `10Gi`  |
-| `storageClass`     | StorageClass used to store the data                                                                                                       | `string`    | `""`    |
-| `external`         | Enable external access from outside the cluster                                                                                           | `bool`      | `false` |
-
+| Name              | Description                                                                                                                           | Value   |
+| ----------------- | ------------------------------------------------------------------------------------------------------------------------------------- | ------- |
+| `replicas`        | Number of replicas                                                                                                                    | `2`     |
+| `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.     | `micro` |
+| `size`            | Persistent Volume size                                                                                                                | `10Gi`  |
+| `storageClass`    | StorageClass used to store the data                                                                                                   | `""`    |
+| `external`        | Enable external access from outside the cluster                                                                                       | `false` |
 
 ### Application-specific parameters
 
-| Name                     | Description                                                                                                                 | Type                | Value   |
-| ------------------------ | --------------------------------------------------------------------------------------------------------------------------- | ------------------- | ------- |
-| `quorum`                 | Configuration for the quorum-based synchronous replication                                                                  | `object`            | `{}`    |
-| `quorum.minSyncReplicas` | Minimum number of synchronous replicas that must acknowledge a transaction before it is considered committed                | `int`               | `0`     |
-| `quorum.maxSyncReplicas` | Maximum number of synchronous replicas that can acknowledge a transaction (must be lower than the total number of replicas) | `int`               | `0`     |
-| `users`                  | Users configuration                                                                                                         | `map[string]object` | `{...}` |
-| `users[name].password`   | Password for the user                                                                                                       | `*string`           | `null`  |
-
+| Name                     | Description                                                                                                                 | Value |
+| ------------------------ | --------------------------------------------------------------------------------------------------------------------------- | ----- |
+| `quorum.minSyncReplicas` | Minimum number of synchronous replicas that must acknowledge a transaction before it is considered committed                | `0`   |
+| `quorum.maxSyncReplicas` | Maximum number of synchronous replicas that can acknowledge a transaction (must be lower than the total number of replicas) | `0`   |
+| `users`                  | Users configuration                                                                                                         | `{}`  |
 
 ### Backup parameters
 
-| Name                     | Description                                                | Type     | Value                               |
-| ------------------------ | ---------------------------------------------------------- | -------- | ----------------------------------- |
-| `backup`                 | Backup configuration                                       | `object` | `{}`                                |
-| `backup.enabled`         | Enable regular backups, default is `false`.                | `bool`   | `false`                             |
-| `backup.schedule`        | Cron schedule for automated backups                        | `string` | `0 2 * * * *`                       |
-| `backup.retentionPolicy` | Retention policy                                           | `string` | `30d`                               |
-| `backup.endpointURL`     | S3 Endpoint used to upload data to the cloud               | `string` | `http://minio-gateway-service:9000` |
-| `backup.destinationPath` | Path to store the backup (i.e. s3://bucket/path/to/folder) | `string` | `s3://bucket/path/to/folder/`       |
-| `backup.s3AccessKey`     | Access key for S3, used for authentication                 | `string` | `<your-access-key>`                 |
-| `backup.s3SecretKey`     | Secret key for S3, used for authentication                 | `string` | `<your-secret-key>`                 |
-
+| Name                     | Description                                                | Value                               |
+| ------------------------ | ---------------------------------------------------------- | ----------------------------------- |
+| `backup.enabled`         | Enable regular backups                                     | `false`                             |
+| `backup.schedule`        | Cron schedule for automated backups                        | `0 2 * * * *`                       |
+| `backup.retentionPolicy` | Retention policy                                           | `30d`                               |
+| `backup.destinationPath` | Path to store the backup (i.e. s3://bucket/path/to/folder) | `s3://bucket/path/to/folder/`       |
+| `backup.endpointURL`     | S3 Endpoint used to upload data to the cloud               | `http://minio-gateway-service:9000` |
+| `backup.s3AccessKey`     | Access key for S3, used for authentication                 | `oobaiRus9pah8PhohL1ThaeTa4UVa7gu`  |
+| `backup.s3SecretKey`     | Secret key for S3, used for authentication                 | `ju3eum4dekeich9ahM1te8waeGai0oog`  |
 
 ### Bootstrap (recovery) parameters
 
-| Name                     | Description                                                                                                           | Type      | Value   |
-| ------------------------ | --------------------------------------------------------------------------------------------------------------------- | --------- | ------- |
-| `bootstrap`              | Bootstrap (recovery) configuration                                                                                    | `object`  | `{}`    |
-| `bootstrap.enabled`      | Restore database cluster from a backup                                                                                | `*bool`   | `false` |
-| `bootstrap.recoveryTime` | Timestamp (PITR) up to which recovery will proceed, expressed in RFC 3339 format. If left empty, will restore latest. | `*string` | `""`    |
-| `bootstrap.oldName`      | Name of database cluster before deleting                                                                              | `*string` | `""`    |
-
+| Name                     | Description                                                                                                          | Value   |
+| ------------------------ | -------------------------------------------------------------------------------------------------------------------- | ------- |
+| `bootstrap.enabled`      | Restore database cluster from a backup                                                                               | `false` |
+| `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                                                                             | `""`    |
 
 ## Parameter examples and reference
 

packages/apps/ferretdb/values.schema.json

@@ -1,202 +1,120 @@
 {
-  "title": "Chart Values",
-  "type": "object",
-  "properties": {
-    "backup": {
-      "description": "Backup configuration",
-      "type": "object",
-      "default": {
-        "destinationPath": "s3://bucket/path/to/folder/",
-        "enabled": false,
-        "endpointURL": "http://minio-gateway-service:9000",
-        "retentionPolicy": "30d",
-        "s3AccessKey": "\u003cyour-access-key\u003e",
-        "s3SecretKey": "\u003cyour-secret-key\u003e",
-        "schedule": "0 2 * * * *"
-      },
-      "required": [
-        "destinationPath",
-        "enabled",
-        "endpointURL",
-        "retentionPolicy",
-        "s3AccessKey",
-        "s3SecretKey",
-        "schedule"
-      ],
-      "properties": {
-        "destinationPath": {
-          "description": "Path to store the backup (i.e. s3://bucket/path/to/folder)",
-          "type": "string",
-          "default": "s3://bucket/path/to/folder/"
-        },
-        "enabled": {
-          "description": "Enable regular backups, default is `false`.",
-          "type": "boolean",
-          "default": false
-        },
-        "endpointURL": {
-          "description": "S3 Endpoint used to upload data to the cloud",
-          "type": "string",
-          "default": "http://minio-gateway-service:9000"
-        },
-        "retentionPolicy": {
-          "description": "Retention policy",
-          "type": "string",
-          "default": "30d"
-        },
-        "s3AccessKey": {
-          "description": "Access key for S3, used for authentication",
-          "type": "string",
-          "default": "\u003cyour-access-key\u003e"
-        },
-        "s3SecretKey": {
-          "description": "Secret key for S3, used for authentication",
-          "type": "string",
-          "default": "\u003cyour-secret-key\u003e"
-        },
-        "schedule": {
-          "description": "Cron schedule for automated backups",
-          "type": "string",
-          "default": "0 2 * * * *"
-        }
-      }
-    },
-    "bootstrap": {
-      "description": "Bootstrap (recovery) configuration",
-      "type": "object",
-      "default": {
-        "enabled": false,
-        "oldName": "",
-        "recoveryTime": ""
-      },
-      "properties": {
-        "enabled": {
-          "description": "Restore database cluster from a backup",
-          "type": "boolean",
-          "default": false
-        },
-        "oldName": {
-          "description": "Name of database cluster before deleting",
-          "type": "string"
-        },
-        "recoveryTime": {
-          "description": "Timestamp (PITR) up to which recovery will proceed, expressed in RFC 3339 format. If left empty, will restore latest.",
-          "type": "string"
-        }
-      }
-    },
-    "external": {
-      "description": "Enable external access from outside the cluster",
-      "type": "boolean",
-      "default": false
-    },
-    "quorum": {
-      "description": "Configuration for the quorum-based synchronous replication",
-      "type": "object",
-      "default": {
-        "maxSyncReplicas": 0,
-        "minSyncReplicas": 0
-      },
-      "required": [
-        "maxSyncReplicas",
-        "minSyncReplicas"
-      ],
-      "properties": {
-        "maxSyncReplicas": {
-          "description": "Maximum number of synchronous replicas that can acknowledge a transaction (must be lower than the total number of replicas)",
-          "type": "integer",
-          "default": 0
-        },
-        "minSyncReplicas": {
-          "description": "Minimum number of synchronous replicas that must acknowledge a transaction before it is considered committed",
-          "type": "integer",
-          "default": 0
-        }
-      }
-    },
-    "replicas": {
-      "description": "Number of replicas",
-      "type": "integer",
-      "default": 2
-    },
-    "resources": {
-      "description": "Explicit CPU and memory configuration for each FerretDB replica. When left empty, the preset defined in `resourcesPreset` is applied.",
-      "type": "object",
-      "default": {},
-      "properties": {
-        "cpu": {
-          "description": "CPU available to each replica",
-          "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
-          "anyOf": [
-            {
-              "type": "integer"
+    "properties": {
+        "backup": {
+            "properties": {
+                "destinationPath": {
+                    "default": "s3://bucket/path/to/folder/",
+                    "description": "Path to store the backup (i.e. s3://bucket/path/to/folder)",
+                    "type": "string"
+                },
+                "enabled": {
+                    "default": false,
+                    "description": "Enable regular backups",
+                    "type": "boolean"
+                },
+                "endpointURL": {
+                    "default": "http://minio-gateway-service:9000",
+                    "description": "S3 Endpoint used to upload data to the cloud",
+                    "type": "string"
+                },
+                "retentionPolicy": {
+                    "default": "30d",
+                    "description": "Retention policy",
+                    "type": "string"
+                },
+                "s3AccessKey": {
+                    "default": "oobaiRus9pah8PhohL1ThaeTa4UVa7gu",
+                    "description": "Access key for S3, used for authentication",
+                    "type": "string"
+                },
+                "s3SecretKey": {
+                    "default": "ju3eum4dekeich9ahM1te8waeGai0oog",
+                    "description": "Secret key for S3, used for authentication",
+                    "type": "string"
+                },
+                "schedule": {
+                    "default": "0 2 * * * *",
+                    "description": "Cron schedule for automated backups",
+                    "type": "string"
+                }
             },
-            {
-              "type": "string"
-            }
-          ],
-          "x-kubernetes-int-or-string": true
+            "type": "object"
         },
-        "memory": {
-          "description": "Memory (RAM) available to each replica",
-          "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
-          "anyOf": [
-            {
-              "type": "integer"
+        "bootstrap": {
+            "properties": {
+                "enabled": {
+                    "default": false,
+                    "description": "Restore database cluster from a backup",
+                    "type": "boolean"
+                },
+                "oldName": {
+                    "default": "",
+                    "description": "Name of database cluster before deleting",
+                    "type": "string"
+                },
+                "recoveryTime": {
+                    "default": "",
+                    "description": "Timestamp (PITR) up to which recovery will proceed, expressed in RFC 3339 format. If left empty, will restore latest",
+                    "type": "string"
+                }
             },
-            {
-              "type": "string"
-            }
-          ],
-          "x-kubernetes-int-or-string": true
-        }
-      }
-    },
-    "resourcesPreset": {
-      "description": "Default sizing preset used when `resources` is omitted. Allowed values: `nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`.",
-      "type": "string",
-      "default": "micro",
-      "enum": [
-        "nano",
-        "micro",
-        "small",
-        "medium",
-        "large",
-        "xlarge",
-        "2xlarge"
-      ]
-    },
-    "size": {
-      "description": "Persistent Volume Claim size, available for application data",
-      "default": "10Gi",
-      "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
-      "anyOf": [
-        {
-          "type": "integer"
+            "type": "object"
         },
-        {
-          "type": "string"
-        }
-      ],
-      "x-kubernetes-int-or-string": true
-    },
-    "storageClass": {
-      "description": "StorageClass used to store the data",
-      "type": "string"
-    },
-    "users": {
-      "description": "Users configuration",
-      "type": "object",
-      "default": {},
-      "additionalProperties": {
-        "type": "object",
-        "properties": {
-          "password": {
-            "description": "Password for the user",
+        "external": {
+            "default": false,
+            "description": "Enable external access from outside the cluster",
+            "type": "boolean"
+        },
+        "quorum": {
+            "properties": {
+                "maxSyncReplicas": {
+                    "default": 0,
+                    "description": "Maximum number of synchronous replicas that can acknowledge a transaction (must be lower than the total number of replicas)",
+                    "type": "number"
+                },
+                "minSyncReplicas": {
+                    "default": 0,
+                    "description": "Minimum number of synchronous replicas that must acknowledge a transaction before it is considered committed",
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "replicas": {
+            "default": 2,
+            "description": "Number of replicas",
+            "type": "number"
+        },
+        "resources": {
+            "default": {},
+            "description": "Explicit CPU and memory configuration for each FerretDB replica. When left empty, the preset defined in `resourcesPreset` is applied.",
+            "type": "object"
+        },
+        "resourcesPreset": {
+            "default": "micro",
+            "description": "Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge.",
+            "type": "string",
+            "enum": [
+                "nano",
+                "micro",
+                "small",
+                "medium",
+                "large",
+                "xlarge",
+                "2xlarge"
+            ]
+        },
+        "size": {
+            "default": "10Gi",
+            "description": "Persistent Volume size",
+            "type": "string"
+        },
+        "storageClass": {
+            "default": "",
+            "description": "StorageClass used to store the data",
             "type": "string"
-          }
         }
-      }
-    }
-  }
-}
+    },
+    "title": "Chart Values",
+    "type": "object"
+}

packages/apps/ferretdb/values.yaml

@@ -1,35 +1,31 @@
 ## @section Common parameters
 ##
-## @param replicas {int} Number of replicas
+## @param replicas Number of replicas
 replicas: 2
-## @param resources {*resources} Explicit CPU and memory configuration for each FerretDB replica. When left empty, the preset defined in `resourcesPreset` is applied.
-## @field resources.cpu {*quantity} CPU available to each replica
-## @field resources.memory {*quantity} Memory (RAM) available to each replica
+## @param resources Explicit CPU and memory configuration for each FerretDB replica. When left empty, the preset defined in `resourcesPreset` is applied.
+resources: {}
 #  resources:
 #    cpu: 4000m
 #    memory: 4Gi
-resources: {}
-
-## @param resourcesPreset {string enum:"nano,micro,small,medium,large,xlarge,2xlarge"} Default sizing preset used when `resources` is omitted. Allowed values: `nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`.
+## @param resourcesPreset Default sizing preset used when `resources` is omitted. Allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge.
 resourcesPreset: "micro"
-## @param size {quantity} Persistent Volume Claim size, available for application data
+## @param size Persistent Volume size
 size: 10Gi
-## @param storageClass {string} StorageClass used to store the data
+## @param storageClass StorageClass used to store the data
 storageClass: ""
-## @param external {bool} Enable external access from outside the cluster
+## @param external Enable external access from outside the cluster
 external: false
 
+
 ## @section Application-specific parameters
 ##
-## @param quorum {quorum} Configuration for the quorum-based synchronous replication
-## @field quorum.minSyncReplicas {int} Minimum number of synchronous replicas that must acknowledge a transaction before it is considered committed
-## @field quorum.maxSyncReplicas {int} Maximum number of synchronous replicas that can acknowledge a transaction (must be lower than the total number of replicas)
+## Configuration for the quorum-based synchronous replication
+## @param quorum.minSyncReplicas Minimum number of synchronous replicas that must acknowledge a transaction before it is considered committed
+## @param quorum.maxSyncReplicas Maximum number of synchronous replicas that can acknowledge a transaction (must be lower than the total number of replicas)
 quorum:
   minSyncReplicas: 0
   maxSyncReplicas: 0
-
-## @param users {map[string]user} Users configuration
-## @field user.password {*string} Password for the user
+## @param users [object] Users configuration
 ## Example:
 ## users:
 ##   user1:
@@ -40,34 +36,30 @@ quorum:
 users: {}
 
 
-
 ## @section Backup parameters
 ##
-
-## @param backup {backup} Backup configuration
-## @field backup.enabled {bool} Enable regular backups, default is `false`.
-## @field backup.schedule {string} Cron schedule for automated backups
-## @field backup.retentionPolicy {string} Retention policy
-## @field backup.endpointURL {string} S3 Endpoint used to upload data to the cloud
-## @field backup.destinationPath {string} Path to store the backup (i.e. s3://bucket/path/to/folder)
-## @field backup.s3AccessKey {string} Access key for S3, used for authentication
-## @field backup.s3SecretKey {string} Secret key for S3, used for authentication
+## @param backup.enabled Enable regular backups
+## @param backup.schedule Cron schedule for automated backups
+## @param backup.retentionPolicy Retention policy
+## @param backup.destinationPath Path to store the backup (i.e. s3://bucket/path/to/folder)
+## @param backup.endpointURL S3 Endpoint used to upload data to the cloud
+## @param backup.s3AccessKey Access key for S3, used for authentication
+## @param backup.s3SecretKey Secret key for S3, used for authentication
 backup:
   enabled: false
-  schedule: "0 2 * * * *"
   retentionPolicy: 30d
-  endpointURL: http://minio-gateway-service:9000
   destinationPath: s3://bucket/path/to/folder/
-  s3AccessKey: "<your-access-key>"
-  s3SecretKey: "<your-secret-key>"
+  endpointURL: http://minio-gateway-service:9000
+  schedule: "0 2 * * * *"
+  s3AccessKey: oobaiRus9pah8PhohL1ThaeTa4UVa7gu
+  s3SecretKey: ju3eum4dekeich9ahM1te8waeGai0oog
 
 
 ## @section Bootstrap (recovery) parameters
 ##
-## @param bootstrap {bootstrap} Bootstrap (recovery) configuration
-## @field bootstrap.enabled {*bool} Restore database cluster from a backup
-## @field bootstrap.recoveryTime {*string} Timestamp (PITR) up to which recovery will proceed, expressed in RFC 3339 format. If left empty, will restore latest.
-## @field bootstrap.oldName {*string} Name of database cluster before deleting
+## @param bootstrap.enabled Restore database cluster from a backup
+## @param bootstrap.recoveryTime Timestamp (PITR) up to which recovery will proceed, expressed in RFC 3339 format. If left empty, will restore latest
+## @param bootstrap.oldName Name of database cluster before deleting
 ##
 bootstrap:
   enabled: false

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.7.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

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
@@ -22,7 +23,9 @@ image-nginx:
 	rm -f images/nginx-cache.json
 
 generate:
-	cozyvalues-gen -v values.yaml -s values.schema.json -r README.md
+	readme-generator-for-helm -v values.yaml -s values.schema.json -r README.md
+	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}') && \

packages/apps/http-cache/README.md

@@ -60,43 +60,33 @@ The deployment architecture is illustrated in the diagram below:
 
 ### Common parameters
 
-| Name           | Description                                                  | Type       | Value   |
-| -------------- | ------------------------------------------------------------ | ---------- | ------- |
-| `size`         | Persistent Volume Claim size, available for application data | `quantity` | `10Gi`  |
-| `storageClass` | StorageClass used to store the data                          | `string`   | `""`    |
-| `external`     | Enable external access from outside the cluster              | `bool`     | `false` |
-
+| Name           | Description                                     | Value   |
+| -------------- | ----------------------------------------------- | ------- |
+| `size`         | Persistent Volume size                          | `10Gi`  |
+| `storageClass` | StorageClass used to store the data             | `""`    |
+| `external`     | Enable external access from outside the cluster | `false` |
 
 ### Application-specific parameters
 
-| Name        | Description                                     | Type       | Value |
-| ----------- | ----------------------------------------------- | ---------- | ----- |
-| `endpoints` | Endpoints configuration, as a list of <ip:port> | `[]string` | `[]`  |
-
+| Name        | Description             | Value |
+| ----------- | ----------------------- | ----- |
+| `endpoints` | Endpoints configuration | `[]`  |
 
 ### HAProxy parameters
 
-| Name                       | Description                                                                                                                               | Type        | Value  |
-| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------- | ------ |
-| `haproxy`                  | HAProxy configuration                                                                                                                     | `object`    | `{}`   |
-| `haproxy.replicas`         | Number of HAProxy replicas                                                                                                                | `int`       | `2`    |
-| `haproxy.resources`        | Explicit CPU and memory configuration for each replica. When left empty, the preset defined in `resourcesPreset` is applied.              | `object`    | `{}`   |
-| `haproxy.resources.cpu`    | CPU available to each replica                                                                                                             | `*quantity` | `null` |
-| `haproxy.resources.memory` | Memory (RAM) available to each replica                                                                                                    | `*quantity` | `null` |
-| `haproxy.resourcesPreset`  | Default sizing preset used when `resources` is omitted. Allowed values: `nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`. | `string`    | `nano` |
-
+| Name                      | Description                                                                                                                          | Value  |
+| ------------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | ------ |
+| `haproxy.replicas`        | Number of HAProxy 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: nano, micro, small, medium, large, xlarge, 2xlarge.          | `nano` |
 
 ### Nginx parameters
 
-| Name                     | Description                                                                                                                               | Type        | Value  |
-| ------------------------ | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------- | ------ |
-| `nginx`                  | Nginx configuration                                                                                                                       | `object`    | `{}`   |
-| `nginx.replicas`         | Number of Nginx replicas                                                                                                                  | `int`       | `2`    |
-| `nginx.resources`        | Explicit CPU and memory configuration for each replica. When left empty, the preset defined in `resourcesPreset` is applied.              | `*object`   | `null` |
-| `nginx.resources.cpu`    | CPU available to each replica                                                                                                             | `*quantity` | `null` |
-| `nginx.resources.memory` | Memory (RAM) available to each replica                                                                                                    | `*quantity` | `null` |
-| `nginx.resourcesPreset`  | Default sizing preset used when `resources` is omitted. Allowed values: `nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`. | `string`    | `nano` |
-
+| Name                    | Description                                                                                                                        | Value  |
+| ----------------------- | ---------------------------------------------------------------------------------------------------------------------------------- | ------ |
+| `nginx.replicas`        | Number of Nginx replicas                                                                                                           | `2`    |
+| `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: nano, micro, small, medium, large, xlarge, 2xlarge.        | `nano` |
 
 ## Parameter examples and reference
 

packages/apps/http-cache/images/nginx-cache.tag

@@ -1 +1 @@
-ghcr.io/cozystack/cozystack/nginx-cache:0.7.0@sha256:50ac1581e3100bd6c477a71161cb455a341ffaf9e5e2f6086802e4e25271e8af
+ghcr.io/cozystack/cozystack/nginx-cache:0.6.1@sha256:b7633717cd7449c0042ae92d8ca9b36e4d69566561f5c7d44e21058e7d05c6d5

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

@@ -1,172 +1,85 @@
 {
-  "title": "Chart Values",
-  "type": "object",
-  "properties": {
-    "endpoints": {
-      "description": "Endpoints configuration, as a list of \u003cip:port\u003e",
-      "type": "array",
-      "default": [],
-      "items": {
-        "type": "string"
-      }
-    },
-    "external": {
-      "description": "Enable external access from outside the cluster",
-      "type": "boolean",
-      "default": false
-    },
-    "haproxy": {
-      "description": "HAProxy configuration",
-      "type": "object",
-      "default": {
-        "replicas": 2,
-        "resources": {},
-        "resourcesPreset": "nano"
-      },
-      "required": [
-        "replicas",
-        "resources",
-        "resourcesPreset"
-      ],
-      "properties": {
-        "replicas": {
-          "description": "Number of HAProxy replicas",
-          "type": "integer",
-          "default": 2
+    "properties": {
+        "endpoints": {
+            "default": [],
+            "description": "Endpoints configuration",
+            "items": {},
+            "type": "array"
         },
-        "resources": {
-          "description": "Explicit CPU and memory configuration for each replica. When left empty, the preset defined in `resourcesPreset` is applied.",
-          "type": "object",
-          "default": {},
-          "properties": {
-            "cpu": {
-              "description": "CPU available to each replica",
-              "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
-              "anyOf": [
-                {
-                  "type": "integer"
+        "external": {
+            "default": false,
+            "description": "Enable external access from outside the cluster",
+            "type": "boolean"
+        },
+        "haproxy": {
+            "properties": {
+                "replicas": {
+                    "default": 2,
+                    "description": "Number of HAProxy replicas",
+                    "type": "number"
                 },
-                {
-                  "type": "string"
+                "resources": {
+                    "default": {},
+                    "description": "Explicit CPU and memory configuration for each HAProxy replica. When left empty, the preset defined in `resourcesPreset` is applied.",
+                    "type": "object"
+                },
+                "resourcesPreset": {
+                    "default": "nano",
+                    "description": "Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge.",
+                    "type": "string",
+                    "enum": [
+                        "nano",
+                        "micro",
+                        "small",
+                        "medium",
+                        "large",
+                        "xlarge",
+                        "2xlarge"
+                    ]
                 }
-              ],
-              "x-kubernetes-int-or-string": true
             },
-            "memory": {
-              "description": "Memory (RAM) available to each replica",
-              "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
-            }
-          }
+            "type": "object"
         },
-        "resourcesPreset": {
-          "description": "Default sizing preset used when `resources` is omitted. Allowed values: `nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`.",
-          "type": "string",
-          "default": "nano",
-          "enum": [
-            "nano",
-            "micro",
-            "small",
-            "medium",
-            "large",
-            "xlarge",
-            "2xlarge"
-          ]
-        }
-      }
-    },
-    "nginx": {
-      "description": "Nginx configuration",
-      "type": "object",
-      "default": {
-        "replicas": 2,
-        "resources": {},
-        "resourcesPreset": "nano"
-      },
-      "required": [
-        "replicas",
-        "resourcesPreset"
-      ],
-      "properties": {
-        "replicas": {
-          "description": "Number of Nginx replicas",
-          "type": "integer",
-          "default": 2
-        },
-        "resources": {
-          "description": "Explicit CPU and memory configuration for each replica. When left empty, the preset defined in `resourcesPreset` is applied.",
-          "type": "object",
-          "default": {},
-          "properties": {
-            "cpu": {
-              "description": "CPU available to each replica",
-              "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
-              "anyOf": [
-                {
-                  "type": "integer"
+        "nginx": {
+            "properties": {
+                "replicas": {
+                    "default": 2,
+                    "description": "Number of Nginx replicas",
+                    "type": "number"
                 },
-                {
-                  "type": "string"
+                "resources": {
+                    "default": {},
+                    "description": "Explicit CPU and memory configuration for each nginx replica. When left empty, the preset defined in `resourcesPreset` is applied.",
+                    "type": "object"
+                },
+                "resourcesPreset": {
+                    "default": "nano",
+                    "description": "Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge.",
+                    "type": "string",
+                    "enum": [
+                        "nano",
+                        "micro",
+                        "small",
+                        "medium",
+                        "large",
+                        "xlarge",
+                        "2xlarge"
+                    ]
                 }
-              ],
-              "x-kubernetes-int-or-string": true
             },
-            "memory": {
-              "description": "Memory (RAM) available to each replica",
-              "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
-            }
-          }
+            "type": "object"
         },
-        "resourcesPreset": {
-          "description": "Default sizing preset used when `resources` is omitted. Allowed values: `nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`.",
-          "type": "string",
-          "default": "nano",
-          "enum": [
-            "nano",
-            "micro",
-            "small",
-            "medium",
-            "large",
-            "xlarge",
-            "2xlarge"
-          ]
-        }
-      }
-    },
-    "size": {
-      "description": "Persistent Volume Claim size, available for application data",
-      "default": "10Gi",
-      "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
-      "anyOf": [
-        {
-          "type": "integer"
+        "size": {
+            "default": "10Gi",
+            "description": "Persistent Volume size",
+            "type": "string"
         },
-        {
-          "type": "string"
+        "storageClass": {
+            "default": "",
+            "description": "StorageClass used to store the data",
+            "type": "string"
         }
-      ],
-      "x-kubernetes-int-or-string": true
     },
-    "storageClass": {
-      "description": "StorageClass used to store the data",
-      "type": "string"
-    }
-  }
-}
+    "title": "Chart Values",
+    "type": "object"
+}

packages/apps/http-cache/values.yaml

@@ -1,14 +1,14 @@
 ## @section Common parameters
 ##
-## @param size {quantity} Persistent Volume Claim size, available for application data
+## @param size Persistent Volume size
 size: 10Gi
-## @param storageClass {string} StorageClass used to store the data
+## @param storageClass StorageClass used to store the data
 storageClass: ""
-## @param external {bool} Enable external access from outside the cluster
+## @param external Enable external access from outside the cluster
 external: false
 ## @section Application-specific parameters
 
-## @param endpoints {[]string} Endpoints configuration, as a list of <ip:port>
+## @param endpoints Endpoints configuration
 ## Example:
 ## endpoints:
 ##   - 10.100.3.1:80
@@ -20,34 +20,28 @@ external: false
 ##
 endpoints: []
 
-
 ## @section HAProxy parameters
-##
-## @param haproxy {haproxy} HAProxy configuration
 haproxy:
-  ## @field haproxy.replicas {int} Number of HAProxy replicas
+  ## @param haproxy.replicas Number of HAProxy replicas
   replicas: 2
-  ## @field haproxy.resources {resources} Explicit CPU and memory configuration for each replica. When left empty, the preset defined in `resourcesPreset` is applied.
-  ## @field resources.cpu {*quantity} CPU available to each replica
-  ## @field resources.memory {*quantity} Memory (RAM) available to each replica
+  ## @param haproxy.resources Explicit CPU and memory configuration for each HAProxy replica. When left empty, the preset defined in `resourcesPreset` is applied.
   resources: {}
   # resources:
   #   cpu: 4000m
   #   memory: 4Gi
-  ## @field haproxy.resourcesPreset {string enum:"nano,micro,small,medium,large,xlarge,2xlarge"} Default sizing preset used when `resources` is omitted. Allowed values: `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"
 
 ## @section Nginx parameters
-##
-## @param nginx {nginx} Nginx configuration
 nginx:
-  ## @field nginx.replicas {int} Number of Nginx replicas
+  ## @param nginx.replicas Number of Nginx replicas
   replicas: 2
-  ## @field nginx.resources {*resources} Explicit CPU and memory configuration for each replica. When left empty, the preset defined in `resourcesPreset` is applied.
+  ## @param nginx.resources Explicit CPU and memory configuration for each nginx replica. When left empty, the preset defined in `resourcesPreset` is applied.
+  resources: {}
   # resources:
   #   cpu: 4000m
   #   memory: 4Gi
-  resources: {}
 
-  ## @field nginx.resourcesPreset {string enum:"nano,micro,small,medium,large,xlarge,2xlarge"} Default sizing preset used when `resources` is omitted. Allowed values: `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"

packages/apps/kafka/Makefile

@@ -2,4 +2,6 @@ include ../../../scripts/package.mk
 PRESET_ENUM := ["nano","micro","small","medium","large","xlarge","2xlarge"]
 
 generate:
-	cozyvalues-gen -v values.yaml -s values.schema.json -r README.md
+	readme-generator-for-helm -v values.yaml -s values.schema.json -r README.md
+	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

packages/apps/kafka/README.md

@@ -4,49 +4,35 @@
 
 ### Common parameters
 
-| Name       | Description                                     | Type   | Value   |
-| ---------- | ----------------------------------------------- | ------ | ------- |
-| `external` | Enable external access from outside the cluster | `bool` | `false` |
-
+| Name       | Description                                     | Value   |
+| ---------- | ----------------------------------------------- | ------- |
+| `external` | Enable external access from outside the cluster | `false` |
 
 ### Application-specific parameters
 
-| Name                   | Description          | Type       | Value |
-| ---------------------- | -------------------- | ---------- | ----- |
-| `topics`               | Topics configuration | `[]object` | `[]`  |
-| `topics[i].name`       | Topic name           | `string`   | `""`  |
-| `topics[i].partitions` | Number of partitions | `int`      | `0`   |
-| `topics[i].replicas`   | Number of replicas   | `int`      | `0`   |
-| `topics[i].config`     | Topic configuration  | `object`   | `{}`  |
-
+| Name     | Description                        | Value |
+| -------- | ---------------------------------- | ----- |
+| `topics` | Topics configuration (see example) | `[]`  |
 
 ### Kafka configuration
 
-| Name                     | Description                                                                                                                               | Type        | Value   |
-| ------------------------ | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------- | ------- |
-| `kafka`                  | Kafka configuration                                                                                                                       | `object`    | `{}`    |
-| `kafka.replicas`         | Number of Kafka replicas                                                                                                                  | `int`       | `3`     |
-| `kafka.resources`        | Explicit CPU and memory configuration for each replica. When left empty, the preset defined in `resourcesPreset` is applied.              | `*object`   | `null`  |
-| `kafka.resources.cpu`    | CPU available to each replica                                                                                                             | `*quantity` | `null`  |
-| `kafka.resources.memory` | Memory (RAM) available to each replica                                                                                                    | `*quantity` | `null`  |
-| `kafka.resourcesPreset`  | Default sizing preset used when `resources` is omitted. Allowed values: `nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`. | `string`    | `small` |
-| `kafka.size`             | Persistent Volume size for Kafka                                                                                                          | `quantity`  | `10Gi`  |
-| `kafka.storageClass`     | StorageClass used to store the Kafka data                                                                                                 | `string`    | `""`    |
-
+| Name                    | Description                                                                                                                        | Value   |
+| ----------------------- | ---------------------------------------------------------------------------------------------------------------------------------- | ------- |
+| `kafka.replicas`        | Number of Kafka replicas                                                                                                           | `3`     |
+| `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: nano, micro, small, medium, large, xlarge, 2xlarge.        | `small` |
+| `kafka.size`            | Persistent Volume size for Kafka                                                                                                   | `10Gi`  |
+| `kafka.storageClass`    | StorageClass used to store the Kafka data                                                                                          | `""`    |
 
 ### Zookeeper configuration
 
-| Name                         | Description                                                                                                                               | Type        | Value   |
-| ---------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------- | ------- |
-| `zookeeper`                  | Zookeeper configuration                                                                                                                   | `object`    | `{}`    |
-| `zookeeper.replicas`         | Number of ZooKeeper replicas                                                                                                              | `int`       | `3`     |
-| `zookeeper.resources`        | Explicit CPU and memory configuration for each replica. When left empty, the preset defined in `resourcesPreset` is applied.              | `*object`   | `null`  |
-| `zookeeper.resources.cpu`    | CPU available to each replica                                                                                                             | `*quantity` | `null`  |
-| `zookeeper.resources.memory` | Memory (RAM) available to each replica                                                                                                    | `*quantity` | `null`  |
-| `zookeeper.resourcesPreset`  | Default sizing preset used when `resources` is omitted. Allowed values: `nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`. | `string`    | `small` |
-| `zookeeper.size`             | Persistent Volume size for ZooKeeper                                                                                                      | `quantity`  | `5Gi`   |
-| `zookeeper.storageClass`     | StorageClass used to store the ZooKeeper data                                                                                             | `string`    | `""`    |
-
+| Name                        | Description                                                                                                                            | Value   |
+| --------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- | ------- |
+| `zookeeper.replicas`        | Number of ZooKeeper replicas                                                                                                           | `3`     |
+| `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: nano, micro, small, medium, large, xlarge, 2xlarge.            | `small` |
+| `zookeeper.size`            | Persistent Volume size for ZooKeeper                                                                                                   | `5Gi`   |
+| `zookeeper.storageClass`    | StorageClass used to store the ZooKeeper data                                                                                          | `""`    |
 
 ## Parameter examples and reference
 

packages/apps/kafka/values.schema.json

@@ -1,222 +1,95 @@
 {
-  "title": "Chart Values",
-  "type": "object",
-  "properties": {
-    "external": {
-      "description": "Enable external access from outside the cluster",
-      "type": "boolean",
-      "default": false
-    },
-    "kafka": {
-      "description": "Kafka configuration",
-      "type": "object",
-      "default": {
-        "replicas": 3,
-        "resources": {},
-        "resourcesPreset": "small",
-        "size": "10Gi",
-        "storageClass": ""
-      },
-      "required": [
-        "replicas",
-        "resourcesPreset",
-        "size",
-        "storageClass"
-      ],
-      "properties": {
-        "replicas": {
-          "description": "Number of Kafka replicas",
-          "type": "integer",
-          "default": 3
+    "properties": {
+        "external": {
+            "default": false,
+            "description": "Enable external access from outside the cluster",
+            "type": "boolean"
         },
-        "resources": {
-          "description": "Explicit CPU and memory configuration for each replica. When left empty, the preset defined in `resourcesPreset` is applied.",
-          "type": "object",
-          "default": {},
-          "properties": {
-            "cpu": {
-              "description": "CPU available to each replica",
-              "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
-              "anyOf": [
-                {
-                  "type": "integer"
+        "kafka": {
+            "properties": {
+                "replicas": {
+                    "default": 3,
+                    "description": "Number of Kafka replicas",
+                    "type": "number"
                 },
-                {
-                  "type": "string"
-                }
-              ],
-              "x-kubernetes-int-or-string": true
-            },
-            "memory": {
-              "description": "Memory (RAM) available to each replica",
-              "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
-              "anyOf": [
-                {
-                  "type": "integer"
+                "resources": {
+                    "default": {},
+                    "description": "Explicit CPU and memory configuration for each Kafka replica. When left empty, the preset defined in `resourcesPreset` is applied.",
+                    "type": "object"
                 },
-                {
-                  "type": "string"
+                "resourcesPreset": {
+                    "default": "small",
+                    "description": "Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge.",
+                    "type": "string",
+                    "enum": [
+                        "nano",
+                        "micro",
+                        "small",
+                        "medium",
+                        "large",
+                        "xlarge",
+                        "2xlarge"
+                    ]
+                },
+                "size": {
+                    "default": "10Gi",
+                    "description": "Persistent Volume size for Kafka",
+                    "type": "string"
+                },
+                "storageClass": {
+                    "default": "",
+                    "description": "StorageClass used to store the Kafka data",
+                    "type": "string"
                 }
-              ],
-              "x-kubernetes-int-or-string": true
-            }
-          }
-        },
-        "resourcesPreset": {
-          "description": "Default sizing preset used when `resources` is omitted. Allowed values: `nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`.",
-          "type": "string",
-          "default": "small",
-          "enum": [
-            "nano",
-            "micro",
-            "small",
-            "medium",
-            "large",
-            "xlarge",
-            "2xlarge"
-          ]
-        },
-        "size": {
-          "description": "Persistent Volume size for Kafka",
-          "default": "10Gi",
-          "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
+            "type": "object"
         },
-        "storageClass": {
-          "description": "StorageClass used to store the Kafka data",
-          "type": "string"
+        "topics": {
+            "default": [],
+            "description": "Topics configuration (see example)",
+            "items": {},
+            "type": "array"
+        },
+        "zookeeper": {
+            "properties": {
+                "replicas": {
+                    "default": 3,
+                    "description": "Number of ZooKeeper replicas",
+                    "type": "number"
+                },
+                "resources": {
+                    "default": {},
+                    "description": "Explicit CPU and memory configuration for each Zookeeper replica. When left empty, the preset defined in `resourcesPreset` is applied.",
+                    "type": "object"
+                },
+                "resourcesPreset": {
+                    "default": "small",
+                    "description": "Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge.",
+                    "type": "string",
+                    "enum": [
+                        "nano",
+                        "micro",
+                        "small",
+                        "medium",
+                        "large",
+                        "xlarge",
+                        "2xlarge"
+                    ]
+                },
+                "size": {
+                    "default": "5Gi",
+                    "description": "Persistent Volume size for ZooKeeper",
+                    "type": "string"
+                },
+                "storageClass": {
+                    "default": "",
+                    "description": "StorageClass used to store the ZooKeeper data",
+                    "type": "string"
+                }
+            },
+            "type": "object"
         }
-      }
     },
-    "topics": {
-      "description": "Topics configuration",
-      "type": "array",
-      "default": [],
-      "items": {
-        "type": "object",
-        "required": [
-          "config",
-          "name",
-          "partitions",
-          "replicas"
-        ],
-        "properties": {
-          "config": {
-            "description": "Topic configuration",
-            "type": "object",
-            "x-kubernetes-preserve-unknown-fields": true
-          },
-          "name": {
-            "description": "Topic name",
-            "type": "string"
-          },
-          "partitions": {
-            "description": "Number of partitions",
-            "type": "integer"
-          },
-          "replicas": {
-            "description": "Number of replicas",
-            "type": "integer"
-          }
-        }
-      }
-    },
-    "zookeeper": {
-      "description": "Zookeeper configuration",
-      "type": "object",
-      "default": {
-        "replicas": 3,
-        "resources": {},
-        "resourcesPreset": "small",
-        "size": "5Gi",
-        "storageClass": ""
-      },
-      "required": [
-        "replicas",
-        "resourcesPreset",
-        "size",
-        "storageClass"
-      ],
-      "properties": {
-        "replicas": {
-          "description": "Number of ZooKeeper replicas",
-          "type": "integer",
-          "default": 3
-        },
-        "resources": {
-          "description": "Explicit CPU and memory configuration for each replica. When left empty, the preset defined in `resourcesPreset` is applied.",
-          "type": "object",
-          "default": {},
-          "properties": {
-            "cpu": {
-              "description": "CPU available to each replica",
-              "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": "Memory (RAM) available to each replica",
-              "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
-            }
-          }
-        },
-        "resourcesPreset": {
-          "description": "Default sizing preset used when `resources` is omitted. Allowed values: `nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`.",
-          "type": "string",
-          "default": "small",
-          "enum": [
-            "nano",
-            "micro",
-            "small",
-            "medium",
-            "large",
-            "xlarge",
-            "2xlarge"
-          ]
-        },
-        "size": {
-          "description": "Persistent Volume size for ZooKeeper",
-          "default": "5Gi",
-          "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 ZooKeeper data",
-          "type": "string"
-        }
-      }
-    }
-  }
-}
+    "title": "Chart Values",
+    "type": "object"
+}

packages/apps/kafka/values.yaml

@@ -1,17 +1,12 @@
 ## @section Common parameters
 ##
-## @param external {bool} Enable external access from outside the cluster
+## @param external Enable external access from outside the cluster
 external: false
 
 
 ## @section Application-specific parameters
 ##
-## @param topics {[]topic} Topics configuration
-## @field topic {topic} Topic
-## @field topic.name {string} Topic name
-## @field topic.partitions {int} Number of partitions
-## @field topic.replicas {int} Number of replicas
-## @field topic.config {object} Topic configuration
+## @param topics Topics configuration (see example)
 ## Example:
 ## topics:
 ##   - name: Results
@@ -32,41 +27,38 @@ topics: []
 
 ## @section Kafka configuration
 ##
-## @param kafka {kafka} Kafka configuration
 kafka:
-  ## @field kafka.replicas {int} Number of Kafka replicas
+  ## @param kafka.replicas Number of Kafka replicas
   replicas: 3
-  ## @field kafka.resources {*resources} Explicit CPU and memory configuration for each replica. When left empty, the preset defined in `resourcesPreset` is applied.
-  ## @field resources.cpu {*quantity} CPU available to each replica
-  ## @field resources.memory {*quantity} Memory (RAM) available to each replica
+  ## @param kafka.resources Explicit CPU and memory configuration for each Kafka replica. When left empty, the preset defined in `resourcesPreset` is applied.
+  resources: {}
   # resources:
   #   cpu: 4000m
   #   memory: 4Gi
-  resources: {}
-  ## @field kafka.resourcesPreset {string enum:"nano,micro,small,medium,large,xlarge,2xlarge"} Default sizing preset used when `resources` is omitted. Allowed values: `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"
-  ## @field kafka.size {quantity} Persistent Volume size for Kafka
+  ## @param kafka.size Persistent Volume size for Kafka
   size: 10Gi
-  ## @field kafka.storageClass {string} StorageClass used to store the Kafka data
+  ## @param kafka.storageClass StorageClass used to store the Kafka data
   storageClass: ""
 
 
 ## @section Zookeeper configuration
 ##
-## @param zookeeper {zookeeper} Zookeeper configuration
 zookeeper:
-  ## @field zookeeper.replicas {int} Number of ZooKeeper replicas
+  ## @param zookeeper.replicas Number of ZooKeeper replicas
   replicas: 3
-  ## @field zookeeper.resources {*resources} Explicit CPU and memory configuration for each replica. When left empty, the preset defined in `resourcesPreset` is applied.
+  ## @param zookeeper.resources Explicit CPU and memory configuration for each Zookeeper replica. When left empty, the preset defined in `resourcesPreset` is applied.
+  resources: {}
   # resources:
   #   cpu: 4000m
   #   memory: 4Gi
-  resources: {}
-
-  ## @field zookeeper.resourcesPreset {string enum:"nano,micro,small,medium,large,xlarge,2xlarge"} Default sizing preset used when `resources` is omitted. Allowed values: `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"
-  ## @field zookeeper.size {quantity} Persistent Volume size for ZooKeeper
+  ## @param zookeeper.size Persistent Volume size for ZooKeeper
   size: 5Gi
-  ## @field zookeeper.storageClass {string} StorageClass used to store the ZooKeeper data
+  ## @param zookeeper.storageClass StorageClass used to store the ZooKeeper data
   storageClass: ""
 
+
+

packages/apps/kubernetes/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.27.0
+version: 0.26.3
 
 # 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

packages/apps/kubernetes/Makefile

@@ -1,12 +1,18 @@
 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
 
 generate:
-	cozyvalues-gen -v values.yaml -s values.schema.json -r README.md
+	readme-generator-for-helm -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 = $(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
 

packages/apps/kubernetes/README.md

@@ -84,91 +84,53 @@ See the reference for components utilized in this service:
 
 ### Common Parameters
 
-| Name           | Description                         | Type     | Value        |
-| -------------- | ----------------------------------- | -------- | ------------ |
-| `storageClass` | StorageClass used to store the data | `string` | `replicated` |
-
+| Name           | Description                           | Value        |
+| -------------- | ------------------------------------- | ------------ |
+| `storageClass` | StorageClass used to store user data. | `replicated` |
 
 ### Application-specific parameters
 
-| Name                                | Description                                                                                                       | Type                | Value   |
-| ----------------------------------- | ----------------------------------------------------------------------------------------------------------------- | ------------------- | ------- |
-| `version`                           | Kubernetes version given as vMAJOR.MINOR. Available are versions from 1.28 to 1.33.                               | `string`            | `v1.32` |
-| `host`                              | Hostname used to access the Kubernetes cluster externally. Defaults to `<cluster-name>.<tenant-host>` when empty. | `string`            | `""`    |
-| `nodeGroups`                        | Worker nodes configuration                                                                                        | `map[string]object` | `{...}` |
-| `nodeGroups[name].minReplicas`      | Minimum amount of replicas                                                                                        | `int`               | `0`     |
-| `nodeGroups[name].maxReplicas`      | Maximum amount of replicas                                                                                        | `int`               | `0`     |
-| `nodeGroups[name].instanceType`     | Virtual machine instance type                                                                                     | `string`            | `""`    |
-| `nodeGroups[name].ephemeralStorage` | Ephemeral storage size                                                                                            | `quantity`          | `""`    |
-| `nodeGroups[name].roles`            | List of node's roles                                                                                              | `[]string`          | `[]`    |
-| `nodeGroups[name].resources`        | Resources available to each worker node                                                                           | `object`            | `{}`    |
-| `nodeGroups[name].resources.cpu`    | CPU available to each worker node                                                                                 | `*quantity`         | `null`  |
-| `nodeGroups[name].resources.memory` | Memory (RAM) available to each worker node                                                                        | `*quantity`         | `null`  |
-| `nodeGroups[name].gpus`             | List of GPUs to attach (WARN: NVIDIA driver requires at least 4 GiB of RAM)                                       | `[]object`          | `[]`    |
-| `nodeGroups[name].gpus.name`        | Name of GPU, such as "nvidia.com/AD102GL_L40S"                                                                    | `string`            | `""`    |
-
+| Name         | Description                                                                                                       | Value   |
+| ------------ | ----------------------------------------------------------------------------------------------------------------- | ------- |
+| `version`    | Kubernetes version given as vMAJOR.MINOR. Available are versions from 1.28 to 1.33.                               | `v1.32` |
+| `host`       | Hostname used to access the Kubernetes cluster externally. Defaults to `<cluster-name>.<tenant-host>` when empty. | `""`    |
+| `nodeGroups` | Worker nodes configuration (see example)                                                                          | `{}`    |
 
 ### Cluster Addons
 
-| Name                                          | Description                                                                                                                                                                       | Type       | Value     |
-| --------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------- | --------- |
-| `addons`                                      | Cluster addons configuration                                                                                                                                                      | `object`   | `{}`      |
-| `addons.certManager`                          | Cert-manager: automatically creates and manages SSL/TLS certificate                                                                                                               | `object`   | `{}`      |
-| `addons.certManager.enabled`                  | Enable cert-manager, which automatically creates and manages SSL/TLS certificates.                                                                                                | `bool`     | `false`   |
-| `addons.certManager.valuesOverride`           | Custom values to override                                                                                                                                                         | `object`   | `{}`      |
-| `addons.cilium`                               | Cilium CNI plugin                                                                                                                                                                 | `object`   | `{}`      |
-| `addons.cilium.valuesOverride`                | Custom values to override                                                                                                                                                         | `object`   | `{}`      |
-| `addons.gatewayAPI`                           | Gateway API                                                                                                                                                                       | `object`   | `{}`      |
-| `addons.gatewayAPI.enabled`                   | Enable the Gateway API                                                                                                                                                            | `bool`     | `false`   |
-| `addons.ingressNginx`                         | Ingress-NGINX Controller                                                                                                                                                          | `object`   | `{}`      |
-| `addons.ingressNginx.enabled`                 | Enable the Ingress-NGINX controller (requires nodes labeled with the 'ingress-nginx' role).                                                                                       | `bool`     | `false`   |
-| `addons.ingressNginx.exposeMethod`            | Method to expose the Ingress-NGINX controller. Allowed values: `Proxied`, `LoadBalancer`.                                                                                         | `string`   | `Proxied` |
-| `addons.ingressNginx.hosts`                   | List of domain names that the parent cluster should route to this tenant cluster. Taken into account only when `exposeMethod` is set to `Proxied`.                                | `[]string` | `[]`      |
-| `addons.ingressNginx.valuesOverride`          | Custom values to override                                                                                                                                                         | `object`   | `{}`      |
-| `addons.gpuOperator`                          | GPU-operator: NVIDIA GPU Operator                                                                                                                                                 | `object`   | `{}`      |
-| `addons.gpuOperator.enabled`                  | Enable the GPU-operator                                                                                                                                                           | `bool`     | `false`   |
-| `addons.gpuOperator.valuesOverride`           | Custom values to override                                                                                                                                                         | `object`   | `{}`      |
-| `addons.fluxcd`                               | Flux CD                                                                                                                                                                           | `object`   | `{}`      |
-| `addons.fluxcd.enabled`                       | Enable FluxCD                                                                                                                                                                     | `bool`     | `false`   |
-| `addons.fluxcd.valuesOverride`                | Custom values to override                                                                                                                                                         | `object`   | `{}`      |
-| `addons.monitoringAgents`                     | MonitoringAgents                                                                                                                                                                  | `object`   | `{}`      |
-| `addons.monitoringAgents.enabled`             | Enable monitoring agents (Fluent Bit and VMAgents) to send logs and metrics. If tenant monitoring is enabled, data is sent to tenant storage; otherwise, it goes to root storage. | `bool`     | `false`   |
-| `addons.monitoringAgents.valuesOverride`      | Custom values to override                                                                                                                                                         | `object`   | `{}`      |
-| `addons.verticalPodAutoscaler`                | VerticalPodAutoscaler                                                                                                                                                             | `object`   | `{}`      |
-| `addons.verticalPodAutoscaler.valuesOverride` | Custom values to override                                                                                                                                                         | `object`   | `{}`      |
-| `addons.velero`                               | Velero                                                                                                                                                                            | `object`   | `{}`      |
-| `addons.velero.enabled`                       | Enable Velero for backup and recovery of a tenant Kubernetes cluster.                                                                                                             | `bool`     | `false`   |
-| `addons.velero.valuesOverride`                | Custom values to override                                                                                                                                                         | `object`   | `{}`      |
-
+| Name                                          | Description                                                                                                                                                                       | Value     |
+| --------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------- |
+| `addons.certManager.enabled`                  | Enable cert-manager, which automatically creates and manages SSL/TLS certificates.                                                                                                | `false`   |
+| `addons.certManager.valuesOverride`           | Custom values to override                                                                                                                                                         | `{}`      |
+| `addons.cilium.valuesOverride`                | Custom values to override                                                                                                                                                         | `{}`      |
+| `addons.gatewayAPI.enabled`                   | Enable the Gateway API                                                                                                                                                            | `false`   |
+| `addons.ingressNginx.enabled`                 | Enable the Ingress-NGINX controller (requires nodes labeled with the 'ingress-nginx' role).                                                                                       | `false`   |
+| `addons.ingressNginx.exposeMethod`            | Method to expose the Ingress-NGINX controller. (allowed values: Proxied, LoadBalancer)                                                                                            | `Proxied` |
+| `addons.ingressNginx.hosts`                   | List of domain names that the parent cluster should route to this tenant cluster. Taken into account only when `exposeMethod` is set to `Proxied`.                                | `[]`      |
+| `addons.ingressNginx.valuesOverride`          | Custom values to override                                                                                                                                                         | `{}`      |
+| `addons.gpuOperator.enabled`                  | Enable the GPU-operator                                                                                                                                                           | `false`   |
+| `addons.gpuOperator.valuesOverride`           | Custom values to override                                                                                                                                                         | `{}`      |
+| `addons.fluxcd.enabled`                       | Enable FluxCD                                                                                                                                                                     | `false`   |
+| `addons.fluxcd.valuesOverride`                | Custom values to override                                                                                                                                                         | `{}`      |
+| `addons.monitoringAgents.enabled`             | Enable monitoring agents (Fluent Bit and VMAgents) to send logs and metrics. If tenant monitoring is enabled, data is sent to tenant storage; otherwise, it goes to root storage. | `false`   |
+| `addons.monitoringAgents.valuesOverride`      | Custom values to override                                                                                                                                                         | `{}`      |
+| `addons.verticalPodAutoscaler.valuesOverride` | Custom values to override                                                                                                                                                         | `{}`      |
+| `addons.velero.enabled`                       | Enable velero for backup and restore k8s cluster.                                                                                                                                 | `false`   |
+| `addons.velero.valuesOverride`                | Custom values to override                                                                                                                                                         | `{}`      |
 
 ### Kubernetes Control Plane Configuration
 
-| Name                                                | Description                                                                                                                               | Type        | Value    |
-| --------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------- | -------- |
-| `controlPlane`                                      | Control Plane Configuration                                                                                                               | `object`    | `{}`     |
-| `controlPlane.replicas`                             | Number of replicas for Kubernetes control plane components.                                                                               | `int`       | `2`      |
-| `controlPlane.apiServer`                            | Control plane API server configuration.                                                                                                   | `object`    | `{}`     |
-| `controlPlane.apiServer.resources`                  | Explicit CPU and memory configuration for the API Server. When left empty, the preset defined in `resourcesPreset` is applied.            | `object`    | `{}`     |
-| `controlPlane.apiServer.resources.cpu`              | CPU available to each worker node                                                                                                         | `*quantity` | `null`   |
-| `controlPlane.apiServer.resources.memory`           | Memory (RAM) available to each worker node                                                                                                | `*quantity` | `null`   |
-| `controlPlane.apiServer.resourcesPreset`            | Default sizing preset used when `resources` is omitted. Allowed values: `nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`. | `string`    | `medium` |
-| `controlPlane.controllerManager`                    | Controller Manager configuration.                                                                                                         | `object`    | `{}`     |
-| `controlPlane.controllerManager.resources`          | Explicit CPU and memory configuration for the Controller Manager. When left empty, the preset defined in `resourcesPreset` is applied.    | `object`    | `{}`     |
-| `controlPlane.controllerManager.resources.cpu`      | CPU available to each worker node                                                                                                         | `*quantity` | `null`   |
-| `controlPlane.controllerManager.resources.memory`   | Memory (RAM) available to each worker node                                                                                                | `*quantity` | `null`   |
-| `controlPlane.controllerManager.resourcesPreset`    | Default sizing preset used when `resources` is omitted. Allowed values: `nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`. | `string`    | `micro`  |
-| `controlPlane.scheduler`                            | Scheduler configuration.                                                                                                                  | `object`    | `{}`     |
-| `controlPlane.scheduler.resources`                  | Explicit CPU and memory configuration for the Scheduler. When left empty, the preset defined in `resourcesPreset` is applied.             | `object`    | `{}`     |
-| `controlPlane.scheduler.resources.cpu`              | CPU available to each worker node                                                                                                         | `*quantity` | `null`   |
-| `controlPlane.scheduler.resources.memory`           | Memory (RAM) available to each worker node                                                                                                | `*quantity` | `null`   |
-| `controlPlane.scheduler.resourcesPreset`            | Default sizing preset used when `resources` is omitted. Allowed values: `nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`. | `string`    | `micro`  |
-| `controlPlane.konnectivity`                         | Konnectivity configuration.                                                                                                               | `object`    | `{}`     |
-| `controlPlane.konnectivity.server`                  | Konnectivity server configuration.                                                                                                        | `object`    | `{}`     |
-| `controlPlane.konnectivity.server.resources`        | Explicit CPU and memory configuration for Konnectivity. When left empty, the preset defined in `resourcesPreset` is applied.              | `object`    | `{}`     |
-| `controlPlane.konnectivity.server.resources.cpu`    | CPU available to each worker node                                                                                                         | `*quantity` | `null`   |
-| `controlPlane.konnectivity.server.resources.memory` | Memory (RAM) available to each worker node                                                                                                | `*quantity` | `null`   |
-| `controlPlane.konnectivity.server.resourcesPreset`  | Default sizing preset used when `resources` is omitted. Allowed values: `nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`. | `string`    | `micro`  |
-
+| Name                                               | Description                                                                                                                            | Value    |
+| -------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- | -------- |
+| `controlPlane.replicas`                            | Number of replicas for Kubernetes control-plane components.                                                                            | `2`      |
+| `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: 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: 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: 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: nano, micro, small, medium, large, xlarge, 2xlarge.            | `micro`  |
 
 ## Parameter examples and reference
 

packages/apps/kubernetes/images/cluster-autoscaler.tag

@@ -1 +1 @@
-ghcr.io/cozystack/cozystack/cluster-autoscaler:0.27.0@sha256:e4fbb7d2043f25b90cc8840468d0880e9d3d72ae8b1c8801bf8c35f944cc485d
+ghcr.io/cozystack/cozystack/cluster-autoscaler:0.26.2@sha256:3a8170433e1632e5cc2b6d9db34d0605e8e6c63c158282c38450415e700e932e

packages/apps/kubernetes/images/kubevirt-cloud-provider.tag

@@ -1 +1 @@
-ghcr.io/cozystack/cozystack/kubevirt-cloud-provider:0.27.0@sha256:5335c044313b69ee13b30ca4941687e509005e55f4ae25723861edbf2fbd6dd2
+ghcr.io/cozystack/cozystack/kubevirt-cloud-provider:0.26.2@sha256:5335c044313b69ee13b30ca4941687e509005e55f4ae25723861edbf2fbd6dd2

packages/apps/kubernetes/images/kubevirt-csi-driver.tag

@@ -1 +1 @@
-ghcr.io/cozystack/cozystack/kubevirt-csi-driver:0.27.0@sha256:df3a2f503b4a035567b20b81a0f105c15971274fd675101c3b3eb2413d966d2e
+ghcr.io/cozystack/cozystack/kubevirt-csi-driver:0.26.2@sha256:761e7235ff9cb7f6f223f00954943e6a5af32ed6624ee592a8610122f96febb0

packages/apps/kubernetes/templates/helmreleases/vertical-pod-autoscaler.yaml

@@ -3,8 +3,8 @@
 {{- $clusterDomain := (index $cozyConfig.data "cluster-domain") | default "cozy.local" }}
 {{- $myNS := lookup "v1" "Namespace" "" .Release.Namespace }}
 {{- $targetTenant := index $myNS.metadata.annotations "namespace.cozystack.io/monitoring" }}
-vpaForVPA: false
 vertical-pod-autoscaler:
+  vpaForVPA: false
   recommender:
     extraArgs:
       container-name-label: container

packages/apps/kubernetes/values.schema.json

@@ -1,365 +1,158 @@
 {
-  "title": "Chart Values",
-  "type": "object",
   "properties": {
     "addons": {
-      "description": "Cluster addons configuration",
-      "type": "object",
-      "default": {
-        "certManager": {
-          "enabled": false,
-          "valuesOverride": {}
-        },
-        "cilium": {
-          "valuesOverride": {}
-        },
-        "fluxcd": {
-          "enabled": false,
-          "valuesOverride": {}
-        },
-        "gatewayAPI": {
-          "enabled": false
-        },
-        "gpuOperator": {
-          "enabled": false,
-          "valuesOverride": {}
-        },
-        "ingressNginx": {
-          "enabled": false,
-          "exposeMethod": "Proxied",
-          "hosts": {},
-          "valuesOverride": {}
-        },
-        "monitoringAgents": {
-          "enabled": false,
-          "valuesOverride": {}
-        },
-        "velero": {
-          "enabled": false,
-          "valuesOverride": {}
-        },
-        "verticalPodAutoscaler": {
-          "valuesOverride": {}
-        }
-      },
-      "required": [
-        "certManager",
-        "cilium",
-        "fluxcd",
-        "gatewayAPI",
-        "gpuOperator",
-        "ingressNginx",
-        "monitoringAgents",
-        "velero",
-        "verticalPodAutoscaler"
-      ],
       "properties": {
         "certManager": {
-          "description": "Cert-manager: automatically creates and manages SSL/TLS certificate",
-          "type": "object",
-          "default": {
-            "enabled": false,
-            "valuesOverride": {}
-          },
-          "required": [
-            "enabled",
-            "valuesOverride"
-          ],
           "properties": {
             "enabled": {
+              "default": false,
               "description": "Enable cert-manager, which automatically creates and manages SSL/TLS certificates.",
-              "type": "boolean",
-              "default": false
+              "type": "boolean"
             },
             "valuesOverride": {
-              "description": "Custom values to override",
-              "type": "object",
               "default": {},
-              "x-kubernetes-preserve-unknown-fields": true
+              "description": "Custom values to override",
+              "type": "object"
             }
-          }
+          },
+          "type": "object"
         },
         "cilium": {
-          "description": "Cilium CNI plugin",
-          "type": "object",
-          "default": {
-            "valuesOverride": {}
-          },
-          "required": [
-            "valuesOverride"
-          ],
           "properties": {
             "valuesOverride": {
-              "description": "Custom values to override",
-              "type": "object",
               "default": {},
-              "x-kubernetes-preserve-unknown-fields": true
+              "description": "Custom values to override",
+              "type": "object"
             }
-          }
+          },
+          "type": "object"
         },
         "fluxcd": {
-          "description": "Flux CD",
-          "type": "object",
-          "default": {
-            "enabled": false,
-            "valuesOverride": {}
-          },
-          "required": [
-            "enabled",
-            "valuesOverride"
-          ],
           "properties": {
             "enabled": {
+              "default": false,
               "description": "Enable FluxCD",
-              "type": "boolean",
-              "default": false
+              "type": "boolean"
             },
             "valuesOverride": {
-              "description": "Custom values to override",
-              "type": "object",
               "default": {},
-              "x-kubernetes-preserve-unknown-fields": true
+              "description": "Custom values to override",
+              "type": "object"
             }
-          }
+          },
+          "type": "object"
         },
         "gatewayAPI": {
-          "description": "Gateway API",
-          "type": "object",
-          "default": {
-            "enabled": false
-          },
-          "required": [
-            "enabled"
-          ],
           "properties": {
             "enabled": {
+              "default": false,
               "description": "Enable the Gateway API",
-              "type": "boolean",
-              "default": false
+              "type": "boolean"
             }
-          }
+          },
+          "type": "object"
         },
         "gpuOperator": {
-          "description": "GPU-operator: NVIDIA GPU Operator",
-          "type": "object",
-          "default": {
-            "enabled": false,
-            "valuesOverride": {}
-          },
-          "required": [
-            "enabled",
-            "valuesOverride"
-          ],
           "properties": {
             "enabled": {
+              "default": false,
               "description": "Enable the GPU-operator",
-              "type": "boolean",
-              "default": false
+              "type": "boolean"
             },
             "valuesOverride": {
-              "description": "Custom values to override",
-              "type": "object",
               "default": {},
-              "x-kubernetes-preserve-unknown-fields": true
+              "description": "Custom values to override",
+              "type": "object"
             }
-          }
+          },
+          "type": "object"
         },
         "ingressNginx": {
-          "description": "Ingress-NGINX Controller",
-          "type": "object",
-          "default": {
-            "enabled": false,
-            "exposeMethod": "Proxied",
-            "hosts": {},
-            "valuesOverride": {}
-          },
-          "required": [
-            "enabled",
-            "exposeMethod",
-            "valuesOverride"
-          ],
           "properties": {
             "enabled": {
+              "default": false,
               "description": "Enable the Ingress-NGINX controller (requires nodes labeled with the 'ingress-nginx' role).",
-              "type": "boolean",
-              "default": false
+              "type": "boolean"
             },
             "exposeMethod": {
-              "description": "Method to expose the Ingress-NGINX controller. Allowed values: `Proxied`, `LoadBalancer`.",
-              "type": "string",
               "default": "Proxied",
+              "description": "Method to expose the Ingress-NGINX controller. (allowed values: Proxied, LoadBalancer)",
+              "type": "string",
               "enum": [
                 "Proxied",
                 "LoadBalancer"
               ]
             },
             "hosts": {
-              "description": "List of domain names that the parent cluster should route to this tenant cluster. Taken into account only when `exposeMethod` is set to `Proxied`.",
-              "type": "array",
               "default": [],
-              "items": {
-                "type": "string"
-              }
+              "description": "List of domain names that the parent cluster should route to this tenant cluster. Taken into account only when `exposeMethod` is set to `Proxied`.",
+              "items": {},
+              "type": "array"
             },
             "valuesOverride": {
-              "description": "Custom values to override",
-              "type": "object",
               "default": {},
-              "x-kubernetes-preserve-unknown-fields": true
+              "description": "Custom values to override",
+              "type": "object"
             }
-          }
+          },
+          "type": "object"
         },
         "monitoringAgents": {
-          "description": "MonitoringAgents",
-          "type": "object",
-          "default": {
-            "enabled": false,
-            "valuesOverride": {}
-          },
-          "required": [
-            "enabled",
-            "valuesOverride"
-          ],
           "properties": {
             "enabled": {
+              "default": false,
               "description": "Enable monitoring agents (Fluent Bit and VMAgents) to send logs and metrics. If tenant monitoring is enabled, data is sent to tenant storage; otherwise, it goes to root storage.",
-              "type": "boolean",
-              "default": false
+              "type": "boolean"
             },
             "valuesOverride": {
-              "description": "Custom values to override",
-              "type": "object",
               "default": {},
-              "x-kubernetes-preserve-unknown-fields": true
+              "description": "Custom values to override",
+              "type": "object"
             }
-          }
+          },
+          "type": "object"
         },
         "velero": {
-          "description": "Velero",
-          "type": "object",
-          "default": {
-            "enabled": false,
-            "valuesOverride": {}
-          },
-          "required": [
-            "enabled",
-            "valuesOverride"
-          ],
           "properties": {
             "enabled": {
-              "description": "Enable Velero for backup and recovery of a tenant Kubernetes cluster.",
-              "type": "boolean",
-              "default": false
+              "default": false,
+              "description": "Enable velero for backup and restore k8s cluster.",
+              "type": "boolean"
             },
             "valuesOverride": {
-              "description": "Custom values to override",
-              "type": "object",
               "default": {},
-              "x-kubernetes-preserve-unknown-fields": true
+              "description": "Custom values to override",
+              "type": "object"
             }
-          }
+          },
+          "type": "object"
         },
         "verticalPodAutoscaler": {
-          "description": "VerticalPodAutoscaler",
-          "type": "object",
-          "default": {
-            "valuesOverride": {}
-          },
-          "required": [
-            "valuesOverride"
-          ],
           "properties": {
             "valuesOverride": {
-              "description": "Custom values to override",
-              "type": "object",
               "default": {},
-              "x-kubernetes-preserve-unknown-fields": true
+              "description": "Custom values to override",
+              "type": "object"
             }
-          }
-        }
-      }
-    },
-    "controlPlane": {
-      "description": "Control Plane Configuration",
-      "type": "object",
-      "default": {
-        "apiServer": {
-          "resources": {},
-          "resourcesPreset": "medium"
-        },
-        "controllerManager": {
-          "resources": {},
-          "resourcesPreset": "micro"
-        },
-        "konnectivity": {
-          "server": {
-            "resources": {},
-            "resourcesPreset": "micro"
-          }
-        },
-        "replicas": 2,
-        "scheduler": {
-          "resources": {},
-          "resourcesPreset": "micro"
+          },
+          "type": "object"
         }
       },
-      "required": [
-        "apiServer",
-        "controllerManager",
-        "konnectivity",
-        "replicas",
-        "scheduler"
-      ],
+      "type": "object"
+    },
+    "controlPlane": {
       "properties": {
         "apiServer": {
-          "description": "Control plane API server configuration.",
-          "type": "object",
-          "default": {
-            "resources": {},
-            "resourcesPreset": "medium"
-          },
-          "required": [
-            "resources",
-            "resourcesPreset"
-          ],
           "properties": {
             "resources": {
-              "description": "Explicit CPU and memory configuration for the API Server. When left empty, the preset defined in `resourcesPreset` is applied.",
-              "type": "object",
               "default": {},
-              "properties": {
-                "cpu": {
-                  "description": "CPU available to each worker node",
-                  "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": "Memory (RAM) available to each worker node",
-                  "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
-                }
-              }
+              "description": "Explicit CPU and memory configuration for the API Server. When left empty, the preset defined in `resourcesPreset` is applied.",
+              "type": "object"
             },
             "resourcesPreset": {
-              "description": "Default sizing preset used when `resources` is omitted. Allowed values: `nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`.",
-              "type": "string",
               "default": "medium",
+              "description": "Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge.",
+              "type": "string",
               "enum": [
                 "nano",
                 "micro",
@@ -370,57 +163,20 @@
                 "2xlarge"
               ]
             }
-          }
+          },
+          "type": "object"
         },
         "controllerManager": {
-          "description": "Controller Manager configuration.",
-          "type": "object",
-          "default": {
-            "resources": {},
-            "resourcesPreset": "micro"
-          },
-          "required": [
-            "resources",
-            "resourcesPreset"
-          ],
           "properties": {
             "resources": {
-              "description": "Explicit CPU and memory configuration for the Controller Manager. When left empty, the preset defined in `resourcesPreset` is applied.",
-              "type": "object",
               "default": {},
-              "properties": {
-                "cpu": {
-                  "description": "CPU available to each worker node",
-                  "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": "Memory (RAM) available to each worker node",
-                  "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
-                }
-              }
+              "description": "Explicit CPU and memory configuration for the Controller Manager. When left empty, the preset defined in `resourcesPreset` is applied.",
+              "type": "object"
             },
             "resourcesPreset": {
-              "description": "Default sizing preset used when `resources` is omitted. Allowed values: `nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`.",
-              "type": "string",
               "default": "micro",
+              "description": "Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge.",
+              "type": "string",
               "enum": [
                 "nano",
                 "micro",
@@ -431,70 +187,22 @@
                 "2xlarge"
               ]
             }
-          }
+          },
+          "type": "object"
         },
         "konnectivity": {
-          "description": "Konnectivity configuration.",
-          "type": "object",
-          "default": {
-            "server": {
-              "resources": {},
-              "resourcesPreset": "micro"
-            }
-          },
-          "required": [
-            "server"
-          ],
           "properties": {
             "server": {
-              "description": "Konnectivity server configuration.",
-              "type": "object",
-              "default": {
-                "resources": {},
-                "resourcesPreset": "micro"
-              },
-              "required": [
-                "resources",
-                "resourcesPreset"
-              ],
               "properties": {
                 "resources": {
-                  "description": "Explicit CPU and memory configuration for Konnectivity. When left empty, the preset defined in `resourcesPreset` is applied.",
-                  "type": "object",
                   "default": {},
-                  "properties": {
-                    "cpu": {
-                      "description": "CPU available to each worker node",
-                      "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": "Memory (RAM) available to each worker node",
-                      "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
-                    }
-                  }
+                  "description": "Explicit CPU and memory configuration for Konnectivity. When left empty, the preset defined in `resourcesPreset` is applied.",
+                  "type": "object"
                 },
                 "resourcesPreset": {
-                  "description": "Default sizing preset used when `resources` is omitted. Allowed values: `nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`.",
-                  "type": "string",
                   "default": "micro",
+                  "description": "Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge.",
+                  "type": "string",
                   "enum": [
                     "nano",
                     "micro",
@@ -505,64 +213,28 @@
                     "2xlarge"
                   ]
                 }
-              }
+              },
+              "type": "object"
             }
-          }
+          },
+          "type": "object"
         },
         "replicas": {
-          "description": "Number of replicas for Kubernetes control plane components.",
-          "type": "integer",
-          "default": 2
+          "default": 2,
+          "description": "Number of replicas for Kubernetes control-plane components.",
+          "type": "number"
         },
         "scheduler": {
-          "description": "Scheduler configuration.",
-          "type": "object",
-          "default": {
-            "resources": {},
-            "resourcesPreset": "micro"
-          },
-          "required": [
-            "resources",
-            "resourcesPreset"
-          ],
           "properties": {
             "resources": {
-              "description": "Explicit CPU and memory configuration for the Scheduler. When left empty, the preset defined in `resourcesPreset` is applied.",
-              "type": "object",
               "default": {},
-              "properties": {
-                "cpu": {
-                  "description": "CPU available to each worker node",
-                  "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": "Memory (RAM) available to each worker node",
-                  "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
-                }
-              }
+              "description": "Explicit CPU and memory configuration for the Scheduler. When left empty, the preset defined in `resourcesPreset` is applied.",
+              "type": "object"
             },
             "resourcesPreset": {
-              "description": "Default sizing preset used when `resources` is omitted. Allowed values: `nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`.",
-              "type": "string",
               "default": "micro",
+              "description": "Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge.",
+              "type": "string",
               "enum": [
                 "nano",
                 "micro",
@@ -573,132 +245,26 @@
                 "2xlarge"
               ]
             }
-          }
+          },
+          "type": "object"
         }
-      }
+      },
+      "type": "object"
     },
     "host": {
+      "default": "",
       "description": "Hostname used to access the Kubernetes cluster externally. Defaults to `<cluster-name>.<tenant-host>` when empty.",
       "type": "string"
     },
-    "nodeGroups": {
-      "description": "Worker nodes configuration",
-      "type": "object",
-      "default": {
-        "md0": {
-          "ephemeralStorage": "20Gi",
-          "gpus": {},
-          "instanceType": "u1.medium",
-          "maxReplicas": 10,
-          "minReplicas": 0,
-          "resources": {},
-          "roles": [
-            "ingress-nginx"
-          ]
-        }
-      },
-      "additionalProperties": {
-        "type": "object",
-        "required": [
-          "ephemeralStorage",
-          "instanceType",
-          "maxReplicas",
-          "minReplicas",
-          "resources"
-        ],
-        "properties": {
-          "ephemeralStorage": {
-            "description": "Ephemeral storage size",
-            "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
-          },
-          "gpus": {
-            "description": "List of GPUs to attach (WARN: NVIDIA driver requires at least 4 GiB of RAM)",
-            "type": "array",
-            "items": {
-              "type": "object",
-              "required": [
-                "name"
-              ],
-              "properties": {
-                "name": {
-                  "description": "Name of GPU, such as \"nvidia.com/AD102GL_L40S\"",
-                  "type": "string"
-                }
-              }
-            }
-          },
-          "instanceType": {
-            "description": "Virtual machine instance type",
-            "type": "string"
-          },
-          "maxReplicas": {
-            "description": "Maximum amount of replicas",
-            "type": "integer"
-          },
-          "minReplicas": {
-            "description": "Minimum amount of replicas",
-            "type": "integer"
-          },
-          "resources": {
-            "description": "Resources available to each worker node",
-            "type": "object",
-            "properties": {
-              "cpu": {
-                "description": "CPU available to each worker node",
-                "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": "Memory (RAM) available to each worker node",
-                "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
-              }
-            }
-          },
-          "roles": {
-            "description": "List of node's roles",
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
-          }
-        }
-      }
-    },
     "storageClass": {
-      "description": "StorageClass used to store the data",
-      "type": "string",
-      "default": "replicated"
+      "default": "replicated",
+      "description": "StorageClass used to store user data.",
+      "type": "string"
     },
     "version": {
+      "default": "v1.32",
       "description": "Kubernetes version given as vMAJOR.MINOR. Available are versions from 1.28 to 1.33.",
       "type": "string",
-      "default": "v1.32",
       "enum": [
         "v1.28",
         "v1.29",
@@ -708,5 +274,7 @@
         "v1.33"
       ]
     }
-  }
+  },
+  "title": "Chart Values",
+  "type": "object"
 }

packages/apps/kubernetes/values.yaml

@@ -1,26 +1,14 @@
 ## @section Common Parameters
 
-## @param storageClass {string} StorageClass used to store the data
+## @param storageClass StorageClass used to store user data.
 storageClass: replicated
 
 ## @section Application-specific parameters
-## @param version {string} Kubernetes version given as vMAJOR.MINOR. Available are versions from 1.28 to 1.33.
+## @param version Kubernetes version given as vMAJOR.MINOR. Available are versions from 1.28 to 1.33.
 version: "v1.32"
-## @param host {string} Hostname used to access the Kubernetes cluster externally. Defaults to `<cluster-name>.<tenant-host>` when empty.
+## @param host Hostname used to access the Kubernetes cluster externally. Defaults to `<cluster-name>.<tenant-host>` when empty.
 host: ""
-
-## @param nodeGroups {map[string]node} Worker nodes configuration
-## @field node {node} Node configuration
-## @field node.minReplicas {int} Minimum amount of replicas
-## @field node.maxReplicas {int} Maximum amount of replicas
-## @field node.instanceType {string} Virtual machine instance type
-## @field node.ephemeralStorage {quantity} Ephemeral storage size
-## @field node.roles {[]string} List of node's roles
-## @field node.resources {resources} Resources available to each worker node
-## @field resources.cpu {*quantity} CPU available to each worker node
-## @field resources.memory {*quantity} Memory (RAM) available to each worker node
-## @field node.gpus {[]gpu} List of GPUs to attach (WARN: NVIDIA driver requires at least 4 GiB of RAM)
-## @field gpu.name {string} Name of GPU, such as "nvidia.com/AD102GL_L40S"
+## @param nodeGroups [object] Worker nodes configuration (see example)
 ##
 nodeGroups:
   md0:
@@ -30,7 +18,11 @@ nodeGroups:
     ephemeralStorage: 20Gi
     roles:
     - ingress-nginx
-    resources: {}
+
+    resources:
+      cpu: ""
+      memory: ""
+
     ## List of GPUs to attach (WARN: NVIDIA driver requires at least 4 GiB of RAM)
     ## e.g:
     ## instanceType: "u1.xlarge"
@@ -41,124 +33,117 @@ nodeGroups:
 
 ## @section Cluster Addons
 ##
-## @param addons {addons} Cluster addons configuration
 addons:
-  ## @field addons.certManager {certManager} Cert-manager: automatically creates and manages SSL/TLS certificate
+  ## Cert-manager: automatically creates and manages SSL/TLS certificate
   ##
   certManager:
-    ## @field certManager.enabled {bool} Enable cert-manager, which automatically creates and manages SSL/TLS certificates.
+    ## @param addons.certManager.enabled Enable cert-manager, which automatically creates and manages SSL/TLS certificates.
     enabled: false
-    ## @field certManager.valuesOverride {object} Custom values to override
+    ## @param addons.certManager.valuesOverride Custom values to override
     valuesOverride: {}
 
-  ## @field addons.cilium {cilium} Cilium CNI plugin
+  ## Cilium CNI plugin
   ##
   cilium:
-    ## @field cilium.valuesOverride {object} Custom values to override
+    ## @param addons.cilium.valuesOverride Custom values to override
     valuesOverride: {}
 
-  ## @field addons.gatewayAPI {gatewayAPI} Gateway API
+  ## Gateway API
   ##
   gatewayAPI:
-    ## @field gatewayAPI.enabled {bool} Enable the Gateway API
+    ## @param addons.gatewayAPI.enabled Enable the Gateway API
     enabled: false
 
-  ## @field addons.ingressNginx {ingressNginx} Ingress-NGINX Controller
+  ## Ingress-NGINX Controller
   ##
   ingressNginx:
-    ## @field ingressNginx.enabled {bool} Enable the Ingress-NGINX controller (requires nodes labeled with the 'ingress-nginx' role).
+    ## @param addons.ingressNginx.enabled Enable the Ingress-NGINX controller (requires nodes labeled with the 'ingress-nginx' role).
     enabled: false
-    ## @field ingressNginx.exposeMethod {string enum:"Proxied,LoadBalancer"} Method to expose the Ingress-NGINX controller. Allowed values: `Proxied`, `LoadBalancer`.
+    ## @param addons.ingressNginx.exposeMethod Method to expose the Ingress-NGINX controller. (allowed values: Proxied, LoadBalancer)
     exposeMethod: Proxied
-    ## @field ingressNginx.hosts {[]string} List of domain names that the parent cluster should route to this tenant cluster. Taken into account only when `exposeMethod` is set to `Proxied`.
+    ## @param addons.ingressNginx.hosts List of domain names that the parent cluster should route to this tenant cluster. Taken into account only when `exposeMethod` is set to `Proxied`.
     ## e.g:
     ## hosts:
     ## - example.org
     ## - foo.example.net
     ##
     hosts: []
-    ## @field ingressNginx.valuesOverride {object} Custom values to override
+    ## @param addons.ingressNginx.valuesOverride Custom values to override
     valuesOverride: {}
 
-  ## @field addons.gpuOperator {gpuOperator} GPU-operator: NVIDIA GPU Operator
+  ## GPU-operator: NVIDIA GPU Operator
   ##
   gpuOperator:
-    ## @field gpuOperator.enabled {bool} Enable the GPU-operator
-    ## @field gpuOperator.valuesOverride {object} Custom values to override
+    ## @param addons.gpuOperator.enabled Enable the GPU-operator
+    ## @param addons.gpuOperator.valuesOverride Custom values to override
     enabled: false
     valuesOverride: {}
 
-  ## @field addons.fluxcd {fluxcd} Flux CD
+  ## Flux CD
   ##
   fluxcd:
-    ## @field fluxcd.enabled {bool} Enable FluxCD
-    ## @field fluxcd.valuesOverride {object} Custom values to override
+    ## @param addons.fluxcd.enabled Enable FluxCD
+    ## @param addons.fluxcd.valuesOverride Custom values to override
     ##
     enabled: false
     valuesOverride: {}
 
-  ## @field addons.monitoringAgents {monitoringAgents} MonitoringAgents
+  ## MonitoringAgents
   ##
   monitoringAgents:
-    ## @field monitoringAgents.enabled {bool} Enable monitoring agents (Fluent Bit and VMAgents) to send logs and metrics. If tenant monitoring is enabled, data is sent to tenant storage; otherwise, it goes to root storage.
-    ## @field monitoringAgents.valuesOverride {object} Custom values to override
+    ## @param addons.monitoringAgents.enabled Enable monitoring agents (Fluent Bit and VMAgents) to send logs and metrics. If tenant monitoring is enabled, data is sent to tenant storage; otherwise, it goes to root storage.
+    ## @param addons.monitoringAgents.valuesOverride Custom values to override
     ##
     enabled: false
     valuesOverride: {}
 
-  ## @field addons.verticalPodAutoscaler {verticalPodAutoscaler} VerticalPodAutoscaler
+  ## VerticalPodAutoscaler
   ##
   verticalPodAutoscaler:
-    ## @field verticalPodAutoscaler.valuesOverride {object} Custom values to override
+    ## @param addons.verticalPodAutoscaler.valuesOverride Custom values to override
     ##
     valuesOverride: {}
 
-  ## @field addons.velero {velero} Velero
+  ## Velero
   ##
   velero:
-    ## @field velero.enabled {bool} Enable Velero for backup and recovery of a tenant Kubernetes cluster.
-    ## @field velero.valuesOverride {object} Custom values to override
+    ## @param addons.velero.enabled Enable velero for backup and restore k8s cluster.
+    ## @param addons.velero.valuesOverride Custom values to override
     ##
     enabled: false
     valuesOverride: {}
 
 ## @section Kubernetes Control Plane Configuration
 ##
-## @param controlPlane {controlPlane} Control Plane Configuration
 controlPlane:
-  ## @field controlPlane.replicas {int} Number of replicas for Kubernetes control plane components.
+  ## @param controlPlane.replicas Number of replicas for Kubernetes control-plane components.
   replicas: 2
-  ## @field controlPlane.apiServer {apiServer} Control plane API server configuration.
   apiServer:
-    ## @field apiServer.resources {resources} Explicit CPU and memory configuration for the API Server. When left empty, the preset defined in `resourcesPreset` is applied.
+    ## @param controlPlane.apiServer.resources Explicit CPU and memory configuration for the API Server. When left empty, the preset defined in `resourcesPreset` is applied.
+    resources: {}
+    ## @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
     ##   memory: 4Gi
     ##
-    resources: {}
-    ## @field apiServer.resourcesPreset {string enum:"nano,micro,small,medium,large,xlarge,2xlarge"} Default sizing preset used when `resources` is omitted. Allowed values: `nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`.
     resourcesPreset: "medium"
 
-  ## @field controlPlane.controllerManager {controllerManager} Controller Manager configuration.
   controllerManager:
-    ## @field controllerManager.resources {resources} Explicit CPU and memory configuration for the Controller Manager. When left empty, the preset defined in `resourcesPreset` is applied.
-    ## @field controllerManager.resourcesPreset {string enum:"nano,micro,small,medium,large,xlarge,2xlarge"} Default sizing preset used when `resources` is omitted. Allowed values: `nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`.
+    ## @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: nano, micro, small, medium, large, xlarge, 2xlarge.
     resourcesPreset: "micro"
     resources: {}
 
-  ## @field controlPlane.scheduler {scheduler} Scheduler configuration.
   scheduler:
-    ## @field scheduler.resources {resources} Explicit CPU and memory configuration for the Scheduler. When left empty, the preset defined in `resourcesPreset` is applied.
-    ## @field scheduler.resourcesPreset {string enum:"nano,micro,small,medium,large,xlarge,2xlarge"} Default sizing preset used when `resources` is omitted. Allowed values: `nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`.
+    ## @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: nano, micro, small, medium, large, xlarge, 2xlarge.
     resourcesPreset: "micro"
     resources: {}
 
-  ## @field controlPlane.konnectivity {konnectivity} Konnectivity configuration.
   konnectivity:
-    ## @field konnectivity.server {konnectivityServer} Konnectivity server configuration.
     server:
-      ## @field konnectivityServer.resources {resources} Explicit CPU and memory configuration for Konnectivity. When left empty, the preset defined in `resourcesPreset` is applied.
-      ## @field konnectivityServer.resourcesPreset {string enum:"nano,micro,small,medium,large,xlarge,2xlarge"} Default sizing preset used when `resources` is omitted. Allowed values: `nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`.
+      ## @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: nano, micro, small, medium, large, xlarge, 2xlarge.
       resourcesPreset: "micro"
       resources: {}

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.10.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

packages/apps/mysql/Makefile

@@ -1,10 +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:
-	cozyvalues-gen -v values.yaml -s values.schema.json -r README.md
+	readme-generator-for-helm -v values.yaml -s values.schema.json -r README.md
+	yq -i -o json --indent 4 '.properties.resourcesPreset.enum = $(PRESET_ENUM)' values.schema.json
 
 image:
 	docker buildx build images/mariadb-backup \

packages/apps/mysql/README.md

@@ -14,12 +14,12 @@ This managed service is controlled by mariadb-operator, ensuring efficient manag
 
 ### How to switch master/slave replica
 
-```bash
+```
 kubectl edit mariadb <instnace>
 ```
 update:
 
-```bash
+```
 spec:
   replication:
     primary:
@@ -28,7 +28,7 @@ spec:
 
 check status:
 
-```bash
+```
 NAME        READY   STATUS    PRIMARY POD   AGE
 <instance>  True    Running   app-db1-1     41d
 ```
@@ -36,13 +36,13 @@ NAME        READY   STATUS    PRIMARY POD   AGE
 ### How to restore backup:
 
 find snapshot:
-```bash
+```
 restic -r s3:s3.example.org/mariadb-backups/database_name snapshots
 ```
 
 
 restore:
-```bash
+```
 restic -r s3:s3.example.org/mariadb-backups/database_name restore latest --target /tmp/
 ```
 
@@ -51,16 +51,15 @@ more details:
 
 ### Known issues
 
-- **Replication can't be finished with various errors**
-- **Replication can't be finished in case if `binlog` purged**
-
-  Until `mariadbbackup` is not used to bootstrap a node by mariadb-operator (this feature is not inmplemented yet), follow these manual steps to fix it:
+- **Replication can't not be finished with various errors**
+- **Replication can't be finised in case if binlog purged**
+  Until mariadbbackup is not used to bootstrap a node by mariadb-operator (this feature is not inmplemented yet), follow these manual steps to fix it:
   https://github.com/mariadb-operator/mariadb-operator/issues/141#issuecomment-1804760231
 
 - **Corrupted indicies**
   Sometimes some indecies can be corrupted on master replica, you can recover them from slave:
 
-  ```bash
+  ```
   mysqldump -h <slave> -P 3306 -u<user> -p<password> --column-statistics=0 <database> <table> ~/tmp/fix-table.sql
   mysql -h <master> -P 3306 -u<user> -p<password> <database> < ~/tmp/fix-table.sql
   ```
@@ -69,45 +68,34 @@ more details:
 
 ### Common parameters
 
-| Name               | Description                                                                                                                               | Type        | Value   |
-| ------------------ | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------- | ------- |
-| `replicas`         | Number of MariaDB replicas                                                                                                                | `int`       | `2`     |
-| `resources`        | Explicit CPU and memory configuration for each MariaDB replica. When left empty, the preset defined in `resourcesPreset` is applied.      | `*object`   | `{}`    |
-| `resources.cpu`    | CPU available to each replica                                                                                                             | `*quantity` | `null`  |
-| `resources.memory` | Memory (RAM) available to each replica                                                                                                    | `*quantity` | `null`  |
-| `resourcesPreset`  | Default sizing preset used when `resources` is omitted. Allowed values: `nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`. | `string`    | `nano`  |
-| `size`             | Persistent Volume Claim size, available for application data                                                                              | `quantity`  | `10Gi`  |
-| `storageClass`     | StorageClass used to store the data                                                                                                       | `string`    | `""`    |
-| `external`         | Enable external access from outside the cluster                                                                                           | `bool`      | `false` |
-
+| Name              | Description                                                                                                                          | Value   |
+| ----------------- | ------------------------------------------------------------------------------------------------------------------------------------ | ------- |
+| `replicas`        | Number of MariaDB replicas                                                                                                           | `2`     |
+| `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: nano, micro, small, medium, large, xlarge, 2xlarge.          | `nano`  |
+| `size`            | Persistent Volume size                                                                                                               | `10Gi`  |
+| `storageClass`    | StorageClass used to store the data                                                                                                  | `""`    |
+| `external`        | Enable external access from outside the cluster                                                                                      | `false` |
 
 ### Application-specific parameters
 
-| Name                             | Description                             | Type                | Value   |
-| -------------------------------- | --------------------------------------- | ------------------- | ------- |
-| `users`                          | Users configuration                     | `map[string]object` | `{...}` |
-| `users[name].password`           | Password for the user                   | `string`            | `""`    |
-| `users[name].maxUserConnections` | Maximum amount of connections           | `int`               | `0`     |
-| `databases`                      | Databases configuration                 | `map[string]object` | `{...}` |
-| `databases[name].roles`          | Roles for the database                  | `*object`           | `null`  |
-| `databases[name].roles.admin`    | List of users with admin privileges     | `[]string`          | `[]`    |
-| `databases[name].roles.readonly` | List of users with read-only privileges | `[]string`          | `[]`    |
-
+| Name        | Description             | Value |
+| ----------- | ----------------------- | ----- |
+| `users`     | Users configuration     | `{}`  |
+| `databases` | Databases configuration | `{}`  |
 
 ### Backup parameters
 
-| Name                     | Description                                    | Type     | Value                                                  |
-| ------------------------ | ---------------------------------------------- | -------- | ------------------------------------------------------ |
-| `backup`                 | Backup configuration                           | `object` | `{}`                                                   |
-| `backup.enabled`         | Enable regular backups, default is `false`.    | `bool`   | `false`                                                |
-| `backup.s3Region`        | AWS S3 region where backups are stored         | `string` | `us-east-1`                                            |
-| `backup.s3Bucket`        | S3 bucket used for storing backups             | `string` | `s3.example.org/mysql-backups`                         |
-| `backup.schedule`        | Cron schedule for automated backups            | `string` | `0 2 * * *`                                            |
-| `backup.cleanupStrategy` | Retention strategy for cleaning up old backups | `string` | `--keep-last=3 --keep-daily=3 --keep-within-weekly=1m` |
-| `backup.s3AccessKey`     | Access key for S3, used for authentication     | `string` | `<your-access-key>`                                    |
-| `backup.s3SecretKey`     | Secret key for S3, used for authentication     | `string` | `<your-secret-key>`                                    |
-| `backup.resticPassword`  | Password for Restic backup encryption          | `string` | `<password>`                                           |
-
+| Name                     | Description                                    | Value                                                  |
+| ------------------------ | ---------------------------------------------- | ------------------------------------------------------ |
+| `backup.enabled`         | Enable periodic backups                        | `false`                                                |
+| `backup.s3Region`        | The AWS S3 region where backups are stored     | `us-east-1`                                            |
+| `backup.s3Bucket`        | The S3 bucket used for storing backups         | `s3.example.org/postgres-backups`                      |
+| `backup.schedule`        | Cron schedule for automated backups            | `0 2 * * *`                                            |
+| `backup.cleanupStrategy` | The strategy for cleaning up old backups       | `--keep-last=3 --keep-daily=3 --keep-within-weekly=1m` |
+| `backup.s3AccessKey`     | The access key for S3, used for authentication | `oobaiRus9pah8PhohL1ThaeTa4UVa7gu`                     |
+| `backup.s3SecretKey`     | The secret key for S3, used for authentication | `ju3eum4dekeich9ahM1te8waeGai0oog`                     |
+| `backup.resticPassword`  | The password for Restic backup encryption      | `ChaXoveekoh6eigh4siesheeda2quai0`                     |
 
 ## Parameter examples and reference
 

packages/apps/mysql/images/mariadb-backup.tag

@@ -1 +1 @@
-ghcr.io/cozystack/cozystack/mariadb-backup:0.10.0@sha256:a3789db9e9e065ff60cbac70771b4a8aa1460db3194307cf5ca5d4fe1b412b6b
+ghcr.io/cozystack/cozystack/mariadb-backup:0.9.1@sha256:a3789db9e9e065ff60cbac70771b4a8aa1460db3194307cf5ca5d4fe1b412b6b

packages/apps/mysql/values.schema.json

@@ -1,199 +1,90 @@
 {
-  "title": "Chart Values",
-  "type": "object",
-  "properties": {
-    "backup": {
-      "description": "Backup configuration",
-      "type": "object",
-      "default": {
-        "cleanupStrategy": "--keep-last=3 --keep-daily=3 --keep-within-weekly=1m",
-        "enabled": false,
-        "resticPassword": "\u003cpassword\u003e",
-        "s3AccessKey": "\u003cyour-access-key\u003e",
-        "s3Bucket": "s3.example.org/mysql-backups",
-        "s3Region": "us-east-1",
-        "s3SecretKey": "\u003cyour-secret-key\u003e",
-        "schedule": "0 2 * * *"
-      },
-      "required": [
-        "cleanupStrategy",
-        "enabled",
-        "resticPassword",
-        "s3AccessKey",
-        "s3Bucket",
-        "s3Region",
-        "s3SecretKey",
-        "schedule"
-      ],
-      "properties": {
-        "cleanupStrategy": {
-          "description": "Retention strategy for cleaning up old backups",
-          "type": "string",
-          "default": "--keep-last=3 --keep-daily=3 --keep-within-weekly=1m"
-        },
-        "enabled": {
-          "description": "Enable regular backups, default is `false`.",
-          "type": "boolean",
-          "default": false
-        },
-        "resticPassword": {
-          "description": "Password for Restic backup encryption",
-          "type": "string",
-          "default": "\u003cpassword\u003e"
-        },
-        "s3AccessKey": {
-          "description": "Access key for S3, used for authentication",
-          "type": "string",
-          "default": "\u003cyour-access-key\u003e"
-        },
-        "s3Bucket": {
-          "description": "S3 bucket used for storing backups",
-          "type": "string",
-          "default": "s3.example.org/mysql-backups"
-        },
-        "s3Region": {
-          "description": "AWS S3 region where backups are stored",
-          "type": "string",
-          "default": "us-east-1"
-        },
-        "s3SecretKey": {
-          "description": "Secret key for S3, used for authentication",
-          "type": "string",
-          "default": "\u003cyour-secret-key\u003e"
-        },
-        "schedule": {
-          "description": "Cron schedule for automated backups",
-          "type": "string",
-          "default": "0 2 * * *"
-        }
-      }
-    },
-    "databases": {
-      "description": "Databases configuration",
-      "type": "object",
-      "default": {},
-      "additionalProperties": {
-        "type": "object",
-        "properties": {
-          "roles": {
-            "description": "Roles for the database",
-            "type": "object",
+    "properties": {
+        "backup": {
             "properties": {
-              "admin": {
-                "description": "List of users with admin privileges",
-                "type": "array",
-                "items": {
-                  "type": "string"
+                "cleanupStrategy": {
+                    "default": "--keep-last=3 --keep-daily=3 --keep-within-weekly=1m",
+                    "description": "The strategy for cleaning up old backups",
+                    "type": "string"
+                },
+                "enabled": {
+                    "default": false,
+                    "description": "Enable periodic backups",
+                    "type": "boolean"
+                },
+                "resticPassword": {
+                    "default": "ChaXoveekoh6eigh4siesheeda2quai0",
+                    "description": "The password for Restic backup encryption",
+                    "type": "string"
+                },
+                "s3AccessKey": {
+                    "default": "oobaiRus9pah8PhohL1ThaeTa4UVa7gu",
+                    "description": "The access key for S3, used for authentication",
+                    "type": "string"
+                },
+                "s3Bucket": {
+                    "default": "s3.example.org/postgres-backups",
+                    "description": "The S3 bucket used for storing backups",
+                    "type": "string"
+                },
+                "s3Region": {
+                    "default": "us-east-1",
+                    "description": "The AWS S3 region where backups are stored",
+                    "type": "string"
+                },
+                "s3SecretKey": {
+                    "default": "ju3eum4dekeich9ahM1te8waeGai0oog",
+                    "description": "The secret key for S3, used for authentication",
+                    "type": "string"
+                },
+                "schedule": {
+                    "default": "0 2 * * *",
+                    "description": "Cron schedule for automated backups",
+                    "type": "string"
                 }
-              },
-              "readonly": {
-                "description": "List of users with read-only privileges",
-                "type": "array",
-                "items": {
-                  "type": "string"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "external": {
-      "description": "Enable external access from outside the cluster",
-      "type": "boolean",
-      "default": false
-    },
-    "replicas": {
-      "description": "Number of MariaDB replicas",
-      "type": "integer",
-      "default": 2
-    },
-    "resources": {
-      "description": "Explicit CPU and memory configuration for each MariaDB replica. When left empty, the preset defined in `resourcesPreset` is applied.",
-      "type": "object",
-      "default": {},
-      "properties": {
-        "cpu": {
-          "description": "CPU available to each replica",
-          "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
+            "type": "object"
         },
-        "memory": {
-          "description": "Memory (RAM) available to each replica",
-          "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
-        }
-      }
-    },
-    "resourcesPreset": {
-      "description": "Default sizing preset used when `resources` is omitted. Allowed values: `nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`.",
-      "type": "string",
-      "default": "nano",
-      "enum": [
-        "nano",
-        "micro",
-        "small",
-        "medium",
-        "large",
-        "xlarge",
-        "2xlarge"
-      ]
-    },
-    "size": {
-      "description": "Persistent Volume Claim size, available for application data",
-      "default": "10Gi",
-      "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
-      "anyOf": [
-        {
-          "type": "integer"
+        "external": {
+            "default": false,
+            "description": "Enable external access from outside the cluster",
+            "type": "boolean"
         },
-        {
-          "type": "string"
-        }
-      ],
-      "x-kubernetes-int-or-string": true
-    },
-    "storageClass": {
-      "description": "StorageClass used to store the data",
-      "type": "string"
-    },
-    "users": {
-      "description": "Users configuration",
-      "type": "object",
-      "default": {},
-      "additionalProperties": {
-        "type": "object",
-        "required": [
-          "maxUserConnections",
-          "password"
-        ],
-        "properties": {
-          "maxUserConnections": {
-            "description": "Maximum amount of connections",
-            "type": "integer"
-          },
-          "password": {
-            "description": "Password for the user",
+        "replicas": {
+            "default": 2,
+            "description": "Number of MariaDB replicas",
+            "type": "number"
+        },
+        "resources": {
+            "default": {},
+            "description": "Explicit CPU and memory configuration for each MariaDB replica. When left empty, the preset defined in `resourcesPreset` is applied.",
+            "type": "object"
+        },
+        "resourcesPreset": {
+            "default": "nano",
+            "description": "Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge.",
+            "type": "string",
+            "enum": [
+                "nano",
+                "micro",
+                "small",
+                "medium",
+                "large",
+                "xlarge",
+                "2xlarge"
+            ]
+        },
+        "size": {
+            "default": "10Gi",
+            "description": "Persistent Volume size",
+            "type": "string"
+        },
+        "storageClass": {
+            "default": "",
+            "description": "StorageClass used to store the data",
             "type": "string"
-          }
         }
-      }
-    }
-  }
-}
+    },
+    "title": "Chart Values",
+    "type": "object"
+}

packages/apps/mysql/values.yaml

@@ -1,28 +1,24 @@
 ## @section Common parameters
 ##
-## @param replicas {int} Number of MariaDB replicas
+## @param replicas Number of MariaDB replicas
 replicas: 2
-## @param resources {*resources} Explicit CPU and memory configuration for each MariaDB replica. When left empty, the preset defined in `resourcesPreset` is applied.
-## @field resources.cpu {*quantity} CPU available to each replica
-## @field resources.memory {*quantity} Memory (RAM) available to each replica
+## @param resources Explicit CPU and memory configuration for each MariaDB replica. When left empty, the preset defined in `resourcesPreset` is applied.
 resources: {}
   # resources:
   #   cpu: 4000m
   #   memory: 4Gi
-## @param resourcesPreset {string enum:"nano,micro,small,medium,large,xlarge,2xlarge"} Default sizing preset used when `resources` is omitted. Allowed values: `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"
-## @param size {quantity} Persistent Volume Claim size, available for application data
+## @param size Persistent Volume size
 size: 10Gi
-## @param storageClass {string} StorageClass used to store the data
+## @param storageClass StorageClass used to store the data
 storageClass: ""
-## @param external {bool} Enable external access from outside the cluster
+## @param external Enable external access from outside the cluster
 external: false
 
 ## @section Application-specific parameters
 ##
-## @param users {map[string]user} Users configuration
-## @field user.password {string} Password for the user
-## @field user.maxUserConnections {int} Maximum amount of connections
+## @param users [object] Users configuration
 ## Example:
 ## users:
 ##   user1:
@@ -34,12 +30,7 @@ external: false
 ##
 users: {}
 
-
-## @param databases {map[string]database} Databases configuration
-## @field database.roles {*databaseRoles} Roles for the database
-## @field databaseRoles.admin {[]string} List of users with admin privileges
-## @field databaseRoles.readonly {[]string} List of users with read-only privileges
-##
+## @param databases [object] Databases configuration
 ## Example:
 ## databases:
 ##   myapp1:
@@ -52,22 +43,21 @@ databases: {}
 
 ## @section Backup parameters
 ##
-## @param backup {backup} Backup configuration
-## @field backup.enabled {bool} Enable regular backups, default is `false`.
-## @field backup.s3Region {string} AWS S3 region where backups are stored
-## @field backup.s3Bucket {string} S3 bucket used for storing backups
-## @field backup.schedule {string} Cron schedule for automated backups
-## @field backup.cleanupStrategy {string} Retention strategy for cleaning up old backups
-## @field backup.s3AccessKey {string} Access key for S3, used for authentication
-## @field backup.s3SecretKey {string} Secret key for S3, used for authentication
-## @field backup.resticPassword {string} Password for Restic backup encryption
+## @param backup.enabled Enable periodic backups
+## @param backup.s3Region The AWS S3 region where backups are stored
+## @param backup.s3Bucket The S3 bucket used for storing backups
+## @param backup.schedule Cron schedule for automated backups
+## @param backup.cleanupStrategy The strategy for cleaning up old backups
+## @param backup.s3AccessKey The access key for S3, used for authentication
+## @param backup.s3SecretKey The secret key for S3, used for authentication
+## @param backup.resticPassword The password for Restic backup encryption
 backup:
   enabled: false
   s3Region: us-east-1
-  s3Bucket: "s3.example.org/mysql-backups"
+  s3Bucket: s3.example.org/postgres-backups
   schedule: "0 2 * * *"
   cleanupStrategy: "--keep-last=3 --keep-daily=3 --keep-within-weekly=1m"
-  s3AccessKey: "<your-access-key>"
-  s3SecretKey: "<your-secret-key>"
-  resticPassword: "<password>"
+  s3AccessKey: oobaiRus9pah8PhohL1ThaeTa4UVa7gu
+  s3SecretKey: ju3eum4dekeich9ahM1te8waeGai0oog
+  resticPassword: ChaXoveekoh6eigh4siesheeda2quai0
 

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.9.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

packages/apps/nats/Makefile

@@ -1,4 +1,6 @@
 include ../../../scripts/package.mk
+PRESET_ENUM := ["nano","micro","small","medium","large","xlarge","2xlarge"]
 
 generate:
-	cozyvalues-gen -v values.yaml -s values.schema.json -r README.md
+	readme-generator-for-helm -v values.yaml -s values.schema.json -r README.md
+	yq -i -o json --indent 4 '.properties.resourcesPreset.enum = $(PRESET_ENUM)' values.schema.json

packages/apps/nats/README.md

@@ -7,30 +7,23 @@ It provides a data layer for cloud native applications, IoT messaging, and micro
 
 ### Common parameters
 
-| Name               | Description                                                                                                                               | Type        | Value   |
-| ------------------ | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------- | ------- |
-| `replicas`         | Number of replicas                                                                                                                        | `int`       | `2`     |
-| `resources`        | Explicit CPU and memory configuration for each NATS replica. When left empty, the preset defined in `resourcesPreset` is applied.         | `*object`   | `{}`    |
-| `resources.cpu`    | CPU available to each replica                                                                                                             | `*quantity` | `null`  |
-| `resources.memory` | Memory (RAM) available to each replica                                                                                                    | `*quantity` | `null`  |
-| `resourcesPreset`  | Default sizing preset used when `resources` is omitted. Allowed values: `nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`. | `string`    | `nano`  |
-| `storageClass`     | StorageClass used to store the data                                                                                                       | `string`    | `""`    |
-| `external`         | Enable external access from outside the cluster                                                                                           | `bool`      | `false` |
-
+| Name              | Description                                                                                                                       | Value   |
+| ----------------- | --------------------------------------------------------------------------------------------------------------------------------- | ------- |
+| `replicas`        | Number of replicas                                                                                                                | `2`     |
+| `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: nano, micro, small, medium, large, xlarge, 2xlarge.       | `nano`  |
+| `storageClass`    | StorageClass used to store the data                                                                                               | `""`    |
+| `external`        | Enable external access from outside the cluster                                                                                   | `false` |
 
 ### Application-specific parameters
 
-| Name                   | Description                                                                                                    | Type                | Value   |
-| ---------------------- | -------------------------------------------------------------------------------------------------------------- | ------------------- | ------- |
-| `users`                | Users configuration                                                                                            | `map[string]object` | `{...}` |
-| `users[name].password` | Password for the user                                                                                          | `*string`           | `null`  |
-| `jetstream`            | Jetstream configuration                                                                                        | `object`            | `{}`    |
-| `jetstream.enabled`    | Enable or disable Jetstream. Set to `true` (default) to enable Jetstream for persistent messaging in NATS.     | `bool`              | `true`  |
-| `jetstream.size`       | Jetstream persistent storage size. Specifies the size of the persistent storage for Jetstream (message store). | `quantity`          | `10Gi`  |
-| `config`               | NATS configuration                                                                                             | `object`            | `{}`    |
-| `config.merge`         | Additional configuration to merge into NATS config (see example)                                               | `*object`           | `{}`    |
-| `config.resolver`      | Additional resolver configuration to merge into NATS config (see example)                                      | `*object`           | `{}`    |
-
+| Name                | Description                                                               | Value  |
+| ------------------- | ------------------------------------------------------------------------- | ------ |
+| `users`             | Users configuration (see example)                                         | `{}`   |
+| `jetstream.enabled` | Enable or disable Jetstream                                               | `true` |
+| `jetstream.size`    | Jetstream persistent storage size                                         | `10Gi` |
+| `config.merge`      | Additional configuration to merge into NATS config (see example)          | `{}`   |
+| `config.resolver`   | Additional resolver configuration to merge into NATS config (see example) | `{}`   |
 
 ## Parameter examples and reference
 

packages/apps/nats/values.schema.json

@@ -1,136 +1,70 @@
 {
-  "title": "Chart Values",
-  "type": "object",
-  "properties": {
-    "config": {
-      "description": "NATS configuration",
-      "type": "object",
-      "default": {
-        "merge": {},
-        "resolver": {}
-      },
-      "properties": {
-        "merge": {
-          "description": "Additional configuration to merge into NATS config (see example)",
-          "type": "object",
-          "default": {},
-          "x-kubernetes-preserve-unknown-fields": true
-        },
-        "resolver": {
-          "description": "Additional resolver configuration to merge into NATS config (see example)",
-          "type": "object",
-          "default": {},
-          "x-kubernetes-preserve-unknown-fields": true
-        }
-      }
-    },
-    "external": {
-      "description": "Enable external access from outside the cluster",
-      "type": "boolean",
-      "default": false
-    },
-    "jetstream": {
-      "description": "Jetstream configuration",
-      "type": "object",
-      "default": {
-        "enabled": true,
-        "size": "10Gi"
-      },
-      "required": [
-        "enabled",
-        "size"
-      ],
-      "properties": {
-        "enabled": {
-          "description": "Enable or disable Jetstream. Set to `true` (default) to enable Jetstream for persistent messaging in NATS.",
-          "type": "boolean",
-          "default": true
-        },
-        "size": {
-          "description": "Jetstream persistent storage size. Specifies the size of the persistent storage for Jetstream (message store).",
-          "default": "10Gi",
-          "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
-          "anyOf": [
-            {
-              "type": "integer"
+    "properties": {
+        "config": {
+            "properties": {
+                "merge": {
+                    "default": {},
+                    "description": "Additional configuration to merge into NATS config (see example)",
+                    "type": "object"
+                },
+                "resolver": {
+                    "default": {},
+                    "description": "Additional resolver configuration to merge into NATS config (see example)",
+                    "type": "object"
+                }
             },
-            {
-              "type": "string"
-            }
-          ],
-          "x-kubernetes-int-or-string": true
-        }
-      }
-    },
-    "replicas": {
-      "description": "Number of replicas",
-      "type": "integer",
-      "default": 2
-    },
-    "resources": {
-      "description": "Explicit CPU and memory configuration for each NATS replica. When left empty, the preset defined in `resourcesPreset` is applied.",
-      "type": "object",
-      "default": {},
-      "properties": {
-        "cpu": {
-          "description": "CPU available to each replica",
-          "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
+            "type": "object"
         },
-        "memory": {
-          "description": "Memory (RAM) available to each replica",
-          "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
-          "anyOf": [
-            {
-              "type": "integer"
+        "external": {
+            "default": false,
+            "description": "Enable external access from outside the cluster",
+            "type": "boolean"
+        },
+        "jetstream": {
+            "properties": {
+                "enabled": {
+                    "default": true,
+                    "description": "Enable or disable Jetstream",
+                    "type": "boolean"
+                },
+                "size": {
+                    "default": "10Gi",
+                    "description": "Jetstream persistent storage size",
+                    "type": "string"
+                }
             },
-            {
-              "type": "string"
-            }
-          ],
-          "x-kubernetes-int-or-string": true
-        }
-      }
-    },
-    "resourcesPreset": {
-      "description": "Default sizing preset used when `resources` is omitted. Allowed values: `nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`.",
-      "type": "string",
-      "default": "nano",
-      "enum": [
-        "nano",
-        "micro",
-        "small",
-        "medium",
-        "large",
-        "xlarge",
-        "2xlarge"
-      ]
-    },
-    "storageClass": {
-      "description": "StorageClass used to store the data",
-      "type": "string"
-    },
-    "users": {
-      "description": "Users configuration",
-      "type": "object",
-      "default": {},
-      "additionalProperties": {
-        "type": "object",
-        "properties": {
-          "password": {
-            "description": "Password for the user",
+            "type": "object"
+        },
+        "replicas": {
+            "default": 2,
+            "description": "Number of replicas",
+            "type": "number"
+        },
+        "resources": {
+            "default": {},
+            "description": "Explicit CPU and memory configuration for each NATS replica. When left empty, the preset defined in `resourcesPreset` is applied.",
+            "type": "object"
+        },
+        "resourcesPreset": {
+            "default": "nano",
+            "description": "Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge.",
+            "type": "string",
+            "enum": [
+                "nano",
+                "micro",
+                "small",
+                "medium",
+                "large",
+                "xlarge",
+                "2xlarge"
+            ]
+        },
+        "storageClass": {
+            "default": "",
+            "description": "StorageClass used to store the data",
             "type": "string"
-          }
         }
-      }
-    }
-  }
-}
+    },
+    "title": "Chart Values",
+    "type": "object"
+}

packages/apps/nats/values.yaml

@@ -1,25 +1,22 @@
 ## @section Common parameters
 ##
-## @param replicas {int} Number of replicas
+## @param replicas Number of replicas
 replicas: 2
-## @param resources {*resources} Explicit CPU and memory configuration for each NATS replica. When left empty, the preset defined in `resourcesPreset` is applied.
-## @field resources.cpu {*quantity} CPU available to each replica
-## @field resources.memory {*quantity} Memory (RAM) available to each replica
+## @param resources Explicit CPU and memory configuration for each NATS replica. When left empty, the preset defined in `resourcesPreset` is applied.
 resources: {}
   # resources:
   #   cpu: 4000m
   #   memory: 4Gi
-## @param resourcesPreset {string enum:"nano,micro,small,medium,large,xlarge,2xlarge"} Default sizing preset used when `resources` is omitted. Allowed values: `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"
-## @param storageClass {string} StorageClass used to store the data
+## @param storageClass StorageClass used to store the data
 storageClass: ""
-## @param external {bool} Enable external access from outside the cluster
+## @param external Enable external access from outside the cluster
 external: false
 
 ## @section Application-specific parameters
 ##
-## @param users {map[string]user} Users configuration
-## @field user.password {*string} Password for the user
+## @param users [object] Users configuration (see example)
 ## Example:
 ## users:
 ##   user1:
@@ -27,19 +24,18 @@ external: false
 ##   user2: {}
 users: {}
 
-## @param jetstream {jetstream} Jetstream configuration
 jetstream:
-  ## @field jetstream.enabled {bool} Enable or disable Jetstream. Set to `true` (default) to enable Jetstream for persistent messaging in NATS.
-  ##
+  ## @param jetstream.enabled Enable or disable Jetstream
+  ## Set to true to enable Jetstream for persistent messaging in NATS.
   ## Default: true
   enabled: true
-  ## @field jetstream.size {quantity} Jetstream persistent storage size. Specifies the size of the persistent storage for Jetstream (message store).
-  ##
+  ## @param jetstream.size Jetstream persistent storage size
+  ## Specifies the size of the persistent storage for Jetstream (message store).
+  ## Default: 10Gi
   size: 10Gi
 
-## @param config {config} NATS configuration
 config:
-  ## @field config.merge {*object} Additional configuration to merge into NATS config (see example)
+  ## @param config.merge Additional configuration to merge into NATS config (see example)
   ## Allows you to customize NATS server settings by merging additional configurations.
   ## For example, you can add extra parameters, configure authentication, or set custom settings.
   ## Default: {}
@@ -67,7 +63,7 @@ config:
   ##   include ./my-config-last.conf;
   ## }
   merge: {}
-  ## @field config.resolver {*object} Additional resolver configuration to merge into NATS config (see example)
+  ## @param config.resolver Additional resolver configuration to merge into NATS config (see example)
   ## Allows you to customize NATS server settings by merging resolver configurations.
   ## Default: {}
   ## Example: https://github.com/nats-io/k8s/blob/94414664c254b0bbac3a07fc9693f6c4f8f88709/helm/charts/nats/values.yaml#L248-L270

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.18.0
+version: 0.17.3
 
 # 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

packages/apps/postgres/Makefile

@@ -1,4 +1,6 @@
 include ../../../scripts/package.mk
+PRESET_ENUM := ["nano","micro","small","medium","large","xlarge","2xlarge"]
 
 generate:
-	cozyvalues-gen -v values.yaml -s values.schema.json -r README.md
+	readme-generator-for-helm -v values.yaml -s values.schema.json -r README.md
+	yq -i -o json --indent 4 '.properties.resourcesPreset.enum = $(PRESET_ENUM)' values.schema.json

packages/apps/postgres/README.md

@@ -66,61 +66,44 @@ See:
 
 ### Common parameters
 
-| Name               | Description                                                                                                                               | Type        | Value   |
-| ------------------ | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------- | ------- |
-| `replicas`         | Number of Postgres replicas                                                                                                               | `int`       | `2`     |
-| `resources`        | Explicit CPU and memory configuration for each PostgreSQL replica. When left empty, the preset defined in `resourcesPreset` is applied.   | `*object`   | `{}`    |
-| `resources.cpu`    | CPU available to each replica                                                                                                             | `*quantity` | `null`  |
-| `resources.memory` | Memory (RAM) available to each replica                                                                                                    | `*quantity` | `null`  |
-| `resourcesPreset`  | Default sizing preset used when `resources` is omitted. Allowed values: `nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`. | `string`    | `micro` |
-| `size`             | Persistent Volume Claim size, available for application data                                                                              | `quantity`  | `10Gi`  |
-| `storageClass`     | StorageClass used to store the data                                                                                                       | `string`    | `""`    |
-| `external`         | Enable external access from outside the cluster                                                                                           | `bool`      | `false` |
-
+| Name              | Description                                                                                                                             | Value   |
+| ----------------- | --------------------------------------------------------------------------------------------------------------------------------------- | ------- |
+| `replicas`        | Number of Postgres replicas                                                                                                             | `2`     |
+| `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: nano, micro, small, medium, large, xlarge, 2xlarge.             | `micro` |
+| `size`            | Persistent Volume size                                                                                                                  | `10Gi`  |
+| `storageClass`    | StorageClass used to store the data                                                                                                     | `""`    |
+| `external`        | Enable external access from outside the cluster                                                                                         | `false` |
 
 ### Application-specific parameters
 
-| Name                                    | Description                                                                                                              | Type                | Value   |
-| --------------------------------------- | ------------------------------------------------------------------------------------------------------------------------ | ------------------- | ------- |
-| `postgresql`                            | PostgreSQL server configuration                                                                                          | `object`            | `{}`    |
-| `postgresql.parameters`                 | PostgreSQL server parameters                                                                                             | `object`            | `{}`    |
-| `postgresql.parameters.max_connections` | Determines the maximum number of concurrent connections to the database server. The default is typically 100 connections | `int`               | `100`   |
-| `quorum`                                | Quorum configuration for synchronous replication                                                                         | `object`            | `{}`    |
-| `quorum.minSyncReplicas`                | Minimum number of synchronous replicas that must acknowledge a transaction before it is considered committed.            | `int`               | `0`     |
-| `quorum.maxSyncReplicas`                | Maximum number of synchronous replicas that can acknowledge a transaction (must be lower than the number of instances).  | `int`               | `0`     |
-| `users`                                 | Users configuration                                                                                                      | `map[string]object` | `{...}` |
-| `users[name].password`                  | Password for the user                                                                                                    | `*string`           | `null`  |
-| `users[name].replication`               | Whether the user has replication privileges                                                                              | `*bool`             | `null`  |
-| `databases`                             | Databases configuration                                                                                                  | `map[string]object` | `{...}` |
-| `databases[name].roles`                 | Roles for the database                                                                                                   | `*object`           | `null`  |
-| `databases[name].roles.admin`           | List of users with admin privileges                                                                                      | `[]string`          | `[]`    |
-| `databases[name].roles.readonly`        | List of users with read-only privileges                                                                                  | `[]string`          | `[]`    |
-| `databases[name].extensions`            | Extensions enabled for the database                                                                                      | `[]string`          | `[]`    |
-
+| Name                                    | Description                                                                                                              | Value |
+| --------------------------------------- | ------------------------------------------------------------------------------------------------------------------------ | ----- |
+| `postgresql.parameters.max_connections` | Determines the maximum number of concurrent connections to the database server. The default is typically 100 connections | `100` |
+| `quorum.minSyncReplicas`                | Minimum number of synchronous replicas that must acknowledge a transaction before it is considered committed.            | `0`   |
+| `quorum.maxSyncReplicas`                | Maximum number of synchronous replicas that can acknowledge a transaction (must be lower than the number of instances).  | `0`   |
+| `users`                                 | Users configuration                                                                                                      | `{}`  |
+| `databases`                             | Databases configuration                                                                                                  | `{}`  |
 
 ### Backup parameters
 
-| Name                     | Description                                                | Type      | Value                               |
-| ------------------------ | ---------------------------------------------------------- | --------- | ----------------------------------- |
-| `backup`                 | Backup configuration                                       | `object`  | `{}`                                |
-| `backup.enabled`         | Enable regular backups                                     | `*bool`   | `false`                             |
-| `backup.schedule`        | Cron schedule for automated backups                        | `*string` | `0 2 * * * *`                       |
-| `backup.retentionPolicy` | Retention policy                                           | `*string` | `30d`                               |
-| `backup.destinationPath` | Path to store the backup (i.e. s3://bucket/path/to/folder) | `*string` | `s3://bucket/path/to/folder/`       |
-| `backup.endpointURL`     | S3 Endpoint used to upload data to the cloud               | `*string` | `http://minio-gateway-service:9000` |
-| `backup.s3AccessKey`     | Access key for S3, used for authentication                 | `*string` | `<your-access-key>`                 |
-| `backup.s3SecretKey`     | Secret key for S3, used for authentication                 | `*string` | `<your-secret-key>`                 |
-
+| Name                     | Description                                                | Value                               |
+| ------------------------ | ---------------------------------------------------------- | ----------------------------------- |
+| `backup.enabled`         | Enable regular backups                                     | `false`                             |
+| `backup.schedule`        | Cron schedule for automated backups                        | `0 2 * * * *`                       |
+| `backup.retentionPolicy` | Retention policy                                           | `30d`                               |
+| `backup.destinationPath` | Path to store the backup (i.e. s3://bucket/path/to/folder) | `s3://bucket/path/to/folder/`       |
+| `backup.endpointURL`     | S3 Endpoint used to upload data to the cloud               | `http://minio-gateway-service:9000` |
+| `backup.s3AccessKey`     | Access key for S3, used for authentication                 | `oobaiRus9pah8PhohL1ThaeTa4UVa7gu`  |
+| `backup.s3SecretKey`     | Secret key for S3, used for authentication                 | `ju3eum4dekeich9ahM1te8waeGai0oog`  |
 
 ### Bootstrap (recovery) parameters
 
-| Name                     | Description                                                                                                          | Type      | Value   |
-| ------------------------ | -------------------------------------------------------------------------------------------------------------------- | --------- | ------- |
-| `bootstrap`              | Bootstrap configuration                                                                                              | `object`  | `{}`    |
-| `bootstrap.enabled`      | Restore database cluster from a backup                                                                               | `bool`    | `false` |
-| `bootstrap.recoveryTime` | Timestamp (PITR) up to which recovery will proceed, expressed in RFC 3339 format. If left empty, will restore latest | `*string` | `""`    |
-| `bootstrap.oldName`      | Name of database cluster before deleting                                                                             | `string`  | `""`    |
-
+| Name                     | Description                                                                                                          | Value   |
+| ------------------------ | -------------------------------------------------------------------------------------------------------------------- | ------- |
+| `bootstrap.enabled`      | Restore database cluster from a backup                                                                               | `false` |
+| `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                                                                             | `""`    |
 
 ## Parameter examples and reference
 

packages/apps/postgres/values.schema.json

@@ -1,269 +1,140 @@
 {
-  "title": "Chart Values",
-  "type": "object",
-  "properties": {
-    "backup": {
-      "description": "Backup configuration",
-      "type": "object",
-      "default": {
-        "destinationPath": "s3://bucket/path/to/folder/",
-        "enabled": false,
-        "endpointURL": "http://minio-gateway-service:9000",
-        "retentionPolicy": "30d",
-        "s3AccessKey": "\u003cyour-access-key\u003e",
-        "s3SecretKey": "\u003cyour-secret-key\u003e",
-        "schedule": "0 2 * * * *"
-      },
-      "properties": {
-        "destinationPath": {
-          "description": "Path to store the backup (i.e. s3://bucket/path/to/folder)",
-          "type": "string",
-          "default": "s3://bucket/path/to/folder/"
-        },
-        "enabled": {
-          "description": "Enable regular backups",
-          "type": "boolean",
-          "default": false
-        },
-        "endpointURL": {
-          "description": "S3 Endpoint used to upload data to the cloud",
-          "type": "string",
-          "default": "http://minio-gateway-service:9000"
-        },
-        "retentionPolicy": {
-          "description": "Retention policy",
-          "type": "string",
-          "default": "30d"
-        },
-        "s3AccessKey": {
-          "description": "Access key for S3, used for authentication",
-          "type": "string",
-          "default": "\u003cyour-access-key\u003e"
-        },
-        "s3SecretKey": {
-          "description": "Secret key for S3, used for authentication",
-          "type": "string",
-          "default": "\u003cyour-secret-key\u003e"
-        },
-        "schedule": {
-          "description": "Cron schedule for automated backups",
-          "type": "string",
-          "default": "0 2 * * * *"
-        }
-      }
-    },
-    "bootstrap": {
-      "description": "Bootstrap configuration",
-      "type": "object",
-      "default": {
-        "enabled": false,
-        "oldName": "",
-        "recoveryTime": ""
-      },
-      "required": [
-        "enabled",
-        "oldName"
-      ],
-      "properties": {
-        "enabled": {
-          "description": "Restore database cluster from a backup",
-          "type": "boolean",
-          "default": false
-        },
-        "oldName": {
-          "description": "Name of database cluster before deleting",
-          "type": "string"
-        },
-        "recoveryTime": {
-          "description": "Timestamp (PITR) up to which recovery will proceed, expressed in RFC 3339 format. If left empty, will restore latest",
-          "type": "string"
-        }
-      }
-    },
-    "databases": {
-      "description": "Databases configuration",
-      "type": "object",
-      "default": {},
-      "additionalProperties": {
-        "type": "object",
-        "properties": {
-          "extensions": {
-            "description": "Extensions enabled for the database",
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
-          },
-          "roles": {
-            "description": "Roles for the database",
-            "type": "object",
+    "properties": {
+        "backup": {
             "properties": {
-              "admin": {
-                "description": "List of users with admin privileges",
-                "type": "array",
-                "items": {
-                  "type": "string"
+                "destinationPath": {
+                    "default": "s3://bucket/path/to/folder/",
+                    "description": "Path to store the backup (i.e. s3://bucket/path/to/folder)",
+                    "type": "string"
+                },
+                "enabled": {
+                    "default": false,
+                    "description": "Enable regular backups",
+                    "type": "boolean"
+                },
+                "endpointURL": {
+                    "default": "http://minio-gateway-service:9000",
+                    "description": "S3 Endpoint used to upload data to the cloud",
+                    "type": "string"
+                },
+                "retentionPolicy": {
+                    "default": "30d",
+                    "description": "Retention policy",
+                    "type": "string"
+                },
+                "s3AccessKey": {
+                    "default": "oobaiRus9pah8PhohL1ThaeTa4UVa7gu",
+                    "description": "Access key for S3, used for authentication",
+                    "type": "string"
+                },
+                "s3SecretKey": {
+                    "default": "ju3eum4dekeich9ahM1te8waeGai0oog",
+                    "description": "Secret key for S3, used for authentication",
+                    "type": "string"
+                },
+                "schedule": {
+                    "default": "0 2 * * * *",
+                    "description": "Cron schedule for automated backups",
+                    "type": "string"
                 }
-              },
-              "readonly": {
-                "description": "List of users with read-only privileges",
-                "type": "array",
-                "items": {
-                  "type": "string"
+            },
+            "type": "object"
+        },
+        "bootstrap": {
+            "properties": {
+                "enabled": {
+                    "default": false,
+                    "description": "Restore database cluster from a backup",
+                    "type": "boolean"
+                },
+                "oldName": {
+                    "default": "",
+                    "description": "Name of database cluster before deleting",
+                    "type": "string"
+                },
+                "recoveryTime": {
+                    "default": "",
+                    "description": "Timestamp (PITR) up to which recovery will proceed, expressed in RFC 3339 format. If left empty, will restore latest",
+                    "type": "string"
                 }
-              }
-            }
-          }
-        }
-      }
-    },
-    "external": {
-      "description": "Enable external access from outside the cluster",
-      "type": "boolean",
-      "default": false
-    },
-    "postgresql": {
-      "description": "PostgreSQL server configuration",
-      "type": "object",
-      "default": {
-        "parameters": {
-          "max_connections": 100
-        }
-      },
-      "required": [
-        "parameters"
-      ],
-      "properties": {
-        "parameters": {
-          "description": "PostgreSQL server parameters",
-          "type": "object",
-          "default": {
-            "max_connections": 100
-          },
-          "required": [
-            "max_connections"
-          ],
-          "properties": {
-            "max_connections": {
-              "description": "Determines the maximum number of concurrent connections to the database server. The default is typically 100 connections",
-              "type": "integer",
-              "default": 100
-            }
-          }
-        }
-      }
-    },
-    "quorum": {
-      "description": "Quorum configuration for synchronous replication",
-      "type": "object",
-      "default": {
-        "maxSyncReplicas": 0,
-        "minSyncReplicas": 0
-      },
-      "required": [
-        "maxSyncReplicas",
-        "minSyncReplicas"
-      ],
-      "properties": {
-        "maxSyncReplicas": {
-          "description": "Maximum number of synchronous replicas that can acknowledge a transaction (must be lower than the number of instances).",
-          "type": "integer",
-          "default": 0
-        },
-        "minSyncReplicas": {
-          "description": "Minimum number of synchronous replicas that must acknowledge a transaction before it is considered committed.",
-          "type": "integer",
-          "default": 0
-        }
-      }
-    },
-    "replicas": {
-      "description": "Number of Postgres replicas",
-      "type": "integer",
-      "default": 2
-    },
-    "resources": {
-      "description": "Explicit CPU and memory configuration for each PostgreSQL replica. When left empty, the preset defined in `resourcesPreset` is applied.",
-      "type": "object",
-      "default": {},
-      "properties": {
-        "cpu": {
-          "description": "CPU available to each replica",
-          "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
+            "type": "object"
         },
-        "memory": {
-          "description": "Memory (RAM) available to each replica",
-          "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
-        }
-      }
-    },
-    "resourcesPreset": {
-      "description": "Default sizing preset used when `resources` is omitted. Allowed values: `nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`.",
-      "type": "string",
-      "default": "micro",
-      "enum": [
-        "nano",
-        "micro",
-        "small",
-        "medium",
-        "large",
-        "xlarge",
-        "2xlarge"
-      ]
-    },
-    "size": {
-      "description": "Persistent Volume Claim size, available for application data",
-      "default": "10Gi",
-      "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
-      "anyOf": [
-        {
-          "type": "integer"
+        "databases": {
+            "default": {},
+            "description": "Databases configuration",
+            "type": "object"
         },
-        {
-          "type": "string"
-        }
-      ],
-      "x-kubernetes-int-or-string": true
-    },
-    "storageClass": {
-      "description": "StorageClass used to store the data",
-      "type": "string"
-    },
-    "users": {
-      "description": "Users configuration",
-      "type": "object",
-      "default": {},
-      "additionalProperties": {
-        "type": "object",
-        "properties": {
-          "password": {
-            "description": "Password for the user",
-            "type": "string"
-          },
-          "replication": {
-            "description": "Whether the user has replication privileges",
+        "external": {
+            "default": false,
+            "description": "Enable external access from outside the cluster",
             "type": "boolean"
-          }
+        },
+        "postgresql": {
+            "properties": {
+                "parameters": {
+                    "properties": {
+                        "max_connections": {
+                            "default": 100,
+                            "description": "Determines the maximum number of concurrent connections to the database server. The default is typically 100 connections",
+                            "type": "number"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "quorum": {
+            "properties": {
+                "maxSyncReplicas": {
+                    "default": 0,
+                    "description": "Maximum number of synchronous replicas that can acknowledge a transaction (must be lower than the number of instances).",
+                    "type": "number"
+                },
+                "minSyncReplicas": {
+                    "default": 0,
+                    "description": "Minimum number of synchronous replicas that must acknowledge a transaction before it is considered committed.",
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "replicas": {
+            "default": 2,
+            "description": "Number of Postgres replicas",
+            "type": "number"
+        },
+        "resources": {
+            "default": {},
+            "description": "Explicit CPU and memory configuration for each PostgreSQL replica. When left empty, the preset defined in `resourcesPreset` is applied.",
+            "type": "object"
+        },
+        "resourcesPreset": {
+            "default": "micro",
+            "description": "Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge.",
+            "type": "string",
+            "enum": [
+                "nano",
+                "micro",
+                "small",
+                "medium",
+                "large",
+                "xlarge",
+                "2xlarge"
+            ]
+        },
+        "size": {
+            "default": "10Gi",
+            "description": "Persistent Volume size",
+            "type": "string"
+        },
+        "storageClass": {
+            "default": "",
+            "description": "StorageClass used to store the data",
+            "type": "string"
         }
-      }
-    }
-  }
-}
+    },
+    "title": "Chart Values",
+    "type": "object"
+}

packages/apps/postgres/values.yaml

@@ -1,44 +1,36 @@
 ## @section Common parameters
 ##
-## @param replicas {int} Number of Postgres replicas
+## @param replicas Number of Postgres replicas
 replicas: 2
-## @param resources {*resources} Explicit CPU and memory configuration for each PostgreSQL replica. When left empty, the preset defined in `resourcesPreset` is applied.
-## @field resources.cpu {*quantity} CPU available to each replica
-## @field resources.memory {*quantity} Memory (RAM) available to each replica
+## @param resources Explicit CPU and memory configuration for each PostgreSQL replica. When left empty, the preset defined in `resourcesPreset` is applied.
 resources: {}
   # resources:
   #   cpu: 4000m
   #   memory: 4Gi
-## @param resourcesPreset {string enum:"nano,micro,small,medium,large,xlarge,2xlarge"} Default sizing preset used when `resources` is omitted. Allowed values: `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"
-## @param size {quantity} Persistent Volume Claim size, available for application data
+## @param size Persistent Volume size
 size: 10Gi
-## @param storageClass {string} StorageClass used to store the data
+## @param storageClass StorageClass used to store the data
 storageClass: ""
-## @param external {bool} Enable external access from outside the cluster
+## @param external Enable external access from outside the cluster
 external: false
 
+
 ## @section Application-specific parameters
-## @param postgresql {postgresql} PostgreSQL server configuration
-## @field postgresql.parameters {postgresqlParameters} PostgreSQL server parameters
-## @field postgresqlParameters.max_connections {int} Determines the maximum number of concurrent connections to the database server. The default is typically 100 connections
 ##
+## @param postgresql.parameters.max_connections Determines the maximum number of concurrent connections to the database server. The default is typically 100 connections
 postgresql:
   parameters:
     max_connections: 100
 
-## Configuration for the quorum-based synchronous replication
-## @param quorum {quorum} Quorum configuration for synchronous replication
-## @field quorum.minSyncReplicas {int} Minimum number of synchronous replicas that must acknowledge a transaction before it is considered committed.
-## @field quorum.maxSyncReplicas {int} Maximum number of synchronous replicas that can acknowledge a transaction (must be lower than the number of instances).
+## @param quorum.minSyncReplicas Minimum number of synchronous replicas that must acknowledge a transaction before it is considered committed.
+## @param quorum.maxSyncReplicas Maximum number of synchronous replicas that can acknowledge a transaction (must be lower than the number of instances).
 quorum:
   minSyncReplicas: 0
   maxSyncReplicas: 0
 
-## @param users {map[string]user} Users configuration
-## @field user.password {*string} Password for the user
-## @field user.replication {*bool} Whether the user has replication privileges
-##
+## @param users [object] Users configuration
 ## Example:
 ## users:
 ##   user1:
@@ -52,12 +44,7 @@ quorum:
 ##
 users: {}
 
-## @param databases {map[string]database} Databases configuration
-## @field database.roles {*databaseRoles} Roles for the database
-## @field databaseRoles.admin {[]string} List of users with admin privileges
-## @field databaseRoles.readonly {[]string} List of users with read-only privileges
-## @field database.extensions {[]string} Extensions enabled for the database
-##
+## @param databases Databases configuration
 ## Example:
 ## databases:
 ##   myapp:
@@ -77,29 +64,27 @@ databases: {}
 
 ## @section Backup parameters
 
-## @param backup {backup} Backup configuration
-## @field backup.enabled {*bool} Enable regular backups
-## @field backup.schedule {*string} Cron schedule for automated backups
-## @field backup.retentionPolicy {*string} Retention policy
-## @field backup.destinationPath {*string} Path to store the backup (i.e. s3://bucket/path/to/folder)
-## @field backup.endpointURL {*string} S3 Endpoint used to upload data to the cloud
-## @field backup.s3AccessKey {*string} Access key for S3, used for authentication
-## @field backup.s3SecretKey {*string} Secret key for S3, used for authentication
+## @param backup.enabled Enable regular backups
+## @param backup.schedule Cron schedule for automated backups
+## @param backup.retentionPolicy Retention policy
+## @param backup.destinationPath Path to store the backup (i.e. s3://bucket/path/to/folder)
+## @param backup.endpointURL S3 Endpoint used to upload data to the cloud
+## @param backup.s3AccessKey Access key for S3, used for authentication
+## @param backup.s3SecretKey Secret key for S3, used for authentication
 backup:
   enabled: false
   retentionPolicy: 30d
-  destinationPath: "s3://bucket/path/to/folder/"
-  endpointURL: "http://minio-gateway-service:9000"
+  destinationPath: s3://bucket/path/to/folder/
+  endpointURL: http://minio-gateway-service:9000
   schedule: "0 2 * * * *"
-  s3AccessKey: "<your-access-key>"
-  s3SecretKey: "<your-secret-key>"
+  s3AccessKey: oobaiRus9pah8PhohL1ThaeTa4UVa7gu
+  s3SecretKey: ju3eum4dekeich9ahM1te8waeGai0oog
 
 ## @section Bootstrap (recovery) parameters
 
-## @param bootstrap {bootstrap} Bootstrap configuration
-## @field bootstrap.enabled {bool} Restore database cluster from a backup
-## @field bootstrap.recoveryTime {*string} Timestamp (PITR) up to which recovery will proceed, expressed in RFC 3339 format. If left empty, will restore latest
-## @field bootstrap.oldName {string} Name of database cluster before deleting
+## @param bootstrap.enabled Restore database cluster from a backup
+## @param bootstrap.recoveryTime Timestamp (PITR) up to which recovery will proceed, expressed in RFC 3339 format. If left empty, will restore latest
+## @param bootstrap.oldName Name of database cluster before deleting
 ##
 bootstrap:
   enabled: false

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.9.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

packages/apps/rabbitmq/Makefile

@@ -1,4 +1,6 @@
 include ../../../scripts/package.mk
+PRESET_ENUM := ["nano","micro","small","medium","large","xlarge","2xlarge"]
 
 generate:
-	cozyvalues-gen -v values.yaml -s values.schema.json -r README.md
+	readme-generator-for-helm -v values.yaml -s values.schema.json -r README.md
+	yq -i -o json --indent 4 '.properties.resourcesPreset.enum = $(PRESET_ENUM)' values.schema.json

packages/apps/rabbitmq/README.md

@@ -13,29 +13,21 @@ The service utilizes official RabbitMQ operator. This ensures the reliability an
 
 ### Common parameters
 
-| Name               | Description                                                                                                                               | Type        | Value   |
-| ------------------ | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------- | ------- |
-| `replicas`         | Number of RabbitMQ replicas                                                                                                               | `int`       | `3`     |
-| `resources`        | Explicit CPU and memory configuration for each RabbitMQ replica.  When left empty, the preset defined in `resourcesPreset` is applied.    | `*object`   | `{}`    |
-| `resources.cpu`    | CPU available to each replica                                                                                                             | `*quantity` | `null`  |
-| `resources.memory` | Memory (RAM) available to each replica                                                                                                    | `*quantity` | `null`  |
-| `resourcesPreset`  | Default sizing preset used when `resources` is omitted. Allowed values: `nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`. | `string`    | `nano`  |
-| `size`             | Persistent Volume Claim size, available for application data                                                                              | `quantity`  | `10Gi`  |
-| `storageClass`     | StorageClass used to store the data                                                                                                       | `string`    | `""`    |
-| `external`         | Enable external access from outside the cluster                                                                                           | `bool`      | `false` |
-
+| Name              | Description                                                                                                                           | Value   |
+| ----------------- | ------------------------------------------------------------------------------------------------------------------------------------- | ------- |
+| `replicas`        | Number of RabbitMQ replicas                                                                                                           | `3`     |
+| `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: nano, micro, small, medium, large, xlarge, 2xlarge.           | `nano`  |
+| `size`            | Persistent Volume size                                                                                                                | `10Gi`  |
+| `storageClass`    | StorageClass used to store the data                                                                                                   | `""`    |
+| `external`        | Enable external access from outside the cluster                                                                                       | `false` |
 
 ### Application-specific parameters
 
-| Name                          | Description                 | Type                | Value   |
-| ----------------------------- | --------------------------- | ------------------- | ------- |
-| `users`                       | Users configuration         | `map[string]object` | `{...}` |
-| `users[name].password`        | Password for the user       | `*string`           | `null`  |
-| `vhosts`                      | Virtual Hosts configuration | `map[string]object` | `{...}` |
-| `vhosts[name].roles`          | Virtual host roles list     | `object`            | `{}`    |
-| `vhosts[name].roles.admin`    | List of admin users         | `[]string`          | `[]`    |
-| `vhosts[name].roles.readonly` | List of readonly users      | `[]string`          | `[]`    |
-
+| Name     | Description                 | Value |
+| -------- | --------------------------- | ----- |
+| `users`  | Users configuration         | `{}`  |
+| `vhosts` | Virtual Hosts configuration | `{}`  |
 
 ## Parameter examples and reference
 

packages/apps/rabbitmq/values.schema.json

@@ -1,128 +1,50 @@
 {
-  "title": "Chart Values",
-  "type": "object",
-  "properties": {
-    "external": {
-      "description": "Enable external access from outside the cluster",
-      "type": "boolean",
-      "default": false
-    },
-    "replicas": {
-      "description": "Number of RabbitMQ replicas",
-      "type": "integer",
-      "default": 3
-    },
-    "resources": {
-      "description": "Explicit CPU and memory configuration for each RabbitMQ replica.  When left empty, the preset defined in `resourcesPreset` is applied.",
-      "type": "object",
-      "default": {},
-      "properties": {
-        "cpu": {
-          "description": "CPU available to each replica",
-          "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
+    "properties": {
+        "external": {
+            "default": false,
+            "description": "Enable external access from outside the cluster",
+            "type": "boolean"
         },
-        "memory": {
-          "description": "Memory (RAM) available to each replica",
-          "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
-        }
-      }
-    },
-    "resourcesPreset": {
-      "description": "Default sizing preset used when `resources` is omitted. Allowed values: `nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`.",
-      "type": "string",
-      "default": "nano",
-      "enum": [
-        "nano",
-        "micro",
-        "small",
-        "medium",
-        "large",
-        "xlarge",
-        "2xlarge"
-      ]
-    },
-    "size": {
-      "description": "Persistent Volume Claim size, available for application data",
-      "default": "10Gi",
-      "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
-      "anyOf": [
-        {
-          "type": "integer"
+        "replicas": {
+            "default": 3,
+            "description": "Number of RabbitMQ replicas",
+            "type": "number"
         },
-        {
-          "type": "string"
-        }
-      ],
-      "x-kubernetes-int-or-string": true
-    },
-    "storageClass": {
-      "description": "StorageClass used to store the data",
-      "type": "string"
-    },
-    "users": {
-      "description": "Users configuration",
-      "type": "object",
-      "default": {},
-      "additionalProperties": {
-        "type": "object",
-        "properties": {
-          "password": {
-            "description": "Password for the user",
+        "resources": {
+            "default": {},
+            "description": "Explicit CPU and memory configuration for each RabbitMQ replica. When left empty, the preset defined in `resourcesPreset` is applied.",
+            "type": "object"
+        },
+        "resourcesPreset": {
+            "default": "nano",
+            "description": "Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge.",
+            "type": "string",
+            "enum": [
+                "nano",
+                "micro",
+                "small",
+                "medium",
+                "large",
+                "xlarge",
+                "2xlarge"
+            ]
+        },
+        "size": {
+            "default": "10Gi",
+            "description": "Persistent Volume size",
             "type": "string"
-          }
+        },
+        "storageClass": {
+            "default": "",
+            "description": "StorageClass used to store the data",
+            "type": "string"
+        },
+        "vhosts": {
+            "default": {},
+            "description": "Virtual Hosts configuration",
+            "type": "object"
         }
-      }
     },
-    "vhosts": {
-      "description": "Virtual Hosts configuration",
-      "type": "object",
-      "default": {},
-      "additionalProperties": {
-        "type": "object",
-        "required": [
-          "roles"
-        ],
-        "properties": {
-          "roles": {
-            "description": "Virtual host roles list",
-            "type": "object",
-            "properties": {
-              "admin": {
-                "description": "List of admin users",
-                "type": "array",
-                "items": {
-                  "type": "string"
-                }
-              },
-              "readonly": {
-                "description": "List of readonly users",
-                "type": "array",
-                "items": {
-                  "type": "string"
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
+    "title": "Chart Values",
+    "type": "object"
+}

packages/apps/rabbitmq/values.yaml

@@ -1,29 +1,25 @@
 ## @section Common parameters
 ##
-## @param replicas {int} Number of RabbitMQ replicas
+## @param replicas Number of RabbitMQ replicas
 replicas: 3
-## @param resources {*resources} Explicit CPU and memory configuration for each RabbitMQ replica.  When left empty, the preset defined in `resourcesPreset` is applied.
-## @field resources.cpu {*quantity} CPU available to each replica
-## @field resources.memory {*quantity} Memory (RAM) available to each replica
-# resources:
-#   cpu: 4000m
-#   memory: 4Gi
+## @param resources Explicit CPU and memory configuration for each RabbitMQ replica. When left empty, the preset defined in `resourcesPreset` is applied.
 resources: {}
-
-## @param resourcesPreset {string enum:"nano,micro,small,medium,large,xlarge,2xlarge"} Default sizing preset used when `resources` is omitted. Allowed values: `nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`.
+  # resources:
+  #   cpu: 4000m
+  #   memory: 4Gi
+## @param resourcesPreset Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge.
 resourcesPreset: "nano"
-## @param size {quantity} Persistent Volume Claim size, available for application data
+## @param size Persistent Volume size
 size: 10Gi
-## @param storageClass {string} StorageClass used to store the data
+## @param storageClass StorageClass used to store the data
 storageClass: ""
-## @param external {bool} Enable external access from outside the cluster
+## @param external Enable external access from outside the cluster
 external: false
 
 
 ## @section Application-specific parameters
 ##
-## @param users {map[string]user} Users configuration
-## @field user.password {*string} Password for the user
+## @param users [object] Users configuration
 ## Example:
 ## users:
 ##   user1:
@@ -35,11 +31,7 @@ external: false
 ##
 users: {}
 
-## @param vhosts {map[string]vhost} Virtual Hosts configuration
-## @field vhost.roles {roles} Virtual host roles list
-## @field roles.admin {[]string} List of admin users
-## @field roles.readonly {[]string} List of readonly users
-##
+## @param vhosts Virtual Hosts configuration
 ## Example:
 ## vhosts:
 ##   myapp:

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.10.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

packages/apps/redis/Makefile

@@ -1,4 +1,6 @@
 include ../../../scripts/package.mk
+PRESET_ENUM := ["nano","micro","small","medium","large","xlarge","2xlarge"]
 
 generate:
-	cozyvalues-gen -v values.yaml -s values.schema.json -r README.md
+	readme-generator-for-helm -v values.yaml -s values.schema.json -r README.md
+	yq -i -o json --indent 4 '.properties.resourcesPreset.enum = $(PRESET_ENUM)' values.schema.json

packages/apps/redis/README.md

@@ -13,24 +13,20 @@ Service utilizes the Spotahome Redis Operator for efficient management and orche
 
 ### Common parameters
 
-| Name               | Description                                                                                                                               | Type        | Value   |
-| ------------------ | ----------------------------------------------------------------------------------------------------------------------------------------- | ----------- | ------- |
-| `replicas`         | Number of Redis replicas                                                                                                                  | `int`       | `2`     |
-| `resources`        | Explicit CPU and memory configuration for each Redis replica.  When left empty, the preset defined in `resourcesPreset` is applied.       | `*object`   | `{}`    |
-| `resources.cpu`    | CPU available to each replica                                                                                                             | `*quantity` | `null`  |
-| `resources.memory` | Memory (RAM) available to each replica                                                                                                    | `*quantity` | `null`  |
-| `resourcesPreset`  | Default sizing preset used when `resources` is omitted. Allowed values: `nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`. | `string`    | `nano`  |
-| `size`             | Persistent Volume Claim size, available for application data                                                                              | `quantity`  | `1Gi`   |
-| `storageClass`     | StorageClass used to store the data                                                                                                       | `string`    | `""`    |
-| `external`         | Enable external access from outside the cluster                                                                                           | `bool`      | `false` |
-
+| Name              | Description                                                                                                                        | Value   |
+| ----------------- | ---------------------------------------------------------------------------------------------------------------------------------- | ------- |
+| `replicas`        | Number of Redis replicas                                                                                                           | `2`     |
+| `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: nano, micro, small, medium, large, xlarge, 2xlarge.        | `nano`  |
+| `size`            | Persistent Volume size                                                                                                             | `1Gi`   |
+| `storageClass`    | StorageClass used to store the data                                                                                                | `""`    |
+| `external`        | Enable external access from outside the cluster                                                                                    | `false` |
 
 ### Application-specific parameters
 
-| Name          | Description                | Type   | Value  |
-| ------------- | -------------------------- | ------ | ------ |
-| `authEnabled` | Enable password generation | `bool` | `true` |
-
+| Name          | Description                | Value  |
+| ------------- | -------------------------- | ------ |
+| `authEnabled` | Enable password generation | `true` |
 
 ## Parameter examples and reference
 

packages/apps/redis/values.schema.json

@@ -1,86 +1,50 @@
 {
-  "title": "Chart Values",
-  "type": "object",
-  "properties": {
-    "authEnabled": {
-      "description": "Enable password generation",
-      "type": "boolean",
-      "default": true
-    },
-    "external": {
-      "description": "Enable external access from outside the cluster",
-      "type": "boolean",
-      "default": false
-    },
-    "replicas": {
-      "description": "Number of Redis replicas",
-      "type": "integer",
-      "default": 2
-    },
-    "resources": {
-      "description": "Explicit CPU and memory configuration for each Redis replica.  When left empty, the preset defined in `resourcesPreset` is applied.",
-      "type": "object",
-      "default": {},
-      "properties": {
-        "cpu": {
-          "description": "CPU available to each replica",
-          "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
+    "properties": {
+        "authEnabled": {
+            "default": true,
+            "description": "Enable password generation",
+            "type": "boolean"
         },
-        "memory": {
-          "description": "Memory (RAM) available to each replica",
-          "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
-        }
-      }
-    },
-    "resourcesPreset": {
-      "description": "Default sizing preset used when `resources` is omitted. Allowed values: `nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`.",
-      "type": "string",
-      "default": "nano",
-      "enum": [
-        "nano",
-        "micro",
-        "small",
-        "medium",
-        "large",
-        "xlarge",
-        "2xlarge"
-      ]
-    },
-    "size": {
-      "description": "Persistent Volume Claim size, available for application data",
-      "default": "1Gi",
-      "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
-      "anyOf": [
-        {
-          "type": "integer"
+        "external": {
+            "default": false,
+            "description": "Enable external access from outside the cluster",
+            "type": "boolean"
         },
-        {
-          "type": "string"
+        "replicas": {
+            "default": 2,
+            "description": "Number of Redis replicas",
+            "type": "number"
+        },
+        "resources": {
+            "default": {},
+            "description": "Explicit CPU and memory configuration for each Redis replica. When left empty, the preset defined in `resourcesPreset` is applied.",
+            "type": "object"
+        },
+        "resourcesPreset": {
+            "default": "nano",
+            "description": "Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge.",
+            "type": "string",
+            "enum": [
+                "nano",
+                "micro",
+                "small",
+                "medium",
+                "large",
+                "xlarge",
+                "2xlarge"
+            ]
+        },
+        "size": {
+            "default": "1Gi",
+            "description": "Persistent Volume size",
+            "type": "string"
+        },
+        "storageClass": {
+            "default": "",
+            "description": "StorageClass used to store the data",
+            "type": "string"
         }
-      ],
-      "x-kubernetes-int-or-string": true
     },
-    "storageClass": {
-      "description": "StorageClass used to store the data",
-      "type": "string"
-    }
-  }
-}
+    "title": "Chart Values",
+    "type": "object"
+}

packages/apps/redis/values.yaml

@@ -1,25 +1,23 @@
 ## @section Common parameters
 ##
-## @param replicas {int} Number of Redis replicas
+## @param replicas Number of Redis replicas
 replicas: 2
-## @param resources {*resources} Explicit CPU and memory configuration for each Redis replica.  When left empty, the preset defined in `resourcesPreset` is applied.
-## @field resources.cpu {*quantity} CPU available to each replica
-## @field resources.memory {*quantity} Memory (RAM) available to each replica
+## @param resources Explicit CPU and memory configuration for each Redis replica. When left empty, the preset defined in `resourcesPreset` is applied.
 resources: {}
   # resources:
   #   cpu: 4000m
   #   memory: 4Gi
-## @param resourcesPreset {string enum:"nano,micro,small,medium,large,xlarge,2xlarge"} Default sizing preset used when `resources` is omitted. Allowed values: `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"
-## @param size {quantity} Persistent Volume Claim size, available for application data
+## @param size Persistent Volume size
 size: 1Gi
-## @param storageClass {string} StorageClass used to store the data
+## @param storageClass StorageClass used to store the data
 storageClass: ""
-## @param external {bool} Enable external access from outside the cluster
+## @param external Enable external access from outside the cluster
 external: false
 
 
 ## @section Application-specific parameters
 ##
-## @param authEnabled {bool} Enable password generation
+## @param authEnabled Enable password generation
 authEnabled: true

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.6.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

packages/apps/tcp-balancer/Makefile

@@ -1,4 +1,8 @@
 include ../../../scripts/package.mk
+PRESET_ENUM := ["nano","micro","small","medium","large","xlarge","2xlarge"]
 
 generate:
-	cozyvalues-gen -v values.yaml -s values.schema.json -r README.md
+	readme-generator-for-helm -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 = $(PRESET_ENUM)' values.schema.json
+	rm -f values.schema.json.tmp

packages/apps/tcp-balancer/README.md

@@ -12,29 +12,23 @@ Managed TCP Load Balancer Service efficiently utilizes HAProxy for load balancin
 
 ### Common parameters
 
-| Name               | Description                                                                                                                                | Type        | Value   |
-| ------------------ | ------------------------------------------------------------------------------------------------------------------------------------------ | ----------- | ------- |
-| `replicas`         | Number of HAProxy replicas                                                                                                                 | `int`       | `2`     |
-| `resources`        | Explicit CPU and memory configuration for each TCP Balancer replica.  When left empty, the preset defined in `resourcesPreset` is applied. | `*object`   | `null`  |
-| `resources.cpu`    | CPU available to each replica                                                                                                              | `*quantity` | `null`  |
-| `resources.memory` | Memory (RAM) available to each replica                                                                                                     | `*quantity` | `null`  |
-| `resourcesPreset`  | Default sizing preset used when `resources` is omitted. Allowed values: `nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`.  | `string`    | `nano`  |
-| `external`         | Enable external access from outside the cluster                                                                                            | `bool`      | `false` |
-
+| Name              | Description                                                                                                                               | Value   |
+| ----------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ------- |
+| `replicas`        | Number of HAProxy replicas                                                                                                                | `2`     |
+| `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: nano, micro, small, medium, large, xlarge, 2xlarge.               | `nano`  |
+| `external`        | Enable external access from outside the cluster                                                                                           | `false` |
 
 ### Application-specific parameters
 
-| Name                             | Description                                                      | Type       | Value   |
-| -------------------------------- | ---------------------------------------------------------------- | ---------- | ------- |
-| `httpAndHttps`                   | HTTP and HTTPS configuration                                     | `object`   | `{}`    |
-| `httpAndHttps.mode`              | Mode for balancer. Allowed values: `tcp` and `tcp-with-proxy`    | `string`   | `tcp`   |
-| `httpAndHttps.targetPorts`       | Target ports configuration                                       | `object`   | `{}`    |
-| `httpAndHttps.targetPorts.http`  | HTTP port number.                                                | `int`      | `80`    |
-| `httpAndHttps.targetPorts.https` | HTTPS port number.                                               | `int`      | `443`   |
-| `httpAndHttps.endpoints`         | Endpoint addresses list                                          | `[]string` | `[]`    |
-| `whitelistHTTP`                  | Secure HTTP by whitelisting client networks, `false` by default. | `bool`     | `false` |
-| `whitelist`                      | List of allowed client networks                                  | `[]string` | `[]`    |
-
+| Name                             | Description                                                   | Value   |
+| -------------------------------- | ------------------------------------------------------------- | ------- |
+| `httpAndHttps.mode`              | Mode for balancer. Allowed values: `tcp` and `tcp-with-proxy` | `tcp`   |
+| `httpAndHttps.targetPorts.http`  | HTTP port number.                                             | `80`    |
+| `httpAndHttps.targetPorts.https` | HTTPS port number.                                            | `443`   |
+| `httpAndHttps.endpoints`         | Endpoint addresses list                                       | `[]`    |
+| `whitelistHTTP`                  | Secure HTTP by whitelisting client networks                   | `false` |
+| `whitelist`                      | List of client networks                                       | `[]`    |
 
 ## Parameter examples and reference
 

packages/apps/tcp-balancer/values.schema.json

@@ -1,112 +1,59 @@
 {
-  "title": "Chart Values",
-  "type": "object",
   "properties": {
     "external": {
+      "default": false,
       "description": "Enable external access from outside the cluster",
-      "type": "boolean",
-      "default": false
+      "type": "boolean"
     },
     "httpAndHttps": {
-      "description": "HTTP and HTTPS configuration",
-      "type": "object",
-      "default": {
-        "endpoints": {},
-        "mode": "tcp",
-        "targetPorts": {
-          "http": 80,
-          "https": 443
-        }
-      },
-      "required": [
-        "mode",
-        "targetPorts"
-      ],
       "properties": {
         "endpoints": {
-          "description": "Endpoint addresses list",
-          "type": "array",
           "default": [],
-          "items": {
-            "type": "string"
-          }
+          "description": "Endpoint addresses list",
+          "items": {},
+          "type": "array"
         },
         "mode": {
+          "default": "tcp",
           "description": "Mode for balancer. Allowed values: `tcp` and `tcp-with-proxy`",
           "type": "string",
-          "default": "tcp",
           "enum": [
             "tcp",
             "tcp-with-proxy"
           ]
         },
         "targetPorts": {
-          "description": "Target ports configuration",
-          "type": "object",
-          "default": {
-            "http": 80,
-            "https": 443
-          },
-          "required": [
-            "http",
-            "https"
-          ],
           "properties": {
             "http": {
+              "default": 80,
               "description": "HTTP port number.",
-              "type": "integer",
-              "default": 80
+              "type": "number"
             },
             "https": {
+              "default": 443,
               "description": "HTTPS port number.",
-              "type": "integer",
-              "default": 443
+              "type": "number"
             }
-          }
+          },
+          "type": "object"
         }
-      }
+      },
+      "type": "object"
     },
     "replicas": {
+      "default": 2,
       "description": "Number of HAProxy replicas",
-      "type": "integer",
-      "default": 2
+      "type": "number"
     },
     "resources": {
-      "description": "Explicit CPU and memory configuration for each TCP Balancer replica.  When left empty, the preset defined in `resourcesPreset` is applied.",
-      "type": "object",
-      "properties": {
-        "cpu": {
-          "description": "CPU available to each replica",
-          "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": "Memory (RAM) available to each replica",
-          "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
-        }
-      }
+      "default": {},
+      "description": "Explicit CPU and memory configuration for each TCP Balancer replica. When left empty, the preset defined in `resourcesPreset` is applied.",
+      "type": "object"
     },
     "resourcesPreset": {
-      "description": "Default sizing preset used when `resources` is omitted. Allowed values: `nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`.",
-      "type": "string",
       "default": "nano",
+      "description": "Default sizing preset used when `resources` is omitted. Allowed values: nano, micro, small, medium, large, xlarge, 2xlarge.",
+      "type": "string",
       "enum": [
         "nano",
         "micro",
@@ -118,17 +65,17 @@
       ]
     },
     "whitelist": {
-      "description": "List of allowed client networks",
-      "type": "array",
       "default": [],
-      "items": {
-        "type": "string"
-      }
+      "description": "List of client networks",
+      "items": {},
+      "type": "array"
     },
     "whitelistHTTP": {
-      "description": "Secure HTTP by whitelisting client networks, `false` by default.",
-      "type": "boolean",
-      "default": false
+      "default": false,
+      "description": "Secure HTTP by whitelisting client networks",
+      "type": "boolean"
     }
-  }
-}
+  },
+  "title": "Chart Values",
+  "type": "object"
+}

packages/apps/tcp-balancer/values.yaml

@@ -1,29 +1,25 @@
 ## @section Common parameters
 ##
-## @param replicas {int} Number of HAProxy replicas
+## @param replicas Number of HAProxy replicas
 replicas: 2
-## @param resources {*resources} Explicit CPU and memory configuration for each TCP Balancer replica.  When left empty, the preset defined in `resourcesPreset` is applied.
-## @field resources.cpu {*quantity} CPU available to each replica
-## @field resources.memory {*quantity} Memory (RAM) available to each replica
-#resources: {}
+## @param resources Explicit CPU and memory configuration for each TCP Balancer replica. When left empty, the preset defined in `resourcesPreset` is applied.
+resources: {}
 # resources:
 #   cpu: 4000m
 #   memory: 4Gi
-## @param resourcesPreset {string enum:"nano,micro,small,medium,large,xlarge,2xlarge"} Default sizing preset used when `resources` is omitted. Allowed values: `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"
 ##
-## @param external {bool} Enable external access from outside the cluster
+## @param external Enable external access from outside the cluster
 external: false
 
 
 ## @section Application-specific parameters
 ##
-## @param httpAndHttps {httpAndHttps} HTTP and HTTPS configuration
-## @field httpAndHttps.mode {string enum:"tcp,tcp-with-proxy"} Mode for balancer. Allowed values: `tcp` and `tcp-with-proxy`
-## @field httpAndHttps.targetPorts {targetPorts} Target ports configuration
-## @field targetPorts.http {int} HTTP port number.
-## @field targetPorts.https {int} HTTPS port number.
-## @field httpAndHttps.endpoints {[]string} Endpoint addresses list
+## @param httpAndHttps.mode Mode for balancer. Allowed values: `tcp` and `tcp-with-proxy`
+## @param httpAndHttps.targetPorts.http HTTP port number.
+## @param httpAndHttps.targetPorts.https HTTPS port number.
+## @param httpAndHttps.endpoints Endpoint addresses list
 ## Example:
 ##
 ## httpAndHttps:
@@ -46,8 +42,8 @@ httpAndHttps:
     https: 443
   endpoints: []
 
-## @param whitelistHTTP {bool} Secure HTTP by whitelisting client networks, `false` by default.
-## @param whitelist {[]string} List of allowed client networks
+## @param whitelistHTTP Secure HTTP by whitelisting client networks
+## @param whitelist List of client networks
 ## Example:
 ## whitelistHTTP: true
 ## whitelist:

packages/apps/tenant/Chart.yaml

@@ -4,4 +4,4 @@ description: Separated tenant namespace
 icon: /logos/tenant.svg
 
 type: application
-version: 1.12.0
+version: 1.11.2

packages/apps/tenant/Makefile

@@ -1,4 +1,4 @@
 include ../../../scripts/package.mk
 
 generate:
-	cozyvalues-gen -v values.yaml -s values.schema.json -r README.md
+	readme-generator-for-helm -v values.yaml -s values.schema.json -r README.md

packages/apps/tenant/README.md

@@ -69,13 +69,12 @@ tenant-u1
 
 ### Common parameters
 
-| Name             | Description                                                                                                                 | Type                  | Value   |
-| ---------------- | --------------------------------------------------------------------------------------------------------------------------- | --------------------- | ------- |
-| `host`           | The hostname used to access tenant services (defaults to using the tenant name as a subdomain for it's parent tenant host). | `*string`             | `""`    |
-| `etcd`           | Deploy own Etcd cluster                                                                                                     | `bool`                | `false` |
-| `monitoring`     | Deploy own Monitoring Stack                                                                                                 | `bool`                | `false` |
-| `ingress`        | Deploy own Ingress Controller                                                                                               | `bool`                | `false` |
-| `seaweedfs`      | Deploy own SeaweedFS                                                                                                        | `bool`                | `false` |
-| `isolated`       | Enforce tenant namespace with network policies, `true` by default                                                           | `bool`                | `true`  |
-| `resourceQuotas` | Define resource quotas for the tenant                                                                                       | `map[string]quantity` | `{}`    |
-
+| Name             | Description                                                                                                                 | Value   |
+| ---------------- | --------------------------------------------------------------------------------------------------------------------------- | ------- |
+| `host`           | The hostname used to access tenant services (defaults to using the tenant name as a subdomain for it's parent tenant host). | `""`    |
+| `etcd`           | Deploy own Etcd cluster                                                                                                     | `false` |
+| `monitoring`     | Deploy own Monitoring Stack                                                                                                 | `false` |
+| `ingress`        | Deploy own Ingress Controller                                                                                               | `false` |
+| `seaweedfs`      | Deploy own SeaweedFS                                                                                                        | `false` |
+| `isolated`       | Enforce tenant namespace with network policies                                                                              | `true`  |
+| `resourceQuotas` | Define resource quotas for the tenant                                                                                       | `{}`    |

packages/apps/tenant/templates/monitoring.yaml

@@ -17,12 +17,6 @@ spec:
         kind: HelmRepository
         name: cozystack-extra
         namespace: cozy-public
-  install:
-    remediation:
-      retries: 10
-  upgrade:
-    remediation:
-      retries: 10
   interval: 1m0s
-  timeout: 10m0s
+  timeout: 5m0s
 {{- end }}

packages/apps/tenant/values.schema.json

@@ -1,52 +1,41 @@
 {
-  "title": "Chart Values",
-  "type": "object",
-  "properties": {
-    "etcd": {
-      "description": "Deploy own Etcd cluster",
-      "type": "boolean",
-      "default": false
-    },
-    "host": {
-      "description": "The hostname used to access tenant services (defaults to using the tenant name as a subdomain for it's parent tenant host).",
-      "type": "string"
-    },
-    "ingress": {
-      "description": "Deploy own Ingress Controller",
-      "type": "boolean",
-      "default": false
-    },
-    "isolated": {
-      "description": "Enforce tenant namespace with network policies, `true` by default",
-      "type": "boolean",
-      "default": true
-    },
-    "monitoring": {
-      "description": "Deploy own Monitoring Stack",
-      "type": "boolean",
-      "default": false
-    },
-    "resourceQuotas": {
-      "description": "Define resource quotas for the tenant",
-      "type": "object",
-      "default": {},
-      "additionalProperties": {
-        "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
-        "anyOf": [
-          {
-            "type": "integer"
-          },
-          {
+    "properties": {
+        "etcd": {
+            "default": false,
+            "description": "Deploy own Etcd cluster",
+            "type": "boolean"
+        },
+        "host": {
+            "default": "",
+            "description": "The hostname used to access tenant services (defaults to using the tenant name as a subdomain for it's parent tenant host).",
             "type": "string"
-          }
-        ],
-        "x-kubernetes-int-or-string": true
-      }
+        },
+        "ingress": {
+            "default": false,
+            "description": "Deploy own Ingress Controller",
+            "type": "boolean"
+        },
+        "isolated": {
+            "default": true,
+            "description": "Enforce tenant namespace with network policies",
+            "type": "boolean"
+        },
+        "monitoring": {
+            "default": false,
+            "description": "Deploy own Monitoring Stack",
+            "type": "boolean"
+        },
+        "resourceQuotas": {
+            "default": {},
+            "description": "Define resource quotas for the tenant",
+            "type": "object"
+        },
+        "seaweedfs": {
+            "default": false,
+            "description": "Deploy own SeaweedFS",
+            "type": "boolean"
+        }
     },
-    "seaweedfs": {
-      "description": "Deploy own SeaweedFS",
-      "type": "boolean",
-      "default": false
-    }
-  }
+    "title": "Chart Values",
+    "type": "object"
 }

packages/apps/tenant/values.yaml

@@ -1,18 +1,18 @@
 ## @section Common parameters
 
-## @param host {*string} The hostname used to access tenant services (defaults to using the tenant name as a subdomain for it's parent tenant host).
-## @param etcd {bool} Deploy own Etcd cluster
-## @param monitoring {bool} Deploy own Monitoring Stack
-## @param ingress {bool} Deploy own Ingress Controller
-## @param seaweedfs {bool} Deploy own SeaweedFS
-## @param isolated {bool} Enforce tenant namespace with network policies, `true` by default
+## @param host The hostname used to access tenant services (defaults to using the tenant name as a subdomain for it's parent tenant host).
+## @param etcd Deploy own Etcd cluster
+## @param monitoring Deploy own Monitoring Stack
+## @param ingress Deploy own Ingress Controller
+## @param seaweedfs Deploy own SeaweedFS
+## @param isolated Enforce tenant namespace with network policies
+## @param resourceQuotas Define resource quotas for the tenant
 host: ""
 etcd: false
 monitoring: false
 ingress: false
 seaweedfs: false
 isolated: true
-## @param resourceQuotas {map[string]quantity} Define resource quotas for the tenant
 resourceQuotas: {}
 # resourceQuotas:
 #   cpu: "1"

packages/apps/versions_map

@@ -15,9 +15,7 @@ clickhouse 0.9.2 632224a3
 clickhouse 0.10.0 6358fd7a
 clickhouse 0.10.1 4369b031
 clickhouse 0.11.0 08cb7c0f
-clickhouse 0.11.1 0e47e1e8
-clickhouse 0.12.0 c02a3818
-clickhouse 0.13.0 HEAD
+clickhouse 0.11.1 HEAD
 ferretdb 0.1.0 e9716091
 ferretdb 0.1.1 91b0499a
 ferretdb 0.2.0 6c5cf5bf
@@ -31,8 +29,7 @@ ferretdb 0.6.1 632224a3
 ferretdb 0.7.0 62cb694d
 ferretdb 0.7.1 4369b031
 ferretdb 0.8.0 08cb7c0f
-ferretdb 1.0.0 c02a3818
-ferretdb 1.1.0 HEAD
+ferretdb 1.0.0 HEAD
 http-cache 0.1.0 263e47be
 http-cache 0.2.0 53f2365e
 http-cache 0.3.0 6c5cf5bf
@@ -42,8 +39,7 @@ http-cache 0.5.0 6130f43d
 http-cache 0.5.1 62cb694d
 http-cache 0.5.2 4369b031
 http-cache 0.6.0 08cb7c0f
-http-cache 0.6.1 c02a3818
-http-cache 0.7.0 HEAD
+http-cache 0.6.1 HEAD
 kafka 0.1.0 f7eaab0a
 kafka 0.2.0 c0685f43
 kafka 0.2.1 dfbc210b
@@ -68,8 +64,7 @@ kubernetes 0.25.2 08cb7c0f
 kubernetes 0.26.0 9584e5f5
 kubernetes 0.26.1 0e47e1e8
 kubernetes 0.26.2 8ddbe32e
-kubernetes 0.26.3 c02a3818
-kubernetes 0.27.0 HEAD
+kubernetes 0.26.3 HEAD
 mysql 0.1.0 263e47be
 mysql 0.2.0 c24a103f
 mysql 0.3.0 53f2365e
@@ -84,8 +79,7 @@ mysql 0.7.1 632224a3
 mysql 0.8.0 62cb694d
 mysql 0.8.1 4369b031
 mysql 0.9.0 08cb7c0f
-mysql 0.9.1 c02a3818
-mysql 0.10.0 HEAD
+mysql 0.9.1 HEAD
 nats 0.1.0 e9716091
 nats 0.2.0 6c5cf5bf
 nats 0.3.0 78366f19
@@ -98,8 +92,7 @@ nats 0.6.1 632224a3
 nats 0.7.0 62cb694d
 nats 0.7.1 4369b031
 nats 0.8.0 08cb7c0f
-nats 0.8.1 c02a3818
-nats 0.9.0 HEAD
+nats 0.8.1 HEAD
 postgres 0.1.0 263e47be
 postgres 0.2.0 53f2365e
 postgres 0.2.1 d7cfa53c
@@ -123,8 +116,7 @@ postgres 0.15.1 4369b031
 postgres 0.16.0 70f82667
 postgres 0.17.0 acd4663a
 postgres 0.17.1 08cb7c0f
-postgres 0.17.3 c02a3818
-postgres 0.18.0 HEAD
+postgres 0.17.3 HEAD
 rabbitmq 0.1.0 263e47be
 rabbitmq 0.2.0 53f2365e
 rabbitmq 0.3.0 6c5cf5bf
@@ -138,8 +130,7 @@ rabbitmq 0.6.0 632224a3
 rabbitmq 0.7.0 62cb694d
 rabbitmq 0.7.1 4369b031
 rabbitmq 0.8.0 08cb7c0f
-rabbitmq 0.8.1 c02a3818
-rabbitmq 0.9.0 HEAD
+rabbitmq 0.8.1 HEAD
 redis 0.1.1 263e47be
 redis 0.2.0 53f2365e
 redis 0.3.0 6c5cf5bf
@@ -152,8 +143,7 @@ redis 0.7.1 632224a3
 redis 0.8.0 62cb694d
 redis 0.8.1 4369b031
 redis 0.9.0 08cb7c0f
-redis 0.9.1 c02a3818
-redis 0.10.0 HEAD
+redis 0.9.1 HEAD
 tcp-balancer 0.1.0 263e47be
 tcp-balancer 0.2.0 53f2365e
 tcp-balancer 0.3.0 93bdf411
@@ -161,13 +151,11 @@ tcp-balancer 0.4.0 6130f43d
 tcp-balancer 0.4.1 62cb694d
 tcp-balancer 0.4.2 4369b031
 tcp-balancer 0.5.0 08cb7c0f
-tcp-balancer 0.5.1 c02a3818
-tcp-balancer 0.6.0 HEAD
+tcp-balancer 0.5.1 HEAD
 tenant 1.10.0 4369b031
 tenant 1.11.0 08cb7c0f
 tenant 1.11.1 28c9fcd6
-tenant 1.11.2 c02a3818
-tenant 1.12.0 HEAD
+tenant 1.11.2 HEAD
 virtual-machine 0.1.4 f2015d65
 virtual-machine 0.1.5 263e47be
 virtual-machine 0.2.0 c0685f43
@@ -188,14 +176,12 @@ virtual-machine 0.11.0 4369b031
 virtual-machine 0.12.0 acd4663a
 virtual-machine 0.12.1 909208ba
 virtual-machine 0.12.2 8ddbe32e
-virtual-machine 0.12.3 c02a3818
-virtual-machine 0.13.0 HEAD
+virtual-machine 0.12.3 HEAD
 vm-disk 0.1.0 d971f2ff
 vm-disk 0.1.1 6130f43d
 vm-disk 0.1.2 632224a3
 vm-disk 0.2.0 4369b031
-vm-disk 0.3.0 c02a3818
-vm-disk 0.4.0 HEAD
+vm-disk 0.3.0 HEAD
 vm-instance 0.1.0 1ec10165
 vm-instance 0.2.0 84f3ccc0
 vm-instance 0.3.0 4e68e65c
@@ -210,8 +196,7 @@ vm-instance 0.8.0 4369b031
 vm-instance 0.9.0 acd4663a
 vm-instance 0.10.0 909208ba
 vm-instance 0.10.1 8ddbe32e
-vm-instance 0.10.2 c02a3818
-vm-instance 0.11.0 HEAD
+vm-instance 0.10.2 HEAD
 vpn 0.1.0 263e47be
 vpn 0.2.0 53f2365e
 vpn 0.3.0 6c5cf5bf
@@ -222,5 +207,4 @@ vpn 0.5.1 632224a3
 vpn 0.6.1 62cb694d
 vpn 0.6.2 4369b031
 vpn 0.7.0 08cb7c0f
-vpn 0.7.1 c02a3818
-vpn 0.8.0 HEAD
+vpn 0.7.1 HEAD

packages/apps/virtual-machine/Chart.yaml

@@ -17,10 +17,10 @@ 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.13.0
+version: 0.12.3
 
 # 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
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: 0.13.0
+appVersion: 0.12.0

packages/apps/virtual-machine/Makefile

@@ -1,9 +1,12 @@
 include ../../../scripts/package.mk
 
 generate:
-	cozyvalues-gen -v values.yaml -s values.schema.json -r README.md
+	readme-generator-for-helm -v values.yaml -s values.schema.json -r README.md
 	yq -o json -i '.properties.gpus.items.type = "object" | .properties.gpus.default = []' values.schema.json
 	# INSTANCE_TYPES=$$(yq e '.metadata.name' -o=json -r ../../system/kubevirt-instancetypes/templates/instancetypes.yaml | yq 'split(" ") | . + [""]' -o json) \
 	#  && yq -i -o json ".properties.instanceType.enum = $${INSTANCE_TYPES}" values.schema.json
 	PREFERENCES=$$(yq e '.metadata.name' -o=json -r ../../system/kubevirt-instancetypes/templates/preferences.yaml | yq 'split(" ") | . + [""]' -o json) \
 	  && yq -i -o json ".properties.instanceProfile.enum = $${PREFERENCES}" values.schema.json
+	yq -i -o json '.properties.externalPorts.items.type = "integer"' values.schema.json
+	yq -i -o json '.properties.systemDisk.properties.image.enum = ["ubuntu", "cirros", "alpine", "fedora", "talos"]' values.schema.json
+	yq -i -o json '.properties.externalMethod.enum = ["PortList", "WholeIP"]' values.schema.json

packages/apps/virtual-machine/README.md

@@ -36,28 +36,24 @@ virtctl ssh <user>@<vm>
 
 ### Common parameters
 
-| Name                      | Description                                                                                                                                                                                                                               | Type        | Value        |
-| ------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------- | ------------ |
-| `external`                | Enable external access from outside the cluster                                                                                                                                                                                           | `bool`      | `false`      |
-| `externalMethod`          | Specify method to pass through the traffic to the virtual machine. Allowed values: `WholeIP` and `PortList`                                                                                                                               | `string`    | `PortList`   |
-| `externalPorts`           | Specify ports to forward from outside the cluster                                                                                                                                                                                         | `[]int`     | `[22]`       |
-| `running`                 | if the virtual machine should be running                                                                                                                                                                                                  | `bool`      | `true`       |
-| `instanceType`            | Virtual Machine instance type                                                                                                                                                                                                             | `string`    | `u1.medium`  |
-| `instanceProfile`         | Virtual Machine preferences profile                                                                                                                                                                                                       | `string`    | `ubuntu`     |
-| `systemDisk`              | System disk configuration                                                                                                                                                                                                                 | `object`    | `{}`         |
-| `systemDisk.image`        | The base image for the virtual machine. Allowed values: `ubuntu`, `cirros`, `alpine`, `fedora` and `talos`                                                                                                                                | `string`    | `ubuntu`     |
-| `systemDisk.storage`      | The size of the disk allocated for the virtual machine                                                                                                                                                                                    | `string`    | `5Gi`        |
-| `systemDisk.storageClass` | StorageClass used to store the data                                                                                                                                                                                                       | `*string`   | `replicated` |
-| `gpus`                    | List of GPUs to attach                                                                                                                                                                                                                    | `[]object`  | `[]`         |
-| `gpus[i].name`            | The name of the GPU to attach. This should match the GPU resource name in the cluster.                                                                                                                                                    | `string`    | `""`         |
-| `resources`               | Resources                                                                                                                                                                                                                                 | `*object`   | `{}`         |
-| `resources.cpu`           | The number of CPU cores allocated to the virtual machine                                                                                                                                                                                  | `*quantity` | `null`       |
-| `resources.sockets`       | The number of CPU sockets allocated to the virtual machine (used to define vCPU topology)                                                                                                                                                 | `*quantity` | `null`       |
-| `resources.memory`        | The amount of memory allocated to the virtual machine                                                                                                                                                                                     | `*quantity` | `null`       |
-| `sshKeys`                 | List of SSH public keys for authentication. Can be a single key or a list of keys.                                                                                                                                                        | `[]string`  | `[]`         |
-| `cloudInit`               | Cloud-init user data config. See cloud-init documentation for more details: [format](https://cloudinit.readthedocs.io/en/latest/explanation/format.html), [examples](https://cloudinit.readthedocs.io/en/latest/reference/examples.html). | `string`    | `""`         |
-| `cloudInitSeed`           | A seed string to generate an SMBIOS UUID for the VM.                                                                                                                                                                                      | `string`    | `""`         |
-
+| Name                      | Description                                                                                                | Value        |
+| ------------------------- | ---------------------------------------------------------------------------------------------------------- | ------------ |
+| `external`                | Enable external access from outside the cluster                                                            | `false`      |
+| `externalMethod`          | specify method to passthrough the traffic to the virtual machine. Allowed values: `WholeIP` and `PortList` | `PortList`   |
+| `externalPorts`           | Specify ports to forward from outside the cluster                                                          | `[]`         |
+| `running`                 | Determines if the virtual machine should be running                                                        | `true`       |
+| `instanceType`            | Virtual Machine instance type                                                                              | `u1.medium`  |
+| `instanceProfile`         | Virtual Machine preferences profile                                                                        | `ubuntu`     |
+| `systemDisk.image`        | The base image for the virtual machine. Allowed values: `ubuntu`, `cirros`, `alpine`, `fedora` and `talos` | `ubuntu`     |
+| `systemDisk.storage`      | The size of the disk allocated for the virtual machine                                                     | `5Gi`        |
+| `systemDisk.storageClass` | StorageClass used to store the data                                                                        | `replicated` |
+| `gpus`                    | List of GPUs to attach                                                                                     | `[]`         |
+| `resources.cpu`           | The number of CPU cores allocated to the virtual machine                                                   | `""`         |
+| `resources.memory`        | The amount of memory allocated to the virtual machine                                                      | `""`         |
+| `resources.sockets`       | The number of CPU sockets allocated to the virtual machine (used to define vCPU topology)                  | `""`         |
+| `sshKeys`                 | List of SSH public keys for authentication. Can be a single key or a list of keys.                         | `[]`         |
+| `cloudInit`               | cloud-init user data config. See cloud-init documentation for more details.                                | `""`         |
+| `cloudInitSeed`           | A seed string to generate an SMBIOS UUID for the VM.                                                       | `""`         |
 
 ## U Series
 

packages/apps/virtual-machine/values.schema.json

@@ -1,60 +1,49 @@
 {
-  "title": "Chart Values",
-  "type": "object",
   "properties": {
     "cloudInit": {
-      "description": "Cloud-init user data config. See cloud-init documentation for more details: [format](https://cloudinit.readthedocs.io/en/latest/explanation/format.html), [examples](https://cloudinit.readthedocs.io/en/latest/reference/examples.html).",
+      "default": "",
+      "description": "cloud-init user data config. See cloud-init documentation for more details.",
       "type": "string"
     },
     "cloudInitSeed": {
+      "default": "",
       "description": "A seed string to generate an SMBIOS UUID for the VM.",
       "type": "string"
     },
     "external": {
+      "default": false,
       "description": "Enable external access from outside the cluster",
-      "type": "boolean",
-      "default": false
+      "type": "boolean"
     },
     "externalMethod": {
-      "description": "Specify method to pass through the traffic to the virtual machine. Allowed values: `WholeIP` and `PortList`",
-      "type": "string",
       "default": "PortList",
+      "description": "specify method to passthrough the traffic to the virtual machine. Allowed values: `WholeIP` and `PortList`",
+      "type": "string",
       "enum": [
         "PortList",
         "WholeIP"
       ]
     },
     "externalPorts": {
+      "default": [],
       "description": "Specify ports to forward from outside the cluster",
-      "type": "array",
-      "default": [
-        22
-      ],
       "items": {
         "type": "integer"
-      }
+      },
+      "type": "array"
     },
     "gpus": {
-      "description": "List of GPUs to attach",
-      "type": "array",
       "default": [],
+      "description": "List of GPUs to attach",
       "items": {
-        "type": "object",
-        "required": [
-          "name"
-        ],
-        "properties": {
-          "name": {
-            "description": "The name of the GPU to attach. This should match the GPU resource name in the cluster.",
-            "type": "string"
-          }
-        }
-      }
+        "type": "object"
+      },
+      "type": "array"
     },
     "instanceProfile": {
+      "default": "ubuntu",
       "description": "Virtual Machine preferences profile",
       "type": "string",
-      "default": "ubuntu",
       "enum": [
         "alpine",
         "centos.7",
@@ -102,86 +91,47 @@
       ]
     },
     "instanceType": {
+      "default": "u1.medium",
       "description": "Virtual Machine instance type",
-      "type": "string",
-      "default": "u1.medium"
+      "type": "string"
     },
     "resources": {
-      "description": "Resources",
-      "type": "object",
-      "default": {},
       "properties": {
         "cpu": {
+          "default": "",
           "description": "The number of CPU cores allocated to the virtual machine",
-          "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
+          "type": "string"
         },
         "memory": {
+          "default": "",
           "description": "The amount of memory allocated to the virtual machine",
-          "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
+          "type": "string"
         },
         "sockets": {
+          "default": "",
           "description": "The number of CPU sockets allocated to the virtual machine (used to define vCPU topology)",
-          "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
+          "type": "string"
         }
-      }
+      },
+      "type": "object"
     },
     "running": {
-      "description": "if the virtual machine should be running",
-      "type": "boolean",
-      "default": true
+      "default": true,
+      "description": "Determines if the virtual machine should be running",
+      "type": "boolean"
     },
     "sshKeys": {
-      "description": "List of SSH public keys for authentication. Can be a single key or a list of keys.",
-      "type": "array",
       "default": [],
-      "items": {
-        "type": "string"
-      }
+      "description": "List of SSH public keys for authentication. Can be a single key or a list of keys.",
+      "items": {},
+      "type": "array"
     },
     "systemDisk": {
-      "description": "System disk configuration",
-      "type": "object",
-      "default": {
-        "image": "ubuntu",
-        "storage": "5Gi",
-        "storageClass": "replicated"
-      },
-      "required": [
-        "image",
-        "storage"
-      ],
       "properties": {
         "image": {
+          "default": "ubuntu",
           "description": "The base image for the virtual machine. Allowed values: `ubuntu`, `cirros`, `alpine`, `fedora` and `talos`",
           "type": "string",
-          "default": "ubuntu",
           "enum": [
             "ubuntu",
             "cirros",
@@ -191,16 +141,19 @@
           ]
         },
         "storage": {
+          "default": "5Gi",
           "description": "The size of the disk allocated for the virtual machine",
-          "type": "string",
-          "default": "5Gi"
+          "type": "string"
         },
         "storageClass": {
+          "default": "replicated",
           "description": "StorageClass used to store the data",
-          "type": "string",
-          "default": "replicated"
+          "type": "string"
         }
-      }
+      },
+      "type": "object"
     }
-  }
+  },
+  "title": "Chart Values",
+  "type": "object"
 }

packages/apps/virtual-machine/values.yaml

@@ -1,53 +1,46 @@
-
 ## @section Common parameters
-##
-## @param external {bool} Enable external access from outside the cluster
-external: false
-## @param externalMethod {string enum:"PortList,WholeIP"} Specify method to pass through the traffic to the virtual machine. Allowed values: `WholeIP` and `PortList`
-externalMethod: "PortList"
-## @param externalPorts {[]int} Specify ports to forward from outside the cluster
-externalPorts:
-  - 22
 
-## @param running {bool} if the virtual machine should be running
+## @param external Enable external access from outside the cluster
+## @param externalMethod specify method to passthrough the traffic to the virtual machine. Allowed values: `WholeIP` and `PortList`
+## @param externalPorts [array] Specify ports to forward from outside the cluster
+external: false
+externalMethod: PortList
+externalPorts:
+- 22
+
+## @param running Determines if the virtual machine should be running
 running: true
 
-## @param instanceType {string} Virtual Machine instance type
-## @param instanceProfile {string} Virtual Machine preferences profile
+## @param instanceType Virtual Machine instance type
+## @param instanceProfile Virtual Machine preferences profile
 ##
 instanceType: "u1.medium"
 instanceProfile: ubuntu
 
-## @param systemDisk {systemDisk} System disk configuration
-## @field systemDisk.image {string enum:"ubuntu,cirros,alpine,fedora,talos"} The base image for the virtual machine. Allowed values: `ubuntu`, `cirros`, `alpine`, `fedora` and `talos`
-## @field systemDisk.storage {string} The size of the disk allocated for the virtual machine
-## @field systemDisk.storageClass {*string} StorageClass used to store the data
-##
+## @param systemDisk.image The base image for the virtual machine. Allowed values: `ubuntu`, `cirros`, `alpine`, `fedora` and `talos`
+## @param systemDisk.storage The size of the disk allocated for the virtual machine
+## @param systemDisk.storageClass StorageClass used to store the data
+## 
 systemDisk:
   image: ubuntu
   storage: 5Gi
   storageClass: replicated
 
-## @param gpus {[]gpu} List of GPUs to attach
-## @field gpu.name {string} The name of the GPU to attach. This should match the GPU resource name in the cluster.
+## @param gpus [array] List of GPUs to attach
 ## Example:
 ## gpus:
 ## - name: nvidia.com/GA102GL_A10
 gpus: []
 
+## @param resources.cpu The number of CPU cores allocated to the virtual machine
+## @param resources.memory The amount of memory allocated to the virtual machine
+## @param resources.sockets The number of CPU sockets allocated to the virtual machine (used to define vCPU topology)
+resources:
+  cpu: ""
+  memory: ""
+  sockets: ""
 
-## @param resources {*resources} Resources
-## @field resources.cpu {*quantity} The number of CPU cores allocated to the virtual machine
-## @field resources.sockets {*quantity} The number of CPU sockets allocated to the virtual machine (used to define vCPU topology)
-## @field resources.memory {*quantity} The amount of memory allocated to the virtual machine
-## Example:
-## resources:
-##   cpu: "4"
-##   sockets: "1"
-##   memory: "8Gi"
-resources: {}
-
-## @param sshKeys {[]string} List of SSH public keys for authentication. Can be a single key or a list of keys.
+## @param sshKeys [array] List of SSH public keys for authentication. Can be a single key or a list of keys.
 ## Example:
 ## sshKeys:
 ##   - ssh-rsa ...
@@ -55,7 +48,7 @@ resources: {}
 ##
 sshKeys: []
 
-## @param cloudInit {string} Cloud-init user data config. See cloud-init documentation for more details: [format](https://cloudinit.readthedocs.io/en/latest/explanation/format.html), [examples](https://cloudinit.readthedocs.io/en/latest/reference/examples.html).
+## @param cloudInit cloud-init user data config. See cloud-init documentation for more details.
 ## - https://cloudinit.readthedocs.io/en/latest/explanation/format.html
 ## - https://cloudinit.readthedocs.io/en/latest/reference/examples.html
 ## Example:
@@ -66,11 +59,11 @@ sshKeys: []
 ##
 cloudInit: ""
 
-## @param cloudInitSeed {string} A seed string to generate an SMBIOS UUID for the VM.
+## @param cloudInitSeed A seed string to generate an SMBIOS UUID for the VM.
+cloudInitSeed: ""
 ## Change it to any new value to force a full cloud-init reconfiguration. Change it when you want to apply
 ## to an existing VM settings that are usually written only once, like new SSH keys or new network configuration.
 ## An empty value does nothing (and the existing UUID is not reverted). Please note that changing this value
 ## does not trigger a VM restart. You must perform the restart separately.
 ## Example:
 ## cloudInitSeed: "upd1"
-cloudInitSeed: ""

packages/apps/vm-disk/Chart.yaml

@@ -16,10 +16,10 @@ 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.4.0
+version: 0.3.0
 
 # 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
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: 0.4.0
+appVersion: 0.3.0

packages/apps/vm-disk/Makefile

@@ -1,4 +1,4 @@
 include ../../../scripts/package.mk
 
 generate:
-	cozyvalues-gen -v values.yaml -s values.schema.json -r README.md
+	readme-generator-for-helm -v values.yaml -s values.schema.json -r README.md

packages/apps/vm-disk/README.md

@@ -6,15 +6,9 @@ A Virtual Machine Disk
 
 ### Common parameters
 
-| Name                | Description                                                                                                          | Type       | Value        |
-| ------------------- | -------------------------------------------------------------------------------------------------------------------- | ---------- | ------------ |
-| `source`            | The source image location used to create a disk                                                                      | `object`   | `{}`         |
-| `source.image`      | Use image by name: uploaded as "golden image" or from the list: `ubuntu`, `fedora`, `cirros`, `alpine`, and `talos`. | `*object`  | `null`       |
-| `source.image.name` | Name of the image to use                                                                                             | `string`   | `""`         |
-| `source.upload`     | Upload local image                                                                                                   | `*object`  | `null`       |
-| `source.http`       | Download image from an HTTP source                                                                                   | `*object`  | `null`       |
-| `source.http.url`   | URL to download the image                                                                                            | `string`   | `""`         |
-| `optical`           | Defines if disk should be considered optical                                                                         | `bool`     | `false`      |
-| `storage`           | The size of the disk allocated for the virtual machine                                                               | `quantity` | `5Gi`        |
-| `storageClass`      | StorageClass used to store the data                                                                                  | `string`   | `replicated` |
-
+| Name           | Description                                            | Value        |
+| -------------- | ------------------------------------------------------ | ------------ |
+| `source`       | The source image location used to create a disk        | `{}`         |
+| `optical`      | Defines is disk should be considered as optical        | `false`      |
+| `storage`      | The size of the disk allocated for the virtual machine | `5Gi`        |
+| `storageClass` | StorageClass used to store the data                    | `replicated` |