Skip to content

Commit b53e9ac

Browse files
authored
v1.0.12: Update Chart documentation, fix resources, and rename hpa to autoscaling (#17)
1 parent 1db38f0 commit b53e9ac

File tree

17 files changed

+1443
-245
lines changed

17 files changed

+1443
-245
lines changed

.github/workflows/docs.yml

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@ on:
44
pull_request:
55
types: [opened, synchronize, reopened]
66

7+
env:
8+
helm: v3.16.2
9+
710
jobs:
811
docs:
9-
runs-on: ubuntu-latest
1012
name: Helm docs
13+
runs-on: ubuntu-latest
1114
steps:
1215
- name: Checkout
1316
uses: actions/checkout@v4
@@ -23,3 +26,25 @@ jobs:
2326
echo "::error::Changes waiting. Please run 'helm-docs' prior to your next commit."
2427
exit -1
2528
fi
29+
30+
schema:
31+
name: Generate schema file
32+
runs-on: ubuntu-latest
33+
steps:
34+
- name: Checkout
35+
uses: actions/checkout@v4
36+
with:
37+
fetch-depth: 0
38+
39+
- name: Set up Helm
40+
uses: azure/setup-helm@v4
41+
with:
42+
version: ${{ env.helm }}
43+
44+
- name: Generate schema file
45+
uses: losisin/helm-values-schema-json-action@v1
46+
with:
47+
input: charts/monica/values.yaml
48+
output: charts/monica/values.schema.json
49+
indent: 2
50+
fail-on-diff: true

.github/workflows/tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ on:
66
env:
77
helm: v3.16.2
88
python-version: 3.x
9-
kubectl: v1.16.0
109

1110
jobs:
1211
linter:
@@ -35,11 +34,12 @@ jobs:
3534

3635
helm-tests:
3736
runs-on: ubuntu-latest
38-
name: Helm tests (${{ matrix.test_cases.name }})
37+
name: Helm tests (${{ matrix.test_cases.name }}) (K8s ${{ matrix.kubectl }})
3938

4039
strategy:
4140
fail-fast: false
4241
matrix:
42+
kubectl: [v1.16.0, v1.29.3]
4343
test_cases:
4444
- name: Default - no custom values
4545

@@ -56,7 +56,7 @@ jobs:
5656
helm_args: '--set=nginx.enabled=true --set=image.tag=main-fpm'
5757

5858
- name: Horizontal Pod Autoscaling Enabled
59-
helm_args: '--set=hpa.enabled=true --set=hpa.minPods=2 --set=hpa.maxPods=3 --set=hpa.cputhreshold=75'
59+
helm_args: '--set=autoscaling.enabled=true --set=autoscaling.miniReplicas=2 --set=autoscaling.maxReplicas=3 --set=autoscaling.targetCPU=75 --set=autoscaling.targetMemory=75'
6060

6161
- name: Redis and queue enabled
6262
file: redis.yaml
@@ -98,7 +98,7 @@ jobs:
9898
uses: helm/kind-action@v1
9999
if: steps.list-changed.outputs.changed == 'true'
100100
with:
101-
kubectl_version: ${{ env.kubectl }}
101+
kubectl_version: ${{ matrix.kubectl }}
102102

103103
- name: Copy test case file
104104
if: matrix.test_cases.file != ''

.pre-commit-config.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,9 @@ repos:
33
rev: v1.14.2
44
hooks:
55
- id: helm-docs
6+
7+
- repo: https://github.com/losisin/helm-values-schema-json
8+
rev: v1.6.1
9+
hooks:
10+
- id: helm-schema
11+
args: ["-input", "charts/monica/values.yaml", "-output", "charts/monica/values.schema.json", "-indent", "2"]

.schema.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Required
2+
input:
3+
- charts/monica/values.yaml
4+
5+
indent: 2
6+
output: charts/monica/values.schema.json
7+
8+
schemaRoot:
9+
id: https://monicahq.github.io/helm/schema
10+
title: Monica Helm Charts Values Schema
11+
description: Schema for Helm values
12+
additionalProperties: true

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
# Monica Helm Charts
22

3+
[![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/monica)](https://artifacthub.io/packages/search?repo=monica)
4+
35
[Helm](https://helm.sh) repo for different charts related to Monica which can be installed on [Kubernetes](https://kubernetes.io)
46

57
## Add Helm repository
68

79
To install the repo just run:
810

9-
```bash
11+
```console
1012
helm repo add monica https://monicahq.github.io/helm/
1113
helm repo update
1214
```

charts/monica/Chart.yaml

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: monica
33
description: A Helm chart for Kubernetes to install Monica
44
type: application
5-
version: 1.0.11
5+
version: 1.0.12
66
appVersion: "5.0.0"
77
icon: https://raw.githubusercontent.com/monicahq/monica/aa98c09/public/img/favicon.svg
88
maintainers:
@@ -12,6 +12,9 @@ maintainers:
1212
1313
keywords:
1414
- crm
15+
- prm
16+
- social
17+
- laravel
1518
kubeVersion: ">=1.16.0-0"
1619
sources:
1720
- https://github.com/monicahq/helm
@@ -61,16 +64,10 @@ annotations:
6164
url: https://github.com/monicahq/monica
6265
artifacthub.io/changes: |
6366
- kind: changed
64-
description: Use a CronJob for the cron job instead of a container
65-
- kind: changed
66-
description: Use a DaemonSet for the queue instead of a container
67-
- kind: fixed
68-
description: Fix static file rendering (css, js, ...) for nginx using and emptydir
69-
- kind: fixed
70-
description: Fixed hpa test value
67+
description: Update chart documentation
7168
- kind: fixed
72-
description: Fixed phpConfigs rendering
69+
description: Fix resources usage
7370
- kind: added
74-
description: Added a rbac.create option
75-
- kind: added
76-
description: Added a monica.queue.priorityClassName option
71+
description: Add resources for cronjob and queue
72+
- kind: changed
73+
description: Renamed 'hpa' to 'autoscaling', and its child values

0 commit comments

Comments
 (0)