Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ on:
types: [opened, synchronize, reopened]

env:
helm: v3.16.2
helm: v4.2.1

jobs:
docs:
name: Helm docs
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: |
Expand All @@ -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
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@ on:
workflow_dispatch:

env:
helm: v3.16.2
helm: v4.2.1

jobs:
release:
name: Release Charts
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:
Expand All @@ -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 }}

Expand All @@ -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
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
types: [opened, synchronize, reopened]

env:
helm: v3.16.2
helm: v4.2.1
python-version: 3.x

jobs:
Expand All @@ -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 }}
Expand All @@ -39,7 +39,7 @@ jobs:
strategy:
fail-fast: false
matrix:
kubectl: [v1.16.0, v1.29.3]
kubectl: [v1.16.0, v1.35.5]
test_cases:
- name: Default - no custom values

Expand Down Expand Up @@ -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
Expand All @@ -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 }}
Expand All @@ -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 }}"
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
args: ["--values", "charts/monica/values.yaml", "--output", "charts/monica/values.schema.json", "--indent", "2"]
20 changes: 20 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand All @@ -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
```
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
14 changes: 7 additions & 7 deletions charts/monica/Chart.lock
Original file line number Diff line number Diff line change
@@ -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"
14 changes: 7 additions & 7 deletions charts/monica/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -20,23 +20,23 @@ sources:
- https://github.com/monicahq/helm
dependencies:
- name: postgresql
version: 16.0.*
version: 18.7.*
repository: oci://registry-1.docker.io/bitnamicharts
condition: postgresql.enabled
- name: mariadb
version: 19.1.*
version: 26.1.*
repository: oci://registry-1.docker.io/bitnamicharts
condition: mariadb.enabled
- name: redis
version: 20.2.*
version: 27.0.*
repository: oci://registry-1.docker.io/bitnamicharts
condition: redis.enabled
- name: memcached
version: 7.5.*
version: 8.6.*
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:
Expand Down Expand Up @@ -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
12 changes: 6 additions & 6 deletions charts/monica/README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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 | 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

Expand Down
2 changes: 1 addition & 1 deletion charts/monica/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading
Loading