Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v1.0.12: Update Chart documentation, fix resources, and rename hpa to autoscaling #17

Merged
merged 6 commits into from
Oct 31, 2024
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
27 changes: 26 additions & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,13 @@ on:
pull_request:
types: [opened, synchronize, reopened]

env:
helm: v3.16.2

jobs:
docs:
runs-on: ubuntu-latest
name: Helm docs
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -23,3 +26,25 @@ jobs:
echo "::error::Changes waiting. Please run 'helm-docs' prior to your next commit."
exit -1
fi

schema:
name: Generate schema file
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Set up Helm
uses: azure/setup-helm@v4
with:
version: ${{ env.helm }}

- name: Generate schema file
uses: losisin/helm-values-schema-json-action@v1
with:
input: charts/monica/values.yaml
output: charts/monica/values.schema.json
indent: 2
fail-on-diff: true
8 changes: 4 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ on:
env:
helm: v3.16.2
python-version: 3.x
kubectl: v1.16.0

jobs:
linter:
Expand Down Expand Up @@ -35,11 +34,12 @@ jobs:

helm-tests:
runs-on: ubuntu-latest
name: Helm tests (${{ matrix.test_cases.name }})
name: Helm tests (${{ matrix.test_cases.name }}) (K8s ${{ matrix.kubectl }})

strategy:
fail-fast: false
matrix:
kubectl: [v1.16.0, v1.29.3]
test_cases:
- name: Default - no custom values

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

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

- name: Redis and queue enabled
file: redis.yaml
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
uses: helm/kind-action@v1
if: steps.list-changed.outputs.changed == 'true'
with:
kubectl_version: ${{ env.kubectl }}
kubectl_version: ${{ matrix.kubectl }}

- name: Copy test case file
if: matrix.test_cases.file != ''
Expand Down
6 changes: 6 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,9 @@ repos:
rev: v1.14.2
hooks:
- id: helm-docs

- repo: https://github.com/losisin/helm-values-schema-json
rev: v1.6.1
hooks:
- id: helm-schema
args: ["-input", "charts/monica/values.yaml", "-output", "charts/monica/values.schema.json", "-indent", "2"]
12 changes: 12 additions & 0 deletions .schema.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Required
input:
- charts/monica/values.yaml

indent: 2
output: charts/monica/values.schema.json

schemaRoot:
id: https://monicahq.github.io/helm/schema
title: Monica Helm Charts Values Schema
description: Schema for Helm values
additionalProperties: true
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
# Monica Helm Charts

[![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/monica)](https://artifacthub.io/packages/search?repo=monica)

[Helm](https://helm.sh) repo for different charts related to Monica which can be installed on [Kubernetes](https://kubernetes.io)

## Add Helm repository

To install the repo just run:

```bash
```console
helm repo add monica https://monicahq.github.io/helm/
helm repo update
```
Expand Down
21 changes: 9 additions & 12 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.11
version: 1.0.12
appVersion: "5.0.0"
icon: https://raw.githubusercontent.com/monicahq/monica/aa98c09/public/img/favicon.svg
maintainers:
Expand All @@ -12,6 +12,9 @@ maintainers:
email: [email protected]
keywords:
- crm
- prm
- social
- laravel
kubeVersion: ">=1.16.0-0"
sources:
- https://github.com/monicahq/helm
Expand Down Expand Up @@ -61,16 +64,10 @@ annotations:
url: https://github.com/monicahq/monica
artifacthub.io/changes: |
- kind: changed
description: Use a CronJob for the cron job instead of a container
- kind: changed
description: Use a DaemonSet for the queue instead of a container
- kind: fixed
description: Fix static file rendering (css, js, ...) for nginx using and emptydir
- kind: fixed
description: Fixed hpa test value
description: Update chart documentation
- kind: fixed
description: Fixed phpConfigs rendering
description: Fix resources usage
- kind: added
description: Added a rbac.create option
- kind: added
description: Added a monica.queue.priorityClassName option
description: Add resources for cronjob and queue
- kind: changed
description: Renamed 'hpa' to 'autoscaling', and its child values
Loading