From e20bf1271a327a0e14e517e74b487763efb9fc20 Mon Sep 17 00:00:00 2001 From: TrueCharts-Bot Date: Mon, 26 Sep 2022 01:42:01 +0000 Subject: [PATCH] Commit new Chart releases for TrueCharts Signed-off-by: TrueCharts-Bot --- .../blocky/{1.0.5 => 1.0.6}/CHANGELOG.md | 28 +++++++++--------- enterprise/blocky/{1.0.5 => 1.0.6}/Chart.lock | 2 +- enterprise/blocky/{1.0.5 => 1.0.6}/Chart.yaml | 2 +- enterprise/blocky/{1.0.5 => 1.0.6}/README.md | 0 .../blocky/{1.0.5 => 1.0.6}/app-readme.md | 0 .../{1.0.5 => 1.0.6}/charts/common-10.6.1.tgz | Bin .../{1.0.5 => 1.0.6}/charts/redis-3.0.84.tgz | Bin .../ci/k8sgateway-values.yaml | 0 .../ci/standalone-values.yaml | 0 .../blocky/{1.0.5 => 1.0.6}/ix_values.yaml | 11 +++---- .../blocky/{1.0.5 => 1.0.6}/questions.yaml | 10 +++---- .../templates/_blockyConfig.tpl | 16 ++++++++++ .../templates/_k8sgateway.tpl | 0 .../{1.0.5 => 1.0.6}/templates/_webui.tpl | 0 .../{1.0.5 => 1.0.6}/templates/common.yaml | 2 +- .../blocky/{1.0.5 => 1.0.6}/values.yaml | 0 16 files changed, 42 insertions(+), 29 deletions(-) rename enterprise/blocky/{1.0.5 => 1.0.6}/CHANGELOG.md (84%) rename enterprise/blocky/{1.0.5 => 1.0.6}/Chart.lock (85%) rename enterprise/blocky/{1.0.5 => 1.0.6}/Chart.yaml (98%) rename enterprise/blocky/{1.0.5 => 1.0.6}/README.md (100%) rename enterprise/blocky/{1.0.5 => 1.0.6}/app-readme.md (100%) rename enterprise/blocky/{1.0.5 => 1.0.6}/charts/common-10.6.1.tgz (100%) rename enterprise/blocky/{1.0.5 => 1.0.6}/charts/redis-3.0.84.tgz (100%) rename enterprise/blocky/{1.0.5 => 1.0.6}/ci/k8sgateway-values.yaml (100%) rename enterprise/blocky/{1.0.5 => 1.0.6}/ci/standalone-values.yaml (100%) rename enterprise/blocky/{1.0.5 => 1.0.6}/ix_values.yaml (98%) rename enterprise/blocky/{1.0.5 => 1.0.6}/questions.yaml (99%) rename enterprise/blocky/{1.0.5 => 1.0.6}/templates/_blockyConfig.tpl (92%) rename enterprise/blocky/{1.0.5 => 1.0.6}/templates/_k8sgateway.tpl (100%) rename enterprise/blocky/{1.0.5 => 1.0.6}/templates/_webui.tpl (100%) rename enterprise/blocky/{1.0.5 => 1.0.6}/templates/common.yaml (96%) rename enterprise/blocky/{1.0.5 => 1.0.6}/values.yaml (100%) diff --git a/enterprise/blocky/1.0.5/CHANGELOG.md b/enterprise/blocky/1.0.6/CHANGELOG.md similarity index 84% rename from enterprise/blocky/1.0.5/CHANGELOG.md rename to enterprise/blocky/1.0.6/CHANGELOG.md index 55e9086e792..29655e5166c 100644 --- a/enterprise/blocky/1.0.5/CHANGELOG.md +++ b/enterprise/blocky/1.0.6/CHANGELOG.md @@ -2,6 +2,20 @@ +## [blocky-1.0.6](https://github.com/truecharts/charts/compare/blocky-1.0.5...blocky-1.0.6) (2022-09-25) + +### Chore + +- Auto-update chart README [skip ci] + - bump version + + ### Fix + +- allow port changes, allow dot, fix prometheus and fix api access ([#3899](https://github.com/truecharts/charts/issues/3899)) + + + + ## [blocky-1.0.5](https://github.com/truecharts/charts/compare/blocky-1.0.4...blocky-1.0.5) (2022-09-25) ### Chore @@ -83,17 +97,3 @@ - Finish up UI ([#3866](https://github.com/truecharts/charts/issues/3866)) - - - -## [blocky-0.0.3](https://github.com/truecharts/charts/compare/blocky-0.0.2...blocky-0.0.3) (2022-09-24) - -### Chore - -- Auto-update chart README [skip ci] - - update docker general non-major ([#3860](https://github.com/truecharts/charts/issues/3860)) - - - - -## [blocky-0.0.2](https://github.com/truecharts/charts/compare/blocky-0.0.1...blocky-0.0.2) (2022-09-23) diff --git a/enterprise/blocky/1.0.5/Chart.lock b/enterprise/blocky/1.0.6/Chart.lock similarity index 85% rename from enterprise/blocky/1.0.5/Chart.lock rename to enterprise/blocky/1.0.6/Chart.lock index f6a2bae9456..657a3d7b71e 100644 --- a/enterprise/blocky/1.0.5/Chart.lock +++ b/enterprise/blocky/1.0.6/Chart.lock @@ -6,4 +6,4 @@ dependencies: repository: https://charts.truecharts.org version: 3.0.84 digest: sha256:e7db3724e7831eba4fe882122ff84908440a55b7e932b4a006fb08272d198db4 -generated: "2022-09-25T13:50:08.110031027Z" +generated: "2022-09-26T01:39:53.828846073Z" diff --git a/enterprise/blocky/1.0.5/Chart.yaml b/enterprise/blocky/1.0.6/Chart.yaml similarity index 98% rename from enterprise/blocky/1.0.5/Chart.yaml rename to enterprise/blocky/1.0.6/Chart.yaml index 3db48304ed2..e0ee85d47ff 100644 --- a/enterprise/blocky/1.0.5/Chart.yaml +++ b/enterprise/blocky/1.0.6/Chart.yaml @@ -26,7 +26,7 @@ sources: - https://github.com/0xERR0R/blocky - https://github.com/Mozart409/blocky-frontend - https://hub.docker.com/r/spx01/blocky -version: 1.0.5 +version: 1.0.6 annotations: truecharts.org/catagories: | - network diff --git a/enterprise/blocky/1.0.5/README.md b/enterprise/blocky/1.0.6/README.md similarity index 100% rename from enterprise/blocky/1.0.5/README.md rename to enterprise/blocky/1.0.6/README.md diff --git a/enterprise/blocky/1.0.5/app-readme.md b/enterprise/blocky/1.0.6/app-readme.md similarity index 100% rename from enterprise/blocky/1.0.5/app-readme.md rename to enterprise/blocky/1.0.6/app-readme.md diff --git a/enterprise/blocky/1.0.5/charts/common-10.6.1.tgz b/enterprise/blocky/1.0.6/charts/common-10.6.1.tgz similarity index 100% rename from enterprise/blocky/1.0.5/charts/common-10.6.1.tgz rename to enterprise/blocky/1.0.6/charts/common-10.6.1.tgz diff --git a/enterprise/blocky/1.0.5/charts/redis-3.0.84.tgz b/enterprise/blocky/1.0.6/charts/redis-3.0.84.tgz similarity index 100% rename from enterprise/blocky/1.0.5/charts/redis-3.0.84.tgz rename to enterprise/blocky/1.0.6/charts/redis-3.0.84.tgz diff --git a/enterprise/blocky/1.0.5/ci/k8sgateway-values.yaml b/enterprise/blocky/1.0.6/ci/k8sgateway-values.yaml similarity index 100% rename from enterprise/blocky/1.0.5/ci/k8sgateway-values.yaml rename to enterprise/blocky/1.0.6/ci/k8sgateway-values.yaml diff --git a/enterprise/blocky/1.0.5/ci/standalone-values.yaml b/enterprise/blocky/1.0.6/ci/standalone-values.yaml similarity index 100% rename from enterprise/blocky/1.0.5/ci/standalone-values.yaml rename to enterprise/blocky/1.0.6/ci/standalone-values.yaml diff --git a/enterprise/blocky/1.0.5/ix_values.yaml b/enterprise/blocky/1.0.6/ix_values.yaml similarity index 98% rename from enterprise/blocky/1.0.5/ix_values.yaml rename to enterprise/blocky/1.0.6/ix_values.yaml index 4e5906a3247..84853e033fa 100644 --- a/enterprise/blocky/1.0.5/ix_values.yaml +++ b/enterprise/blocky/1.0.6/ix_values.yaml @@ -77,17 +77,17 @@ service: port: 10315 protocol: HTTP targetPort: 80 - dns-tcp: + dnstcp: enabled: true ports: - dns-tcp: + dnstcp: enabled: true port: 53 targetPort: 53 - dns-udp: + dnsudp: enabled: true ports: - dns-udp: + dnsudp: enabled: true port: 53 protocol: UDP @@ -338,9 +338,6 @@ k8sgateway: - name: tls_servername value: cloudflare-dns.com -unbound: - enabled: false - redis: enabled: true existingSecret: "rediscreds" diff --git a/enterprise/blocky/1.0.5/questions.yaml b/enterprise/blocky/1.0.6/questions.yaml similarity index 99% rename from enterprise/blocky/1.0.5/questions.yaml rename to enterprise/blocky/1.0.6/questions.yaml index 5d3c158c49f..12b912f033c 100644 --- a/enterprise/blocky/1.0.5/questions.yaml +++ b/enterprise/blocky/1.0.6/questions.yaml @@ -1020,7 +1020,7 @@ questions: schema: type: int default: 80 - - variable: dns-tcp + - variable: dnstcp label: DNS TCP Service description: The DNS TCP service schema: @@ -1101,7 +1101,7 @@ questions: additional_attrs: true type: dict attrs: - - variable: dns-tcp + - variable: dnstcp label: DNS TCP Port Configuration schema: additional_attrs: true @@ -1154,7 +1154,7 @@ questions: schema: type: int default: 53 - - variable: dns-udp + - variable: dnsudp label: DNS UDP Service description: The DNS UDP service schema: @@ -1235,7 +1235,7 @@ questions: additional_attrs: true type: dict attrs: - - variable: dns-udp + - variable: dnsudp label: DNS UDP Port Configuration schema: additional_attrs: true @@ -3491,7 +3491,7 @@ questions: default: true - variable: donateNag group: Documentation - label: Please consider supporting TrueCharts, see https://truecharts.org/docs/about/sponsor + label: Please consider supporting TrueCharts, see https://truecharts.org/sponsor description: Please consider supporting TrueCharts, see
https://truecharts.org/sponsor schema: diff --git a/enterprise/blocky/1.0.5/templates/_blockyConfig.tpl b/enterprise/blocky/1.0.6/templates/_blockyConfig.tpl similarity index 92% rename from enterprise/blocky/1.0.5/templates/_blockyConfig.tpl rename to enterprise/blocky/1.0.6/templates/_blockyConfig.tpl index 20836e1b0aa..59153071dd8 100644 --- a/enterprise/blocky/1.0.5/templates/_blockyConfig.tpl +++ b/enterprise/blocky/1.0.6/templates/_blockyConfig.tpl @@ -35,6 +35,22 @@ upstream: {{- $value.dnsservers | toYaml | nindent 8 }} {{- end }} +{{- if .Values.service.dnsudp.enabled }} +port: {{ .Values.service.dnsudp.ports.dnsudp.targetPort }} +{{- end }} + +{{- if .Values.service.dot.enabled }} +tlsPort: {{ .Values.service.dot.ports.dot.targetPort }} +{{- end }} + +{{- if .Values.service.http.enabled }} +httpPort: {{ .Values.service.http.ports.http.targetPort }} +{{- end }} + +{{- if .Values.service.https.enabled }} +httpsPort: {{ .Values.service.https.ports.https.targetPort }} +{{- end }} + {{- if .Values.certFile }} certFile: {{ .Values.certFile }} {{- end }} diff --git a/enterprise/blocky/1.0.5/templates/_k8sgateway.tpl b/enterprise/blocky/1.0.6/templates/_k8sgateway.tpl similarity index 100% rename from enterprise/blocky/1.0.5/templates/_k8sgateway.tpl rename to enterprise/blocky/1.0.6/templates/_k8sgateway.tpl diff --git a/enterprise/blocky/1.0.5/templates/_webui.tpl b/enterprise/blocky/1.0.6/templates/_webui.tpl similarity index 100% rename from enterprise/blocky/1.0.5/templates/_webui.tpl rename to enterprise/blocky/1.0.6/templates/_webui.tpl diff --git a/enterprise/blocky/1.0.5/templates/common.yaml b/enterprise/blocky/1.0.6/templates/common.yaml similarity index 96% rename from enterprise/blocky/1.0.5/templates/common.yaml rename to enterprise/blocky/1.0.6/templates/common.yaml index 3d85e6e208f..deeed907d3d 100644 --- a/enterprise/blocky/1.0.5/templates/common.yaml +++ b/enterprise/blocky/1.0.6/templates/common.yaml @@ -34,7 +34,7 @@ volumeSpec: {{- $_ := set .Values.podAnnotations "prometheus.io/scrape" "true" -}} {{- $_ := set .Values.podAnnotations "prometheus.io/path" "/metrics" -}} -{{- $_ := set .Values.podAnnotations "prometheus.io/port" (.Values.service.main.ports.main.targetPort | quote) -}} +{{- $_ := set .Values.podAnnotations "prometheus.io/port" (.Values.service.http.ports.http.targetPort | toString) -}} {{- if .Values.blocky.enableWebUI -}} {{- $_ := set .Values.additionalContainers "frontend" (include "blocky.frontend" . | fromYaml) -}} diff --git a/enterprise/blocky/1.0.5/values.yaml b/enterprise/blocky/1.0.6/values.yaml similarity index 100% rename from enterprise/blocky/1.0.5/values.yaml rename to enterprise/blocky/1.0.6/values.yaml