Skip to content

Commit

Permalink
salt: Re-render Salt prometheus-adapter formula
Browse files Browse the repository at this point in the history
We have bumped prometheus-adapter chart to version
2.12.2, so we need to re-render this formula as
follows:

```
./charts/render.py prometheus-adapter --namespace metalk8s-monitoring \
  charts/prometheus-adapter.yaml  charts/prometheus-adapter/ \
  > salt/metalk8s/addons/prometheus-adapter/deployed/chart.sls
```

Refs: #3279
  • Loading branch information
alexandre-allard committed May 7, 2021
1 parent ed38944 commit 203ed47
Showing 1 changed file with 20 additions and 23 deletions.
43 changes: 20 additions & 23 deletions salt/metalk8s/addons/prometheus-adapter/deployed/chart.sls
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ metadata:
app.kubernetes.io/managed-by: salt
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: metalk8s
chart: prometheus-adapter-2.10.1
chart: prometheus-adapter-2.12.2
heritage: metalk8s
release: prometheus-adapter
name: prometheus-adapter
Expand Down Expand Up @@ -93,10 +93,8 @@ data:
resourceRules:
cpu:
containerLabel: container_name
containerQuery: sum(rate(container_cpu_usage_seconds_total{<<.LabelMatchers>>}[3m]))
by (<<.GroupBy>>)
nodeQuery: sum(rate(container_cpu_usage_seconds_total{<<.LabelMatchers>>, id='/'}[3m]))
by (<<.GroupBy>>)
containerQuery: sum(rate(container_cpu_usage_seconds_total{<<.LabelMatchers>>}[3m])) by (<<.GroupBy>>)
nodeQuery: sum(rate(container_cpu_usage_seconds_total{<<.LabelMatchers>>, id='/'}[3m])) by (<<.GroupBy>>)
resources:
overrides:
namespace:
Expand All @@ -108,8 +106,7 @@ data:
memory:
containerLabel: container_name
containerQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>}) by (<<.GroupBy>>)
nodeQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>,id='/'}) by
(<<.GroupBy>>)
nodeQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>,id='/'}) by (<<.GroupBy>>)
resources:
overrides:
namespace:
Expand All @@ -126,7 +123,7 @@ metadata:
app.kubernetes.io/managed-by: salt
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: metalk8s
chart: prometheus-adapter-2.10.1
chart: prometheus-adapter-2.12.2
heritage: metalk8s
release: prometheus-adapter
name: prometheus-adapter
Expand All @@ -140,7 +137,7 @@ metadata:
app.kubernetes.io/managed-by: salt
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: metalk8s
chart: prometheus-adapter-2.10.1
chart: prometheus-adapter-2.12.2
heritage: metalk8s
release: prometheus-adapter
name: prometheus-adapter-resource-reader
Expand All @@ -166,7 +163,7 @@ metadata:
app.kubernetes.io/managed-by: salt
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: metalk8s
chart: prometheus-adapter-2.10.1
chart: prometheus-adapter-2.12.2
heritage: metalk8s
release: prometheus-adapter
name: prometheus-adapter-server-resources
Expand All @@ -187,7 +184,7 @@ metadata:
app.kubernetes.io/managed-by: salt
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: metalk8s
chart: prometheus-adapter-2.10.1
chart: prometheus-adapter-2.12.2
heritage: metalk8s
release: prometheus-adapter
name: prometheus-adapter-metrics
Expand All @@ -212,7 +209,7 @@ metadata:
app.kubernetes.io/managed-by: salt
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: metalk8s
chart: prometheus-adapter-2.10.1
chart: prometheus-adapter-2.12.2
heritage: metalk8s
release: prometheus-adapter
name: prometheus-adapter-system-auth-delegator
Expand All @@ -234,7 +231,7 @@ metadata:
app.kubernetes.io/managed-by: salt
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: metalk8s
chart: prometheus-adapter-2.10.1
chart: prometheus-adapter-2.12.2
heritage: metalk8s
release: prometheus-adapter
name: prometheus-adapter-resource-reader
Expand All @@ -256,7 +253,7 @@ metadata:
app.kubernetes.io/managed-by: salt
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: metalk8s
chart: prometheus-adapter-2.10.1
chart: prometheus-adapter-2.12.2
heritage: metalk8s
release: prometheus-adapter
name: prometheus-adapter-hpa-controller
Expand All @@ -278,7 +275,7 @@ metadata:
app.kubernetes.io/managed-by: salt
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: metalk8s
chart: prometheus-adapter-2.10.1
chart: prometheus-adapter-2.12.2
heritage: metalk8s
release: prometheus-adapter
name: prometheus-adapter-hpa-controller-metrics
Expand All @@ -300,7 +297,7 @@ metadata:
app.kubernetes.io/managed-by: salt
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: metalk8s
chart: prometheus-adapter-2.10.1
chart: prometheus-adapter-2.12.2
heritage: metalk8s
release: prometheus-adapter
name: prometheus-adapter-auth-reader
Expand All @@ -323,7 +320,7 @@ metadata:
app.kubernetes.io/managed-by: salt
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: metalk8s
chart: prometheus-adapter-2.10.1
chart: prometheus-adapter-2.12.2
heritage: metalk8s
release: prometheus-adapter
name: prometheus-adapter
Expand All @@ -346,7 +343,7 @@ metadata:
app.kubernetes.io/managed-by: salt
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: metalk8s
chart: prometheus-adapter-2.10.1
chart: prometheus-adapter-2.12.2
heritage: metalk8s
release: prometheus-adapter
name: prometheus-adapter
Expand All @@ -360,13 +357,13 @@ spec:
template:
metadata:
annotations:
checksum/config: ed5cebb9ba2d709cae2d5c161407360d40d4f2aebfc068e246f17331916ae7e0
checksum/config: 78db41895b530d031fc6986d06be80739327f0d2777cb46288a7923ea5211e63
labels:
app: prometheus-adapter
app.kubernetes.io/managed-by: salt
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: metalk8s
chart: prometheus-adapter-2.10.1
chart: prometheus-adapter-2.12.2
heritage: metalk8s
release: prometheus-adapter
name: prometheus-adapter
Expand All @@ -383,7 +380,7 @@ spec:
- --v=4
- --config=/etc/adapter/config.yaml
image: '{%- endraw -%}{{ build_image_name("k8s-prometheus-adapter-amd64",
False) }}{%- raw -%}:v0.8.2'
False) }}{%- raw -%}:v0.8.4'
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
Expand Down Expand Up @@ -441,7 +438,7 @@ metadata:
app.kubernetes.io/managed-by: salt
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: metalk8s
chart: prometheus-adapter-2.10.1
chart: prometheus-adapter-2.12.2
heritage: metalk8s
release: prometheus-adapter
name: v1beta1.custom.metrics.k8s.io
Expand All @@ -464,7 +461,7 @@ metadata:
app.kubernetes.io/managed-by: salt
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: metalk8s
chart: prometheus-adapter-2.10.1
chart: prometheus-adapter-2.12.2
heritage: metalk8s
release: prometheus-adapter
name: v1beta1.metrics.k8s.io
Expand Down

0 comments on commit 203ed47

Please sign in to comment.