From 4a5a8092067b7c3a00afbe2068c7c1dfc105b784 Mon Sep 17 00:00:00 2001 From: joshmeranda Date: Fri, 12 May 2023 13:47:44 -0400 Subject: [PATCH] update rancher/mirrored-lirbrary-nginx and rancher/shell versions --- .../generated-changes/patch/README.md.patch | 6 +++--- .../rules-1.14/alertmanager.rules.yaml.patch | 6 ++---- .../prometheus/rules-1.14/etcd.yaml.patch | 8 +++----- .../kubernetes-system-kube-proxy.yaml.patch | 11 +++++------ .../generated-changes/patch/values.yaml.patch | 17 ++++++++--------- 5 files changed, 21 insertions(+), 27 deletions(-) diff --git a/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/README.md.patch b/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/README.md.patch index 6fb1229e8..bfe732845 100644 --- a/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/README.md.patch +++ b/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/README.md.patch @@ -3,7 +3,7 @@ @@ -457,7 +457,39 @@ helm show values prometheus-community/kube-prometheus-stack ``` - + -You may also `helm show values` on this chart's [dependencies](#dependencies) for additional options. +You may also run `helm show values` on this chart's [dependencies](#dependencies) for additional options. + @@ -38,6 +38,6 @@ +| `kubeAdmProxy.enabled` | Create a PushProx installation for monitoring kube-proxy metrics in kubeAdm clusters | `false` | +| `kubeAdmEtcd.enabled` | Create a PushProx installation for monitoring etcd metrics in kubeAdm clusters | `false` | + - + ### Multiple releases - + diff --git a/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/alertmanager.rules.yaml.patch b/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/alertmanager.rules.yaml.patch index a35dbc5f9..8119097ff 100644 --- a/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/alertmanager.rules.yaml.patch +++ b/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/alertmanager.rules.yaml.patch @@ -8,13 +8,11 @@ apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: -@@ -210,6 +211,7 @@ - severity: critical - {{- if .Values.defaultRules.additionalRuleLabels }} +@@ -212,4 +213,5 @@ {{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }} -+{{- end }} {{- end }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} ++{{- end }} diff --git a/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/etcd.yaml.patch b/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/etcd.yaml.patch index 02ea870f0..20f8d0ca9 100644 --- a/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/etcd.yaml.patch +++ b/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/etcd.yaml.patch @@ -10,12 +10,10 @@ apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: -@@ -289,6 +290,7 @@ - severity: warning - {{- if .Values.defaultRules.additionalRuleLabels }} +@@ -291,4 +292,5 @@ {{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }} + {{- end }} + {{- end }} +{{- end }} {{- end }} - {{- end }} - {{- end }} \ No newline at end of file diff --git a/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kubernetes-system-kube-proxy.yaml.patch b/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kubernetes-system-kube-proxy.yaml.patch index 6b8859e79..71f466fd2 100644 --- a/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kubernetes-system-kube-proxy.yaml.patch +++ b/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/templates/prometheus/rules-1.14/kubernetes-system-kube-proxy.yaml.patch @@ -10,7 +10,7 @@ apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: -@@ -33,12 +34,13 @@ +@@ -33,7 +34,7 @@ description: KubeProxy has disappeared from Prometheus target discovery. runbook_url: {{ .Values.defaultRules.runbookUrl }}/kubernetes/kubeproxydown summary: Target disappeared from Prometheus target discovery. @@ -19,9 +19,8 @@ for: 15m labels: severity: critical - {{- if .Values.defaultRules.additionalRuleLabels }} - {{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }} +@@ -42,3 +43,4 @@ + {{- end }} + {{- end }} + {{- end }} +{{- end }} - {{- end }} - {{- end }} - {{- end }} diff --git a/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/values.yaml.patch b/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/values.yaml.patch index 9bc918a61..4d01b6d73 100644 --- a/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/values.yaml.patch +++ b/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/values.yaml.patch @@ -557,7 +557,7 @@ + ## Image to use to run the scripts + image: + repository: rancher/shell -+ tag: v0.1.18 ++ tag: v0.1.19 + +## Rancher Monitoring +## @@ -674,7 +674,7 @@ pspAnnotations: {} ## Specify pod annotations ## Ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/#apparmor -@@ -225,26 +865,78 @@ +@@ -225,25 +865,77 @@ ## ref: https://prometheus.io/docs/alerting/notifications/ ## https://prometheus.io/docs/alerting/notification_examples/ ## @@ -697,7 +697,7 @@ - # {{ end }} - # {{ end }} - # {{ end }} - ++ + templateFiles: + rancher_defaults.tmpl: |- + {{- define "slack.rancher.text" -}} @@ -768,10 +768,9 @@ + {{- end }} + {{- end }} + {{- end -}} -+ + ingress: enabled: false - @@ -452,7 +1144,7 @@ ## Image of Alertmanager ## @@ -887,11 +886,11 @@ + ## Service type + ## + type: ClusterIP - ++ + proxy: + image: + repository: rancher/mirrored-library-nginx -+ tag: 1.21.1-alpine ++ tag: 1.24.0-alpine + + ## Enable an Specify container in extraContainers. This is meant to allow adding an authentication proxy to a grafana pod + extraContainers: | @@ -915,7 +914,7 @@ + securityContext: + runAsUser: 101 + runAsGroup: 101 -+ + + ## Volumes that can be used in containers + extraContainerVolumes: + - name: nginx-home @@ -1150,7 +1149,7 @@ + proxy: + image: + repository: rancher/mirrored-library-nginx -+ tag: 1.21.1-alpine ++ tag: 1.24.0-alpine + ## 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