diff --git a/charts/domain-watch/Chart.lock b/charts/domain-watch/Chart.lock index 525d08bd7..9dc6293cb 100644 --- a/charts/domain-watch/Chart.lock +++ b/charts/domain-watch/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: common repository: https://bjw-s.github.io/helm-charts - version: 1.5.1 -digest: sha256:3588c89621170f198d4938664d3ea4c469bd91fd78183c83cfcf63f474d348c4 -generated: "2023-08-06T06:23:31.053086158Z" + version: 2.4.0 +digest: sha256:dcf2f5bef73f1da784d5021045e34ff6a70ce7d4518efec6500c7d697ffdacea +generated: "2024-01-09T00:25:59.61141-06:00" diff --git a/charts/domain-watch/Chart.yaml b/charts/domain-watch/Chart.yaml index 45b0dc4d9..b9f99c8c8 100644 --- a/charts/domain-watch/Chart.yaml +++ b/charts/domain-watch/Chart.yaml @@ -4,7 +4,7 @@ description: Tool to watch whois reports and notify when statuses change or expi home: https://charts.gabe565.com/charts/domain-watch/ icon: https://raw.githubusercontent.com/gabe565/domain-watch/ee028db/assets/icon.svg type: application -version: 0.5.3 +version: 1.0.0 # renovate datasource=docker depName=ghcr.io/gabe565/domain-watch appVersion: latest kubeVersion: ">=1.22.0-0" @@ -15,13 +15,13 @@ keywords: dependencies: - name: common repository: https://bjw-s.github.io/helm-charts - version: 1.5.1 + version: 2.4.0 sources: - https://github.com/gabe565/domain-watch annotations: artifacthub.io/changes: |- - - kind: added - description: Add default ServiceMonitor values + - kind: changed + description: BREAKING - Update common helm release to v2 artifacthub.io/links: |- - name: App Source url: https://github.com/gabe565/domain-watch diff --git a/charts/domain-watch/README.md b/charts/domain-watch/README.md index c2f04bfb8..07871ae61 100644 --- a/charts/domain-watch/README.md +++ b/charts/domain-watch/README.md @@ -2,7 +2,7 @@ domain-watch logo -![Version: 0.5.3](https://img.shields.io/badge/Version-0.5.3-informational?style=flat) +![Version: 1.0.0](https://img.shields.io/badge/Version-1.0.0-informational?style=flat) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat) @@ -11,7 +11,7 @@ Tool to watch whois reports and notify when statuses change or expiration is inc **Homepage:** **This chart is not maintained by the upstream project and any issues with the chart should be raised -[here](https://github.com/gabe565/charts/issues/new?assignees=gabe565&labels=bug&template=bug_report.yaml&name=domain-watch&version=0.5.3)** +[here](https://github.com/gabe565/charts/issues/new?assignees=gabe565&labels=bug&template=bug_report.yaml&name=domain-watch&version=1.0.0)** ## Source Code @@ -25,7 +25,7 @@ Kubernetes: `>=1.22.0-0` | Repository | Name | Version | |------------|------|---------| -| | common | 1.5.1 | +| | common | 2.4.0 | ## Installing the Chart @@ -58,7 +58,7 @@ The command removes all the Kubernetes components associated with the chart **in ## 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/bjw-s/helm-charts/tree/a081de5/charts/library/common/values.yaml) from the [bjw-s common library](https://github.com/bjw-s/helm-charts/tree/a081de5/charts/library/common). +Other values may be used from the [values.yaml](https://github.com/bjw-s/helm-charts/tree/main/charts/library/common/values.yaml) from the [bjw-s common library](https://github.com/bjw-s/helm-charts/tree/main/charts/library/common). Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. @@ -80,21 +80,21 @@ N/A ## Values -**Important**: When deploying an application Helm chart you can add more values from the bjw-s common library chart [here](https://github.com/bjw-s/helm-charts/tree/a081de5/charts/library/common) +**Important**: When deploying an application Helm chart you can add more values from the bjw-s common library chart [here](https://github.com/bjw-s/helm-charts/tree/main/charts/library/common) | Key | Type | Default | Description | |-----|------|---------|-------------| -| controller.strategy | string | `"RollingUpdate"` | Set the controller upgrade strategy | -| env.WATCH_DOMAINS | string | `"example.com example.org"` | Whitespace-separated list of domains to watch. See [values.yaml](./values.yaml) for example. | -| env.WATCH_EVERY | string | `"6h"` | Domain check interval | -| env.WATCH_LOG_FORMAT | string | `"text"` | Log format. Valid options are text, json. | -| env.WATCH_LOG_LEVEL | string | `"info"` | Log level. Valid options are trace, debug, info, warn, error, fatal, panic. | -| env.WATCH_SLEEP | string | `"3s"` | Sleep interval between domain checks to avoid rate limits | -| env.WATCH_TELEGRAM_CHAT | string | `""` | Telegram chat ID | -| env.WATCH_TELEGRAM_TOKEN | string | `""` | Telegram token [[ref]](https://core.telegram.org/bots#6-botfather) | -| image.pullPolicy | string | `"Always"` | image pull policy | -| image.repository | string | `"ghcr.io/gabe565/domain-watch"` | image repository | -| image.tag | string | `"latest"` | image tag | +| controllers.main.containers.main.env.WATCH_DOMAINS | string | `"example.com example.org"` | Whitespace-separated list of domains to watch. See [values.yaml](./values.yaml) for example. | +| controllers.main.containers.main.env.WATCH_EVERY | string | `"6h"` | Domain check interval | +| controllers.main.containers.main.env.WATCH_LOG_FORMAT | string | `"text"` | Log format. Valid options are text, json. | +| controllers.main.containers.main.env.WATCH_LOG_LEVEL | string | `"info"` | Log level. Valid options are trace, debug, info, warn, error, fatal, panic. | +| controllers.main.containers.main.env.WATCH_SLEEP | string | `"3s"` | Sleep interval between domain checks to avoid rate limits | +| controllers.main.containers.main.env.WATCH_TELEGRAM_CHAT | string | `""` | Telegram chat ID | +| controllers.main.containers.main.env.WATCH_TELEGRAM_TOKEN | string | `""` | Telegram token [[ref]](https://core.telegram.org/bots#6-botfather) | +| controllers.main.containers.main.image.pullPolicy | string | `"Always"` | image pull policy | +| controllers.main.containers.main.image.repository | string | `"ghcr.io/gabe565/domain-watch"` | image repository | +| controllers.main.containers.main.image.tag | string | `"latest"` | image tag | +| controllers.main.strategy | string | `"RollingUpdate"` | Set the controller upgrade strategy | | service | object | See [values.yaml](./values.yaml) | Configures service settings for the chart. | | serviceMonitor.main.enabled | bool | `false` | Enables or disables the serviceMonitor. | | serviceMonitor.main.endpoints | list | See [values.yaml](./values.yaml) | Configures the endpoints for the serviceMonitor. | diff --git a/charts/domain-watch/templates/NOTES.txt b/charts/domain-watch/templates/NOTES.txt deleted file mode 100644 index 44ecfaa6c..000000000 --- a/charts/domain-watch/templates/NOTES.txt +++ /dev/null @@ -1 +0,0 @@ -{{- include "bjw-s.common.lib.chart.notes" . -}} diff --git a/charts/domain-watch/templates/common.yaml b/charts/domain-watch/templates/common.yaml index af7c9bbbf..6eb9b68ff 100644 --- a/charts/domain-watch/templates/common.yaml +++ b/charts/domain-watch/templates/common.yaml @@ -1,10 +1 @@ -{{/* Append the hardcoded settings */}} -{{- define "domain-watch.harcodedValues" -}} -service: - main: - enabled: false -{{- end -}} -{{- $_ := merge .Values (include "domain-watch.harcodedValues" . | fromYaml) -}} - -{{/* Render the templates */}} {{ include "bjw-s.common.loader.all" . }} diff --git a/charts/domain-watch/values.yaml b/charts/domain-watch/values.yaml index 7009be742..c3634e85e 100644 --- a/charts/domain-watch/values.yaml +++ b/charts/domain-watch/values.yaml @@ -2,41 +2,44 @@ # IMPORTANT NOTE # # This chart inherits from our common library chart. You can check the default values/options here: -# https://github.com/bjw-s/helm-charts/blob/a081de5/charts/library/common/values.yaml +# https://github.com/bjw-s/helm-charts/blob/main/charts/library/common/values.yaml # -image: - # -- image repository - repository: ghcr.io/gabe565/domain-watch - # -- image pull policy - pullPolicy: Always - # -- image tag - tag: latest +controllers: + main: + containers: + main: + image: + # -- image repository + repository: ghcr.io/gabe565/domain-watch + # -- image pull policy + pullPolicy: Always + # -- image tag + tag: latest -controller: - # -- Set the controller upgrade strategy - strategy: RollingUpdate + env: + # -- Domain check interval + WATCH_EVERY: 6h + # -- Sleep interval between domain checks to avoid rate limits + WATCH_SLEEP: 3s + # -- Whitespace-separated list of domains to watch. See [values.yaml](./values.yaml) for example. + WATCH_DOMAINS: >- + example.com + example.org -env: - # -- Domain check interval - WATCH_EVERY: 6h - # -- Sleep interval between domain checks to avoid rate limits - WATCH_SLEEP: 3s - # -- Whitespace-separated list of domains to watch. See [values.yaml](./values.yaml) for example. - WATCH_DOMAINS: >- - example.com - example.org + # -- Telegram token + # [[ref]](https://core.telegram.org/bots#6-botfather) + WATCH_TELEGRAM_TOKEN: "" + # -- Telegram chat ID + WATCH_TELEGRAM_CHAT: "" - # -- Telegram token - # [[ref]](https://core.telegram.org/bots#6-botfather) - WATCH_TELEGRAM_TOKEN: "" - # -- Telegram chat ID - WATCH_TELEGRAM_CHAT: "" + # -- Log level. Valid options are trace, debug, info, warn, error, fatal, panic. + WATCH_LOG_LEVEL: info + # -- Log format. Valid options are text, json. + WATCH_LOG_FORMAT: text - # -- Log level. Valid options are trace, debug, info, warn, error, fatal, panic. - WATCH_LOG_LEVEL: info - # -- Log format. Valid options are text, json. - WATCH_LOG_FORMAT: text + # -- Set the controller upgrade strategy + strategy: RollingUpdate # -- Configures service settings for the chart. # @default -- See [values.yaml](./values.yaml)