chore(blocky): move blocky to enterprise (#3875)

charts/enterprise/blocky/Chart.yaml

@@ -8,7 +8,7 @@ dependencies:
     name: redis
     repository: https://charts.truecharts.org
     version: 3.0.67
-description: Blocky is a DNS proxy and ad-blocker for the local network written in Go
+description: Blocky is a DNS proxy, DNS enhancer and ad-blocker for the local network written in Go
 home: https://truecharts.org/docs/charts/incubator/blocky
 icon: https://truecharts.org/img/hotlink-ok/chart-icons/blocky.png
 keywords:
@@ -26,7 +26,7 @@ sources:
   - https://github.com/0xERR0R/blocky
   - https://github.com/Mozart409/blocky-frontend
   - https://hub.docker.com/r/spx01/blocky
-version: 0.0.4
+version: 1.0.0
 annotations:
   truecharts.org/catagories: |
     - network

charts/enterprise/blocky/templates/_blockyConfig.tpl

@@ -10,7 +10,7 @@ metadata:
   labels:
     {{- include "tc.common.labels" . | nindent 4 }}
 data:
-  tc-config.yaml: |
+  config.yml: |
 {{ $config | toYaml | indent 4 }}
 {{- end -}}
 

charts/enterprise/blocky/templates/common.yaml

@@ -7,8 +7,8 @@
 {{- define "blocky.configmap.mount" -}}
 enabled: true
 type: custom
-mountPath: /app/config/tc-config.yaml
+mountPath: /app/config.yml
-subPath: tc-config.yaml
+subPath: config.yml
 readOnly: true
 volumeSpec:
   configMap:

charts/enterprise/blocky/values.yaml

@@ -1,8 +1,8 @@
 image:
-  repository: spx01/blocky
+  # repository: spx01/blocky
-  tag: development@sha256:ddb35986cbc924de11cd37ccf625ff6bd0896fad456e57ee9c0bd67bd034770e
+  # tag: development@sha256:ddb35986cbc924de11cd37ccf625ff6bd0896fad456e57ee9c0bd67bd034770e
-  # repository: tccr.io/truecharts/blocky
+  repository: tccr.io/truecharts/blocky
-  # tag: v0.19@sha256:77a474542f12f480deca33ff0a6375846918b86988c13f858620839d8818ca84
+  tag: v0.19@sha256:77a474542f12f480deca33ff0a6375846918b86988c13f858620839d8818ca84
   pullPolicy: IfNotPresent
 
 WebUIImage:
@@ -31,9 +31,6 @@ blockyConfig: {}
 #   default:
 #     - 1.1.1.1
 
-env:
-  BLOCKY_CONFIG_FILE: "/app/config/"
-
 blocky:
   enableWebUI: true
   enablePrometheus: true

charts/incubator/blocky/README.md

@@ -1,110 +0,0 @@
-# blocky
-
-Blocky is a DNS proxy and ad-blocker for the local network written in Go
-
-TrueCharts can be installed as both *normal* Helm Charts or as Apps on TrueNAS SCALE.
-
-This readme is just an automatically generated general guide on installing our Helm Charts and Apps.
-For more information, please click here: [blocky](https://truecharts.org/docs/charts/incubator/blocky)
-
-**This chart is not maintained by the upstream project and any issues with the chart should be raised [here](https://github.com/truecharts/charts/issues/new/choose)**
-
-## Source Code
-
-* <https://github.com/truecharts/charts/tree/master/charts/incubator/blocky>
-* <https://0xerr0r.github.io/blocky/>
-* <https://github.com/0xERR0R/blocky>
-* <https://github.com/Mozart409/blocky-frontend>
-* <https://hub.docker.com/r/spx01/blocky>
-
-## Requirements
-
-Kubernetes: `>=1.16.0-0`
-
-## Dependencies
-
-| Repository | Name | Version |
-|------------|------|---------|
-| https://charts.truecharts.org | redis | 3.0.67 |
-| https://library-charts.truecharts.org | common | 10.6.0 |
-
-## Installing the Chart
-
-### TrueNAS SCALE
-
-To install this Chart on TrueNAS SCALE check our [Quick-Start Guide](https://truecharts.org/docs/manual/SCALE%20Apps/Installing-an-App).
-
-### Helm
-
-To install the chart with the release name `blocky`
-
-```console
-helm repo add TrueCharts https://charts.truecharts.org
-helm repo update
-helm install blocky TrueCharts/blocky
-```
-
-## Uninstall
-
-### TrueNAS SCALE
-
-**Upgrading, Rolling Back and Uninstalling the Chart**
-
-To upgrade, rollback or delete this Chart from TrueNAS SCALE check our [Quick-Start Guide](https://truecharts.org/docs/manual/SCALE%20Apps/Upgrade-rollback-delete-an-App).
-
-### Helm
-
-To uninstall the `blocky` deployment
-
-```console
-helm uninstall blocky
-```
-
-## Configuration
-
-### Helm
-
-#### Available Settings
-
-Read through the values.yaml file. It has several commented out suggested values.
-Other values may be used from the [values.yaml](https://github.com/truecharts/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).
-
-#### Configure using the command line
-
-Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`.
-
-```console
-helm install blocky \
-  --set env.TZ="America/New York" \
-    TrueCharts/blocky
-```
-
-#### Configure using a yaml file
-
-Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart.
-
-```console
-helm install blocky TrueCharts/blocky -f values.yaml
-```
-
-#### Connecting to other charts
-
-If you need to connect this Chart to other Charts on TrueNAS SCALE, please refer to our [Linking Charts Internally](https://truecharts.org/docs/manual/SCALE%20Apps/linking-apps) quick-start guide.
-
-## Support
-
-- Please check our [quick-start guides for TrueNAS SCALE](https://truecharts.org/docs/manual/SCALE%20Apps/Important-MUST-READ).
-- See the [Website](https://truecharts.org)
-- Check our [Discord](https://discord.gg/tVsPTHWTtr)
-- Open a [issue](https://github.com/truecharts/apps/issues/new/choose)
-
----
-
-## Sponsor TrueCharts
-
-TrueCharts can only exist due to the incredible effort of our staff.
-Please consider making a [donation](https://truecharts.org/sponsor) or contributing back to the project any way you can!
-
----
-
-All Rights Reserved - The TrueCharts Project