diff --git a/enterprise/grafana/6.0.24/app-changelog.md b/enterprise/grafana/6.0.24/app-changelog.md deleted file mode 100644 index d04634ccdc..0000000000 --- a/enterprise/grafana/6.0.24/app-changelog.md +++ /dev/null @@ -1,13 +0,0 @@ - - -## [grafana-6.0.24](https://github.com/truecharts/charts/compare/grafana-6.0.23...grafana-6.0.24) (2023-01-18) - -### Chore - -- update container image tccr.io/truecharts/grafana to 9.3.2 - - ### Feat - -- move Grafana, Prometheus and Traefik to Enterprise Train ([#6372](https://github.com/truecharts/charts/issues/6372)) - - \ No newline at end of file diff --git a/enterprise/grafana/6.0.24/CHANGELOG.md b/enterprise/grafana/6.0.25/CHANGELOG.md similarity index 67% rename from enterprise/grafana/6.0.24/CHANGELOG.md rename to enterprise/grafana/6.0.25/CHANGELOG.md index c2a30e064d..c38a20bc23 100644 --- a/enterprise/grafana/6.0.24/CHANGELOG.md +++ b/enterprise/grafana/6.0.25/CHANGELOG.md @@ -4,6 +4,15 @@ +## [grafana-6.0.25](https://github.com/truecharts/charts/compare/grafana-6.0.24...grafana-6.0.25) (2023-01-24) + +### Chore + +- update container image tccr.io/truecharts/grafana to 9.3.2 + + + + ## [grafana-6.0.24](https://github.com/truecharts/charts/compare/grafana-6.0.23...grafana-6.0.24) (2023-01-18) ### Chore diff --git a/enterprise/grafana/6.0.24/Chart.yaml b/enterprise/grafana/6.0.25/Chart.yaml similarity index 98% rename from enterprise/grafana/6.0.24/Chart.yaml rename to enterprise/grafana/6.0.25/Chart.yaml index 508ca469d9..faccd327c3 100644 --- a/enterprise/grafana/6.0.24/Chart.yaml +++ b/enterprise/grafana/6.0.25/Chart.yaml @@ -24,7 +24,7 @@ sources: - https://github.com/bitnami/bitnami-docker-grafana - https://grafana.com/ type: application -version: 6.0.24 +version: 6.0.25 annotations: truecharts.org/catagories: | - metrics diff --git a/enterprise/grafana/6.0.24/README.md b/enterprise/grafana/6.0.25/README.md similarity index 100% rename from enterprise/grafana/6.0.24/README.md rename to enterprise/grafana/6.0.25/README.md diff --git a/enterprise/grafana/6.0.25/app-changelog.md b/enterprise/grafana/6.0.25/app-changelog.md new file mode 100644 index 0000000000..09f1168a32 --- /dev/null +++ b/enterprise/grafana/6.0.25/app-changelog.md @@ -0,0 +1,9 @@ + + +## [grafana-6.0.25](https://github.com/truecharts/charts/compare/grafana-6.0.24...grafana-6.0.25) (2023-01-24) + +### Chore + +- update container image tccr.io/truecharts/grafana to 9.3.2 + + \ No newline at end of file diff --git a/enterprise/grafana/6.0.24/app-readme.md b/enterprise/grafana/6.0.25/app-readme.md similarity index 100% rename from enterprise/grafana/6.0.24/app-readme.md rename to enterprise/grafana/6.0.25/app-readme.md diff --git a/enterprise/grafana/6.0.24/charts/common-11.1.2.tgz b/enterprise/grafana/6.0.25/charts/common-11.1.2.tgz similarity index 100% rename from enterprise/grafana/6.0.24/charts/common-11.1.2.tgz rename to enterprise/grafana/6.0.25/charts/common-11.1.2.tgz diff --git a/enterprise/grafana/6.0.24/ix_values.yaml b/enterprise/grafana/6.0.25/ix_values.yaml similarity index 95% rename from enterprise/grafana/6.0.24/ix_values.yaml rename to enterprise/grafana/6.0.25/ix_values.yaml index 0d1217f590..a56854c8fa 100644 --- a/enterprise/grafana/6.0.24/ix_values.yaml +++ b/enterprise/grafana/6.0.25/ix_values.yaml @@ -1,7 +1,7 @@ image: repository: tccr.io/truecharts/grafana pullPolicy: IfNotPresent - tag: 9.3.2@sha256:c78aa4f4234acc8cc5b99415cddd1c2d270ce8d063e49430a762f55bf0f1bb01 + tag: 9.3.2@sha256:631cb131d086967d38a8b67457fc480997a5d9d376a59050403f42cac900d1c4 securityContext: readOnlyRootFilesystem: false diff --git a/enterprise/grafana/6.0.24/questions.yaml b/enterprise/grafana/6.0.25/questions.yaml similarity index 97% rename from enterprise/grafana/6.0.24/questions.yaml rename to enterprise/grafana/6.0.25/questions.yaml index ad60361799..2cfcf03de6 100644 --- a/enterprise/grafana/6.0.24/questions.yaml +++ b/enterprise/grafana/6.0.25/questions.yaml @@ -672,10 +672,17 @@ questions: type: string required: true default: Prefix + - variable: clusterIssuer + label: clusterIssuer + description: 'add the name of your cert-manager clusterIssuer here for automatic tls certificates. Cannot be used combined with tls option below' + schema: + type: string + default: "" - variable: tls label: TLS-Settings schema: type: list + show_if: [["clusterIssuer", "=", ""]] default: [] items: - variable: tlsEntry @@ -696,12 +703,26 @@ questions: type: string default: "" required: true - - variable: scaleCert - label: Select TrueNAS SCALE Certificate + + - variable: clusterIssuer + label: Use Cert-Manager clusterIssuer + description: 'add the name of your cert-manager clusterIssuer here for automatic tls certificates.' schema: + type: string + default: "" + - variable: scaleCert + label: Use TrueNAS SCALE Certificate (Deprecated) + schema: + show_if: [["clusterIssuer", "=", ""]] type: int $ref: - "definitions/certificate" + - variable: secretName + label: Use Custom Secret (Advanced) + schema: + show_if: [["clusterIssuer", "=", ""]] + type: string + default: "" - variable: entrypoint label: (Advanced) Traefik Entrypoint description: Entrypoint used by Traefik when using Traefik as Ingress Provider @@ -813,11 +834,18 @@ questions: label: Service Port schema: type: int + - variable: clusterIssuer + label: clusterIssuer + description: 'add the name of your cert-manager clusterIssuer here for automatic tls certificates. Cannot be used combined with tls option below' + schema: + type: string + default: "" - variable: tls label: TLS-Settings schema: type: list default: [] + show_if: [["clusterIssuer", "=", ""]] items: - variable: tlsEntry label: Host @@ -837,12 +865,25 @@ questions: type: string default: "" required: true - - variable: scaleCert - label: Select TrueNAS SCALE Certificate + - variable: clusterIssuer + label: Use Cert-Manager clusterIssuer + description: 'add the name of your Cert-Manager clusterIssuer here for automatic tls certificates.' schema: + type: string + default: "" + - variable: scaleCert + label: Use TrueNAS SCALE Certificate (Deprecated) + schema: + show_if: [["clusterIssuer", "=", ""]] type: int $ref: - "definitions/certificate" + - variable: secretName + label: Use Custom Secret (Advanced) + schema: + type: string + show_if: [["clusterIssuer", "=", ""]] + default: "" - variable: entrypoint label: Traefik Entrypoint description: Entrypoint used by Traefik when using Traefik as Ingress Provider diff --git a/enterprise/grafana/6.0.24/templates/common.yaml b/enterprise/grafana/6.0.25/templates/common.yaml similarity index 100% rename from enterprise/grafana/6.0.24/templates/common.yaml rename to enterprise/grafana/6.0.25/templates/common.yaml diff --git a/enterprise/grafana/6.0.24/templates/prometheusrules.yaml b/enterprise/grafana/6.0.25/templates/prometheusrules.yaml similarity index 100% rename from enterprise/grafana/6.0.24/templates/prometheusrules.yaml rename to enterprise/grafana/6.0.25/templates/prometheusrules.yaml diff --git a/enterprise/grafana/6.0.24/templates/servicemonitor.yaml b/enterprise/grafana/6.0.25/templates/servicemonitor.yaml similarity index 100% rename from enterprise/grafana/6.0.24/templates/servicemonitor.yaml rename to enterprise/grafana/6.0.25/templates/servicemonitor.yaml diff --git a/enterprise/grafana/6.0.24/values.yaml b/enterprise/grafana/6.0.25/values.yaml similarity index 100% rename from enterprise/grafana/6.0.24/values.yaml rename to enterprise/grafana/6.0.25/values.yaml