diff --git a/enterprise/blocky/4.0.0/app-changelog.md b/enterprise/blocky/4.0.0/app-changelog.md deleted file mode 100644 index 4b03041f249..00000000000 --- a/enterprise/blocky/4.0.0/app-changelog.md +++ /dev/null @@ -1,9 +0,0 @@ - - -## [blocky-4.0.0](https://github.com/truecharts/charts/compare/blocky-3.0.1...blocky-4.0.0) (2022-11-14) - -### Chore - -- update helm general major (major) ([#4424](https://github.com/truecharts/charts/issues/4424)) - - \ No newline at end of file diff --git a/enterprise/blocky/4.0.0/CHANGELOG.md b/enterprise/blocky/4.0.1/CHANGELOG.md similarity index 100% rename from enterprise/blocky/4.0.0/CHANGELOG.md rename to enterprise/blocky/4.0.1/CHANGELOG.md diff --git a/enterprise/blocky/4.0.0/Chart.yaml b/enterprise/blocky/4.0.1/Chart.yaml similarity index 98% rename from enterprise/blocky/4.0.0/Chart.yaml rename to enterprise/blocky/4.0.1/Chart.yaml index dce3000a7c3..5f677a5e75b 100644 --- a/enterprise/blocky/4.0.0/Chart.yaml +++ b/enterprise/blocky/4.0.1/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: 4.0.0 +version: 4.0.1 annotations: truecharts.org/catagories: | - network diff --git a/enterprise/blocky/4.0.0/README.md b/enterprise/blocky/4.0.1/README.md similarity index 100% rename from enterprise/blocky/4.0.0/README.md rename to enterprise/blocky/4.0.1/README.md diff --git a/enterprise/blocky/4.0.1/app-changelog.md b/enterprise/blocky/4.0.1/app-changelog.md new file mode 100644 index 00000000000..f6c1bb87cdd --- /dev/null +++ b/enterprise/blocky/4.0.1/app-changelog.md @@ -0,0 +1,9 @@ + + +## [blocky-4.0.1](https://github.com/truecharts/charts/compare/blocky-4.0.0...blocky-4.0.1) (2022-11-15) + +### Fix + +- fix servicemonitor crapping out + + \ No newline at end of file diff --git a/enterprise/blocky/4.0.0/app-readme.md b/enterprise/blocky/4.0.1/app-readme.md similarity index 100% rename from enterprise/blocky/4.0.0/app-readme.md rename to enterprise/blocky/4.0.1/app-readme.md diff --git a/enterprise/blocky/4.0.0/charts/common-11.0.0.tgz b/enterprise/blocky/4.0.1/charts/common-11.0.0.tgz similarity index 100% rename from enterprise/blocky/4.0.0/charts/common-11.0.0.tgz rename to enterprise/blocky/4.0.1/charts/common-11.0.0.tgz diff --git a/enterprise/blocky/4.0.0/charts/redis-5.0.0.tgz b/enterprise/blocky/4.0.1/charts/redis-5.0.0.tgz similarity index 100% rename from enterprise/blocky/4.0.0/charts/redis-5.0.0.tgz rename to enterprise/blocky/4.0.1/charts/redis-5.0.0.tgz diff --git a/enterprise/blocky/4.0.0/ix_values.yaml b/enterprise/blocky/4.0.1/ix_values.yaml similarity index 100% rename from enterprise/blocky/4.0.0/ix_values.yaml rename to enterprise/blocky/4.0.1/ix_values.yaml diff --git a/enterprise/blocky/4.0.0/questions.yaml b/enterprise/blocky/4.0.1/questions.yaml similarity index 100% rename from enterprise/blocky/4.0.0/questions.yaml rename to enterprise/blocky/4.0.1/questions.yaml diff --git a/enterprise/blocky/4.0.0/templates/_blockyConfig.tpl b/enterprise/blocky/4.0.1/templates/_blockyConfig.tpl similarity index 100% rename from enterprise/blocky/4.0.0/templates/_blockyConfig.tpl rename to enterprise/blocky/4.0.1/templates/_blockyConfig.tpl diff --git a/enterprise/blocky/4.0.0/templates/_k8sgateway.tpl b/enterprise/blocky/4.0.1/templates/_k8sgateway.tpl similarity index 100% rename from enterprise/blocky/4.0.0/templates/_k8sgateway.tpl rename to enterprise/blocky/4.0.1/templates/_k8sgateway.tpl diff --git a/enterprise/blocky/4.0.0/templates/prometheusrules.yaml b/enterprise/blocky/4.0.1/templates/_prometheusrules.tpl similarity index 91% rename from enterprise/blocky/4.0.0/templates/prometheusrules.yaml rename to enterprise/blocky/4.0.1/templates/_prometheusrules.tpl index 35b77edf0f6..9be09114e03 100644 --- a/enterprise/blocky/4.0.0/templates/prometheusrules.yaml +++ b/enterprise/blocky/4.0.1/templates/_prometheusrules.tpl @@ -1,4 +1,6 @@ +{{- define "blocky.prometheusrule" -}} {{- if and .Values.metrics.enabled .Values.metrics.prometheusRule.enabled }} +--- apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: @@ -16,3 +18,4 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} {{- end }} +{{- end -}} diff --git a/enterprise/blocky/4.0.0/templates/servicemonitor.yaml b/enterprise/blocky/4.0.1/templates/_servicemonitor.tpl similarity index 99% rename from enterprise/blocky/4.0.0/templates/servicemonitor.yaml rename to enterprise/blocky/4.0.1/templates/_servicemonitor.tpl index 1e54ac2c453..6a6f8208912 100644 --- a/enterprise/blocky/4.0.0/templates/servicemonitor.yaml +++ b/enterprise/blocky/4.0.1/templates/_servicemonitor.tpl @@ -1,5 +1,6 @@ {{- define "blocky.servicemonitor" -}} {{- if .Values.metrics.enabled }} +--- apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: diff --git a/enterprise/blocky/4.0.0/templates/_webui.tpl b/enterprise/blocky/4.0.1/templates/_webui.tpl similarity index 100% rename from enterprise/blocky/4.0.0/templates/_webui.tpl rename to enterprise/blocky/4.0.1/templates/_webui.tpl diff --git a/enterprise/blocky/4.0.0/templates/common.yaml b/enterprise/blocky/4.0.1/templates/common.yaml similarity index 98% rename from enterprise/blocky/4.0.0/templates/common.yaml rename to enterprise/blocky/4.0.1/templates/common.yaml index f096620f92d..82486e127a2 100644 --- a/enterprise/blocky/4.0.0/templates/common.yaml +++ b/enterprise/blocky/4.0.1/templates/common.yaml @@ -100,6 +100,7 @@ service: {{- include "blocky.dohinjector" . }} {{- include "blocky.servicemonitor" . -}} +{{- include "blocky.prometheusrule" . -}} {{/* Render the templates */}} {{ include "tc.common.loader.apply" . }} diff --git a/enterprise/blocky/4.0.0/values.yaml b/enterprise/blocky/4.0.1/values.yaml similarity index 100% rename from enterprise/blocky/4.0.0/values.yaml rename to enterprise/blocky/4.0.1/values.yaml