diff --git a/index.yaml b/index.yaml index f62a6b12ea2..8776710a5c7 100755 --- a/index.yaml +++ b/index.yaml @@ -11126,11 +11126,7 @@ entries: catalog.cattle.io/upstream-version: 19.0.3 apiVersion: v2 appVersion: 0.59.1 -<<<<<<< HEAD created: "2023-09-05T15:59:46.046773-07:00" -======= - created: "2023-07-11T16:08:44.299055553-04:00" ->>>>>>> da440cf17 (bump package version) dependencies: - condition: grafana.enabled name: grafana @@ -11201,7 +11197,139 @@ entries: 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. - digest: 76a9b059e6f830e41ca8223d459e89b92860d6cee28c7d3dd39fb99db54d1d10 + digest: 5ea30bcd8f77b030ea0d37dfdf5a7798577c7613e615c964eb0671fba690b516 + 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: + - email: andrew@quadcorps.co.uk + name: andrewgkew + - email: cedric@desaintmartin.fr + name: desaintmartin + - email: gianrubio@gmail.com + name: gianrubio + - email: github.gkarthiks@gmail.com + name: gkarthiks + - email: kube-prometheus-stack@sisti.pt + name: GMartinez-Sisti + - email: scott@r6by.com + name: scottrigby + - email: miroslav.hadzhiev@gmail.com + name: Xtigyro + - email: arvind.iyengar@suse.com + name: Arvind + - email: amangeet.samra@suse.com + name: Geet + url: https://github.com/geethub97 + name: rancher-monitoring + sources: + - https://github.com/prometheus-community/helm-charts + - https://github.com/prometheus-operator/kube-prometheus + type: application + urls: + - assets/rancher-monitoring/rancher-monitoring-102.0.2+up40.1.2.tgz + version: 102.0.2+up40.1.2 + - annotations: + artifacthub.io/links: | + - name: Chart Source + url: https://github.com/prometheus-community/helm-charts + - name: Upstream Project + url: https://github.com/prometheus-operator/kube-prometheus + artifacthub.io/operator: "true" + catalog.cattle.io/auto-install: rancher-monitoring-crd=match + catalog.cattle.io/certified: rancher + catalog.cattle.io/deploys-on-os: windows + catalog.cattle.io/display-name: Monitoring + catalog.cattle.io/kube-version: '>= 1.16.0-0 < 1.27.0-0' + 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.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 + catalog.cattle.io/type: cluster-tool + catalog.cattle.io/ui-component: monitoring + catalog.cattle.io/upstream-version: 19.0.3 + apiVersion: v2 + appVersion: 0.59.1 + created: "2023-08-15T09:59:59.470478475-04:00" + dependencies: + - condition: grafana.enabled + name: grafana + repository: file://./charts/grafana + - condition: hardenedKubelet.enabled + name: hardenedKubelet + repository: file://./charts/hardenedKubelet + - condition: hardenedNodeExporter.enabled + name: hardenedNodeExporter + repository: file://./charts/hardenedNodeExporter + - condition: k3sServer.enabled + name: k3sServer + repository: file://./charts/k3sServer + - condition: kubeStateMetrics.enabled + name: kube-state-metrics + repository: file://./charts/kube-state-metrics + - condition: kubeAdmControllerManager.enabled + name: kubeAdmControllerManager + repository: file://./charts/kubeAdmControllerManager + - condition: kubeAdmEtcd.enabled + name: kubeAdmEtcd + repository: file://./charts/kubeAdmEtcd + - condition: kubeAdmProxy.enabled + name: kubeAdmProxy + repository: file://./charts/kubeAdmProxy + - condition: kubeAdmScheduler.enabled + name: kubeAdmScheduler + repository: file://./charts/kubeAdmScheduler + - condition: prometheus-adapter.enabled + name: prometheus-adapter + repository: file://./charts/prometheus-adapter + - condition: nodeExporter.enabled + name: prometheus-node-exporter + repository: file://./charts/prometheus-node-exporter + - condition: rke2ControllerManager.enabled + name: rke2ControllerManager + repository: file://./charts/rke2ControllerManager + - condition: rke2Etcd.enabled + name: rke2Etcd + repository: file://./charts/rke2Etcd + - condition: rke2IngressNginx.enabled + name: rke2IngressNginx + repository: file://./charts/rke2IngressNginx + - condition: rke2Proxy.enabled + name: rke2Proxy + repository: file://./charts/rke2Proxy + - condition: rke2Scheduler.enabled + name: rke2Scheduler + repository: file://./charts/rke2Scheduler + - condition: rkeControllerManager.enabled + name: rkeControllerManager + repository: file://./charts/rkeControllerManager + - condition: rkeEtcd.enabled + name: rkeEtcd + repository: file://./charts/rkeEtcd + - condition: rkeIngressNginx.enabled + name: rkeIngressNginx + repository: file://./charts/rkeIngressNginx + - condition: rkeProxy.enabled + name: rkeProxy + repository: file://./charts/rkeProxy + - condition: rkeScheduler.enabled + name: rkeScheduler + repository: file://./charts/rkeScheduler + - condition: global.cattle.windows.enabled + name: windowsExporter + repository: file://./charts/windowsExporter + 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. + digest: affcd74e7d8064c7868d3089805b03448e74b99fd71016c6967bd838bc96695f home: https://github.com/prometheus-operator/kube-prometheus icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png keywords: diff --git a/packages/rancher-monitoring/rancher-kube-state-metrics/generated-changes/patch/templates/podsecuritypolicy.yaml.patch b/packages/rancher-monitoring/rancher-kube-state-metrics/generated-changes/patch/templates/podsecuritypolicy.yaml.patch index fcc04509a21..e282bb4b109 100644 --- a/packages/rancher-monitoring/rancher-kube-state-metrics/generated-changes/patch/templates/podsecuritypolicy.yaml.patch +++ b/packages/rancher-monitoring/rancher-kube-state-metrics/generated-changes/patch/templates/podsecuritypolicy.yaml.patch @@ -1,11 +1,8 @@ --- charts-original/templates/podsecuritypolicy.yaml +++ charts/templates/podsecuritypolicy.yaml -@@ -1,4 +1,8 @@ -+<<<<<<< HEAD -+{{- if .Values.global.cattle.psp.enabled }} -+======= - {{- if and .Values.podSecurityPolicy.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") }} -+>>>>>>> 768332c8633ec0161abbee060e9862a878f94072 +@@ -1,4 +1,4 @@ +-{{- if and .Values.podSecurityPolicy.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") }} ++{{- if or and .Values.global.cattle.psp.enabled .Values.rbac.create (and .Values.podSecurityPolicy.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy")) }} apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: diff --git a/packages/rancher-monitoring/rancher-kube-state-metrics/generated-changes/patch/templates/psp-clusterrole.yaml.patch b/packages/rancher-monitoring/rancher-kube-state-metrics/generated-changes/patch/templates/psp-clusterrole.yaml.patch index 0b80f06165c..9742494399b 100644 --- a/packages/rancher-monitoring/rancher-kube-state-metrics/generated-changes/patch/templates/psp-clusterrole.yaml.patch +++ b/packages/rancher-monitoring/rancher-kube-state-metrics/generated-changes/patch/templates/psp-clusterrole.yaml.patch @@ -1,11 +1,8 @@ --- charts-original/templates/psp-clusterrole.yaml +++ charts/templates/psp-clusterrole.yaml -@@ -1,4 +1,8 @@ -+<<<<<<< HEAD -+{{- if and .Values.global.cattle.psp.enabled .Values.rbac.create -}} -+======= - {{- if and .Values.podSecurityPolicy.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") }} -+>>>>>>> 768332c8633ec0161abbee060e9862a878f94072 +@@ -1,4 +1,4 @@ +-{{- if and .Values.podSecurityPolicy.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") }} ++{{- if or and .Values.global.cattle.psp.enabled .Values.rbac.create (and .Values.podSecurityPolicy.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy")) }} apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: diff --git a/packages/rancher-monitoring/rancher-kube-state-metrics/generated-changes/patch/templates/psp-clusterrolebinding.yaml.patch b/packages/rancher-monitoring/rancher-kube-state-metrics/generated-changes/patch/templates/psp-clusterrolebinding.yaml.patch index 2b0f6b4e4f0..e4dd4bf476d 100644 --- a/packages/rancher-monitoring/rancher-kube-state-metrics/generated-changes/patch/templates/psp-clusterrolebinding.yaml.patch +++ b/packages/rancher-monitoring/rancher-kube-state-metrics/generated-changes/patch/templates/psp-clusterrolebinding.yaml.patch @@ -1,11 +1,8 @@ --- charts-original/templates/psp-clusterrolebinding.yaml +++ charts/templates/psp-clusterrolebinding.yaml -@@ -1,4 +1,8 @@ -+<<<<<<< HEAD -+{{- if and .Values.global.cattle.psp.enabled .Values.rbac.create -}} -+======= - {{- if and .Values.podSecurityPolicy.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") }} -+>>>>>>> 768332c8633ec0161abbee060e9862a878f94072 +@@ -1,4 +1,4 @@ +-{{- if and .Values.podSecurityPolicy.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") }} ++{{- if or and .Values.global.cattle.psp.enabled .Values.rbac.create (and .Values.podSecurityPolicy.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy")) }} apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: