diff --git a/enterprise/blocky/5.0.6/app-changelog.md b/enterprise/blocky/5.0.6/app-changelog.md deleted file mode 100644 index 8f7c749547a..00000000000 --- a/enterprise/blocky/5.0.6/app-changelog.md +++ /dev/null @@ -1,4 +0,0 @@ - - -## [blocky-5.0.6](https://github.com/truecharts/charts/compare/blocky-5.0.5...blocky-5.0.6) (2023-03-06) - diff --git a/enterprise/blocky/5.0.6/charts/common-12.2.20.tgz b/enterprise/blocky/5.0.6/charts/common-12.2.20.tgz deleted file mode 100644 index ca1c3ea4ffd..00000000000 Binary files a/enterprise/blocky/5.0.6/charts/common-12.2.20.tgz and /dev/null differ diff --git a/enterprise/blocky/5.0.6/charts/redis-6.0.11.tgz b/enterprise/blocky/5.0.6/charts/redis-6.0.11.tgz deleted file mode 100644 index 5eb33e1caae..00000000000 Binary files a/enterprise/blocky/5.0.6/charts/redis-6.0.11.tgz and /dev/null differ diff --git a/enterprise/blocky/5.0.6/CHANGELOG.md b/enterprise/blocky/5.0.7/CHANGELOG.md similarity index 89% rename from enterprise/blocky/5.0.6/CHANGELOG.md rename to enterprise/blocky/5.0.7/CHANGELOG.md index 9377fea0596..5075ba7718a 100644 --- a/enterprise/blocky/5.0.6/CHANGELOG.md +++ b/enterprise/blocky/5.0.7/CHANGELOG.md @@ -4,6 +4,15 @@ +## [blocky-5.0.7](https://github.com/truecharts/charts/compare/blocky-5.0.6...blocky-5.0.7) (2023-03-07) + +### Feat + +- add support for more query logging options, including postgresql ([#7760](https://github.com/truecharts/charts/issues/7760)) + + + + ## [blocky-5.0.6](https://github.com/truecharts/charts/compare/blocky-5.0.5...blocky-5.0.6) (2023-03-06) @@ -88,12 +97,3 @@ ## [blocky-4.0.20](https://github.com/truecharts/charts/compare/blocky-4.0.19...blocky-4.0.20) (2023-02-03) -### Fix - -- clean more non-link sources ([#6925](https://github.com/truecharts/charts/issues/6925)) - - - - -## [blocky-4.0.19](https://github.com/truecharts/charts/compare/blocky-4.0.18...blocky-4.0.19) (2023-01-31) - diff --git a/enterprise/blocky/5.0.6/Chart.yaml b/enterprise/blocky/5.0.7/Chart.yaml similarity index 94% rename from enterprise/blocky/5.0.6/Chart.yaml rename to enterprise/blocky/5.0.7/Chart.yaml index ccf8eaa54ce..def73defe98 100644 --- a/enterprise/blocky/5.0.6/Chart.yaml +++ b/enterprise/blocky/5.0.7/Chart.yaml @@ -3,11 +3,11 @@ appVersion: "0.20.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 12.2.20 + version: 12.2.22 - condition: redis.enabled name: redis repository: https://deps.truecharts.org - version: 6.0.11 + version: 6.0.13 description: Blocky is a DNS proxy, DNS enhancer and ad-blocker for the local network written in Go home: https://truecharts.org/charts/enterprise/blocky icon: https://truecharts.org/img/hotlink-ok/chart-icons/blocky.png @@ -26,7 +26,7 @@ sources: - https://0xerr0r.github.io/blocky/ - https://github.com/0xERR0R/blocky - https://github.com/Mozart409/blocky-frontend -version: 5.0.6 +version: 5.0.7 annotations: truecharts.org/catagories: | - network diff --git a/enterprise/blocky/5.0.6/LICENSE b/enterprise/blocky/5.0.7/LICENSE similarity index 100% rename from enterprise/blocky/5.0.6/LICENSE rename to enterprise/blocky/5.0.7/LICENSE diff --git a/enterprise/blocky/5.0.6/README.md b/enterprise/blocky/5.0.7/README.md similarity index 100% rename from enterprise/blocky/5.0.6/README.md rename to enterprise/blocky/5.0.7/README.md diff --git a/enterprise/blocky/5.0.7/app-changelog.md b/enterprise/blocky/5.0.7/app-changelog.md new file mode 100644 index 00000000000..0433f8cf93b --- /dev/null +++ b/enterprise/blocky/5.0.7/app-changelog.md @@ -0,0 +1,9 @@ + + +## [blocky-5.0.7](https://github.com/truecharts/charts/compare/blocky-5.0.6...blocky-5.0.7) (2023-03-07) + +### Feat + +- add support for more query logging options, including postgresql ([#7760](https://github.com/truecharts/charts/issues/7760)) + + \ No newline at end of file diff --git a/enterprise/blocky/5.0.6/app-readme.md b/enterprise/blocky/5.0.7/app-readme.md similarity index 100% rename from enterprise/blocky/5.0.6/app-readme.md rename to enterprise/blocky/5.0.7/app-readme.md diff --git a/enterprise/blocky/5.0.7/charts/common-12.2.22.tgz b/enterprise/blocky/5.0.7/charts/common-12.2.22.tgz new file mode 100644 index 00000000000..f0d34229508 Binary files /dev/null and b/enterprise/blocky/5.0.7/charts/common-12.2.22.tgz differ diff --git a/enterprise/blocky/5.0.7/charts/redis-6.0.13.tgz b/enterprise/blocky/5.0.7/charts/redis-6.0.13.tgz new file mode 100644 index 00000000000..232b4605788 Binary files /dev/null and b/enterprise/blocky/5.0.7/charts/redis-6.0.13.tgz differ diff --git a/enterprise/blocky/5.0.6/ix_values.yaml b/enterprise/blocky/5.0.7/ix_values.yaml similarity index 99% rename from enterprise/blocky/5.0.6/ix_values.yaml rename to enterprise/blocky/5.0.7/ix_values.yaml index a8709f606f9..da80f4bde2e 100644 --- a/enterprise/blocky/5.0.6/ix_values.yaml +++ b/enterprise/blocky/5.0.7/ix_values.yaml @@ -350,7 +350,7 @@ redis: queryLog: # optional one of: mysql, postgresql, csv, csv-client. If empty, log to console type: "" - # directory (should be mounted as volume in docker) for csv, db connection string for mysql/postgresql + # directory (should be mounted as volume in docker) for csv, db connection string for mysql, ignored for included postgresql # target: /var/log/something # postgresql target: postgres://user:password@db_host_or_ip:5432/db_name # if > 0, deletes log files which are older than ... days @@ -362,6 +362,6 @@ queryLog: cnpg: main: - enabled: true + enabled: false user: blocky database: blocky diff --git a/enterprise/blocky/5.0.6/questions.yaml b/enterprise/blocky/5.0.7/questions.yaml similarity index 98% rename from enterprise/blocky/5.0.6/questions.yaml rename to enterprise/blocky/5.0.7/questions.yaml index f86ff147827..d6489629349 100644 --- a/enterprise/blocky/5.0.6/questions.yaml +++ b/enterprise/blocky/5.0.7/questions.yaml @@ -39,7 +39,7 @@ portals: - "$kubernetes-resource_configmap_tcportal-open_port" questions: - - variable: Workload + - variable: workload group: "Workload Settings" label: "" schema: @@ -673,6 +673,48 @@ questions: schema: type: string default: 30m + - variable: queryLog + group: App Configuration + label: Query Logging configuration + schema: + additional_attrs: true + type: dict + attrs: + - variable: type + label: Type + schema: + type: string + default: "" + enum: + - value: "" + description: Console + - value: postgresql + description: postgresql + - value: csv + description: csv + - value: csv-client + description: csv-client + - variable: target + label: Target + schema: + type: string + show_if: [["type", "!=", "postgresql"]] + default: "/var/log/something" + - variable: logRetentionDays + label: Log Retention Days + schema: + type: int + default: 0 + - variable: creationAttempts + label: Creation Attempts + schema: + type: int + default: 3 + - variable: creationCooldown + label: Creation Cooldown + schema: + type: string + default: 2s - variable: k8sgateway group: App Configuration label: k8s-Gateway Configuration diff --git a/enterprise/blocky/5.0.6/templates/NOTES.txt b/enterprise/blocky/5.0.7/templates/NOTES.txt similarity index 100% rename from enterprise/blocky/5.0.6/templates/NOTES.txt rename to enterprise/blocky/5.0.7/templates/NOTES.txt diff --git a/enterprise/blocky/5.0.6/templates/_blockyConfig.tpl b/enterprise/blocky/5.0.7/templates/_blockyConfig.tpl similarity index 99% rename from enterprise/blocky/5.0.6/templates/_blockyConfig.tpl rename to enterprise/blocky/5.0.7/templates/_blockyConfig.tpl index d498a8a3b88..de2a61808ff 100644 --- a/enterprise/blocky/5.0.6/templates/_blockyConfig.tpl +++ b/enterprise/blocky/5.0.7/templates/_blockyConfig.tpl @@ -24,7 +24,7 @@ queryLog: # directory (should be mounted as volume in docker) for csv, db connection string for mysql/postgresql #postgresql target: postgres://user:password@db_host_or_ip:5432/db_name {{- if eq .Values.queryLog.type "postgresql" }} - target: {{ .Values.cnpg.creds.std }} + target: {{ .Values.cnpg.main.creds.std }} {{- else }} target: {{ .Values.queryLog.target }} {{- end }} diff --git a/enterprise/blocky/5.0.6/templates/_k8sgateway.tpl b/enterprise/blocky/5.0.7/templates/_k8sgateway.tpl similarity index 100% rename from enterprise/blocky/5.0.6/templates/_k8sgateway.tpl rename to enterprise/blocky/5.0.7/templates/_k8sgateway.tpl diff --git a/enterprise/blocky/5.0.6/templates/common.yaml b/enterprise/blocky/5.0.7/templates/common.yaml similarity index 96% rename from enterprise/blocky/5.0.6/templates/common.yaml rename to enterprise/blocky/5.0.7/templates/common.yaml index f8f297e8e64..40bf6d293a4 100644 --- a/enterprise/blocky/5.0.6/templates/common.yaml +++ b/enterprise/blocky/5.0.7/templates/common.yaml @@ -1,4 +1,7 @@ {{/* Make sure all variables are set properly */}} +{{- if eq .Values.queryLog.type "postgresql" -}} + {{- $_ := set .Values.cnpg.main "enabled" true -}} +{{- end }} {{- include "tc.v1.common.loader.init" . }} diff --git a/enterprise/blocky/5.0.6/values.yaml b/enterprise/blocky/5.0.7/values.yaml similarity index 100% rename from enterprise/blocky/5.0.6/values.yaml rename to enterprise/blocky/5.0.7/values.yaml