docs: add greghaskins as a contributor for code (#1336)

Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>

.all-contributorsrc

@@ -436,6 +436,42 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "rogerrum",
+      "name": "Roger Rumao",
+      "avatar_url": "https://avatars.githubusercontent.com/u/10350796?v=4",
+      "profile": "https://github.com/rogerrum",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "marcelloceschia",
+      "name": "Marcello Ceschia",
+      "avatar_url": "https://avatars.githubusercontent.com/u/203448?v=4",
+      "profile": "https://github.com/marcelloceschia",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "roobre",
+      "name": "Roberto Santalla",
+      "avatar_url": "https://avatars.githubusercontent.com/u/969721?v=4",
+      "profile": "https://www.carrierlost.net",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "greghaskins",
+      "name": "Greg Haskins",
+      "avatar_url": "https://avatars.githubusercontent.com/u/285310?v=4",
+      "profile": "http://www.greghaskins.com",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.github/ct-install.yaml

@@ -6,6 +6,7 @@ chart-dirs:
 - charts/stable
 excluded-charts:
 - charts/stable/alertmanager-bot
+- charts/stable/alertmanager-discord
 - charts/stable/amcrest2mqtt
 - charts/stable/foundryvtt
 - charts/stable/heimdall

README.md

@@ -1,6 +1,6 @@
 # Helm charts
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-48-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-52-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 [![docs](https://img.shields.io/badge/docs-rtfm-yellow?logo=gitbook&logoColor=white&style=for-the-badge)](https://docs.k8s-at-home.com/)
@@ -108,6 +108,12 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://github.com/pysen"><img src="https://avatars.githubusercontent.com/u/3030145?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Arthur</b></sub></a><br /><a href="https://github.com/k8s-at-home/charts/commits?author=pysen" title="Code">💻</a></td>
     <td align="center"><a href="https://samip.dev"><img src="https://avatars.githubusercontent.com/u/1703002?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Skyler Mäntysaari</b></sub></a><br /><a href="https://github.com/k8s-at-home/charts/commits?author=samip5" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/disconn3ct"><img src="https://avatars.githubusercontent.com/u/397465?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dis</b></sub></a><br /><a href="https://github.com/k8s-at-home/charts/commits?author=disconn3ct" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/rogerrum"><img src="https://avatars.githubusercontent.com/u/10350796?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Roger Rumao</b></sub></a><br /><a href="https://github.com/k8s-at-home/charts/commits?author=rogerrum" title="Code">💻</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/marcelloceschia"><img src="https://avatars.githubusercontent.com/u/203448?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Marcello Ceschia</b></sub></a><br /><a href="https://github.com/k8s-at-home/charts/commits?author=marcelloceschia" title="Code">💻</a></td>
+    <td align="center"><a href="https://www.carrierlost.net"><img src="https://avatars.githubusercontent.com/u/969721?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Roberto Santalla</b></sub></a><br /><a href="https://github.com/k8s-at-home/charts/commits?author=roobre" title="Code">💻</a></td>
+    <td align="center"><a href="http://www.greghaskins.com"><img src="https://avatars.githubusercontent.com/u/285310?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Greg Haskins</b></sub></a><br /><a href="https://github.com/k8s-at-home/charts/commits?author=greghaskins" title="Code">💻</a></td>
   </tr>
 </table>
 

charts/README.md

@@ -5,6 +5,7 @@
 | [adguard-home](stable/adguard-home) | DNS proxy as ad-blocker for local network |
 | [airsonic](stable/airsonic) | Airsonic is a Free and Open Source community driven media server |
 | [alertmanager-bot](stable/alertmanager-bot) | Bot for Prometheus Alertmanager |
+| [alertmanager-discord](stable/alertmanager-discord) | Webhook for Prometheus Alertmanager to listen for notifications and pushes them to Discord channel |
 | [amcrest2mqtt](stable/amcrest2mqtt) | Expose all events from an Amcrest device to an MQTT broker |
 | [anonaddy](stable/anonaddy) | Anonaddy: Anonymous email forwarding |
 | [apache-musicindex](stable/apache-musicindex) | Index and stream music using apache-musicindex and m3u playlists |
@@ -160,6 +161,7 @@
 | Chart | Description |
 | ----- | ----------- |
 | [changedetection-io](incubator/changedetection-io) | changedetection-io helm package |
+| [cryptpad](incubator/cryptpad) | cryptpad helm package |
 | [lancache](incubator/lancache) | LanCache Monolithic - a caching proxy server for game download content |
 | [openhab](incubator/openhab) | openhab helm package |
 | [seafile](incubator/seafile) | seafile helm package |

charts/incubator/cryptpad/.helmignore

@@ -0,0 +1,26 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
+# OWNERS file for Kubernetes
+OWNERS
+# helm-docs templates
+*.gotmpl

charts/incubator/cryptpad/Chart.yaml

@@ -0,0 +1,19 @@
+apiVersion: v2
+appVersion: v4.12.0-nginx
+description: cryptpad helm package
+name: cryptpad
+version: 0.1.0
+kubeVersion: ">=1.16.0-0"
+keywords:
+  - cryptpad
+home: https://github.com/k8s-at-home/charts/tree/master/charts/incubator/cryptpad
+icon: https://cryptpad.fr/customize/CryptPad_logo.svg
+sources:
+  - https://github.com/xwiki-labs/cryptpad-docker
+maintainers:
+  - name: roobre
+    email: roobre@roobre.es
+dependencies:
+  - name: common
+    repository: https://library-charts.k8s-at-home.com
+    version: 4.0.1

charts/incubator/cryptpad/README.md

@@ -0,0 +1,127 @@
+# cryptpad
+
+![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![AppVersion: v4.12.0-nginx](https://img.shields.io/badge/AppVersion-v4.12.0--nginx-informational?style=flat-square)
+
+cryptpad helm package
+
+**This chart is not maintained by the upstream project and any issues with the chart should be raised [here](https://github.com/k8s-at-home/charts/issues/new/choose)**
+
+## Source Code
+
+* <https://github.com/xwiki-labs/cryptpad-docker>
+
+## Requirements
+
+Kubernetes: `>=1.16.0-0`
+
+## Dependencies
+
+| Repository | Name | Version |
+|------------|------|---------|
+| https://library-charts.k8s-at-home.com | common | 4.0.1 |
+
+## TL;DR
+
+```console
+helm repo add k8s-at-home https://k8s-at-home.com/charts/
+helm repo update
+helm install cryptpad k8s-at-home/cryptpad
+```
+
+## Installing the Chart
+
+To install the chart with the release name `cryptpad`
+
+```console
+helm install cryptpad k8s-at-home/cryptpad
+```
+
+## Uninstalling the Chart
+
+To uninstall the `cryptpad` deployment
+
+```console
+helm uninstall cryptpad
+```
+
+The command removes all the Kubernetes components associated with the chart **including persistent volumes** and deletes the release.
+
+## Configuration
+
+Read through the [values.yaml](./values.yaml) file. It has several commented out suggested values.
+Other values may be used from the [values.yaml](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common/values.yaml) from the [common library](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common).
+
+Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`.
+
+```console
+helm install cryptpad \
+  --set env.TZ="America/New York" \
+    k8s-at-home/cryptpad
+```
+
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart.
+
+```console
+helm install cryptpad k8s-at-home/cryptpad -f values.yaml
+```
+
+## Custom configuration
+
+N/A
+
+## Values
+
+**Important**: When deploying an application Helm chart you can add more values from our common library chart [here](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common)
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| config.installMethod | string | `"helm"` |  |
+| config.logFeedback | bool | `false` |  |
+| config.logLevel | string | `"info"` |  |
+| config.logToStdout | bool | `true` |  |
+| config.verbose | bool | `false` |  |
+| env | object | See below | environment variables. See more environment variables in the [cryptpad documentation](https://cryptpad.org/docs). |
+| env.TZ | string | `"UTC"` | Set the container timezone |
+| image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
+| image.repository | string | `"promasu/cryptpad"` | image repository |
+| image.tag | string | `""` | image tag (overrides appVersion) |
+| ingress.main.enabled | bool | `false` |  |
+| ingress.main.hosts[0].host | string | `"cryptpad.local"` |  |
+| ingress.main.hosts[0].paths[0].path | string | `"/"` |  |
+| ingress.main.hosts[1].host | string | `"sec.cryptpad.local"` |  |
+| ingress.main.hosts[1].paths[0].path | string | `"/"` |  |
+| ingress.main.ingressClassName | string | `""` |  |
+| persistence | object | See values.yaml | Configure persistence settings for the chart under this key. |
+| service | object | See values.yaml | Configures service settings for the chart. |
+
+## Changelog
+
+All notable changes to this application Helm chart will be documented in this file but does not include changes from our common library. To read those click [here](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common#changelog).
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+### [1.0.0]
+
+#### Added
+
+- Initial version
+
+#### Changed
+
+- N/A
+
+#### Removed
+
+- N/A
+
+[1.0.0]: #100
+
+## Support
+
+- See the [Docs](https://docs.k8s-at-home.com/our-helm-charts/getting-started/)
+- Open an [issue](https://github.com/k8s-at-home/charts/issues/new/choose)
+- Ask a [question](https://github.com/k8s-at-home/organization/discussions)
+- Join our [Discord](https://discord.gg/sTMX7Vh) community
+
+----------------------------------------------
+Autogenerated from chart metadata using [helm-docs v1.5.0](https://github.com/norwoodj/helm-docs/releases/v1.5.0)

charts/incubator/cryptpad/README.md.gotmpl

@@ -0,0 +1,146 @@
+{{- define "custom.repository.organization" -}}
+k8s-at-home
+{{- end -}}
+
+{{- define "custom.repository.url" -}}
+https://github.com/k8s-at-home/charts
+{{- end -}}
+
+{{- define "custom.helm.url" -}}
+https://k8s-at-home.com/charts/
+{{- end -}}
+
+{{- define "custom.helm.path" -}}
+{{ template "custom.repository.organization" . }}/{{ template "chart.name" . }}
+{{- end -}}
+
+{{- define "custom.notes" -}}
+**This chart is not maintained by the upstream project and any issues with the chart should be raised [here](https://github.com/k8s-at-home/charts/issues/new/choose)**
+{{- end -}}
+
+{{- define "custom.requirements" -}}
+## Requirements
+
+{{ template "chart.kubeVersionLine" . }}
+{{- end -}}
+
+{{- define "custom.dependencies" -}}
+## Dependencies
+
+{{ template "chart.requirementsTable" . }}
+{{- end -}}
+
+{{- define "custom.install.tldr" -}}
+## TL;DR
+
+```console
+helm repo add {{ template "custom.repository.organization" . }} {{ template "custom.helm.url" . }}
+helm repo update
+helm install {{ template "chart.name" . }} {{ template "custom.helm.path" . }}
+```
+{{- end -}}
+
+{{- define "custom.install" -}}
+## Installing the Chart
+
+To install the chart with the release name `{{ template "chart.name" . }}`
+
+```console
+helm install {{ template "chart.name" . }} {{ template "custom.helm.path" . }}
+```
+{{- end -}}
+
+{{- define "custom.uninstall" -}}
+## Uninstalling the Chart
+
+To uninstall the `{{ template "chart.name" . }}` deployment
+
+```console
+helm uninstall {{ template "chart.name" . }}
+```
+
+The command removes all the Kubernetes components associated with the chart **including persistent volumes** and deletes the release.
+{{- end -}}
+
+{{- define "custom.configuration.header" -}}
+## Configuration
+{{- end -}}
+
+{{- define "custom.configuration.readValues" -}}
+Read through the [values.yaml](./values.yaml) file. It has several commented out suggested values.
+Other values may be used from the [values.yaml](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common/values.yaml) from the [common library](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common).
+{{- end -}}
+
+{{- define "custom.configuration.example.set" -}}
+Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`.
+
+```console
+helm install {{ template "chart.name" . }} \
+  --set env.TZ="America/New York" \
+    {{ template "custom.helm.path" . }}
+```
+{{- end -}}
+
+{{- define "custom.configuration.example.file" -}}
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart.
+
+```console
+helm install {{ template "chart.name" . }} {{ template "custom.helm.path" . }} -f values.yaml
+```
+{{- end -}}
+
+{{- define "custom.valuesSection" -}}
+## Values
+
+**Important**: When deploying an application Helm chart you can add more values from our common library chart [here](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common)
+
+{{ template "chart.valuesTable" . }}
+{{- end -}}
+
+{{- define "custom.support" -}}
+## Support
+
+- See the [Docs](https://docs.k8s-at-home.com/our-helm-charts/getting-started/)
+- Open an [issue](https://github.com/k8s-at-home/charts/issues/new/choose)
+- Ask a [question](https://github.com/k8s-at-home/organization/discussions)
+- Join our [Discord](https://discord.gg/sTMX7Vh) community
+{{- end -}}
+
+{{ template "chart.header" . }}
+
+{{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }}
+
+{{ template "chart.description" . }}
+
+{{ template "custom.notes" . }}
+
+{{ template "chart.sourcesSection" . }}
+
+{{ template "custom.requirements" . }}
+
+{{ template "custom.dependencies" . }}
+
+{{ template "custom.install.tldr" . }}
+
+{{ template "custom.install" . }}
+
+{{ template "custom.uninstall" . }}
+
+{{ template "custom.configuration.header" . }}
+
+{{ template "custom.configuration.readValues" . }}
+
+{{ template "custom.configuration.example.set" . }}
+
+{{ template "custom.configuration.example.file" . }}
+
+{{ template "custom.custom.configuration" . }}
+
+{{ template "custom.valuesSection" . }}
+
+{{ template "custom.changelog" . }}
+
+{{ template "custom.support" . }}
+
+{{ template "helm-docs.versionFooter" . }}
+{{ "" }}

charts/incubator/cryptpad/README_CHANGELOG.md.gotmpl

@@ -0,0 +1,27 @@
+{{- define "custom.changelog.header" -}}
+## Changelog
+{{- end -}}
+
+{{- define "custom.changelog" -}}
+{{ template "custom.changelog.header" . }}
+
+All notable changes to this application Helm chart will be documented in this file but does not include changes from our common library. To read those click [here](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common#changelog).
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+### [1.0.0]
+
+#### Added
+
+- Initial version
+
+#### Changed
+
+- N/A
+
+#### Removed
+
+- N/A
+
+[1.0.0]: #100
+{{- end -}}

charts/incubator/cryptpad/README_CONFIG.md.gotmpl

@@ -0,0 +1,9 @@
+{{- define "custom.custom.configuration.header" -}}
+## Custom configuration
+{{- end -}}
+
+{{- define "custom.custom.configuration" -}}
+{{ template "custom.custom.configuration.header" . }}
+
+N/A
+{{- end -}}

charts/incubator/cryptpad/templates/NOTES.txt

@@ -0,0 +1 @@
+{{- include "common.notes.defaultNotes" . -}}

charts/incubator/cryptpad/templates/common.yaml

@@ -0,0 +1,16 @@
+{{/* Make sure all variables are set properly */}}
+{{- include "common.values.setup" . }}
+
+{{/* Append the configMap volume to the volumes */}}
+{{- define "cryptpad.configVolume" -}}
+enabled: "true"
+mountPath: "/cryptpad/config/config.js"
+subPath: "config.js"
+type: "custom"
+volumeSpec:
+  configMap:
+    name: {{ template "common.names.fullname" . }}-config
+{{- end -}}
+{{- $_ := set .Values.persistence "cryptpad-config" (include "cryptpad.configVolume" . | fromYaml) -}}
+
+{{ include "common.all" . }}

charts/incubator/cryptpad/templates/configmap.yaml

@@ -0,0 +1,23 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "common.names.fullname" . }}-config
+  labels:
+  {{- include "common.labels" . | nindent 4 }}
+data:
+  config.js: |
+    module.exports = {
+      {{- if and .Values.ingress.main.enabled .Values.ingress.main.tls }}
+      httpUnsafeOrigin: 'https://{{ (index (.Values.ingress.main.tls | first).hosts 0) }}',
+      httpSafeOrigin:   'https://{{ (index (.Values.ingress.main.tls | first).hosts 1) }}',
+      {{- else if .Values.ingress.main.enabled }}
+      httpUnsafeOrigin: '{{ (index .Values.ingress.main.hosts 0).host }}',
+      httpSafeOrigin:   '{{ (index .Values.ingress.main.hosts 1).host }}',
+      {{- end }}
+
+      httpAddress: '::',
+
+      {{- range $key, $val := .Values.config }}
+      {{ $key }}: {{ $val | toJson }},
+      {{- end }}
+    };

charts/incubator/cryptpad/values.yaml

@@ -0,0 +1,78 @@
+#
+# IMPORTANT NOTE
+#
+# This chart inherits from our common library chart. You can check the default values/options here:
+# https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common/values.yaml
+#
+
+# config.js is derived from this map.
+# See: https://github.com/xwiki-labs/cryptpad/blob/main/config/config.example.js
+# httpUnsafeOrigin and httpSafeOrigin are automatically derived from the first and second host defined in the main
+# ingress, respectively.
+config:
+#  adminKeys:
+#    - "[cryptpad-user1@my.awesome.website/YZgXQxKR0Rcb6r6CmxHPdAGLVludrAF2lEnkbx1vVOo=]"
+  logLevel: info
+  verbose: false
+  logFeedback: false
+  logToStdout: true
+  installMethod: helm
+
+image:
+  # -- image repository
+  repository: promasu/cryptpad
+  # -- image tag (overrides appVersion)
+  tag: ""
+  # -- image pull policy
+  pullPolicy: IfNotPresent
+
+# -- environment variables. See more environment variables in the [cryptpad documentation](https://cryptpad.org/docs).
+# @default -- See below
+env:
+  # -- Set the container timezone
+  TZ: UTC
+  # Main and sandbox domains are automatically fetched from the first and second host defined in the ingress,
+  # respectively.
+  # These env vars are used in the internal nginx.
+  CPAD_MAIN_DOMAIN: "{{ (index .Values.ingress.main.hosts 0).host }}"
+  CPAD_SANDBOX_DOMAIN: "{{ (index .Values.ingress.main.hosts 1).host }}"
+  # Internal nginx _forces_ http2 rather than offering it, which breaks many ingress controllers.
+  CPAD_HTTP2_DISABLE: "true"
+
+# -- Configures service settings for the chart.
+# @default -- See values.yaml
+service:
+  main:
+    ports:
+      http:
+        port: 80
+
+ingress:
+  main:
+    enabled: false
+    ingressClassName: ""
+    hosts:
+    # You must define two hosts here
+      - host: cryptpad.local
+        paths:
+          - path: /
+      - host: sec.cryptpad.local
+        paths:
+          - path: /
+
+# -- Configure persistence settings for the chart under this key.
+# @default -- See values.yaml
+persistence:
+  # Cryptpad will persist everything here.
+  data:
+    enabled: false
+    type: emptyDir
+    subPath:
+      - path: blob
+        mountPath: /cryptpad/blob
+      - path: block
+        mountPath: /cryptpad/block
+      - path: data
+        mountPath: /cryptpad/data
+      - path: datastore
+        mountPath: /cryptpad/datastore

charts/incubator/openhab/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: 3.1.0
+appVersion: 3.2.0
 description: openhab helm package
 name: openhab
-version: 1.1.0
+version: 1.2.0
 kubeVersion: ">=1.16.0-0"
 keywords:
 - openhab

charts/incubator/openhab/README.md

@@ -1,6 +1,6 @@
 # openhab
 
-![Version: 1.1.0](https://img.shields.io/badge/Version-1.1.0-informational?style=flat-square) ![AppVersion: 3.1.0](https://img.shields.io/badge/AppVersion-3.1.0-informational?style=flat-square)
+![Version: 1.2.0](https://img.shields.io/badge/Version-1.2.0-informational?style=flat-square) ![AppVersion: 3.2.0](https://img.shields.io/badge/AppVersion-3.2.0-informational?style=flat-square)
 
 openhab helm package
 
@@ -78,7 +78,7 @@ N/A
 | env | string | `nil` | environment variables. See more environment variables in the [openhab image documentation](https://hub.docker.com/r/openhab/openhab). |
 | image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
 | image.repository | string | `"openhab/openhab"` | image repository |
-| image.tag | string | `"3.1.0"` | image tag |
+| image.tag | string | `"3.2.0"` | image tag |
 | ingress.main | object | See values.yaml | Enable and configure ingress settings for the chart under this key. |
 | persistence | object | See values.yaml | Configure persistence settings for the chart under this key. Choose either -- a single volume for all data or separate volumes for each sub-directory. |
 | persistence.addons | object | `{"enabled":false,"mountPath":"/openhab/addons"}` | separate volumes |

charts/incubator/openhab/values.yaml

@@ -9,7 +9,7 @@ image:
   # -- image repository
   repository: openhab/openhab
   # -- image tag
-  tag: 3.1.0
+  tag: 3.2.0
   # -- image pull policy
   pullPolicy: IfNotPresent
 

charts/stable/alertmanager-discord/.helmignore

@@ -0,0 +1,27 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
+# OWNERS file for Kubernetes
+OWNERS
+# helm-docs templates
+*.gotmpl

charts/stable/alertmanager-discord/Chart.yaml

@@ -0,0 +1,22 @@
+apiVersion: v2
+appVersion: 1.0.3
+description: Webhook for Prometheus Alertmanager to listen for notifications and pushes them to Discord channel
+name: alertmanager-discord
+version: 1.0.0
+kubeVersion: ">=1.16.0-0"
+keywords:
+- alertmanager
+- discord
+- alerting
+home: https://github.com/k8s-at-home/charts/tree/master/charts/stable/alertmanager-discord
+icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png
+sources:
+- https://github.com/rogerrum/alertmanager-discord
+- https://hub.docker.com/r/rogerrum/alertmanager-discord
+maintainers:
+- name: rogerrum
+  email: rogerrum@gmail.com
+dependencies:
+- name: common
+  repository: https://library-charts.k8s-at-home.com
+  version: 4.2.0

charts/stable/alertmanager-discord/README.md

@@ -0,0 +1,119 @@
+# alertmanager-discord
+
+![Version: 1.0.0](https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square) ![AppVersion: 1.0.3](https://img.shields.io/badge/AppVersion-1.0.3-informational?style=flat-square)
+
+Webhook for Prometheus Alertmanager to listen for notifications and pushes them to Discord channel
+
+**This chart is not maintained by the upstream project and any issues with the chart should be raised [here](https://github.com/k8s-at-home/charts/issues/new/choose)**
+
+## Source Code
+
+* <https://github.com/rogerrum/alertmanager-discord>
+* <https://hub.docker.com/r/rogerrum/alertmanager-discord>
+
+## Requirements
+
+Kubernetes: `>=1.16.0-0`
+
+## Dependencies
+
+| Repository | Name | Version |
+|------------|------|---------|
+| https://library-charts.k8s-at-home.com | common | 4.2.0 |
+
+## TL;DR
+
+```console
+helm repo add k8s-at-home https://k8s-at-home.com/charts/
+helm repo update
+helm install alertmanager-discord k8s-at-home/alertmanager-discord
+```
+
+## Installing the Chart
+
+To install the chart with the release name `alertmanager-discord`
+
+```console
+helm install alertmanager-discord k8s-at-home/alertmanager-discord
+```
+
+## Uninstalling the Chart
+
+To uninstall the `alertmanager-discord` deployment
+
+```console
+helm uninstall alertmanager-discord
+```
+
+The command removes all the Kubernetes components associated with the chart **including persistent volumes** and deletes the release.
+
+## Configuration
+
+Read through the [values.yaml](./values.yaml) file. It has several commented out suggested values.
+Other values may be used from the [values.yaml](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common/values.yaml) from the [common library](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common).
+
+Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`.
+
+```console
+helm install alertmanager-discord \
+  --set env.TZ="America/New York" \
+    k8s-at-home/alertmanager-discord
+```
+
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart.
+
+```console
+helm install alertmanager-discord k8s-at-home/alertmanager-discord -f values.yaml
+```
+
+## Custom configuration
+
+N/A
+
+## Values
+
+**Important**: When deploying an application Helm chart you can add more values from our common library chart [here](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common)
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| env | object | See below | environment variables. See [image docs](https://github.com/metalmatze/alertmanager-bot) for more configuration options. |
+| env.DISCORD_USERNAME | string | `"Alertmanager"` | Discord Username |
+| image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
+| image.repository | string | `"rogerrum/alertmanager-discord"` | image repository |
+| image.tag | string | `"1.0.3"` | image tag |
+| ingress | object | Disabled | Enable and configure ingress settings for the chart under this key. |
+| persistence | object | See values.yaml | Configure persistence settings for the chart under this key. |
+| probes | object | Disabled | Configures probes for the chart. Normally this does not need to be modified. |
+| service | object | `{"main":{"enabled":true,"ports":{"http":{"port":9094}}}}` | Configures service settings for the chart. Normally this does not need to be modified. |
+
+## Changelog
+
+All notable changes to this application Helm chart will be documented in this file but does not include changes from our common library. To read those click [here](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/commonREADME.md#Changelog).
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+### [1.0.0]
+
+#### Added
+
+- N/A
+
+#### Changed
+
+- N/A
+
+#### Removed
+
+- N/A
+
+[1.0.0]: #1.0.0
+
+## Support
+
+- See the [Docs](https://docs.k8s-at-home.com/our-helm-charts/getting-started/)
+- Open an [issue](https://github.com/k8s-at-home/charts/issues/new/choose)
+- Ask a [question](https://github.com/k8s-at-home/organization/discussions)
+- Join our [Discord](https://discord.gg/sTMX7Vh) community
+
+----------------------------------------------
+Autogenerated from chart metadata using [helm-docs v1.5.0](https://github.com/norwoodj/helm-docs/releases/v1.5.0)

charts/stable/alertmanager-discord/README.md.gotmpl

@@ -0,0 +1,146 @@
+{{- define "custom.repository.organization" -}}
+k8s-at-home
+{{- end -}}
+
+{{- define "custom.repository.url" -}}
+https://github.com/k8s-at-home/charts
+{{- end -}}
+
+{{- define "custom.helm.url" -}}
+https://k8s-at-home.com/charts/
+{{- end -}}
+
+{{- define "custom.helm.path" -}}
+{{ template "custom.repository.organization" . }}/{{ template "chart.name" . }}
+{{- end -}}
+
+{{- define "custom.notes" -}}
+**This chart is not maintained by the upstream project and any issues with the chart should be raised [here](https://github.com/k8s-at-home/charts/issues/new/choose)**
+{{- end -}}
+
+{{- define "custom.requirements" -}}
+## Requirements
+
+{{ template "chart.kubeVersionLine" . }}
+{{- end -}}
+
+{{- define "custom.dependencies" -}}
+## Dependencies
+
+{{ template "chart.requirementsTable" . }}
+{{- end -}}
+
+{{- define "custom.install.tldr" -}}
+## TL;DR
+
+```console
+helm repo add {{ template "custom.repository.organization" . }} {{ template "custom.helm.url" . }}
+helm repo update
+helm install {{ template "chart.name" . }} {{ template "custom.helm.path" . }}
+```
+{{- end -}}
+
+{{- define "custom.install" -}}
+## Installing the Chart
+
+To install the chart with the release name `{{ template "chart.name" . }}`
+
+```console
+helm install {{ template "chart.name" . }} {{ template "custom.helm.path" . }}
+```
+{{- end -}}
+
+{{- define "custom.uninstall" -}}
+## Uninstalling the Chart
+
+To uninstall the `{{ template "chart.name" . }}` deployment
+
+```console
+helm uninstall {{ template "chart.name" . }}
+```
+
+The command removes all the Kubernetes components associated with the chart **including persistent volumes** and deletes the release.
+{{- end -}}
+
+{{- define "custom.configuration.header" -}}
+## Configuration
+{{- end -}}
+
+{{- define "custom.configuration.readValues" -}}
+Read through the [values.yaml](./values.yaml) file. It has several commented out suggested values.
+Other values may be used from the [values.yaml](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common/values.yaml) from the [common library](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common).
+{{- end -}}
+
+{{- define "custom.configuration.example.set" -}}
+Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`.
+
+```console
+helm install {{ template "chart.name" . }} \
+  --set env.TZ="America/New York" \
+    {{ template "custom.helm.path" . }}
+```
+{{- end -}}
+
+{{- define "custom.configuration.example.file" -}}
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart.
+
+```console
+helm install {{ template "chart.name" . }} {{ template "custom.helm.path" . }} -f values.yaml
+```
+{{- end -}}
+
+{{- define "custom.valuesSection" -}}
+## Values
+
+**Important**: When deploying an application Helm chart you can add more values from our common library chart [here](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common)
+
+{{ template "chart.valuesTable" . }}
+{{- end -}}
+
+{{- define "custom.support" -}}
+## Support
+
+- See the [Docs](https://docs.k8s-at-home.com/our-helm-charts/getting-started/)
+- Open an [issue](https://github.com/k8s-at-home/charts/issues/new/choose)
+- Ask a [question](https://github.com/k8s-at-home/organization/discussions)
+- Join our [Discord](https://discord.gg/sTMX7Vh) community
+{{- end -}}
+
+{{ template "chart.header" . }}
+
+{{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }}
+
+{{ template "chart.description" . }}
+
+{{ template "custom.notes" . }}
+
+{{ template "chart.sourcesSection" . }}
+
+{{ template "custom.requirements" . }}
+
+{{ template "custom.dependencies" . }}
+
+{{ template "custom.install.tldr" . }}
+
+{{ template "custom.install" . }}
+
+{{ template "custom.uninstall" . }}
+
+{{ template "custom.configuration.header" . }}
+
+{{ template "custom.configuration.readValues" . }}
+
+{{ template "custom.configuration.example.set" . }}
+
+{{ template "custom.configuration.example.file" . }}
+
+{{ template "custom.custom.configuration" . }}
+
+{{ template "custom.valuesSection" . }}
+
+{{ template "custom.changelog" . }}
+
+{{ template "custom.support" . }}
+
+{{ template "helm-docs.versionFooter" . }}
+{{ "" }}

charts/stable/alertmanager-discord/README_CHANGELOG.md.gotmpl

@@ -0,0 +1,27 @@
+{{- define "custom.changelog.header" -}}
+## Changelog
+{{- end -}}
+
+{{- define "custom.changelog" -}}
+{{ template "custom.changelog.header" . }}
+
+All notable changes to this application Helm chart will be documented in this file but does not include changes from our common library. To read those click [here](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/commonREADME.md#Changelog).
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+### [1.0.0]
+
+#### Added
+
+- N/A
+
+#### Changed
+
+- N/A
+
+#### Removed
+
+- N/A
+
+[1.0.0]: #1.0.0
+{{- end -}}

charts/stable/alertmanager-discord/README_CONFIG.md.gotmpl

@@ -0,0 +1,9 @@
+{{- define "custom.custom.configuration.header" -}}
+## Custom configuration
+{{- end -}}
+
+{{- define "custom.custom.configuration" -}}
+{{ template "custom.custom.configuration.header" . }}
+
+N/A
+{{- end -}}

charts/stable/alertmanager-discord/templates/NOTES.txt

@@ -0,0 +1 @@
+{{- include "common.notes.defaultNotes" . -}}

charts/stable/alertmanager-discord/templates/common.yaml

@@ -0,0 +1 @@
+{{ include "common.all" . }}

charts/stable/alertmanager-discord/values.yaml

@@ -0,0 +1,62 @@
+#
+# IMPORTANT NOTE
+#
+# This chart inherits from our common library chart. You can check the default values/options here:
+# https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common/values.yaml
+#
+
+image:
+  # -- image repository
+  repository: rogerrum/alertmanager-discord
+  # -- image tag
+  tag: 1.0.3
+  # -- image pull policy
+  pullPolicy: IfNotPresent
+
+# -- environment variables. See [image docs](https://github.com/metalmatze/alertmanager-bot) for more configuration options.
+# @default -- See below
+env:
+  # -- Discord Username
+  DISCORD_USERNAME: "Alertmanager"
+#   -- Discord Avatar icon
+#  DISCORD_AVATAR_URL: "https://avatars3.githubusercontent.com/u/3380462"
+#   -- Enable Verbose mode (log request and responses)
+#  VERBOSE: "ON"
+#   -- Discord Webhook - Can be used from envValueFrom secrets
+#  DISCORD_WEBHOOK=""
+#  DISCORD_WEBHOOK:
+#    valueFrom:
+#      secretKeyRef:
+#        name: alertmanager-discord-secret
+#        key: DISCORD_WEBHOOK
+
+
+# -- Configures service settings for the chart. Normally this does not need to be modified.
+service:
+  main:
+    enabled: true
+    ports:
+      http:
+        port: 9094
+
+# -- Enable and configure ingress settings for the chart under this key.
+# @default -- Disabled
+ingress:
+  main:
+    enabled: false
+
+# -- Configures probes for the chart. Normally this does not need to be modified.
+# @default -- Disabled
+probes:
+  liveness:
+    enabled: false
+  readiness:
+    enabled: false
+  startup:
+    enabled: false
+
+# -- Configure persistence settings for the chart under this key.
+# @default -- See values.yaml
+persistence:
+  data:
+    enabled: false

charts/stable/blocky/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: v0.15
+appVersion: v0.17
 description: DNS proxy as ad-blocker for local network
 name: blocky
-version: 9.1.0
+version: 10.0.0
 kubeVersion: ">=1.16.0-0"
 keywords:
 - blocky

charts/stable/blocky/README.md

@@ -1,6 +1,6 @@
 # blocky
 
-![Version: 9.1.0](https://img.shields.io/badge/Version-9.1.0-informational?style=flat-square) ![AppVersion: v0.15](https://img.shields.io/badge/AppVersion-v0.15-informational?style=flat-square)
+![Version: 10.0.0](https://img.shields.io/badge/Version-10.0.0-informational?style=flat-square) ![AppVersion: v0.17](https://img.shields.io/badge/AppVersion-v0.17-informational?style=flat-square)
 
 DNS proxy as ad-blocker for local network
 
@@ -75,20 +75,23 @@ N/A
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| config | string | see URL to default config | Full list of options https://github.com/0xERR0R/blocky/blob/master/docs/config.yml |
+| config | string | see URL to default config | Full list of options https://github.com/0xERR0R/blocky/blob/v0.17/docs/config.yml |
 | controller.replicas | int | `1` | (int) Number of pods to load balance between |
 | controller.strategy | string | `"RollingUpdate"` | Set the controller upgrade strategy |
 | env | object | See below | environment variables. See [image docs](https://0xerr0r.github.io/blocky/installation/#run-with-docker) for more details. |
 | env.TZ | string | `"UTC"` | Set the container timezone |
 | image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
 | image.repository | string | `"spx01/blocky"` | image repository |
-| image.tag | string | `"v0.15"` | image tag |
+| image.tag | string | `"v0.17"` | image tag |
 | metrics.enabled | bool | See values.yaml | Enable and configure a Prometheus serviceMonitor for the chart under this key. |
 | metrics.prometheusRule | object | See values.yaml | Enable and configure Prometheus Rules for the chart under this key. |
 | metrics.prometheusRule.rules | list | See prometheusrules.yaml | Configure additionial rules for the chart under this key. |
-| metrics.serviceMonitor.interval | string | `"30s"` |  |
-| metrics.serviceMonitor.labels | object | `{}` |  |
-| metrics.serviceMonitor.scrapeTimeout | string | `"10s"` |  |
+| metrics.serviceMonitor.interval | string | `"30s"` | Interval at which Prometheus should scrape metrics |
+| metrics.serviceMonitor.jobLabel | string | `""` | The Kubernetes `Endpoints` label to use as the Prometheus job name |
+| metrics.serviceMonitor.labels | object | `{}` | Additional labels for the Kubernetes `ServiceMonitor` object |
+| metrics.serviceMonitor.podTargetLabels | list | `[]` | PodTargetLabels transfers labels on the Kubernetes `Pod`` onto the created metrics. |
+| metrics.serviceMonitor.scrapeTimeout | string | `"10s"` | Timeout after which the scrape is ended |
+| metrics.serviceMonitor.targetLabels | list | `[]` | TargetLabels transfers labels from the Kubernetes `Service`` onto the created metrics. |
 | persistence | object | See values.yaml | Configure persistence settings for the chart under this key. |
 | service | object | See values.yaml | Configures service settings for the chart. |
 
@@ -98,6 +101,16 @@ All notable changes to this application Helm chart will be documented in this fi
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+### [10.0.0]
+
+#### Added
+
+- Parameters in `values.yaml` for specifying the `jobLabel`, `targetLabels`, and `podTargetLabels` fields on the Prometheus ServiceMonitor object.
+
+#### Changed
+
+- **BREAKING**: Updated Blocky image and AppVersion to v0.17. This version of Blocky has a few backwards-incompatible `config.yml` differences compared to v0.15. Update your `config` chart values to check the `upstream`, `queryLog`, `certFile`, and `keyFile` settings (if applicable).
+
 ### [9.0.0]
 
 #### Changed

charts/stable/blocky/README_CHANGELOG.md.gotmpl

@@ -9,6 +9,16 @@ All notable changes to this application Helm chart will be documented in this fi
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+### [10.0.0]
+
+#### Added
+
+- Parameters in `values.yaml` for specifying the `jobLabel`, `targetLabels`, and `podTargetLabels` fields on the Prometheus ServiceMonitor object.
+
+#### Changed
+
+- **BREAKING**: Updated Blocky image and AppVersion to v0.17. This version of Blocky has a few backwards-incompatible `config.yml` differences compared to v0.15. Update your `config` chart values to check the `upstream`, `queryLog`, `certFile`, and `keyFile` settings (if applicable).
+
 ### [9.0.0]
 
 #### Changed

charts/stable/blocky/templates/servicemonitor.yaml

@@ -21,4 +21,19 @@ spec:
       scrapeTimeout: {{ . }}
       {{- end }}
       path: /metrics
+  {{- with .Values.metrics.serviceMonitor.jobLabel }}
+  jobLabel: {{ . }}
+  {{- end }}
+  {{- with .Values.metrics.serviceMonitor.targetLabels }}
+  targetLabels:
+    {{- range . }}
+    - {{ . }}
+    {{- end }}
+  {{- end}}
+  {{- with .Values.metrics.serviceMonitor.podTargetLabels }}
+  podTargetLabels:
+    {{- range . }}
+    - {{ . }}
+    {{- end }}
+  {{- end}}
 {{- end }}

charts/stable/blocky/values.yaml

@@ -9,7 +9,7 @@ image:
   # -- image repository
   repository: spx01/blocky
   # -- image tag
-  tag: v0.15
+  tag: v0.17
   # -- image pull policy
   pullPolicy: IfNotPresent
 
@@ -65,9 +65,18 @@ metrics:
   # @default -- See values.yaml
   enabled: false
   serviceMonitor:
+    # -- Interval at which Prometheus should scrape metrics
     interval: 30s
+    # -- Timeout after which the scrape is ended
     scrapeTimeout: 10s
+    # -- Additional labels for the Kubernetes `ServiceMonitor` object
     labels: {}
+    # -- The Kubernetes `Endpoints` label to use as the Prometheus job name
+    jobLabel: ""
+    # -- TargetLabels transfers labels from the Kubernetes `Service`` onto the created metrics.
+    targetLabels: []
+    # -- PodTargetLabels transfers labels on the Kubernetes `Pod`` onto the created metrics.
+    podTargetLabels: []
   # -- Enable and configure Prometheus Rules for the chart under this key.
   # @default -- See values.yaml
   prometheusRule:
@@ -87,27 +96,38 @@ metrics:
       #   labels:
       #     severity: critical
 
-# -- Full list of options https://github.com/0xERR0R/blocky/blob/master/docs/config.yml
+# -- Full list of options https://github.com/0xERR0R/blocky/blob/v0.17/docs/config.yml
 # @default -- see URL to default config
 config: |
   upstream:
     # these external DNS resolvers will be used. Blocky picks 2 random resolvers from the list for each query
     # format for resolver: [net:]host:[port][/path]. net could be empty (default, shortcut for tcp+udp), tcp+udp, tcp, udp, tcp-tls or https (DoH). If port is empty, default port will be used (53 for udp and tcp, 853 for tcp-tls, 443 for https (Doh))
-    externalResolvers:
+    # this configuration is mandatory, please define at least one external DNS resolver
+    default:
       - 46.182.19.48
       - 80.241.218.68
       - tcp-tls:fdns1.dismail.de:853
       - https://dns.digitale-gesellschaft.ch/dns-query
+    # optional: use client name (with wildcard support: * - sequence of any characters, [0-9] - range)
+    # or single ip address / client subnet as CIDR notation
+    laptop*:
+      - 123.123.123.123
 
-  # optional: custom IP address for domain name (with all sub-domains)
+  # optional: timeout to query the upstream resolver. Default: 2s
+  upstreamTimeout: 2s
+
+  # optional: custom IP address(es) for domain name (with all sub-domains). Multiple addresses must be separated by a comma
   # example: query "printer.lan" or "my.printer.lan" will return 192.168.178.3
   customDNS:
     mapping:
-      printer.lan: 192.168.178.3
+      printer.lan: 192.168.178.3,2001:0db8:85a3:08d3:1319:8a2e:0370:7344
 
-  # optional: definition, which DNS resolver(s) should be used for queries to the domain (with all sub-domains). Multiple resolvers must be separated by comma
+  # optional: definition, which DNS resolver(s) should be used for queries to the domain (with all sub-domains). Multiple resolvers must be separated by a comma
   # Example: Query client.fritz.box will ask DNS server 192.168.178.1. This is necessary for local network, to resolve clients by host name
   conditional:
+    # optional: replace domain in the query with other domain before resolver lookup in the mapping
+    rewrite:
+      example.com: fritz.box
     mapping:
       fritz.box: udp:192.168.178.1
       lan.net: udp:192.168.178.1,udp:192.168.178.2
@@ -123,12 +143,22 @@ config: |
         - http://sysctl.org/cameleon/hosts
         - https://zeustracker.abuse.ch/blocklist.php?download=domainblocklist
         - https://s3.amazonaws.com/lists.disconnect.me/simple_tracking.txt
+        - |
+          # inline definition with YAML literal block scalar style
+          # hosts format
+          someadsdomain.com
       special:
         - https://raw.githubusercontent.com/StevenBlack/hosts/master/alternates/fakenews/hosts
     # definition of whitelist groups. Attention: if the same group has black and whitelists, whitelists will be used to disable particular blacklist entries. If a group has only whitelist entries -> this means only domains from this list are allowed, all other domains will be blocked
     whiteLists:
       ads:
         - whitelist.txt
+        - |
+          # inline definition with YAML literal block scalar style
+          # hosts format
+          whitelistdomain.com
+          # this is a regex
+          /^banners?[_.-]/
     # definition: which groups should be applied for which client
     clientGroupsBlock:
       # default will be used, if no special definition for a client name exists
@@ -144,29 +174,52 @@ config: |
     # which response will be sent, if query is blocked:
     # zeroIp: 0.0.0.0 will be returned (default)
     # nxDomain: return NXDOMAIN as return code
-    # comma separated list of destination IP adresses (for example: 192.100.100.15, 2001:0db8:85a3:08d3:1319:8a2e:0370:7344). Should contain ipv4 and ipv6 to cover all query types. Useful with running web server on this address to display the "blocked" page.
+    # comma separated list of destination IP addresses (for example: 192.100.100.15, 2001:0db8:85a3:08d3:1319:8a2e:0370:7344). Should contain ipv4 and ipv6 to cover all query types. Useful with running web server on this address to display the "blocked" page.
     blockType: zeroIp
-    # optional: automatically list refresh period in minutes. Default: 4h.
+    # optional: TTL for answers to blocked domains
+    # default: 6h
+    blockTTL: 1m
+    # optional: automatically list refresh period (in duration format). Default: 4h.
     # Negative value -> deactivate automatically refresh.
     # 0 value -> use default
-    refreshPeriod: 0
+    refreshPeriod: 4h
+    # optional: timeout for list download (each url). Default: 60s. Use large values for big lists or slow internet connections
+    downloadTimeout: 4m
+    # optional: Download attempt timeout. Default: 60s
+    downloadAttempts: 5
+    # optional: Time between the download attempts. Default: 1s
+    downloadCooldown: 10s
+    # optional: if true, application startup will fail if at least one list can't be downloaded / opened. Default: false
+    failStartOnListError: false
 
   # optional: configuration for caching of DNS responses
   caching:
-    # amount in minutes, how long a response must be cached (min value).
+    # duration how long a response must be cached (min value).
     # If <=0, use response's TTL, if >0 use this value, if TTL is smaller
     # Default: 0
-    minTime: 5
-    # amount in minutes, how long a response must be cached (max value).
+    minTime: 5m
+    # duration how long a response must be cached (max value).
     # If <0, do not cache responses
     # If 0, use TTL
     # If > 0, use this value, if TTL is greater
     # Default: 0
     maxTime: -1
-    # if true, will preload DNS results for often used queries (names queried more than 5 times in a 2 hour time window)
+    # Max number of cache entries (responses) to be kept in cache (soft limit). Useful on systems with limited amount of RAM.
+    # Default (0): unlimited
+    maxItemsCount: 0
+    # if true, will preload DNS results for often used queries (default: names queried more than 5 times in a 2-hour time window)
     # this improves the response time for often used queries, but significantly increases external traffic
     # default: false
     prefetching: true
+    # prefetch track time window (in duration format)
+    # default: 120
+    prefetchExpires: 2h
+    # name queries threshold for prefetch
+    # default: 5
+    prefetchThreshold: 5
+    # Max number of domains to be kept in cache for prefetching (soft limit). Useful on systems with limited amount of RAM.
+    # Default (0): unlimited
+    prefetchMaxItemsCount: 0
 
   # optional: configuration of client name resolution
   clientLookup:
@@ -181,35 +234,41 @@ config: |
     clients:
       laptop:
         - 192.168.178.29
-
   # optional: configuration for prometheus metrics endpoint
-  # prometheus:
-  #   # enabled if true
-  #   enable: true
-  #   # url path, optional (default '/metrics')
-  #   path: /metrics
+  prometheus:
+    # enabled if true
+    enable: true
+    # url path, optional (default '/metrics')
+    path: /metrics
 
-  # optional: write query information (question, answer, client, duration etc) to daily csv file
-  # queryLog:
-  #   # directory (should be mounted as volume in docker)
-  #   dir: /logs
-  #   # if true, write one file per client. Writes all queries to single file otherwise
-  #   perClient: true
-  #   # if > 0, deletes log files which are older than ... days
-  #   logRetentionDays: 7
+  # optional: write query information (question, answer, client, duration etc.) to daily csv file
+  queryLog:
+    # optional one of: mysql, csv, csv-client. If empty, log to console
+    type: mysql
+    # directory (should be mounted as volume in docker) for csv, db connection string for mysql
+    target: db_user:db_password@tcp(db_host_or_ip:3306)/db_user?charset=utf8mb4&parseTime=True&loc=Local
+    # if > 0, deletes log files which are older than ... days
+    logRetentionDays: 7
 
   # optional: DNS listener port and bind ip address, default 53 (UDP and TCP). Example: 53, :53, 127.0.0.1:53
   port: 53
-  # optional: HTTP listener port, default 0 = no http listener. If > 0, will be used for prometheus metrics, pprof, REST API, DoH ...
+  # optional: Port for DoT (DNS-over-TLS) listener. Example: 853, 127.0.0.1:853
+  #tlsPort: 53
+  # optional: HTTPS listener port and bind ip address, default empty = no http listener. If > 0, will be used for prometheus metrics, pprof, REST API, DoH... Example: 443, :443, 127.0.0.1:443
   httpPort: 4000
-  # optional: HTTPS listener port, default 0 = no http listener. If > 0, will be used for prometheus metrics, pprof, REST API, DoH...
   #httpsPort: 443
   # mandatory, if https port > 0: path to cert and key file for SSL encryption
-  #httpsCertFile: server.crt
-  #httpsKeyFile: server.key
-  # optional: use this DNS server to resolve blacklist urls and upstream DNS servers (DOH). Useful if no DNS resolver is configured and blocky needs to resolve a host name. Format net:IP:port, net must be udp or tcp
+  #certFile: server.crt
+  #keyFile: server.key
+  # optional: use this DNS server to resolve blacklist urls and upstream DNS servers. Useful if no DNS resolver is configured and blocky needs to resolve a host name. Format net:IP:port, net must be udp or tcp
   bootstrapDns: tcp:1.1.1.1
+  # optional: Drop all AAAA query if set to true. Default: false
+  disableIPv6: false
   # optional: Log level (one from debug, info, warn, error). Default: info
   logLevel: info
   # optional: Log format (text or json). Default: text
   logFormat: text
+  # optional: log timestamps. Default: true
+  logTimestamp: true
+  # optional: obfuscate log output (replace all alphanumeric characters with *) for user sensitive data like request domains or responses to increase privacy. Default: false
+  logPrivacy: false

charts/stable/mealie/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v0.5.1
 description: Mealie is a self hosted recipe manager and meal planner with a RestAPI backend and a reactive frontend application built in Vue for a pleasant user experience for the whole family.
 name: mealie
-version: 3.2.0
+version: 3.2.1
 kubeVersion: ">=1.16.0-0"
 keywords:
 - grocy

charts/stable/mealie/README.md

@@ -1,6 +1,6 @@
 # mealie
 
-![Version: 3.2.0](https://img.shields.io/badge/Version-3.2.0-informational?style=flat-square) ![AppVersion: v0.5.1](https://img.shields.io/badge/AppVersion-v0.5.1-informational?style=flat-square)
+![Version: 3.2.1](https://img.shields.io/badge/Version-3.2.1-informational?style=flat-square) ![AppVersion: v0.5.1](https://img.shields.io/badge/AppVersion-v0.5.1-informational?style=flat-square)
 
 Mealie is a self hosted recipe manager and meal planner with a RestAPI backend and a reactive frontend application built in Vue for a pleasant user experience for the whole family.
 
@@ -84,7 +84,7 @@ N/A
 | image.tag | string | `"v0.5.1"` | image tag |
 | ingress.main | object | See values.yaml | Enable and configure ingress settings for the chart under this key. |
 | persistence | object | See values.yaml | Configure persistence settings for the chart under this key. |
-| postgres | object | See values.yaml | Enable and configure postgresql database subchart under this key.    For more options see [postgresql chart documentation](https://github.com/bitnami/charts/tree/master/bitnami/postgresql) |
+| postgresql | object | See values.yaml | Enable and configure postgresql database subchart under this key.    For more options see [postgresql chart documentation](https://github.com/bitnami/charts/tree/master/bitnami/postgresql) |
 | service | object | See values.yaml | Configures service settings for the chart. |
 
 ## Changelog

charts/stable/mealie/values.yaml

@@ -45,7 +45,7 @@ persistence:
 # -- Enable and configure postgresql database subchart under this key.
 #    For more options see [postgresql chart documentation](https://github.com/bitnami/charts/tree/master/bitnami/postgresql)
 # @default -- See values.yaml
-postgres:
+postgresql:
   enabled: false
   postgresqlUsername: mealie
   postgresqlPassword: mealie-pass