(dev-v2.6-archive) Fix monitoring Chart.yaml

This is required due to the change released in v0.1.0 of the charts-build-scripts to switch the package used for YAML marshalling / unmarshalling.

Note: This does not need a packageVersion bump since it has already been bumped once for this release.
(cherry picked from commit 7ec1716f66)

(partially cherry picked from commit e2c9a0746b)
pull/1680/head
Arvind Iyengar 2021-05-06 16:49:10 -07:00
parent 4db1d5822e
commit 5c0f816c65
No known key found for this signature in database
GPG Key ID: A8DD9BFD6C811498
1 changed files with 40 additions and 43 deletions

View File

@ -1,38 +1,6 @@
--- charts-original/Chart.yaml
+++ charts/Chart.yaml
@@ -1,17 +1,15 @@
-name: kube-prometheus-stack
+name: rancher-monitoring
home: https://github.com/prometheus-operator/kube-prometheus
sources:
- https://github.com/prometheus-community/helm-charts
- https://github.com/prometheus-operator/kube-prometheus
-version: 14.5.0
-description: kube-prometheus-stack collects Kubernetes manifests, Grafana dashboards,
- and Prometheus rules combined with documentation and scripts to provide easy to
- operate end-to-end Kubernetes cluster monitoring with Prometheus using the Prometheus
- Operator.
+version: 14.5.1
+description: Collects several related Helm charts, Grafana dashboards, and Prometheus rules combined with documentation and scripts to provide easy to operate end-to-end Kubernetes cluster monitoring with Prometheus using the Prometheus Operator.
keywords:
- operator
- prometheus
- kube-prometheus
+- monitoring
maintainers:
- name: vsliouniaev
email: ""
@@ -31,6 +29,9 @@
- name: Xtigyro
email: miroslav.hadzhiev@gmail.com
url: ""
+- name: Arvind
+ email: arvind.iyengar@suse.com
+ url: ""
icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png
apiversion: v2
condition: ""
@@ -44,6 +45,15 @@
@@ -5,6 +5,15 @@
- name: Upstream Project
url: https://github.com/prometheus-operator/kube-prometheus
artifacthub.io/operator: "true"
@ -45,15 +13,44 @@
+ catalog.cattle.io/auto-install: rancher-monitoring-crd=match
+ catalog.cattle.io/requests-cpu: "4500m"
+ catalog.cattle.io/requests-memory: "4000Mi"
kubeversion: '>=1.16.0-0'
apiVersion: v2
appVersion: 0.46.0
dependencies:
- name: grafana
@@ -185,7 +195,7 @@
- name: windowsExporter
version: ""
@@ -59,19 +68,17 @@
- condition: rkeScheduler.enabled
name: rkeScheduler
repository: file://./charts/rkeScheduler
-- condition: windowsExporter.enabled
+- condition: global.cattle.windows.enabled
name: windowsExporter
repository: file://./charts/windowsExporter
- condition: windowsExporter.enabled
+ condition: global.cattle.windows.enabled
tags: []
enabled: false
importvalues: []
-description: kube-prometheus-stack collects Kubernetes manifests, Grafana dashboards,
- and Prometheus rules combined with documentation and scripts to provide easy to
- operate end-to-end Kubernetes cluster monitoring with Prometheus using the Prometheus
- Operator.
+description: Collects several related Helm charts, Grafana dashboards, and Prometheus rules combined with documentation and scripts to provide easy to operate end-to-end Kubernetes cluster monitoring with Prometheus using the Prometheus Operator.
home: https://github.com/prometheus-operator/kube-prometheus
icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png
keywords:
- operator
- prometheus
- kube-prometheus
+- monitoring
kubeVersion: '>=1.16.0-0'
maintainers:
- name: vsliouniaev
@@ -84,9 +91,12 @@
name: scottrigby
- email: miroslav.hadzhiev@gmail.com
name: Xtigyro
-name: kube-prometheus-stack
+- name: Arvind
+ email: arvind.iyengar@suse.com
+ url: ""
+name: rancher-monitoring
sources:
- https://github.com/prometheus-community/helm-charts
- https://github.com/prometheus-operator/kube-prometheus
type: application
-version: 14.5.0
+version: 14.5.1