andata
/
rancher-charts
mirror of https://git.rancher.io/charts
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2189 from aiyengar2/fix_values_yaml_redundant_keys 

Fix patches and remove redundant container value from values.yaml
pull/2181/head
Arvind Iyengar 2022-11-01 14:41:08 -07:00 committed by GitHub
parent 0faf3c7d06 b5bfaa72a1
commit 252143f2d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 35 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/rancher-monitoring/rancher-monitoring-100.2.0+up40.1.2.tgz
View File

Binary file not shown.

14
charts/rancher-monitoring/100.2.0+up40.1.2/values.yaml
View File

@ -3576,20 +3576,6 @@ prometheus:
## Containers allows injecting additional containers. This is meant to allow adding an authentication proxy to a Prometheus pod.
## if using proxy extraContainer update targetPort with proxy container port
containers: []
# containers:
# - name: oauth-proxy
# image: quay.io/oauth2-proxy/oauth2-proxy:v7.3.0
# args:
# - --upstream=http://127.0.0.1:9093
# - --http-address=0.0.0.0:8081
# - ...
# ports:
# - containerPort: 8081
# name: oauth-proxy
# protocol: TCP
# resources: {}
containers:
- name: prometheus-proxy
args:

4
index.yaml
View File

@ -6814,7 +6814,7 @@ entries:
catalog.cattle.io/upstream-version: 19.0.3
apiVersion: v2
appVersion: 0.59.1
created: "2022-10-25T20:29:23.765949-07:00"
created: "2022-11-01T14:29:50.238623-07:00"
dependencies:
- condition: grafana.enabled
name: grafana
@ -6885,7 +6885,7 @@ 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: 83d4e9dbce998adc237624159dc7cffab695152a5e79c409126d2b52fe437615
digest: c6b71ed7ca0f976e590b1da957ce0e4dbdfb4b88c17f7227cc08841bd02e8a43
home: https://github.com/prometheus-operator/kube-prometheus
icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png
keywords:

8
packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/etcd.yaml.patch vendored
View File

@ -10,10 +10,12 @@
apiVersion: monitoring.coreos.com/v1
kind: PrometheusRule
metadata:
@@ -291,4 +292,5 @@
@@ -289,6 +290,7 @@
severity: warning
{{- if .Values.defaultRules.additionalRuleLabels }}
{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }}
{{- end }}
{{- end }}
+{{- end }}
{{- end }}
{{- end }}
{{- end }}
\ No newline at end of file

11
packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kubernetes-system-kube-proxy.yaml.patch vendored
View File

@ -10,7 +10,7 @@
apiVersion: monitoring.coreos.com/v1
kind: PrometheusRule
metadata:
@@ -33,7 +34,7 @@
@@ -33,12 +34,13 @@
description: KubeProxy has disappeared from Prometheus target discovery.
runbook_url: {{ .Values.defaultRules.runbookUrl }}/kubernetes/kubeproxydown
summary: Target disappeared from Prometheus target discovery.
@ -19,8 +19,9 @@
for: 15m
labels:
severity: critical
@@ -42,3 +43,4 @@
{{- end }}
{{- end }}
{{- end }}
{{- if .Values.defaultRules.additionalRuleLabels }}
{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }}
+{{- end }}
{{- end }}
{{- end }}
{{- end }}

36
packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/values.yaml.patch
View File

@ -675,7 +675,7 @@
pspAnnotations: {}
## Specify pod annotations
## Ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/#apparmor
@@ -225,25 +866,77 @@
@@ -225,26 +866,78 @@
## ref: https://prometheus.io/docs/alerting/notifications/
## https://prometheus.io/docs/alerting/notification_examples/
##
@ -698,7 +698,7 @@
- # {{ end }}
- # {{ end }}
- # {{ end }}
+
+ templateFiles:
+ rancher_defaults.tmpl: |-
+ {{- define "slack.rancher.text" -}}
@ -769,9 +769,10 @@
+ {{- end }}
+ {{- end }}
+ {{- end -}}
+
ingress:
enabled: false
@@ -452,7 +1145,7 @@
## Image of Alertmanager
##
@ -887,7 +888,7 @@
+ ## Service type
+ ##
+ type: ClusterIP
+
+ proxy:
+ image:
+ repository: rancher/mirrored-library-nginx
@ -927,7 +928,7 @@
+ - key: nginx.conf
+ mode: 438
+ path: nginx.conf
+
+ ## If true, create a serviceMonitor for grafana
+ ##
serviceMonitor:
@ -1143,7 +1144,7 @@
# Additional VolumeMounts on the output StatefulSet definition.
volumeMounts: []
@@ -2768,6 +3569,11 @@
@@ -2768,21 +3569,34 @@
# fileName: "objstore.yaml"
# objectStorageConfigFile: /var/secrets/object-store.yaml
@ -1154,11 +1155,19 @@
+
## Containers allows injecting additional containers. This is meant to allow adding an authentication proxy to a Prometheus pod.
## if using proxy extraContainer update targetPort with proxy container port
containers: []
@@ -2784,6 +3590,28 @@
# protocol: TCP
# resources: {}
- containers: []
- # containers:
- # - name: oauth-proxy
- # image: quay.io/oauth2-proxy/oauth2-proxy:v7.3.0
- # args:
- # - --upstream=http://127.0.0.1:9093
- # - --http-address=0.0.0.0:8081
- # - ...
- # ports:
- # - containerPort: 8081
- # name: oauth-proxy
- # protocol: TCP
- # resources: {}
+ containers:
+ - name: prometheus-proxy
+ args:
@ -1180,11 +1189,10 @@
+ securityContext:
+ runAsUser: 101
+ runAsGroup: 101
+
## InitContainers allows injecting additional initContainers. This is meant to allow doing some changes
## (permissions, dir tree) on mounted volumes before starting prometheus
initContainers: []
@@ -3154,7 +3982,7 @@
@@ -3154,7 +3968,7 @@
## Image of ThanosRuler
##
image: