Merge pull request #2755 from geethub97/fixing-annotations

Fixing Rancher annotations for prometheus federator and project monitoring.
rancher · Jun 30, 2023 · 9471736 · 9471736
2 parents ac159e3 + 08f4c63
commit 9471736
Show file tree

Hide file tree

Showing 143 changed files with 77 additions and 47 deletions.
diff --git a/assets/prometheus-federator/prometheus-federator-0.3.0+up0.3.2.tgz b/assets/prometheus-federator/prometheus-federator-0.3.0+up0.3.2.tgz
diff --git a/assets/prometheus-federator/prometheus-federator-0.3.0+up0.3.3.tgz b/assets/prometheus-federator/prometheus-federator-0.3.0+up0.3.3.tgz
diff --git a/assets/rancher-project-monitoring/rancher-project-monitoring-0.3.0+up0.3.2.tgz b/assets/rancher-project-monitoring/rancher-project-monitoring-0.3.0+up0.3.2.tgz
diff --git a/assets/rancher-project-monitoring/rancher-project-monitoring-0.3.0+up0.3.3.tgz b/assets/rancher-project-monitoring/rancher-project-monitoring-0.3.0+up0.3.3.tgz
diff --git a/...etheus-federator/0.3.0+up0.3.2/Chart.yaml → ...etheus-federator/0.3.0+up0.3.3/Chart.yaml b/...etheus-federator/0.3.0+up0.3.2/Chart.yaml → ...etheus-federator/0.3.0+up0.3.3/Chart.yaml
@@ -1,12 +1,12 @@
 annotations:
   catalog.cattle.io/certified: rancher
   catalog.cattle.io/display-name: Prometheus Federator
-  catalog.cattle.io/kube-version: '>=1.16.0-0'
+  catalog.cattle.io/kube-version: '>= 1.16.0-0 < 1.25.0-0'
   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/rancher-version: '>= 2.6.5-0 < 2.8.0-0'
+  catalog.cattle.io/rancher-version: '>= 2.6.5-0 < 2.7.0-0'
   catalog.cattle.io/release-name: prometheus-federator
 apiVersion: v2
 appVersion: 0.3.2
@@ -17,4 +17,4 @@ dependencies:
 description: Prometheus Federator
 icon: https://raw.githubusercontent.com/rancher/prometheus-federator/main/assets/logos/prometheus-federator.svg
 name: prometheus-federator
-version: 0.3.0+up0.3.2
+version: 0.3.0+up0.3.3
diff --git a/...metheus-federator/0.3.0+up0.3.2/README.md → ...metheus-federator/0.3.0+up0.3.3/README.md b/...metheus-federator/0.3.0+up0.3.2/README.md → ...metheus-federator/0.3.0+up0.3.3/README.md
diff --git a/...eus-federator/0.3.0+up0.3.2/app-README.md → ...eus-federator/0.3.0+up0.3.3/app-README.md b/...eus-federator/0.3.0+up0.3.2/app-README.md → ...eus-federator/0.3.0+up0.3.3/app-README.md
diff --git a/...3.2/charts/helmProjectOperator/Chart.yaml → ...3.3/charts/helmProjectOperator/Chart.yaml b/...3.2/charts/helmProjectOperator/Chart.yaml → ...3.3/charts/helmProjectOperator/Chart.yaml
@@ -1,12 +1,12 @@
 annotations:
   catalog.cattle.io/certified: rancher
   catalog.cattle.io/display-name: Helm Project Operator
-  catalog.cattle.io/kube-version: '>=1.16.0-0'
+  catalog.cattle.io/kube-version: '>= 1.16.0-0 < 1.25.0-0'
   catalog.cattle.io/namespace: cattle-helm-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/rancher-version: '>= 2.6.0-0'
+  catalog.cattle.io/rancher-version: '>= 2.6.5-0 < 2.7.0-0'
   catalog.cattle.io/release-name: helm-project-operator
 apiVersion: v2
 appVersion: 0.2.1

diff --git a/....3.2/charts/helmProjectOperator/README.md → ....3.3/charts/helmProjectOperator/README.md b/....3.2/charts/helmProjectOperator/README.md → ....3.3/charts/helmProjectOperator/README.md
diff --git a/.../charts/helmProjectOperator/app-readme.md → .../charts/helmProjectOperator/app-readme.md b/.../charts/helmProjectOperator/app-readme.md → .../charts/helmProjectOperator/app-readme.md
diff --git a/...charts/helmProjectOperator/questions.yaml → ...charts/helmProjectOperator/questions.yaml b/...charts/helmProjectOperator/questions.yaml → ...charts/helmProjectOperator/questions.yaml
diff --git a/...s/helmProjectOperator/templates/NOTES.txt → ...s/helmProjectOperator/templates/NOTES.txt b/...s/helmProjectOperator/templates/NOTES.txt → ...s/helmProjectOperator/templates/NOTES.txt
diff --git a/...elmProjectOperator/templates/_helpers.tpl → ...elmProjectOperator/templates/_helpers.tpl b/...elmProjectOperator/templates/_helpers.tpl → ...elmProjectOperator/templates/_helpers.tpl
diff --git a/...elmProjectOperator/templates/cleanup.yaml → ...elmProjectOperator/templates/cleanup.yaml b/...elmProjectOperator/templates/cleanup.yaml → ...elmProjectOperator/templates/cleanup.yaml
diff --git a/...rojectOperator/templates/clusterrole.yaml → ...rojectOperator/templates/clusterrole.yaml b/...rojectOperator/templates/clusterrole.yaml → ...rojectOperator/templates/clusterrole.yaml
diff --git a/...mProjectOperator/templates/configmap.yaml → ...mProjectOperator/templates/configmap.yaml b/...mProjectOperator/templates/configmap.yaml → ...mProjectOperator/templates/configmap.yaml
diff --git a/...ProjectOperator/templates/deployment.yaml → ...ProjectOperator/templates/deployment.yaml b/...ProjectOperator/templates/deployment.yaml → ...ProjectOperator/templates/deployment.yaml
diff --git a/...ts/helmProjectOperator/templates/psp.yaml → ...ts/helmProjectOperator/templates/psp.yaml b/...ts/helmProjectOperator/templates/psp.yaml → ...ts/helmProjectOperator/templates/psp.yaml
diff --git a/...s/helmProjectOperator/templates/rbac.yaml → ...s/helmProjectOperator/templates/rbac.yaml b/...s/helmProjectOperator/templates/rbac.yaml → ...s/helmProjectOperator/templates/rbac.yaml
diff --git a/...emplates/system-namespaces-configmap.yaml → ...emplates/system-namespaces-configmap.yaml b/...emplates/system-namespaces-configmap.yaml → ...emplates/system-namespaces-configmap.yaml
diff --git a/...rator/templates/validate-psp-install.yaml → ...rator/templates/validate-psp-install.yaml b/...rator/templates/validate-psp-install.yaml → ...rator/templates/validate-psp-install.yaml
diff --git a/....2/charts/helmProjectOperator/values.yaml → ....3/charts/helmProjectOperator/values.yaml b/....2/charts/helmProjectOperator/values.yaml → ....3/charts/helmProjectOperator/values.yaml
diff --git a/...us-federator/0.3.0+up0.3.2/questions.yaml → ...us-federator/0.3.0+up0.3.3/questions.yaml b/...us-federator/0.3.0+up0.3.2/questions.yaml → ...us-federator/0.3.0+up0.3.3/questions.yaml
diff --git a/...derator/0.3.0+up0.3.2/templates/NOTES.txt → ...derator/0.3.0+up0.3.3/templates/NOTES.txt b/...derator/0.3.0+up0.3.2/templates/NOTES.txt → ...derator/0.3.0+up0.3.3/templates/NOTES.txt
diff --git a/...ator/0.3.0+up0.3.2/templates/_helpers.tpl → ...ator/0.3.0+up0.3.3/templates/_helpers.tpl b/...ator/0.3.0+up0.3.2/templates/_helpers.tpl → ...ator/0.3.0+up0.3.3/templates/_helpers.tpl
diff --git a/...theus-federator/0.3.0+up0.3.2/values.yaml → ...theus-federator/0.3.0+up0.3.3/values.yaml b/...theus-federator/0.3.0+up0.3.2/values.yaml → ...theus-federator/0.3.0+up0.3.3/values.yaml
diff --git a/...oject-monitoring/0.3.0+up0.3.2/Chart.yaml → ...oject-monitoring/0.3.0+up0.3.3/Chart.yaml b/...oject-monitoring/0.3.0+up0.3.2/Chart.yaml → ...oject-monitoring/0.3.0+up0.3.3/Chart.yaml
@@ -2,9 +2,9 @@ annotations:
   catalog.cattle.io/certified: rancher
   catalog.cattle.io/display-name: Project Monitoring
   catalog.cattle.io/hidden: "true"
-  catalog.cattle.io/kube-version: '>= 1.16.0-0 < 1.26.0-0'
+  catalog.cattle.io/kube-version: '>= 1.16.0-0 < 1.25.0-0'
   catalog.cattle.io/permits-os: linux,windows
-  catalog.cattle.io/rancher-version: '>= 2.6.5-0 <= 2.7.0-0'
+  catalog.cattle.io/rancher-version: '>= 2.6.5-0 < 2.7.0-0'
   catalog.cattle.io/release-name: rancher-project-monitoring
 apiVersion: v2
 appVersion: 0.59.1
@@ -21,7 +21,6 @@ icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/a
 keywords:
 - prometheus
 - monitoring
-kubeVersion: '>=1.16.0-0'
 maintainers:
 - email: arvind.iyengar@suse.com
   name: Arvind
@@ -30,4 +29,4 @@ maintainers:
   url: https://github.com/geethub97
 name: rancher-project-monitoring
 type: application
-version: 0.3.0+up0.3.2
+version: 0.3.0+up0.3.3
diff --git a/...roject-monitoring/0.3.0+up0.3.2/README.md → ...roject-monitoring/0.3.0+up0.3.3/README.md b/...roject-monitoring/0.3.0+up0.3.2/README.md → ...roject-monitoring/0.3.0+up0.3.3/README.md
diff --git a/...ct-monitoring/0.3.0+up0.3.2/app-README.md → ...ct-monitoring/0.3.0+up0.3.3/app-README.md b/...ct-monitoring/0.3.0+up0.3.2/app-README.md → ...ct-monitoring/0.3.0+up0.3.3/app-README.md
diff --git a/.../0.3.0+up0.3.2/charts/grafana/.helmignore → .../0.3.0+up0.3.3/charts/grafana/.helmignore b/.../0.3.0+up0.3.2/charts/grafana/.helmignore → .../0.3.0+up0.3.3/charts/grafana/.helmignore
diff --git a/...g/0.3.0+up0.3.2/charts/grafana/Chart.yaml → ...g/0.3.0+up0.3.3/charts/grafana/Chart.yaml b/...g/0.3.0+up0.3.2/charts/grafana/Chart.yaml → ...g/0.3.0+up0.3.3/charts/grafana/Chart.yaml
@@ -1,7 +1,8 @@
 annotations:
   catalog.cattle.io/hidden: "true"
-  catalog.cattle.io/kube-version: '>= 1.16.0-0 < 1.27.0-0'
+  catalog.cattle.io/kube-version: '>= 1.16.0-0 < 1.25.0-0'
   catalog.cattle.io/os: linux
+  catalog.cattle.io/rancher-version: '>= 2.6.5-0 < 2.7.0-0'
   catalog.rancher.io/certified: rancher
   catalog.rancher.io/namespace: cattle-monitoring-system
   catalog.rancher.io/release-name: rancher-grafana

diff --git a/...ng/0.3.0+up0.3.2/charts/grafana/README.md → ...ng/0.3.0+up0.3.3/charts/grafana/README.md b/...ng/0.3.0+up0.3.2/charts/grafana/README.md → ...ng/0.3.0+up0.3.3/charts/grafana/README.md
diff --git a/.../grafana/dashboards/custom-dashboard.json → .../grafana/dashboards/custom-dashboard.json b/.../grafana/dashboards/custom-dashboard.json → .../grafana/dashboards/custom-dashboard.json
diff --git a/...p0.3.2/charts/grafana/templates/NOTES.txt → ...p0.3.3/charts/grafana/templates/NOTES.txt b/...p0.3.2/charts/grafana/templates/NOTES.txt → ...p0.3.3/charts/grafana/templates/NOTES.txt
diff --git a/...3.2/charts/grafana/templates/_helpers.tpl → ...3.3/charts/grafana/templates/_helpers.tpl b/...3.2/charts/grafana/templates/_helpers.tpl → ...3.3/charts/grafana/templates/_helpers.tpl
diff --git a/...up0.3.2/charts/grafana/templates/_pod.tpl → ...up0.3.3/charts/grafana/templates/_pod.tpl b/...up0.3.2/charts/grafana/templates/_pod.tpl → ...up0.3.3/charts/grafana/templates/_pod.tpl
diff --git a/...charts/grafana/templates/clusterrole.yaml → ...charts/grafana/templates/clusterrole.yaml b/...charts/grafana/templates/clusterrole.yaml → ...charts/grafana/templates/clusterrole.yaml
diff --git a/...grafana/templates/clusterrolebinding.yaml → ...grafana/templates/clusterrolebinding.yaml b/...grafana/templates/clusterrolebinding.yaml → ...grafana/templates/clusterrolebinding.yaml
diff --git a/...mplates/configmap-dashboard-provider.yaml → ...mplates/configmap-dashboard-provider.yaml b/...mplates/configmap-dashboard-provider.yaml → ...mplates/configmap-dashboard-provider.yaml
diff --git a/...2/charts/grafana/templates/configmap.yaml → ...3/charts/grafana/templates/configmap.yaml b/...2/charts/grafana/templates/configmap.yaml → ...3/charts/grafana/templates/configmap.yaml
diff --git a/.../templates/dashboards-json-configmap.yaml → .../templates/dashboards-json-configmap.yaml b/.../templates/dashboards-json-configmap.yaml → .../templates/dashboards-json-configmap.yaml
diff --git a/.../charts/grafana/templates/deployment.yaml → .../charts/grafana/templates/deployment.yaml b/.../charts/grafana/templates/deployment.yaml → .../charts/grafana/templates/deployment.yaml
diff --git a/...s/grafana/templates/headless-service.yaml → ...s/grafana/templates/headless-service.yaml b/...s/grafana/templates/headless-service.yaml → ...s/grafana/templates/headless-service.yaml
diff --git a/...up0.3.2/charts/grafana/templates/hpa.yaml → ...up0.3.3/charts/grafana/templates/hpa.yaml b/...up0.3.2/charts/grafana/templates/hpa.yaml → ...up0.3.3/charts/grafana/templates/hpa.yaml
diff --git a/.../templates/image-renderer-deployment.yaml → .../templates/image-renderer-deployment.yaml b/.../templates/image-renderer-deployment.yaml → .../templates/image-renderer-deployment.yaml
diff --git a/...plates/image-renderer-network-policy.yaml → ...plates/image-renderer-network-policy.yaml b/...plates/image-renderer-network-policy.yaml → ...plates/image-renderer-network-policy.yaml
diff --git a/...ana/templates/image-renderer-service.yaml → ...ana/templates/image-renderer-service.yaml b/...ana/templates/image-renderer-service.yaml → ...ana/templates/image-renderer-service.yaml
diff --git a/...3.2/charts/grafana/templates/ingress.yaml → ...3.3/charts/grafana/templates/ingress.yaml b/...3.2/charts/grafana/templates/ingress.yaml → ...3.3/charts/grafana/templates/ingress.yaml
diff --git a/...arts/grafana/templates/networkpolicy.yaml → ...arts/grafana/templates/networkpolicy.yaml b/...arts/grafana/templates/networkpolicy.yaml → ...arts/grafana/templates/networkpolicy.yaml
diff --git a/...harts/grafana/templates/nginx-config.yaml → ...harts/grafana/templates/nginx-config.yaml b/...harts/grafana/templates/nginx-config.yaml → ...harts/grafana/templates/nginx-config.yaml
diff --git a/...rafana/templates/poddisruptionbudget.yaml → ...rafana/templates/poddisruptionbudget.yaml b/...rafana/templates/poddisruptionbudget.yaml → ...rafana/templates/poddisruptionbudget.yaml
diff --git a/.../grafana/templates/podsecuritypolicy.yaml → .../grafana/templates/podsecuritypolicy.yaml b/.../grafana/templates/podsecuritypolicy.yaml → .../grafana/templates/podsecuritypolicy.yaml
diff --git a/...up0.3.2/charts/grafana/templates/pvc.yaml → ...up0.3.3/charts/grafana/templates/pvc.yaml b/...up0.3.2/charts/grafana/templates/pvc.yaml → ...up0.3.3/charts/grafana/templates/pvc.yaml
diff --git a/...p0.3.2/charts/grafana/templates/role.yaml → ...p0.3.3/charts/grafana/templates/role.yaml b/...p0.3.2/charts/grafana/templates/role.yaml → ...p0.3.3/charts/grafana/templates/role.yaml
diff --git a/...charts/grafana/templates/rolebinding.yaml → ...charts/grafana/templates/rolebinding.yaml b/...charts/grafana/templates/rolebinding.yaml → ...charts/grafana/templates/rolebinding.yaml
diff --git a/.../charts/grafana/templates/secret-env.yaml → .../charts/grafana/templates/secret-env.yaml b/.../charts/grafana/templates/secret-env.yaml → .../charts/grafana/templates/secret-env.yaml
diff --git a/....3.2/charts/grafana/templates/secret.yaml → ....3.3/charts/grafana/templates/secret.yaml b/....3.2/charts/grafana/templates/secret.yaml → ....3.3/charts/grafana/templates/secret.yaml
diff --git a/...3.2/charts/grafana/templates/service.yaml → ...3.3/charts/grafana/templates/service.yaml b/...3.2/charts/grafana/templates/service.yaml → ...3.3/charts/grafana/templates/service.yaml
diff --git a/...rts/grafana/templates/serviceaccount.yaml → ...rts/grafana/templates/serviceaccount.yaml b/...rts/grafana/templates/serviceaccount.yaml → ...rts/grafana/templates/serviceaccount.yaml
diff --git a/...rts/grafana/templates/servicemonitor.yaml → ...rts/grafana/templates/servicemonitor.yaml b/...rts/grafana/templates/servicemonitor.yaml → ...rts/grafana/templates/servicemonitor.yaml
diff --git a/...charts/grafana/templates/statefulset.yaml → ...charts/grafana/templates/statefulset.yaml b/...charts/grafana/templates/statefulset.yaml → ...charts/grafana/templates/statefulset.yaml
diff --git a/...afana/templates/tests/test-configmap.yaml → ...afana/templates/tests/test-configmap.yaml b/...afana/templates/tests/test-configmap.yaml → ...afana/templates/tests/test-configmap.yaml
diff --git a/...mplates/tests/test-podsecuritypolicy.yaml → ...mplates/tests/test-podsecuritypolicy.yaml b/...mplates/tests/test-podsecuritypolicy.yaml → ...mplates/tests/test-podsecuritypolicy.yaml
diff --git a/...ts/grafana/templates/tests/test-role.yaml → ...ts/grafana/templates/tests/test-role.yaml b/...ts/grafana/templates/tests/test-role.yaml → ...ts/grafana/templates/tests/test-role.yaml
diff --git a/...ana/templates/tests/test-rolebinding.yaml → ...ana/templates/tests/test-rolebinding.yaml b/...ana/templates/tests/test-rolebinding.yaml → ...ana/templates/tests/test-rolebinding.yaml
diff --git a/.../templates/tests/test-serviceaccount.yaml → .../templates/tests/test-serviceaccount.yaml b/.../templates/tests/test-serviceaccount.yaml → .../templates/tests/test-serviceaccount.yaml
diff --git a/.../charts/grafana/templates/tests/test.yaml → .../charts/grafana/templates/tests/test.yaml b/.../charts/grafana/templates/tests/test.yaml → .../charts/grafana/templates/tests/test.yaml
diff --git a/.../0.3.0+up0.3.2/charts/grafana/values.yaml → .../0.3.0+up0.3.3/charts/grafana/values.yaml b/.../0.3.0+up0.3.2/charts/grafana/values.yaml → .../0.3.0+up0.3.3/charts/grafana/values.yaml
diff --git a/...iles/federate/federate-scrape-config.yaml → ...iles/federate/federate-scrape-config.yaml b/...iles/federate/federate-scrape-config.yaml → ...iles/federate/federate-scrape-config.yaml
diff --git a/.../rancher/pods/rancher-pod-containers.json → .../rancher/pods/rancher-pod-containers.json b/.../rancher/pods/rancher-pod-containers.json → .../rancher/pods/rancher-pod-containers.json
diff --git a/...0.3.2/files/rancher/pods/rancher-pod.json → ...0.3.3/files/rancher/pods/rancher-pod.json b/...0.3.2/files/rancher/pods/rancher-pod.json → ...0.3.3/files/rancher/pods/rancher-pod.json
diff --git a/...cher/workloads/rancher-workload-pods.json → ...cher/workloads/rancher-workload-pods.json b/...cher/workloads/rancher-workload-pods.json → ...cher/workloads/rancher-workload-pods.json
diff --git a/...s/rancher/workloads/rancher-workload.json → ...s/rancher/workloads/rancher-workload.json b/...s/rancher/workloads/rancher-workload.json → ...s/rancher/workloads/rancher-workload.json
diff --git a/...t-monitoring/0.3.0+up0.3.2/questions.yaml → ...t-monitoring/0.3.0+up0.3.3/questions.yaml b/...t-monitoring/0.3.0+up0.3.2/questions.yaml → ...t-monitoring/0.3.0+up0.3.3/questions.yaml
diff --git a/...itoring/0.3.0+up0.3.2/templates/NOTES.txt → ...itoring/0.3.0+up0.3.3/templates/NOTES.txt b/...itoring/0.3.0+up0.3.2/templates/NOTES.txt → ...itoring/0.3.0+up0.3.3/templates/NOTES.txt
diff --git a/...ring/0.3.0+up0.3.2/templates/_helpers.tpl → ...ring/0.3.0+up0.3.3/templates/_helpers.tpl b/...ring/0.3.0+up0.3.2/templates/_helpers.tpl → ...ring/0.3.0+up0.3.3/templates/_helpers.tpl
diff --git a/.../templates/alertmanager/alertmanager.yaml → .../templates/alertmanager/alertmanager.yaml b/.../templates/alertmanager/alertmanager.yaml → .../templates/alertmanager/alertmanager.yaml
diff --git a/...2/templates/alertmanager/extrasecret.yaml → ...3/templates/alertmanager/extrasecret.yaml b/...2/templates/alertmanager/extrasecret.yaml → ...3/templates/alertmanager/extrasecret.yaml
diff --git a/...0.3.2/templates/alertmanager/ingress.yaml → ...0.3.3/templates/alertmanager/ingress.yaml b/...0.3.2/templates/alertmanager/ingress.yaml → ...0.3.3/templates/alertmanager/ingress.yaml
diff --git a/...tes/alertmanager/podDisruptionBudget.yaml → ...tes/alertmanager/podDisruptionBudget.yaml b/...tes/alertmanager/podDisruptionBudget.yaml → ...tes/alertmanager/podDisruptionBudget.yaml
diff --git a/....3.2/templates/alertmanager/psp-role.yaml → ....3.3/templates/alertmanager/psp-role.yaml b/....3.2/templates/alertmanager/psp-role.yaml → ....3.3/templates/alertmanager/psp-role.yaml
diff --git a/...mplates/alertmanager/psp-rolebinding.yaml → ...mplates/alertmanager/psp-rolebinding.yaml b/...mplates/alertmanager/psp-rolebinding.yaml → ...mplates/alertmanager/psp-rolebinding.yaml
diff --git a/...0+up0.3.2/templates/alertmanager/psp.yaml → ...0+up0.3.3/templates/alertmanager/psp.yaml b/...0+up0.3.2/templates/alertmanager/psp.yaml → ...0+up0.3.3/templates/alertmanager/psp.yaml
diff --git a/...p0.3.2/templates/alertmanager/secret.yaml → ...p0.3.3/templates/alertmanager/secret.yaml b/...p0.3.2/templates/alertmanager/secret.yaml → ...p0.3.3/templates/alertmanager/secret.yaml
diff --git a/...0.3.2/templates/alertmanager/service.yaml → ...0.3.3/templates/alertmanager/service.yaml b/...0.3.2/templates/alertmanager/service.yaml → ...0.3.3/templates/alertmanager/service.yaml
diff --git a/...emplates/alertmanager/serviceaccount.yaml → ...emplates/alertmanager/serviceaccount.yaml b/...emplates/alertmanager/serviceaccount.yaml → ...emplates/alertmanager/serviceaccount.yaml
diff --git a/...emplates/alertmanager/servicemonitor.yaml → ...emplates/alertmanager/servicemonitor.yaml b/...emplates/alertmanager/servicemonitor.yaml → ...emplates/alertmanager/servicemonitor.yaml
diff --git a/....0+up0.3.2/templates/dashboard-roles.yaml → ....0+up0.3.3/templates/dashboard-roles.yaml b/....0+up0.3.2/templates/dashboard-roles.yaml → ....0+up0.3.3/templates/dashboard-roles.yaml
diff --git a/...templates/dashboard-values-configmap.yaml → ...templates/dashboard-values-configmap.yaml b/...templates/dashboard-values-configmap.yaml → ...templates/dashboard-values-configmap.yaml
diff --git a/...s/dashboards/rancher/pods-dashboards.yaml → ...s/dashboards/rancher/pods-dashboards.yaml b/...s/dashboards/rancher/pods-dashboards.yaml → ...s/dashboards/rancher/pods-dashboards.yaml
diff --git a/...shboards/rancher/workload-dashboards.yaml → ...shboards/rancher/workload-dashboards.yaml b/...shboards/rancher/workload-dashboards.yaml → ...shboards/rancher/workload-dashboards.yaml
diff --git a/...mplates/grafana/configmap-dashboards.yaml → ...mplates/grafana/configmap-dashboards.yaml b/...mplates/grafana/configmap-dashboards.yaml → ...mplates/grafana/configmap-dashboards.yaml
diff --git a/...lates/grafana/configmaps-datasources.yaml → ...lates/grafana/configmaps-datasources.yaml b/...lates/grafana/configmaps-datasources.yaml → ...lates/grafana/configmaps-datasources.yaml
diff --git a/...ashboards-1.14/alertmanager-overview.yaml → ...ashboards-1.14/alertmanager-overview.yaml b/...ashboards-1.14/alertmanager-overview.yaml → ...ashboards-1.14/alertmanager-overview.yaml
diff --git a/...rafana/dashboards-1.14/cluster-total.yaml → ...rafana/dashboards-1.14/cluster-total.yaml b/...rafana/dashboards-1.14/cluster-total.yaml → ...rafana/dashboards-1.14/cluster-total.yaml
diff --git a/...ana/dashboards-1.14/grafana-overview.yaml → ...ana/dashboards-1.14/grafana-overview.yaml b/...ana/dashboards-1.14/grafana-overview.yaml → ...ana/dashboards-1.14/grafana-overview.yaml
diff --git a/...hboards-1.14/k8s-resources-namespace.yaml → ...hboards-1.14/k8s-resources-namespace.yaml b/...hboards-1.14/k8s-resources-namespace.yaml → ...hboards-1.14/k8s-resources-namespace.yaml
diff --git a/...a/dashboards-1.14/k8s-resources-node.yaml → ...a/dashboards-1.14/k8s-resources-node.yaml b/...a/dashboards-1.14/k8s-resources-node.yaml → ...a/dashboards-1.14/k8s-resources-node.yaml
diff --git a/...na/dashboards-1.14/k8s-resources-pod.yaml → ...na/dashboards-1.14/k8s-resources-pod.yaml b/...na/dashboards-1.14/k8s-resources-pod.yaml → ...na/dashboards-1.14/k8s-resources-pod.yaml
diff --git a/...ashboards-1.14/k8s-resources-project.yaml → ...ashboards-1.14/k8s-resources-project.yaml b/...ashboards-1.14/k8s-resources-project.yaml → ...ashboards-1.14/k8s-resources-project.yaml
diff --git a/...shboards-1.14/k8s-resources-workload.yaml → ...shboards-1.14/k8s-resources-workload.yaml b/...shboards-1.14/k8s-resources-workload.yaml → ...shboards-1.14/k8s-resources-workload.yaml
diff --git a/...14/k8s-resources-workloads-namespace.yaml → ...14/k8s-resources-workloads-namespace.yaml b/...14/k8s-resources-workloads-namespace.yaml → ...14/k8s-resources-workloads-namespace.yaml
diff --git a/...ana/dashboards-1.14/namespace-by-pod.yaml → ...ana/dashboards-1.14/namespace-by-pod.yaml b/...ana/dashboards-1.14/namespace-by-pod.yaml → ...ana/dashboards-1.14/namespace-by-pod.yaml
diff --git a/...ashboards-1.14/namespace-by-workload.yaml → ...ashboards-1.14/namespace-by-workload.yaml b/...ashboards-1.14/namespace-by-workload.yaml → ...ashboards-1.14/namespace-by-workload.yaml
diff --git a/...shboards-1.14/persistentvolumesusage.yaml → ...shboards-1.14/persistentvolumesusage.yaml b/...shboards-1.14/persistentvolumesusage.yaml → ...shboards-1.14/persistentvolumesusage.yaml
diff --git a/...es/grafana/dashboards-1.14/pod-total.yaml → ...es/grafana/dashboards-1.14/pod-total.yaml b/...es/grafana/dashboards-1.14/pod-total.yaml → ...es/grafana/dashboards-1.14/pod-total.yaml
diff --git a/...hboards-1.14/prometheus-remote-write.yaml → ...hboards-1.14/prometheus-remote-write.yaml b/...hboards-1.14/prometheus-remote-write.yaml → ...hboards-1.14/prometheus-remote-write.yaml
diff --git a/...s/grafana/dashboards-1.14/prometheus.yaml → ...s/grafana/dashboards-1.14/prometheus.yaml b/...s/grafana/dashboards-1.14/prometheus.yaml → ...s/grafana/dashboards-1.14/prometheus.yaml
diff --git a/...afana/dashboards-1.14/workload-total.yaml → ...afana/dashboards-1.14/workload-total.yaml b/...afana/dashboards-1.14/workload-total.yaml → ...afana/dashboards-1.14/workload-total.yaml
diff --git a/...0+up0.3.2/templates/prometheus/_rules.tpl → ...0+up0.3.3/templates/prometheus/_rules.tpl b/...0+up0.3.2/templates/prometheus/_rules.tpl → ...0+up0.3.3/templates/prometheus/_rules.tpl
diff --git a/...3.2/templates/prometheus/clusterrole.yaml → ...3.3/templates/prometheus/clusterrole.yaml b/...3.2/templates/prometheus/clusterrole.yaml → ...3.3/templates/prometheus/clusterrole.yaml
diff --git a/...plates/prometheus/clusterrolebinding.yaml → ...plates/prometheus/clusterrolebinding.yaml b/...plates/prometheus/clusterrolebinding.yaml → ...plates/prometheus/clusterrolebinding.yaml
diff --git a/...3.2/templates/prometheus/extrasecret.yaml → ...3.3/templates/prometheus/extrasecret.yaml b/...3.2/templates/prometheus/extrasecret.yaml → ...3.3/templates/prometheus/extrasecret.yaml
diff --git a/...p0.3.2/templates/prometheus/federate.yaml → ...p0.3.3/templates/prometheus/federate.yaml b/...p0.3.2/templates/prometheus/federate.yaml → ...p0.3.3/templates/prometheus/federate.yaml
diff --git a/...up0.3.2/templates/prometheus/ingress.yaml → ...up0.3.3/templates/prometheus/ingress.yaml b/...up0.3.2/templates/prometheus/ingress.yaml → ...up0.3.3/templates/prometheus/ingress.yaml
diff --git a/....2/templates/prometheus/nginx-config.yaml → ....3/templates/prometheus/nginx-config.yaml b/....2/templates/prometheus/nginx-config.yaml → ....3/templates/prometheus/nginx-config.yaml
diff --git a/...lates/prometheus/podDisruptionBudget.yaml → ...lates/prometheus/podDisruptionBudget.yaml b/...lates/prometheus/podDisruptionBudget.yaml → ...lates/prometheus/podDisruptionBudget.yaml
diff --git a/....3.2/templates/prometheus/prometheus.yaml → ....3.3/templates/prometheus/prometheus.yaml b/....3.2/templates/prometheus/prometheus.yaml → ....3.3/templates/prometheus/prometheus.yaml
diff --git a/...templates/prometheus/psp-clusterrole.yaml → ...templates/prometheus/psp-clusterrole.yaml b/...templates/prometheus/psp-clusterrole.yaml → ...templates/prometheus/psp-clusterrole.yaml
diff --git a/...es/prometheus/psp-clusterrolebinding.yaml → ...es/prometheus/psp-clusterrolebinding.yaml b/...es/prometheus/psp-clusterrolebinding.yaml → ...es/prometheus/psp-clusterrolebinding.yaml
diff --git a/...3.0+up0.3.2/templates/prometheus/psp.yaml → ...3.0+up0.3.3/templates/prometheus/psp.yaml b/...3.0+up0.3.2/templates/prometheus/psp.yaml → ...3.0+up0.3.3/templates/prometheus/psp.yaml
diff --git a/...etheus/rules-1.14/alertmanager.rules.yaml → ...etheus/rules-1.14/alertmanager.rules.yaml b/...etheus/rules-1.14/alertmanager.rules.yaml → ...etheus/rules-1.14/alertmanager.rules.yaml
diff --git a/.../prometheus/rules-1.14/general.rules.yaml → .../prometheus/rules-1.14/general.rules.yaml b/.../prometheus/rules-1.14/general.rules.yaml → .../prometheus/rules-1.14/general.rules.yaml
diff --git a/...rometheus/rules-1.14/kubernetes-apps.yaml → ...rometheus/rules-1.14/kubernetes-apps.yaml b/...rometheus/rules-1.14/kubernetes-apps.yaml → ...rometheus/rules-1.14/kubernetes-apps.yaml
diff --git a/...etheus/rules-1.14/kubernetes-storage.yaml → ...etheus/rules-1.14/kubernetes-storage.yaml b/...etheus/rules-1.14/kubernetes-storage.yaml → ...etheus/rules-1.14/kubernetes-storage.yaml
diff --git a/...tes/prometheus/rules-1.14/prometheus.yaml → ...tes/prometheus/rules-1.14/prometheus.yaml b/...tes/prometheus/rules-1.14/prometheus.yaml → ...tes/prometheus/rules-1.14/prometheus.yaml
diff --git a/...up0.3.2/templates/prometheus/service.yaml → ...up0.3.3/templates/prometheus/service.yaml b/...up0.3.2/templates/prometheus/service.yaml → ...up0.3.3/templates/prometheus/service.yaml
diff --git a/.../templates/prometheus/serviceaccount.yaml → .../templates/prometheus/serviceaccount.yaml b/.../templates/prometheus/serviceaccount.yaml → .../templates/prometheus/serviceaccount.yaml
diff --git a/.../templates/prometheus/servicemonitor.yaml → .../templates/prometheus/servicemonitor.yaml b/.../templates/prometheus/servicemonitor.yaml → .../templates/prometheus/servicemonitor.yaml
diff --git a/...emplates/rancher-monitoring/hardened.yaml → ...emplates/rancher-monitoring/hardened.yaml b/...emplates/rancher-monitoring/hardened.yaml → ...emplates/rancher-monitoring/hardened.yaml
diff --git a/...0.3.2/templates/validate-install-crd.yaml → ...0.3.3/templates/validate-install-crd.yaml b/...0.3.2/templates/validate-install-crd.yaml → ...0.3.3/templates/validate-install-crd.yaml
diff --git a/...0.3.2/templates/validate-psp-install.yaml → ...0.3.3/templates/validate-psp-install.yaml b/...0.3.2/templates/validate-psp-install.yaml → ...0.3.3/templates/validate-psp-install.yaml
diff --git a/...ject-monitoring/0.3.0+up0.3.2/values.yaml → ...ject-monitoring/0.3.0+up0.3.3/values.yaml b/...ject-monitoring/0.3.0+up0.3.2/values.yaml → ...ject-monitoring/0.3.0+up0.3.3/values.yaml
@@ -67,7 +67,7 @@ defaultRules:
 global:
   cattle:
     psp:
-      enabled: true
+      enabled: false
     systemDefaultRegistry: ""
     projectNamespaceSelector: {}
     projectNamespaces: []

diff --git a/index.yaml b/index.yaml
@@ -3033,27 +3033,27 @@ entries:
   - annotations:
       catalog.cattle.io/certified: rancher
       catalog.cattle.io/display-name: Prometheus Federator
-      catalog.cattle.io/kube-version: '>=1.16.0-0'
+      catalog.cattle.io/kube-version: '>= 1.16.0-0 < 1.25.0-0'
       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/rancher-version: '>= 2.6.5-0 < 2.8.0-0'
+      catalog.cattle.io/rancher-version: '>= 2.6.5-0 < 2.7.0-0'
       catalog.cattle.io/release-name: prometheus-federator
     apiVersion: v2
     appVersion: 0.3.2
-    created: "2023-06-28T12:03:08.919885-07:00"
+    created: "2023-06-30T12:27:00.322379-07:00"
     dependencies:
     - condition: helmProjectOperator.enabled
       name: helmProjectOperator
       repository: file://./charts/helmProjectOperator
     description: Prometheus Federator
-    digest: 681987434ae24d77cfdc9dad9af6d8e4d9be198fc53e36cf77de339c18afb0a5
+    digest: 47127ade201ff9cdcb6db5f90c9396a9470addb6d37c1f0a657817bbf6433572
     icon: https://raw.githubusercontent.com/rancher/prometheus-federator/main/assets/logos/prometheus-federator.svg
     name: prometheus-federator
     urls:
-    - assets/prometheus-federator/prometheus-federator-0.3.0+up0.3.2.tgz
-    version: 0.3.0+up0.3.2
+    - assets/prometheus-federator/prometheus-federator-0.3.0+up0.3.3.tgz
+    version: 0.3.0+up0.3.3
   - annotations:
       catalog.cattle.io/certified: rancher
       catalog.cattle.io/display-name: Prometheus Federator
@@ -9749,13 +9749,13 @@ entries:
       catalog.cattle.io/certified: rancher
       catalog.cattle.io/display-name: Project Monitoring
       catalog.cattle.io/hidden: "true"
-      catalog.cattle.io/kube-version: '>= 1.16.0-0 < 1.26.0-0'
+      catalog.cattle.io/kube-version: '>= 1.16.0-0 < 1.25.0-0'
       catalog.cattle.io/permits-os: linux,windows
-      catalog.cattle.io/rancher-version: '>= 2.6.5-0 <= 2.7.0-0'
+      catalog.cattle.io/rancher-version: '>= 2.6.5-0 < 2.7.0-0'
       catalog.cattle.io/release-name: rancher-project-monitoring
     apiVersion: v2
     appVersion: 0.59.1
-    created: "2023-06-28T12:03:13.347487-07:00"
+    created: "2023-06-30T12:27:04.545972-07:00"
     dependencies:
     - condition: grafana.enabled
       name: grafana
@@ -9764,13 +9764,12 @@ entries:
       rules combined with documentation and scripts to provide easy to operate end-to-end
       Kubernetes cluster monitoring with Prometheus. Depends on the existence of a
       Cluster Prometheus deployed via Prometheus Operator
-    digest: 770bebb520acabc698a825c77ecdf7f9daaee72ff1b99743f4e8ec2ff3962fa8
+    digest: d211f2643a2b1e0072c01f582d2c7459dd6e05e2f67d7defa25e70185515e5de
     home: https://github.com/prometheus-operator/kube-prometheus
     icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png
     keywords:
     - prometheus
     - monitoring
-    kubeVersion: '>=1.16.0-0'
     maintainers:
     - email: arvind.iyengar@suse.com
       name: Arvind
@@ -9780,8 +9779,8 @@ entries:
     name: rancher-project-monitoring
     type: application
     urls:
-    - assets/rancher-project-monitoring/rancher-project-monitoring-0.3.0+up0.3.2.tgz
-    version: 0.3.0+up0.3.2
+    - assets/rancher-project-monitoring/rancher-project-monitoring-0.3.0+up0.3.3.tgz
+    version: 0.3.0+up0.3.3
   - annotations:
       catalog.cattle.io/certified: rancher
       catalog.cattle.io/display-name: Project Monitoring

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
@@ -0,0 +1,15 @@
+--- charts-original/Chart.yaml
++++ charts/Chart.yaml
+@@ -1,10 +1,12 @@
+ annotations:
+   catalog.cattle.io/certified: rancher
+   catalog.cattle.io/display-name: Prometheus Federator
++  catalog.cattle.io/kube-version: '>= 1.16.0-0 < 1.25.0-0'
+   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/rancher-version: '>= 2.6.5-0 < 2.7.0-0'
+   catalog.cattle.io/release-name: prometheus-federator
+ apiVersion: v2
+ appVersion: 0.3.2
diff --git a/.../prometheus-federator/generated-changes/patch/charts/helmProjectOperator/Chart.yaml.patch b/.../prometheus-federator/generated-changes/patch/charts/helmProjectOperator/Chart.yaml.patch
@@ -0,0 +1,17 @@
+--- charts-original/charts/helmProjectOperator/Chart.yaml
++++ charts/charts/helmProjectOperator/Chart.yaml
+@@ -1,12 +1,12 @@
+ annotations:
+   catalog.cattle.io/certified: rancher
+   catalog.cattle.io/display-name: Helm Project Operator
+-  catalog.cattle.io/kube-version: '>=1.16.0-0'
++  catalog.cattle.io/kube-version: '>= 1.16.0-0 < 1.25.0-0'
+   catalog.cattle.io/namespace: cattle-helm-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/rancher-version: '>= 2.6.0-0'
++  catalog.cattle.io/rancher-version: '>= 2.6.5-0 < 2.7.0-0'
+   catalog.cattle.io/release-name: helm-project-operator
+ apiVersion: v2
+ appVersion: 0.2.1
diff --git 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.3.2
-commit: 7c7cc83b3efdcc19cae5e7c7ba3ac6504ede55d2
+subdirectory: charts/prometheus-federator/0.3.3
+commit: 002944bfa164dc325613e2acd9a00e9014799297
 version: 0.3.0
diff --git a/...itoring/rancher-project-monitoring/generated-changes/dependencies/grafana/dependency.yaml b/...itoring/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.3.2/charts/grafana
-commit: 7c7cc83b3efdcc19cae5e7c7ba3ac6504ede55d2
+subdirectory: charts/rancher-project-monitoring/0.3.3/charts/grafana
+commit: 002944bfa164dc325613e2acd9a00e9014799297
diff --git a/...es/rancher-monitoring/rancher-project-monitoring/generated-changes/patch/Chart.yaml.patch b/...es/rancher-monitoring/rancher-project-monitoring/generated-changes/patch/Chart.yaml.patch
@@ -1,11 +1,12 @@
 --- charts-original/Chart.yaml
 +++ charts/Chart.yaml
-@@ -4,7 +4,7 @@
+@@ -2,7 +2,9 @@
+   catalog.cattle.io/certified: rancher
+   catalog.cattle.io/display-name: Project Monitoring
    catalog.cattle.io/hidden: "true"
-   catalog.cattle.io/kube-version: '>= 1.16.0-0 < 1.26.0-0'
++  catalog.cattle.io/kube-version: '>= 1.16.0-0 < 1.25.0-0'
    catalog.cattle.io/permits-os: linux,windows
--  catalog.cattle.io/rancher-version: '>= 2.6.5-0 <= 2.8.0-0'
-+  catalog.cattle.io/rancher-version: '>= 2.6.5-0 <= 2.7.0-0'
++  catalog.cattle.io/rancher-version: '>= 2.6.5-0 < 2.7.0-0'
    catalog.cattle.io/release-name: rancher-project-monitoring
  apiVersion: v2
  appVersion: 0.59.1
diff --git a/...toring/rancher-project-monitoring/generated-changes/patch/charts/grafana/Chart.yaml.patch b/...toring/rancher-project-monitoring/generated-changes/patch/charts/grafana/Chart.yaml.patch
@@ -0,0 +1,9 @@
+--- charts-original/charts/grafana/Chart.yaml
++++ charts/charts/grafana/Chart.yaml
+@@ -1,4 +1,6 @@
+ annotations:
++  catalog.cattle.io/rancher-version: '>= 2.6.5-0 < 2.7.0-0'
++  catalog.cattle.io/kube-version: '>= 1.16.0-0 < 1.25.0-0'
+   catalog.cattle.io/hidden: "true"
+   catalog.cattle.io/os: linux
+   catalog.rancher.io/certified: rancher
diff --git a/...s/rancher-monitoring/rancher-project-monitoring/generated-changes/patch/values.yaml.patch b/...s/rancher-monitoring/rancher-project-monitoring/generated-changes/patch/values.yaml.patch
diff --git 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.3.2
-commit: 7c7cc83b3efdcc19cae5e7c7ba3ac6504ede55d2
+subdirectory: charts/rancher-project-monitoring/0.3.3
+commit: 002944bfa164dc325613e2acd9a00e9014799297
 version: 0.3.0
diff --git a/release.yaml b/release.yaml
@@ -1,4 +1,4 @@
 prometheus-federator:
-- 0.3.0+up0.3.2
+- 0.3.0+up0.3.3
 rancher-project-monitoring:
-- 0.3.0+up0.3.2
+- 0.3.0+up0.3.3