From 2424bee96d3440e03f7d6b1e3eb0a18ed88b0563 Mon Sep 17 00:00:00 2001 From: Alexis Saettler Date: Sat, 13 Jun 2026 17:20:29 +0200 Subject: [PATCH 1/4] Upgrade all packages and GHA --- .github/workflows/docs.yml | 14 +++++++------- .github/workflows/release.yml | 10 +++++----- .github/workflows/tests.yml | 20 ++++++++++---------- .pre-commit-config.yaml | 2 +- README.md | 2 +- charts/monica/Chart.yaml | 14 +++++++------- charts/monica/README.md | 12 ++++++------ charts/monica/templates/_helpers.tpl | 2 +- 8 files changed, 38 insertions(+), 38 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index aa3091f..359c2d0 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -5,7 +5,7 @@ on: types: [opened, synchronize, reopened] env: - helm: v3.16.2 + helm: v4.2.1 jobs: docs: @@ -13,10 +13,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 - name: Run helm-docs - uses: losisin/helm-docs-github-action@v1 + uses: losisin/helm-docs-github-action@3a4528e97c49a5e83de6b78c50c61c8ee5c9f944 # v2.0.0 - name: Check if there is any file update needed run: | @@ -32,19 +32,19 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: fetch-depth: 0 - name: Set up Helm - uses: azure/setup-helm@v4 + uses: azure/setup-helm@dda3372f752e03dde6b3237bc9431cdc2f7a02a2 # v5.0.0 with: version: ${{ env.helm }} - name: Generate schema file - uses: losisin/helm-values-schema-json-action@v1 + uses: losisin/helm-values-schema-json-action@cfefdf4241da6dbe17f3378e3cd0e863d4a4c3c8 # v3.0.1 with: - input: charts/monica/values.yaml + values: charts/monica/values.yaml output: charts/monica/values.schema.json indent: 2 fail-on-diff: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9433cf5..8e9fbbb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,7 @@ on: workflow_dispatch: env: - helm: v3.16.2 + helm: v4.2.1 jobs: release: @@ -16,12 +16,12 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: fetch-depth: 0 - name: Turnstyle - uses: softprops/turnstyle@v2 + uses: softprops/turnstyle@fa86562458e34a9067f0dc1316a76b3975b1c413 # v3.3.1 with: continue-after-seconds: 180 env: @@ -41,7 +41,7 @@ jobs: GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }} - name: Set up Helm - uses: azure/setup-helm@v4 + uses: azure/setup-helm@dda3372f752e03dde6b3237bc9431cdc2f7a02a2 # v5.0.0 with: version: ${{ env.helm }} @@ -51,7 +51,7 @@ jobs: helm repo add meilisearch https://meilisearch.github.io/meilisearch-kubernetes - name: Run chart-releaser - uses: helm/chart-releaser-action@v1 + uses: helm/chart-releaser-action@cae68fefc6b5f367a0275617c9f83181ba54714f # v1.7.0 env: CR_KEY: ${{ secrets.CR_KEY }} CR_KEYRING: ~/.gnupg/secring.gpg diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d5b51b1..9fed4b2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -4,7 +4,7 @@ on: types: [opened, synchronize, reopened] env: - helm: v3.16.2 + helm: v4.2.1 python-version: 3.x jobs: @@ -13,21 +13,21 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: fetch-depth: 0 - name: Set up Helm - uses: azure/setup-helm@v4 + uses: azure/setup-helm@dda3372f752e03dde6b3237bc9431cdc2f7a02a2 # v5.0.0 with: version: ${{ env.helm }} - - uses: actions/setup-python@v5 + - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0 with: python-version: ${{ env.python-version }} - name: Set up chart-testing - uses: helm/chart-testing-action@v2 + uses: helm/chart-testing-action@6ec842c01de15ebb84c8627d2744a0c2f2755c9f # v2.8.0 - name: Run chart-testing (lint) run: ct lint --config ct.yaml --target-branch ${{ github.event.repository.default_branch }} @@ -70,21 +70,21 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: fetch-depth: 0 - name: Set up Helm - uses: azure/setup-helm@v4 + uses: azure/setup-helm@dda3372f752e03dde6b3237bc9431cdc2f7a02a2 # v5.0.0 with: version: ${{ env.helm }} - - uses: actions/setup-python@v5 + - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0 with: python-version: ${{ env.python-version }} - name: Set up chart-testing - uses: helm/chart-testing-action@v2 + uses: helm/chart-testing-action@6ec842c01de15ebb84c8627d2744a0c2f2755c9f # v2.8.0 - name: Run chart-testing (list-changed) id: list-changed @@ -95,7 +95,7 @@ jobs: fi - name: Create kind cluster - uses: helm/kind-action@v1 + uses: helm/kind-action@ef37e7f390d99f746eb8b610417061a60e82a6cc # v1.14.0 if: steps.list-changed.outputs.changed == 'true' with: kubectl_version: ${{ matrix.kubectl }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7a77794..1b874bc 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -5,7 +5,7 @@ repos: - id: helm-docs - repo: https://github.com/losisin/helm-values-schema-json - rev: v1.6.1 + rev: v2.5.0 hooks: - id: helm-schema args: ["-input", "charts/monica/values.yaml", "-output", "charts/monica/values.schema.json", "-indent", "2"] diff --git a/README.md b/README.md index 58813da..11c52e6 100644 --- a/README.md +++ b/README.md @@ -38,6 +38,6 @@ Author: [Alexis Saettler](https://github.com/asbiin) This project is part of [MonicaHQ](https://github.com/monicahq/). -Copyright © 2019–2024. +Copyright © 2019–2026. Licensed under the AGPL-3.0 License. [View license](LICENSE.md). diff --git a/charts/monica/Chart.yaml b/charts/monica/Chart.yaml index 7d7bdf8..85f449f 100644 --- a/charts/monica/Chart.yaml +++ b/charts/monica/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: monica description: A Helm chart for Kubernetes to install Monica type: application -version: 1.0.14 +version: 1.0.15 appVersion: "5.0.0" icon: https://raw.githubusercontent.com/monicahq/monica/aa98c09/public/img/favicon.svg maintainers: @@ -20,23 +20,23 @@ sources: - https://github.com/monicahq/helm dependencies: - name: postgresql - version: 16.0.* + version: 17.1.* repository: oci://registry-1.docker.io/bitnamicharts condition: postgresql.enabled - name: mariadb - version: 19.1.* + version: 23.0.* repository: oci://registry-1.docker.io/bitnamicharts condition: mariadb.enabled - name: redis - version: 20.2.* + version: 23.1.* repository: oci://registry-1.docker.io/bitnamicharts condition: redis.enabled - name: memcached - version: 7.5.* + version: 8.0.* repository: oci://registry-1.docker.io/bitnamicharts condition: memcached.enabled - name: meilisearch - version: 0.10.* + version: 0.32.* repository: https://meilisearch.github.io/meilisearch-kubernetes condition: meilisearch.enabled annotations: @@ -65,4 +65,4 @@ annotations: url: https://github.com/monicahq/monica artifacthub.io/changes: | - kind: changed - description: Add labels for cronjob and queue + description: Renamed Meilisearch variable diff --git a/charts/monica/README.md b/charts/monica/README.md index 9f0760e..d87cbec 100644 --- a/charts/monica/README.md +++ b/charts/monica/README.md @@ -1,6 +1,6 @@ # monica -![Version: 1.0.14](https://img.shields.io/badge/Version-1.0.14-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 5.0.0](https://img.shields.io/badge/AppVersion-5.0.0-informational?style=flat-square) +![Version: 1.0.15](https://img.shields.io/badge/Version-1.0.15-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 5.0.0](https://img.shields.io/badge/AppVersion-5.0.0-informational?style=flat-square) A Helm chart for Kubernetes to install Monica @@ -40,11 +40,11 @@ Kubernetes: `>=1.16.0-0` | Repository | Name | Version | |------------|------|---------| -| https://meilisearch.github.io/meilisearch-kubernetes | meilisearch | 0.10.* | -| oci://registry-1.docker.io/bitnamicharts | mariadb | 19.1.* | -| oci://registry-1.docker.io/bitnamicharts | memcached | 7.5.* | -| oci://registry-1.docker.io/bitnamicharts | postgresql | 16.0.* | -| oci://registry-1.docker.io/bitnamicharts | redis | 20.2.* | +| https://meilisearch.github.io/meilisearch-kubernetes | meilisearch | 0.32.* | +| oci://registry-1.docker.io/bitnamicharts | mariadb | 23.0.* | +| oci://registry-1.docker.io/bitnamicharts | memcached | 8.0.* | +| oci://registry-1.docker.io/bitnamicharts | postgresql | 17.1.* | +| oci://registry-1.docker.io/bitnamicharts | redis | 23.1.* | ## Values diff --git a/charts/monica/templates/_helpers.tpl b/charts/monica/templates/_helpers.tpl index 757f95a..dbd70b4 100644 --- a/charts/monica/templates/_helpers.tpl +++ b/charts/monica/templates/_helpers.tpl @@ -240,7 +240,7 @@ Create environment variables used to configure the monica container as well as t {{- end }} {{- end }} {{- if .Values.meilisearch.enabled }} -- name: MEILISEARCH_HOST +- name: MEILISEARCH_URL value: http://{{ template "monica.meilisearch.fullname" . }}:7700 - name: MEILISEARCH_KEY valueFrom: From b96760658e9d272f82c4e48bb18ee6a357f005e5 Mon Sep 17 00:00:00 2001 From: Alexis Saettler Date: Sat, 13 Jun 2026 17:34:58 +0200 Subject: [PATCH 2/4] fixes --- .github/workflows/tests.yml | 2 +- .pre-commit-config.yaml | 2 +- charts/monica/Chart.lock | 14 +- charts/monica/Chart.yaml | 8 +- charts/monica/README.md | 8 +- charts/monica/values.schema.json | 247 ++++++++++++++----------------- 6 files changed, 129 insertions(+), 152 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9fed4b2..8b4a525 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -39,7 +39,7 @@ jobs: strategy: fail-fast: false matrix: - kubectl: [v1.16.0, v1.29.3] + kubectl: [v1.16.0, v1.29.3, v1.35.5] test_cases: - name: Default - no custom values diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 1b874bc..4d5b89f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,4 +8,4 @@ repos: rev: v2.5.0 hooks: - id: helm-schema - args: ["-input", "charts/monica/values.yaml", "-output", "charts/monica/values.schema.json", "-indent", "2"] + args: ["--values", "charts/monica/values.yaml", "--output", "charts/monica/values.schema.json", "--indent", "2"] diff --git a/charts/monica/Chart.lock b/charts/monica/Chart.lock index b52ee03..f680c91 100644 --- a/charts/monica/Chart.lock +++ b/charts/monica/Chart.lock @@ -1,18 +1,18 @@ dependencies: - name: postgresql repository: oci://registry-1.docker.io/bitnamicharts - version: 16.0.3 + version: 18.7.3 - name: mariadb repository: oci://registry-1.docker.io/bitnamicharts - version: 19.1.0 + version: 26.1.3 - name: redis repository: oci://registry-1.docker.io/bitnamicharts - version: 20.2.1 + version: 27.0.8 - name: memcached repository: oci://registry-1.docker.io/bitnamicharts - version: 7.5.1 + version: 8.6.1 - name: meilisearch repository: https://meilisearch.github.io/meilisearch-kubernetes - version: 0.10.1 -digest: sha256:3fb70271b7f30bc1a3072252b987b1941e768d3eb7bc26aefd0e18c9eaf7b841 -generated: "2024-10-19T23:24:58.299202579+02:00" + version: 0.32.0 +digest: sha256:a9a8b0a1aa4d4c7c03346cc5564ae7682859c61514b960587789bde7aed8034f +generated: "2026-06-13T17:30:32.547663791+02:00" diff --git a/charts/monica/Chart.yaml b/charts/monica/Chart.yaml index 85f449f..e722a27 100644 --- a/charts/monica/Chart.yaml +++ b/charts/monica/Chart.yaml @@ -20,19 +20,19 @@ sources: - https://github.com/monicahq/helm dependencies: - name: postgresql - version: 17.1.* + version: 18.7.* repository: oci://registry-1.docker.io/bitnamicharts condition: postgresql.enabled - name: mariadb - version: 23.0.* + version: 26.1.* repository: oci://registry-1.docker.io/bitnamicharts condition: mariadb.enabled - name: redis - version: 23.1.* + version: 27.0.* repository: oci://registry-1.docker.io/bitnamicharts condition: redis.enabled - name: memcached - version: 8.0.* + version: 8.6.* repository: oci://registry-1.docker.io/bitnamicharts condition: memcached.enabled - name: meilisearch diff --git a/charts/monica/README.md b/charts/monica/README.md index d87cbec..4cfc725 100644 --- a/charts/monica/README.md +++ b/charts/monica/README.md @@ -41,10 +41,10 @@ Kubernetes: `>=1.16.0-0` | Repository | Name | Version | |------------|------|---------| | https://meilisearch.github.io/meilisearch-kubernetes | meilisearch | 0.32.* | -| oci://registry-1.docker.io/bitnamicharts | mariadb | 23.0.* | -| oci://registry-1.docker.io/bitnamicharts | memcached | 8.0.* | -| oci://registry-1.docker.io/bitnamicharts | postgresql | 17.1.* | -| oci://registry-1.docker.io/bitnamicharts | redis | 23.1.* | +| oci://registry-1.docker.io/bitnamicharts | mariadb | 26.1.* | +| oci://registry-1.docker.io/bitnamicharts | memcached | 8.6.* | +| oci://registry-1.docker.io/bitnamicharts | postgresql | 18.7.* | +| oci://registry-1.docker.io/bitnamicharts | redis | 27.0.* | ## Values diff --git a/charts/monica/values.schema.json b/charts/monica/values.schema.json index 14975ed..7ca009d 100644 --- a/charts/monica/values.schema.json +++ b/charts/monica/values.schema.json @@ -1,14 +1,15 @@ { - "$id": "https://monicahq.github.io/helm/schema", "$schema": "https://json-schema.org/draft/2020-12/schema", - "additionalProperties": true, + "$id": "https://monicahq.github.io/helm/schema", + "title": "Monica Helm Charts Values Schema", "description": "Schema for Helm values", + "type": "object", "properties": { "affinity": { - "properties": {}, "type": "object" }, "autoscaling": { + "type": "object", "properties": { "enabled": { "type": "boolean" @@ -37,18 +38,16 @@ "null" ] } - }, - "type": "object" + } }, "deploymentAnnotations": { - "properties": {}, "type": "object" }, "deploymentLabels": { - "properties": {}, "type": "object" }, "externalDatabase": { + "type": "object", "properties": { "database": { "type": "string" @@ -57,12 +56,12 @@ "type": "boolean" }, "existingSecret": { + "type": "object", "properties": { "enabled": { "type": "boolean" } - }, - "type": "object" + } }, "host": { "type": "string" @@ -76,13 +75,17 @@ "user": { "type": "string" } - }, - "type": "object" + } }, "fullnameOverride": { "type": "string" }, "image": { + "type": "object", + "required": [ + "repository", + "tag" + ], "properties": { "pullPolicy": { "type": "string" @@ -96,17 +99,12 @@ "tag": { "type": "string" } - }, - "required": [ - "repository", - "tag" - ], - "type": "object" + } }, "ingress": { + "type": "object", "properties": { "annotations": { - "properties": {}, "type": "object" }, "className": { @@ -116,7 +114,6 @@ "type": "boolean" }, "labels": { - "properties": {}, "type": "object" }, "path": { @@ -128,10 +125,10 @@ "tls": { "type": "array" } - }, - "type": "object" + } }, "internalDatabase": { + "type": "object", "properties": { "enabled": { "type": "boolean" @@ -139,14 +136,13 @@ "name": { "type": "string" } - }, - "type": "object" + } }, "lifecycle": { - "properties": {}, "type": "object" }, "livenessProbe": { + "type": "object", "properties": { "enabled": { "type": "boolean" @@ -166,15 +162,16 @@ "timeoutSeconds": { "type": "integer" } - }, - "type": "object" + } }, "mariadb": { + "type": "object", "properties": { "architecture": { "type": "string" }, "auth": { + "type": "object", "properties": { "database": { "type": "string" @@ -185,15 +182,16 @@ "username": { "type": "string" } - }, - "type": "object" + } }, "enabled": { "type": "boolean" }, "primary": { + "type": "object", "properties": { "persistence": { + "type": "object", "properties": { "accessMode": { "type": "string" @@ -210,34 +208,33 @@ "storageClass": { "type": "string" } - }, - "type": "object" + } } - }, - "type": "object" + } } - }, - "type": "object" + } }, "meilisearch": { + "type": "object", "properties": { "enabled": { "type": "boolean" }, "environment": { + "type": "object", "properties": { "MEILI_ENV": { "type": "string" } - }, - "type": "object" + } } - }, - "type": "object" + } }, "memcached": { + "type": "object", "properties": { "auth": { + "type": "object", "properties": { "enabled": { "type": "boolean" @@ -254,55 +251,51 @@ "username": { "type": "string" } - }, - "type": "object" + } }, "containerSecurityContext": { + "type": "object", "properties": { "readOnlyRootFilesystem": { "type": "boolean" } - }, - "type": "object" + } }, "enabled": { "type": "boolean" } - }, - "type": "object" + } }, "monica": { + "type": "object", "properties": { "containerPort": { "type": "integer" }, "cronjob": { + "type": "object", "properties": { "annotations": { - "properties": {}, "type": "object" }, "enabled": { "type": "boolean" }, "labels": { - "properties": {}, "type": "object" }, "resources": { - "properties": {}, "type": "object" } - }, - "type": "object" + } }, "existingSecret": { + "type": "object", "properties": { "enabled": { "type": "boolean" } - }, - "type": "object" + } }, "extraEnv": { "type": "array" @@ -323,6 +316,7 @@ "type": "string" }, "mail": { + "type": "object", "properties": { "enabled": { "type": "boolean" @@ -334,6 +328,7 @@ "type": "string" }, "smtp": { + "type": "object", "properties": { "encryption": { "type": "string" @@ -350,66 +345,60 @@ "username": { "type": "string" } - }, - "type": "object" + } } - }, - "type": "object" + } }, "phpConfigs": { - "properties": {}, "type": "object" }, "queue": { + "type": "object", "properties": { "annotations": { - "properties": {}, "type": "object" }, "enabled": { "type": "boolean" }, "labels": { - "properties": {}, "type": "object" }, "lifecycle": { - "properties": {}, "type": "object" }, "priorityClassName": { "type": "string" }, "resources": { - "properties": {}, "type": "object" }, "terminationGracePeriodSeconds": { "type": "integer" } - }, - "type": "object" + } }, "storagedir": { "type": "string" }, "strategy": { + "type": "object", "properties": { "type": { "type": "string" } - }, - "type": "object" + } } - }, - "type": "object" + } }, "nameOverride": { "type": "string" }, "nginx": { + "type": "object", "properties": { "config": { + "type": "object", "properties": { "custom": { "type": "string" @@ -417,8 +406,7 @@ "default": { "type": "boolean" } - }, - "type": "object" + } }, "containerPort": { "type": "integer" @@ -427,6 +415,7 @@ "type": "boolean" }, "image": { + "type": "object", "properties": { "pullPolicy": { "type": "string" @@ -437,27 +426,23 @@ "tag": { "type": "string" } - }, - "type": "object" + } }, "resources": { - "properties": {}, "type": "object" } - }, - "type": "object" + } }, "nodeSelector": { - "properties": {}, "type": "object" }, "persistence": { + "type": "object", "properties": { "accessMode": { "type": "string" }, "annotations": { - "properties": {}, "type": "object" }, "enabled": { @@ -472,27 +457,28 @@ "storageClass": { "type": "string" } - }, - "type": "object" + } }, "podAnnotations": { - "properties": {}, "type": "object" }, "podLabels": { - "properties": {}, "type": "object" }, "postgresql": { + "type": "object", "properties": { "enabled": { "type": "boolean" }, "global": { + "type": "object", "properties": { "postgresql": { + "type": "object", "properties": { "auth": { + "type": "object", "properties": { "database": { "type": "string" @@ -503,18 +489,17 @@ "username": { "type": "string" } - }, - "type": "object" + } } - }, - "type": "object" + } } - }, - "type": "object" + } }, "primary": { + "type": "object", "properties": { "persistence": { + "type": "object", "properties": { "enabled": { "type": "boolean" @@ -525,24 +510,22 @@ "storageClass": { "type": "string" } - }, - "type": "object" + } } - }, - "type": "object" + } } - }, - "type": "object" + } }, "rbac": { + "type": "object", "properties": { "create": { "type": "boolean" } - }, - "type": "object" + } }, "readinessProbe": { + "type": "object", "properties": { "enabled": { "type": "boolean" @@ -562,12 +545,13 @@ "timeoutSeconds": { "type": "integer" } - }, - "type": "object" + } }, "redis": { + "type": "object", "properties": { "auth": { + "type": "object", "properties": { "enabled": { "type": "boolean" @@ -581,60 +565,57 @@ "password": { "type": "string" } - }, - "type": "object" + } }, "enabled": { "type": "boolean" }, "global": { + "type": "object", "properties": { "storageClass": { "type": "string" } - }, - "type": "object" + } }, "master": { + "type": "object", "properties": { "persistence": { + "type": "object", "properties": { "enabled": { "type": "boolean" } - }, - "type": "object" + } } - }, - "type": "object" + } }, "replica": { + "type": "object", "properties": { "persistence": { + "type": "object", "properties": { "enabled": { "type": "boolean" } - }, - "type": "object" + } } - }, - "type": "object" + } } - }, - "type": "object" + } }, "replicaCount": { "type": "integer" }, "resources": { - "properties": {}, "type": "object" }, "service": { + "type": "object", "properties": { "annotations": { - "properties": {}, "type": "object" }, "loadBalancerClass": { @@ -653,32 +634,30 @@ "type": "integer" }, "sessionAffinity": { + "type": "string", "enum": [ "ClusterIP", "None" - ], - "type": "string" + ] }, "sessionAffinityConfig": { - "properties": {}, "type": "object" }, "type": { + "type": "string", "enum": [ "ClusterIP", "LoadBalancer", "NodePort", null - ], - "type": "string" + ] } - }, - "type": "object" + } }, "serviceAccount": { + "type": "object", "properties": { "annotations": { - "properties": {}, "type": "object" }, "create": { @@ -687,10 +666,10 @@ "name": { "type": "string" } - }, - "type": "object" + } }, "startupProbe": { + "type": "object", "properties": { "enabled": { "type": "boolean" @@ -710,16 +689,19 @@ "timeoutSeconds": { "type": "integer" } - }, - "type": "object" + } }, "tests": { + "type": "object", "properties": { "unitTests": { + "type": "object", "properties": { "resources": { + "type": "object", "properties": { "limits": { + "type": "object", "properties": { "cpu": { "type": "string" @@ -727,10 +709,10 @@ "memory": { "type": "string" } - }, - "type": "object" + } }, "requests": { + "type": "object", "properties": { "cpu": { "type": "string" @@ -738,22 +720,17 @@ "memory": { "type": "string" } - }, - "type": "object" + } } - }, - "type": "object" + } } - }, - "type": "object" + } } - }, - "type": "object" + } }, "tolerations": { "type": "array" } }, - "title": "Monica Helm Charts Values Schema", - "type": "object" + "additionalProperties": true } From 875456f666cb742c13bf68cfb25bf4072feffbce Mon Sep 17 00:00:00 2001 From: Alexis Saettler Date: Sat, 13 Jun 2026 22:57:08 +0200 Subject: [PATCH 3/4] up --- .github/workflows/tests.yml | 2 +- CONTRIBUTING.md | 20 ++++++++++++++++++++ LICENSE.md | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8b4a525..8472771 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -39,7 +39,7 @@ jobs: strategy: fail-fast: false matrix: - kubectl: [v1.16.0, v1.29.3, v1.35.5] + kubectl: [v1.16.0, v1.35.5] test_cases: - name: Default - no custom values diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1f966af..e0decb9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,6 +6,9 @@ Install prerequisites: - [helm](https://helm.sh/) - [helm chart testing](https://github.com/helm/chart-testing) - [minikube](https://minikube.sigs.k8s.io/docs/start/) +- [pre-commit](https://pre-commit.com/) +- [helm-docs](https://github.com/norwoodj/helm-docs#installation) +- [helm values schema](https://github.com/losisin/helm-values-schema-json) Start minikube: @@ -29,4 +32,21 @@ To install pre-commit, run: ```sh pre-commit install +pre-commit install-hooks +``` + +## Helm docs + +To generate the documentation for the chart, run: + +```sh +helm-docs +``` + +# Helm values schema + +To generate the values schema for the chart, run: + +```sh +helm schema --values charts/monica/values.yaml --output charts/monica/values.schema.json --indent 2 ``` diff --git a/LICENSE.md b/LICENSE.md index d031ccb..a057046 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -628,7 +628,7 @@ the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. The software is called Monica and is a personal relationship management system. - Copyright (C) 2016-2024 asbiin + Copyright (C) 2016-2026 asbiin This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as From ec38fe8441fac0f208e610334b8890df8aec3a25 Mon Sep 17 00:00:00 2001 From: Alexis Saettler Date: Sat, 13 Jun 2026 23:12:42 +0200 Subject: [PATCH 4/4] add skip-clean-up --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8472771..6ed4b53 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -117,4 +117,4 @@ jobs: - name: Run chart-testing (install) if: steps.list-changed.outputs.changed == 'true' - run: ct install --config ct.yaml --helm-extra-args '--timeout 600s' --target-branch ${{ github.event.repository.default_branch }} --helm-extra-set-args "${{ matrix.test_cases.helm_args }}" + run: ct install --skip-clean-up --config ct.yaml --helm-extra-args '--timeout 600s' --target-branch ${{ github.event.repository.default_branch }} --helm-extra-set-args "${{ matrix.test_cases.helm_args }}"