From d5d2502fdf1ae327e194a0494fbc25b3282a8264 Mon Sep 17 00:00:00 2001 From: Arvind Iyengar Date: Wed, 11 May 2022 14:51:36 -0700 Subject: [PATCH] Bump Prometheus Federator and rancher-project-monitoring to GA release --- .../dependencies/helmProjectOperator/dependency.yaml | 4 ++-- .../generated-changes/patch/Chart.yaml.patch | 11 ----------- .../prometheus-federator/package.yaml | 4 ++-- .../dependencies/grafana/dependency.yaml | 4 ++-- .../rancher-project-monitoring/package.yaml | 4 ++-- release.yaml | 4 ++-- 6 files changed, 10 insertions(+), 21 deletions(-) delete mode 100644 packages/rancher-monitoring/prometheus-federator/generated-changes/patch/Chart.yaml.patch diff --git a/packages/rancher-monitoring/prometheus-federator/generated-changes/dependencies/helmProjectOperator/dependency.yaml b/packages/rancher-monitoring/prometheus-federator/generated-changes/dependencies/helmProjectOperator/dependency.yaml index 7c916049f..411d314e7 100644 --- a/packages/rancher-monitoring/prometheus-federator/generated-changes/dependencies/helmProjectOperator/dependency.yaml +++ b/packages/rancher-monitoring/prometheus-federator/generated-changes/dependencies/helmProjectOperator/dependency.yaml @@ -1,4 +1,4 @@ workingDir: "" url: https://github.com/rancher/prometheus-federator.git -subdirectory: charts/prometheus-federator/0.0.1/charts/helmProjectOperator -commit: e87ce2ec776f711a209c3cbb87fe9d46541917ce +subdirectory: charts/prometheus-federator/0.1.0/charts/helmProjectOperator +commit: 0798a8f46069afff05ded6ebd4cd6564c5989634 diff --git a/packages/rancher-monitoring/prometheus-federator/generated-changes/patch/Chart.yaml.patch b/packages/rancher-monitoring/prometheus-federator/generated-changes/patch/Chart.yaml.patch deleted file mode 100644 index 0fd89a332..000000000 --- a/packages/rancher-monitoring/prometheus-federator/generated-changes/patch/Chart.yaml.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- charts-original/Chart.yaml -+++ charts/Chart.yaml -@@ -6,7 +6,7 @@ - catalog.cattle.io/os: linux,windows - catalog.cattle.io/permits-os: linux,windows - catalog.cattle.io/provides-gvr: helm.cattle.io.projecthelmchart/v1alpha1 -- catalog.cattle.io/rancher-version: '>= 2.6.0-0 <=2.6.99-0' -+ catalog.cattle.io/rancher-version: '>= 2.6.5-0 <= 2.6.100-0' - catalog.cattle.io/release-name: prometheus-federator - apiVersion: v2 - appVersion: 0.0.1 diff --git a/packages/rancher-monitoring/prometheus-federator/package.yaml b/packages/rancher-monitoring/prometheus-federator/package.yaml index 2205920f4..d2e073431 100644 --- a/packages/rancher-monitoring/prometheus-federator/package.yaml +++ b/packages/rancher-monitoring/prometheus-federator/package.yaml @@ -1,4 +1,4 @@ url: https://github.com/rancher/prometheus-federator.git -subdirectory: charts/prometheus-federator/0.0.1 -commit: e87ce2ec776f711a209c3cbb87fe9d46541917ce +subdirectory: charts/prometheus-federator/0.1.0 +commit: 0798a8f46069afff05ded6ebd4cd6564c5989634 version: 0.1.0 diff --git a/packages/rancher-monitoring/rancher-project-monitoring/generated-changes/dependencies/grafana/dependency.yaml b/packages/rancher-monitoring/rancher-project-monitoring/generated-changes/dependencies/grafana/dependency.yaml index 183c83f68..e63529234 100644 --- a/packages/rancher-monitoring/rancher-project-monitoring/generated-changes/dependencies/grafana/dependency.yaml +++ b/packages/rancher-monitoring/rancher-project-monitoring/generated-changes/dependencies/grafana/dependency.yaml @@ -1,4 +1,4 @@ workingDir: "" url: https://github.com/rancher/prometheus-federator.git -subdirectory: charts/rancher-project-monitoring/0.0.1/charts/grafana -commit: e87ce2ec776f711a209c3cbb87fe9d46541917ce +subdirectory: charts/rancher-project-monitoring/0.1.0/charts/grafana +commit: 0798a8f46069afff05ded6ebd4cd6564c5989634 diff --git a/packages/rancher-monitoring/rancher-project-monitoring/package.yaml b/packages/rancher-monitoring/rancher-project-monitoring/package.yaml index d714d6623..1ed26d1cd 100644 --- a/packages/rancher-monitoring/rancher-project-monitoring/package.yaml +++ b/packages/rancher-monitoring/rancher-project-monitoring/package.yaml @@ -1,4 +1,4 @@ url: https://github.com/rancher/prometheus-federator.git -subdirectory: charts/rancher-project-monitoring/0.0.1 -commit: e87ce2ec776f711a209c3cbb87fe9d46541917ce +subdirectory: charts/rancher-project-monitoring/0.1.0 +commit: 0798a8f46069afff05ded6ebd4cd6564c5989634 version: 0.1.0 diff --git a/release.yaml b/release.yaml index 66da40560..12f6bf408 100644 --- a/release.yaml +++ b/release.yaml @@ -3,7 +3,7 @@ neuvector: neuvector-crd: - 100.0.0+up2.2.0 prometheus-federator: -- 0.1.0+up0.0.1 +- 0.1.0 rancher-aks-operator: - 100.0.4+up1.0.5 rancher-aks-operator-crd: @@ -23,7 +23,7 @@ rancher-logging: rancher-logging-crd: - 100.1.2+up3.17.4 rancher-project-monitoring: -- 0.1.0+up0.0.1 +- 0.1.0 rancher-vsphere-cpi: - 100.3.0+up1.2.1 rancher-vsphere-csi: