diff --git a/assets/prometheus-federator/prometheus-federator-104.0.0-rc1+up0.4.0.tgz b/assets/prometheus-federator/prometheus-federator-104.0.0-rc1+up0.4.0.tgz new file mode 100644 index 000000000..3a24a5a0d Binary files /dev/null and b/assets/prometheus-federator/prometheus-federator-104.0.0-rc1+up0.4.0.tgz differ diff --git a/assets/prometheus-federator/prometheus-federator-104.0.0-rc1+up0.4.1.tgz b/assets/prometheus-federator/prometheus-federator-104.0.0-rc1+up0.4.1.tgz deleted file mode 100644 index 246d28d8b..000000000 Binary files a/assets/prometheus-federator/prometheus-federator-104.0.0-rc1+up0.4.1.tgz and /dev/null differ diff --git a/charts/prometheus-federator/104.0.0-rc1+up0.4.1/Chart.yaml b/charts/prometheus-federator/104.0.0-rc1+up0.4.0/Chart.yaml similarity index 94% rename from charts/prometheus-federator/104.0.0-rc1+up0.4.1/Chart.yaml rename to charts/prometheus-federator/104.0.0-rc1+up0.4.0/Chart.yaml index 44676e6dc..ffa531014 100644 --- a/charts/prometheus-federator/104.0.0-rc1+up0.4.1/Chart.yaml +++ b/charts/prometheus-federator/104.0.0-rc1+up0.4.0/Chart.yaml @@ -9,7 +9,7 @@ annotations: catalog.cattle.io/rancher-version: '>= 2.9.0-0 < 2.10.0-0' catalog.cattle.io/release-name: prometheus-federator apiVersion: v2 -appVersion: 0.3.5 +appVersion: 0.3.4 dependencies: - condition: helmProjectOperator.enabled name: helmProjectOperator @@ -19,4 +19,4 @@ description: Prometheus Federator icon: https://raw.githubusercontent.com/rancher/prometheus-federator/main/assets/logos/prometheus-federator.svg kubeVersion: '>=1.26.0-0' name: prometheus-federator -version: 104.0.0-rc1+up0.4.1 +version: 104.0.0-rc1+up0.4.0 diff --git a/charts/prometheus-federator/104.0.0-rc1+up0.4.0/Chart.yaml.orig b/charts/prometheus-federator/104.0.0-rc1+up0.4.0/Chart.yaml.orig new file mode 100644 index 000000000..1663200c6 --- /dev/null +++ b/charts/prometheus-federator/104.0.0-rc1+up0.4.0/Chart.yaml.orig @@ -0,0 +1,19 @@ +annotations: + catalog.cattle.io/certified: rancher + catalog.cattle.io/display-name: Prometheus Federator + catalog.cattle.io/namespace: cattle-monitoring-system + 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/release-name: prometheus-federator +apiVersion: v2 +appVersion: 0.3.4 +dependencies: +- condition: helmProjectOperator.enabled + name: helmProjectOperator + repository: file://./charts/helmProjectOperator + version: 0.2.1 +description: Prometheus Federator +icon: https://raw.githubusercontent.com/rancher/prometheus-federator/main/assets/logos/prometheus-federator.svg +name: prometheus-federator +version: 0.4.0 diff --git a/charts/prometheus-federator/104.0.0-rc1+up0.4.1/README.md b/charts/prometheus-federator/104.0.0-rc1+up0.4.0/README.md similarity index 100% rename from charts/prometheus-federator/104.0.0-rc1+up0.4.1/README.md rename to charts/prometheus-federator/104.0.0-rc1+up0.4.0/README.md diff --git a/charts/prometheus-federator/104.0.0-rc1+up0.4.1/app-README.md b/charts/prometheus-federator/104.0.0-rc1+up0.4.0/app-README.md similarity index 100% rename from charts/prometheus-federator/104.0.0-rc1+up0.4.1/app-README.md rename to charts/prometheus-federator/104.0.0-rc1+up0.4.0/app-README.md diff --git a/charts/prometheus-federator/104.0.0-rc1+up0.4.1/charts/helmProjectOperator/Chart.yaml b/charts/prometheus-federator/104.0.0-rc1+up0.4.0/charts/helmProjectOperator/Chart.yaml similarity index 100% rename from charts/prometheus-federator/104.0.0-rc1+up0.4.1/charts/helmProjectOperator/Chart.yaml rename to charts/prometheus-federator/104.0.0-rc1+up0.4.0/charts/helmProjectOperator/Chart.yaml diff --git a/charts/prometheus-federator/104.0.0-rc1+up0.4.1/charts/helmProjectOperator/README.md b/charts/prometheus-federator/104.0.0-rc1+up0.4.0/charts/helmProjectOperator/README.md similarity index 100% rename from charts/prometheus-federator/104.0.0-rc1+up0.4.1/charts/helmProjectOperator/README.md rename to charts/prometheus-federator/104.0.0-rc1+up0.4.0/charts/helmProjectOperator/README.md diff --git a/charts/prometheus-federator/104.0.0-rc1+up0.4.1/charts/helmProjectOperator/app-readme.md b/charts/prometheus-federator/104.0.0-rc1+up0.4.0/charts/helmProjectOperator/app-readme.md similarity index 100% rename from charts/prometheus-federator/104.0.0-rc1+up0.4.1/charts/helmProjectOperator/app-readme.md rename to charts/prometheus-federator/104.0.0-rc1+up0.4.0/charts/helmProjectOperator/app-readme.md diff --git a/charts/prometheus-federator/104.0.0-rc1+up0.4.1/charts/helmProjectOperator/questions.yaml b/charts/prometheus-federator/104.0.0-rc1+up0.4.0/charts/helmProjectOperator/questions.yaml similarity index 100% rename from charts/prometheus-federator/104.0.0-rc1+up0.4.1/charts/helmProjectOperator/questions.yaml rename to charts/prometheus-federator/104.0.0-rc1+up0.4.0/charts/helmProjectOperator/questions.yaml diff --git a/charts/prometheus-federator/104.0.0-rc1+up0.4.1/charts/helmProjectOperator/templates/NOTES.txt b/charts/prometheus-federator/104.0.0-rc1+up0.4.0/charts/helmProjectOperator/templates/NOTES.txt similarity index 100% rename from charts/prometheus-federator/104.0.0-rc1+up0.4.1/charts/helmProjectOperator/templates/NOTES.txt rename to charts/prometheus-federator/104.0.0-rc1+up0.4.0/charts/helmProjectOperator/templates/NOTES.txt diff --git a/charts/prometheus-federator/104.0.0-rc1+up0.4.1/charts/helmProjectOperator/templates/_helpers.tpl b/charts/prometheus-federator/104.0.0-rc1+up0.4.0/charts/helmProjectOperator/templates/_helpers.tpl similarity index 100% rename from charts/prometheus-federator/104.0.0-rc1+up0.4.1/charts/helmProjectOperator/templates/_helpers.tpl rename to charts/prometheus-federator/104.0.0-rc1+up0.4.0/charts/helmProjectOperator/templates/_helpers.tpl diff --git a/charts/prometheus-federator/104.0.0-rc1+up0.4.1/charts/helmProjectOperator/templates/cleanup.yaml b/charts/prometheus-federator/104.0.0-rc1+up0.4.0/charts/helmProjectOperator/templates/cleanup.yaml similarity index 100% rename from charts/prometheus-federator/104.0.0-rc1+up0.4.1/charts/helmProjectOperator/templates/cleanup.yaml rename to charts/prometheus-federator/104.0.0-rc1+up0.4.0/charts/helmProjectOperator/templates/cleanup.yaml diff --git a/charts/prometheus-federator/104.0.0-rc1+up0.4.1/charts/helmProjectOperator/templates/clusterrole.yaml b/charts/prometheus-federator/104.0.0-rc1+up0.4.0/charts/helmProjectOperator/templates/clusterrole.yaml similarity index 100% rename from charts/prometheus-federator/104.0.0-rc1+up0.4.1/charts/helmProjectOperator/templates/clusterrole.yaml rename to charts/prometheus-federator/104.0.0-rc1+up0.4.0/charts/helmProjectOperator/templates/clusterrole.yaml diff --git a/charts/prometheus-federator/104.0.0-rc1+up0.4.1/charts/helmProjectOperator/templates/configmap.yaml b/charts/prometheus-federator/104.0.0-rc1+up0.4.0/charts/helmProjectOperator/templates/configmap.yaml similarity index 100% rename from charts/prometheus-federator/104.0.0-rc1+up0.4.1/charts/helmProjectOperator/templates/configmap.yaml rename to charts/prometheus-federator/104.0.0-rc1+up0.4.0/charts/helmProjectOperator/templates/configmap.yaml diff --git a/charts/prometheus-federator/104.0.0-rc1+up0.4.1/charts/helmProjectOperator/templates/deployment.yaml b/charts/prometheus-federator/104.0.0-rc1+up0.4.0/charts/helmProjectOperator/templates/deployment.yaml similarity index 100% rename from charts/prometheus-federator/104.0.0-rc1+up0.4.1/charts/helmProjectOperator/templates/deployment.yaml rename to charts/prometheus-federator/104.0.0-rc1+up0.4.0/charts/helmProjectOperator/templates/deployment.yaml diff --git a/charts/prometheus-federator/104.0.0-rc1+up0.4.1/charts/helmProjectOperator/templates/psp.yaml b/charts/prometheus-federator/104.0.0-rc1+up0.4.0/charts/helmProjectOperator/templates/psp.yaml similarity index 100% rename from charts/prometheus-federator/104.0.0-rc1+up0.4.1/charts/helmProjectOperator/templates/psp.yaml rename to charts/prometheus-federator/104.0.0-rc1+up0.4.0/charts/helmProjectOperator/templates/psp.yaml diff --git a/charts/prometheus-federator/104.0.0-rc1+up0.4.1/charts/helmProjectOperator/templates/rbac.yaml b/charts/prometheus-federator/104.0.0-rc1+up0.4.0/charts/helmProjectOperator/templates/rbac.yaml similarity index 100% rename from charts/prometheus-federator/104.0.0-rc1+up0.4.1/charts/helmProjectOperator/templates/rbac.yaml rename to charts/prometheus-federator/104.0.0-rc1+up0.4.0/charts/helmProjectOperator/templates/rbac.yaml diff --git a/charts/prometheus-federator/104.0.0-rc1+up0.4.1/charts/helmProjectOperator/templates/system-namespaces-configmap.yaml b/charts/prometheus-federator/104.0.0-rc1+up0.4.0/charts/helmProjectOperator/templates/system-namespaces-configmap.yaml similarity index 100% rename from charts/prometheus-federator/104.0.0-rc1+up0.4.1/charts/helmProjectOperator/templates/system-namespaces-configmap.yaml rename to charts/prometheus-federator/104.0.0-rc1+up0.4.0/charts/helmProjectOperator/templates/system-namespaces-configmap.yaml diff --git a/charts/prometheus-federator/104.0.0-rc1+up0.4.1/charts/helmProjectOperator/templates/validate-psp-install.yaml b/charts/prometheus-federator/104.0.0-rc1+up0.4.0/charts/helmProjectOperator/templates/validate-psp-install.yaml similarity index 100% rename from charts/prometheus-federator/104.0.0-rc1+up0.4.1/charts/helmProjectOperator/templates/validate-psp-install.yaml rename to charts/prometheus-federator/104.0.0-rc1+up0.4.0/charts/helmProjectOperator/templates/validate-psp-install.yaml diff --git a/charts/prometheus-federator/104.0.0-rc1+up0.4.1/charts/helmProjectOperator/values.yaml b/charts/prometheus-federator/104.0.0-rc1+up0.4.0/charts/helmProjectOperator/values.yaml similarity index 100% rename from charts/prometheus-federator/104.0.0-rc1+up0.4.1/charts/helmProjectOperator/values.yaml rename to charts/prometheus-federator/104.0.0-rc1+up0.4.0/charts/helmProjectOperator/values.yaml diff --git a/charts/prometheus-federator/104.0.0-rc1+up0.4.1/questions.yaml b/charts/prometheus-federator/104.0.0-rc1+up0.4.0/questions.yaml similarity index 100% rename from charts/prometheus-federator/104.0.0-rc1+up0.4.1/questions.yaml rename to charts/prometheus-federator/104.0.0-rc1+up0.4.0/questions.yaml diff --git a/charts/prometheus-federator/104.0.0-rc1+up0.4.1/templates/NOTES.txt b/charts/prometheus-federator/104.0.0-rc1+up0.4.0/templates/NOTES.txt similarity index 100% rename from charts/prometheus-federator/104.0.0-rc1+up0.4.1/templates/NOTES.txt rename to charts/prometheus-federator/104.0.0-rc1+up0.4.0/templates/NOTES.txt diff --git a/charts/prometheus-federator/104.0.0-rc1+up0.4.1/templates/_helpers.tpl b/charts/prometheus-federator/104.0.0-rc1+up0.4.0/templates/_helpers.tpl similarity index 100% rename from charts/prometheus-federator/104.0.0-rc1+up0.4.1/templates/_helpers.tpl rename to charts/prometheus-federator/104.0.0-rc1+up0.4.0/templates/_helpers.tpl diff --git a/charts/prometheus-federator/104.0.0-rc1+up0.4.1/values.yaml b/charts/prometheus-federator/104.0.0-rc1+up0.4.0/values.yaml similarity index 98% rename from charts/prometheus-federator/104.0.0-rc1+up0.4.1/values.yaml rename to charts/prometheus-federator/104.0.0-rc1+up0.4.0/values.yaml index 103c1604b..a9b898baf 100644 --- a/charts/prometheus-federator/104.0.0-rc1+up0.4.1/values.yaml +++ b/charts/prometheus-federator/104.0.0-rc1+up0.4.0/values.yaml @@ -58,7 +58,7 @@ helmProjectOperator: image: repository: rancher/prometheus-federator - tag: v0.3.5 + tag: v0.3.4 pullPolicy: IfNotPresent # Additional arguments to be passed into the Prometheus Federator image diff --git a/index.yaml b/index.yaml index 3cf21fb05..42c8288e7 100755 --- a/index.yaml +++ b/index.yaml @@ -6760,21 +6760,21 @@ entries: catalog.cattle.io/rancher-version: '>= 2.9.0-0 < 2.10.0-0' catalog.cattle.io/release-name: prometheus-federator apiVersion: v2 - appVersion: 0.3.5 - created: "2024-06-07T12:12:22.466384-04:00" + appVersion: 0.3.4 + created: "2024-06-10T06:15:35.190850129-04:00" dependencies: - condition: helmProjectOperator.enabled name: helmProjectOperator repository: file://./charts/helmProjectOperator version: '*' description: Prometheus Federator - digest: 328717b1a327f74954e4ec7f14706a8e6cb1612dd407e1b36abb62ceb5c869d3 + digest: f3960b8de53ce8344ecff1ee726a4c42579724c1edddb456b08e7db5eb073904 icon: https://raw.githubusercontent.com/rancher/prometheus-federator/main/assets/logos/prometheus-federator.svg kubeVersion: '>=1.26.0-0' name: prometheus-federator urls: - - assets/prometheus-federator/prometheus-federator-104.0.0-rc1+up0.4.1.tgz - version: 104.0.0-rc1+up0.4.1 + - assets/prometheus-federator/prometheus-federator-104.0.0-rc1+up0.4.0.tgz + version: 104.0.0-rc1+up0.4.0 - annotations: catalog.cattle.io/certified: rancher catalog.cattle.io/display-name: Prometheus Federator diff --git a/packages/rancher-monitoring/prometheus-federator/package.yaml b/packages/rancher-monitoring/prometheus-federator/package.yaml index f2e43367d..f315e6023 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.4.1 -commit: cff814f807f6e86229ad940e77f3d14768cc1b86 +subdirectory: charts/prometheus-federator/0.4.0 +commit: 35bebb0b19b69584cfee819511532a7198e56df4 version: 104.0.0-rc1 diff --git a/release.yaml b/release.yaml index a875870b0..9cfc66d0d 100644 --- a/release.yaml +++ b/release.yaml @@ -75,7 +75,7 @@ neuvector-monitor: - 103.0.3+up2.7.6 prometheus-federator: - 103.0.1+up0.4.1 - - 104.0.0-rc1+up0.4.1 + - 104.0.0-rc1+up0.4.0 - 3.0.1+up0.3.3 - 103.0.1+up0.4.0 rancher-aks-operator: