From 3d91ea795fb452c7a0dcd6b1e2a9e4b2a13fd765 Mon Sep 17 00:00:00 2001 From: zanhsieh Date: Wed, 2 Sep 2020 20:27:06 +0800 Subject: [PATCH] [stable/grafana] deprecate chart (#23662) * [stable/grafana] deprecate chart Signed-off-by: zanhsieh * fix chart Signed-off-by: David Karlsen * drop values file causing tests to fail Signed-off-by: David Karlsen Co-authored-by: David Karlsen --- stable/grafana/Chart.yaml | 11 +++-------- stable/grafana/README.md | 4 ++++ stable/grafana/ci/with-dashboard-values.yaml | 19 ------------------- stable/grafana/templates/NOTES.txt | 5 +++++ 4 files changed, 12 insertions(+), 27 deletions(-) delete mode 100644 stable/grafana/ci/with-dashboard-values.yaml diff --git a/stable/grafana/Chart.yaml b/stable/grafana/Chart.yaml index 8ad0c2601c..107bf04d1c 100644 --- a/stable/grafana/Chart.yaml +++ b/stable/grafana/Chart.yaml @@ -1,6 +1,8 @@ +# This chart is deprecated and moved to https://github.com/grafana/helm2-grafana apiVersion: v1 name: grafana -version: 5.5.5 +deprecated: true +version: 5.5.6 appVersion: 7.1.1 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. @@ -8,12 +10,5 @@ home: https://grafana.net icon: https://raw.githubusercontent.com/grafana/grafana/master/public/img/logo_transparent_400x.png sources: - https://github.com/grafana/grafana -maintainers: - - name: zanhsieh - email: zanhsieh@gmail.com - - name: rtluckie - email: rluckie@cisco.com - - name: maorfr - email: maor.friedman@redhat.com engine: gotpl tillerVersion: ">=2.12.0" diff --git a/stable/grafana/README.md b/stable/grafana/README.md index 6bb2470a83..a271eb9767 100644 --- a/stable/grafana/README.md +++ b/stable/grafana/README.md @@ -1,3 +1,7 @@ +# ⚠️ DEPRECATED + +This chart was moved to https://github.com/grafana/helm2-grafana + # Grafana Helm Chart * Installs the web dashboarding system [Grafana](http://grafana.org/) diff --git a/stable/grafana/ci/with-dashboard-values.yaml b/stable/grafana/ci/with-dashboard-values.yaml deleted file mode 100644 index 7b662c5fd4..0000000000 --- a/stable/grafana/ci/with-dashboard-values.yaml +++ /dev/null @@ -1,19 +0,0 @@ -dashboards: - my-provider: - my-awesome-dashboard: - gnetId: 10000 - revision: 1 - datasource: Prometheus -dashboardProviders: - dashboardproviders.yaml: - apiVersion: 1 - providers: - - name: 'my-provider' - orgId: 1 - folder: '' - type: file - updateIntervalSeconds: 10 - disableDeletion: true - editable: true - options: - path: /var/lib/grafana/dashboards/my-provider diff --git a/stable/grafana/templates/NOTES.txt b/stable/grafana/templates/NOTES.txt index 1fc8436d95..14ebebf907 100644 --- a/stable/grafana/templates/NOTES.txt +++ b/stable/grafana/templates/NOTES.txt @@ -1,3 +1,8 @@ +******************* +****DEPRECATED***** +******************* +* The chart is deprecated. Future development has been moved to https://github.com/grafana/helm2-grafana + 1. Get your '{{ .Values.adminUser }}' user password by running: kubectl get secret --namespace {{ template "grafana.namespace" . }} {{ template "grafana.fullname" . }} -o jsonpath="{.data.admin-password}" | base64 --decode ; echo