From 459e6c15a4de3512a1bc791b5751fc20087288c4 Mon Sep 17 00:00:00 2001 From: TrueCharts-Bot Date: Thu, 29 Sep 2022 20:04:34 +0000 Subject: [PATCH] Commit new Chart releases for TrueCharts Signed-off-by: TrueCharts-Bot --- .../blocky/{1.0.11 => 1.1.0}/CHANGELOG.md | 8 ++--- .../blocky/{1.0.11 => 1.1.0}/Chart.lock | 2 +- .../blocky/{1.0.11 => 1.1.0}/Chart.yaml | 2 +- enterprise/blocky/{1.0.11 => 1.1.0}/README.md | 0 .../blocky/{1.0.11 => 1.1.0}/app-readme.md | 0 .../charts/common-10.6.4.tgz | Bin .../{1.0.11 => 1.1.0}/charts/redis-3.0.85.tgz | Bin .../ci/k8sgateway-values.yaml | 0 .../ci/standalone-values.yaml | 0 .../blocky/{1.0.11 => 1.1.0}/ix_values.yaml | 0 .../blocky/{1.0.11 => 1.1.0}/questions.yaml | 0 .../templates/_blockyConfig.tpl | 0 .../templates/_k8sgateway.tpl | 0 .../{1.0.11 => 1.1.0}/templates/_webui.tpl | 0 .../{1.0.11 => 1.1.0}/templates/common.yaml | 30 ++++++++++++++++++ .../templates/prometheusrules.yaml | 0 .../templates/servicemonitor.yaml | 0 .../blocky/{1.0.11 => 1.1.0}/values.yaml | 0 18 files changed, 36 insertions(+), 6 deletions(-) rename enterprise/blocky/{1.0.11 => 1.1.0}/CHANGELOG.md (88%) rename enterprise/blocky/{1.0.11 => 1.1.0}/Chart.lock (85%) rename enterprise/blocky/{1.0.11 => 1.1.0}/Chart.yaml (98%) rename enterprise/blocky/{1.0.11 => 1.1.0}/README.md (100%) rename enterprise/blocky/{1.0.11 => 1.1.0}/app-readme.md (100%) rename enterprise/blocky/{1.0.11 => 1.1.0}/charts/common-10.6.4.tgz (100%) rename enterprise/blocky/{1.0.11 => 1.1.0}/charts/redis-3.0.85.tgz (100%) rename enterprise/blocky/{1.0.11 => 1.1.0}/ci/k8sgateway-values.yaml (100%) rename enterprise/blocky/{1.0.11 => 1.1.0}/ci/standalone-values.yaml (100%) rename enterprise/blocky/{1.0.11 => 1.1.0}/ix_values.yaml (100%) rename enterprise/blocky/{1.0.11 => 1.1.0}/questions.yaml (100%) rename enterprise/blocky/{1.0.11 => 1.1.0}/templates/_blockyConfig.tpl (100%) rename enterprise/blocky/{1.0.11 => 1.1.0}/templates/_k8sgateway.tpl (100%) rename enterprise/blocky/{1.0.11 => 1.1.0}/templates/_webui.tpl (100%) rename enterprise/blocky/{1.0.11 => 1.1.0}/templates/common.yaml (75%) rename enterprise/blocky/{1.0.11 => 1.1.0}/templates/prometheusrules.yaml (100%) rename enterprise/blocky/{1.0.11 => 1.1.0}/templates/servicemonitor.yaml (100%) rename enterprise/blocky/{1.0.11 => 1.1.0}/values.yaml (100%) diff --git a/enterprise/blocky/1.0.11/CHANGELOG.md b/enterprise/blocky/1.1.0/CHANGELOG.md similarity index 88% rename from enterprise/blocky/1.0.11/CHANGELOG.md rename to enterprise/blocky/1.1.0/CHANGELOG.md index 91a08025a6a..5679b8d2381 100644 --- a/enterprise/blocky/1.0.11/CHANGELOG.md +++ b/enterprise/blocky/1.1.0/CHANGELOG.md @@ -2,12 +2,11 @@ -## [blocky-1.0.11](https://github.com/truecharts/charts/compare/blocky-1.0.10...blocky-1.0.11) (2022-09-27) +## [blocky-1.1.0](https://github.com/truecharts/charts/compare/blocky-1.0.11...blocky-1.1.0) (2022-09-29) -### Chore +### Feat -- Auto-update chart README [skip ci] - - update helm general non-major ([#3925](https://github.com/truecharts/charts/issues/3925)) +- add DoH support on main ingress ([#3959](https://github.com/truecharts/charts/issues/3959)) @@ -97,3 +96,4 @@ ## [blocky-1.0.2](https://github.com/truecharts/charts/compare/blocky-1.0.1...blocky-1.0.2) (2022-09-25) +### Chore diff --git a/enterprise/blocky/1.0.11/Chart.lock b/enterprise/blocky/1.1.0/Chart.lock similarity index 85% rename from enterprise/blocky/1.0.11/Chart.lock rename to enterprise/blocky/1.1.0/Chart.lock index aeb29258810..3dd9fc20eb0 100644 --- a/enterprise/blocky/1.0.11/Chart.lock +++ b/enterprise/blocky/1.1.0/Chart.lock @@ -6,4 +6,4 @@ dependencies: repository: https://charts.truecharts.org version: 3.0.85 digest: sha256:7b7b7ae17622f706bfa5e1f5dc54b3489a4baf2b6649f103f9a43b8f0d580acf -generated: "2022-09-27T20:22:50.714543151Z" +generated: "2022-09-29T20:02:47.59641608Z" diff --git a/enterprise/blocky/1.0.11/Chart.yaml b/enterprise/blocky/1.1.0/Chart.yaml similarity index 98% rename from enterprise/blocky/1.0.11/Chart.yaml rename to enterprise/blocky/1.1.0/Chart.yaml index f20037eb793..6897ac188cb 100644 --- a/enterprise/blocky/1.0.11/Chart.yaml +++ b/enterprise/blocky/1.1.0/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.11 +version: 1.1.0 annotations: truecharts.org/catagories: | - network diff --git a/enterprise/blocky/1.0.11/README.md b/enterprise/blocky/1.1.0/README.md similarity index 100% rename from enterprise/blocky/1.0.11/README.md rename to enterprise/blocky/1.1.0/README.md diff --git a/enterprise/blocky/1.0.11/app-readme.md b/enterprise/blocky/1.1.0/app-readme.md similarity index 100% rename from enterprise/blocky/1.0.11/app-readme.md rename to enterprise/blocky/1.1.0/app-readme.md diff --git a/enterprise/blocky/1.0.11/charts/common-10.6.4.tgz b/enterprise/blocky/1.1.0/charts/common-10.6.4.tgz similarity index 100% rename from enterprise/blocky/1.0.11/charts/common-10.6.4.tgz rename to enterprise/blocky/1.1.0/charts/common-10.6.4.tgz diff --git a/enterprise/blocky/1.0.11/charts/redis-3.0.85.tgz b/enterprise/blocky/1.1.0/charts/redis-3.0.85.tgz similarity index 100% rename from enterprise/blocky/1.0.11/charts/redis-3.0.85.tgz rename to enterprise/blocky/1.1.0/charts/redis-3.0.85.tgz diff --git a/enterprise/blocky/1.0.11/ci/k8sgateway-values.yaml b/enterprise/blocky/1.1.0/ci/k8sgateway-values.yaml similarity index 100% rename from enterprise/blocky/1.0.11/ci/k8sgateway-values.yaml rename to enterprise/blocky/1.1.0/ci/k8sgateway-values.yaml diff --git a/enterprise/blocky/1.0.11/ci/standalone-values.yaml b/enterprise/blocky/1.1.0/ci/standalone-values.yaml similarity index 100% rename from enterprise/blocky/1.0.11/ci/standalone-values.yaml rename to enterprise/blocky/1.1.0/ci/standalone-values.yaml diff --git a/enterprise/blocky/1.0.11/ix_values.yaml b/enterprise/blocky/1.1.0/ix_values.yaml similarity index 100% rename from enterprise/blocky/1.0.11/ix_values.yaml rename to enterprise/blocky/1.1.0/ix_values.yaml diff --git a/enterprise/blocky/1.0.11/questions.yaml b/enterprise/blocky/1.1.0/questions.yaml similarity index 100% rename from enterprise/blocky/1.0.11/questions.yaml rename to enterprise/blocky/1.1.0/questions.yaml diff --git a/enterprise/blocky/1.0.11/templates/_blockyConfig.tpl b/enterprise/blocky/1.1.0/templates/_blockyConfig.tpl similarity index 100% rename from enterprise/blocky/1.0.11/templates/_blockyConfig.tpl rename to enterprise/blocky/1.1.0/templates/_blockyConfig.tpl diff --git a/enterprise/blocky/1.0.11/templates/_k8sgateway.tpl b/enterprise/blocky/1.1.0/templates/_k8sgateway.tpl similarity index 100% rename from enterprise/blocky/1.0.11/templates/_k8sgateway.tpl rename to enterprise/blocky/1.1.0/templates/_k8sgateway.tpl diff --git a/enterprise/blocky/1.0.11/templates/_webui.tpl b/enterprise/blocky/1.1.0/templates/_webui.tpl similarity index 100% rename from enterprise/blocky/1.0.11/templates/_webui.tpl rename to enterprise/blocky/1.1.0/templates/_webui.tpl diff --git a/enterprise/blocky/1.0.11/templates/common.yaml b/enterprise/blocky/1.1.0/templates/common.yaml similarity index 75% rename from enterprise/blocky/1.0.11/templates/common.yaml rename to enterprise/blocky/1.1.0/templates/common.yaml index 771a3d532ce..f8e20c4da02 100644 --- a/enterprise/blocky/1.0.11/templates/common.yaml +++ b/enterprise/blocky/1.1.0/templates/common.yaml @@ -73,5 +73,35 @@ service: {{/* inject api paths in ingress */}} {{- include "blocky.apiinjector" . }} + + +{{/* Define path for DoH */}} +{{- define "blocky.doh" -}} +{{- $fullname := include "tc.common.names.fullname" . -}} +path: "/dns-query" +# -- Ignored if not kubeVersion >= 1.14-0 +pathType: Prefix +service: + # -- Overrides the service name reference for this path + name: {{ printf "%s-http" $fullname }} + port: {{ .Values.service.http.ports.http.port }} +{{- end -}} + +{{/* inject websocket path to all main ingress hosts*/}} +{{- define "blocky.dohinjector" -}} +{{- $path := list (include "blocky.doh" . | fromYaml) -}} +{{- if .Values.ingress.main.enabled }} +{{- range .Values.ingress.main.hosts }} +{{- $newpaths := list }} +{{- $newpaths := concat .paths $path }} +{{- $_ := set . "paths" ( deepCopy $newpaths ) -}} +{{- end }} +{{- end }} +{{- end -}} + +{{/* inject api paths in ingress */}} +{{- include "blocky.dohinjector" . }} + + {{/* Render the templates */}} {{ include "tc.common.loader.apply" . }} diff --git a/enterprise/blocky/1.0.11/templates/prometheusrules.yaml b/enterprise/blocky/1.1.0/templates/prometheusrules.yaml similarity index 100% rename from enterprise/blocky/1.0.11/templates/prometheusrules.yaml rename to enterprise/blocky/1.1.0/templates/prometheusrules.yaml diff --git a/enterprise/blocky/1.0.11/templates/servicemonitor.yaml b/enterprise/blocky/1.1.0/templates/servicemonitor.yaml similarity index 100% rename from enterprise/blocky/1.0.11/templates/servicemonitor.yaml rename to enterprise/blocky/1.1.0/templates/servicemonitor.yaml diff --git a/enterprise/blocky/1.0.11/values.yaml b/enterprise/blocky/1.1.0/values.yaml similarity index 100% rename from enterprise/blocky/1.0.11/values.yaml rename to enterprise/blocky/1.1.0/values.yaml