From 801a6eb85f82bc80ce4f7d96c116195b220c3aa6 Mon Sep 17 00:00:00 2001 From: Arvind Iyengar Date: Tue, 20 Sep 2022 11:57:43 -0700 Subject: [PATCH] Prepare monitoring for 2.7 --- .../generated-changes/patch/Chart.yaml.patch | 2 +- packages/rancher-monitoring/rancher-monitoring/package.yaml | 1 - release.yaml | 4 ++++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/Chart.yaml.patch b/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/Chart.yaml.patch index 519cc8108..475c58103 100644 --- a/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/Chart.yaml.patch +++ b/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/Chart.yaml.patch @@ -12,7 +12,7 @@ + catalog.cattle.io/namespace: cattle-monitoring-system + catalog.cattle.io/permits-os: linux,windows + catalog.cattle.io/provides-gvr: monitoring.coreos.com.prometheus/v1 -+ catalog.cattle.io/rancher-version: '>= 2.6.0-0 < 2.7.0-0' ++ catalog.cattle.io/rancher-version: '>= 2.7.0-0 < 2.8.0-0' + catalog.cattle.io/release-name: rancher-monitoring + catalog.cattle.io/requests-cpu: 4500m + catalog.cattle.io/requests-memory: 4000Mi diff --git a/packages/rancher-monitoring/rancher-monitoring/package.yaml b/packages/rancher-monitoring/rancher-monitoring/package.yaml index 4ec10e698..b991496f6 100644 --- a/packages/rancher-monitoring/rancher-monitoring/package.yaml +++ b/packages/rancher-monitoring/rancher-monitoring/package.yaml @@ -2,7 +2,6 @@ url: https://github.com/prometheus-community/helm-charts.git subdirectory: charts/kube-prometheus-stack commit: c6208979d494156a3869d2e5faab669ce4301c68 version: 101.0.0 -doNotRelease: true additionalCharts: - workingDir: charts-crd crdOptions: diff --git a/release.yaml b/release.yaml index aa0db0025..8da4ca5f3 100644 --- a/release.yaml +++ b/release.yaml @@ -16,3 +16,7 @@ ui-plugin-operator: - 101.0.0+up0.1.0 ui-plugin-operator-crd: - 101.0.0+up0.1.0 +rancher-monitoring: +- 101.0.0+up19.0.3 +rancher-monitoring-crd: +- 101.0.0+up19.0.3