Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[dev-v2.11] rancher-monitoring 106.0.0+up61.3.2 update #5106

Merged
merged 2 commits into from
Feb 13, 2025
+7 −7
Merged

[dev-v2.11] rancher-monitoring 106.0.0+up61.3.2 update #5106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1d1221
correctly remove duplicate nodeSelector template definition
alexandreLamarre Feb 6, 2025
0cbd271
make charts
alexandreLamarre Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified assets/rancher-monitoring/rancher-monitoring-106.0.0+up61.3.2.tgz
View file
Open in desktop
Binary file not shown.
2 changes: 0 additions & 2 deletions ...s/rancher-monitoring/106.0.0+up61.3.2/charts/prometheus-adapter/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,6 @@ spec:
{{- if .Values.nodeSelector }}
{{- toYaml .Values.nodeSelector | nindent 8 }}
{{- end }}
nodeSelector:
{{- toYaml .Values.nodeSelector | nindent 8 }}
affinity:
{{- toYaml .Values.affinity | nindent 8 }}
topologySpreadConstraints:
Expand Down
4 changes: 2 additions & 2 deletions index.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15772,7 +15772,7 @@ entries:
catalog.cattle.io/upstream-version: 57.0.3
apiVersion: v2
appVersion: v0.75.1
created: "2025-02-10T10:44:30.168476-05:00"
created: "2025-02-13T12:07:47.454175437-05:00"
dependencies:
- condition: grafana.enabled
name: grafana
Expand Down Expand Up @@ -15844,7 +15844,7 @@ entries:
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: 97b5672160a3a86517a1aad50c75b36e906220d6c24df73c726049d1996ac25b
digest: cb51b9c1aa90a7227d4659c9d910bde06ba17a2d7acb6a344d809a798f674b03
home: https://github.com/prometheus-operator/kube-prometheus
icon: file://assets/logos/rancher-monitoring.png
keywords:
Expand Down
8 changes: 5 additions & 3 deletions ...itoring/generated-changes/patch/charts/prometheus-adapter/templates/deployment.yaml.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
--- charts-original/charts/prometheus-adapter/templates/deployment.yaml
+++ charts/charts/prometheus-adapter/templates/deployment.yaml
@@ -112,6 +112,9 @@
@@ -112,8 +112,9 @@
{{- toYaml . | nindent 6 }}
{{- end }}
nodeSelector: {{ include "linux-node-selector" . | nindent 8 }}
- nodeSelector:
- {{- toYaml .Values.nodeSelector | nindent 8 }}
+{{- if .Values.nodeSelector }}
+{{- toYaml .Values.nodeSelector | nindent 8 }}
+{{- end }}
nodeSelector:
{{- toYaml .Values.nodeSelector | nindent 8 }}
affinity:
{{- toYaml .Values.affinity | nindent 8 }}
topologySpreadConstraints:
Loading