Skip to content

Commit

Permalink
chore: update manifests to 0.13.1
Browse files Browse the repository at this point in the history
Fixes #1013

Signed-off-by: bwplotka <[email protected]>
  • Loading branch information
bwplotka committed Sep 18, 2024
1 parent 9de5732 commit d770a7b
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 25 deletions.
16 changes: 9 additions & 7 deletions charts/values.global.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,29 +16,31 @@ commonLabels: false
namespace:
public: gmp-public
system: gmp-system
version: 0.13.0
version: 0.13.1
images:
# NOTE: All tags have to be quoted otherwise they will be treated as a number.
bash:
image: gke.gcr.io/gke-distroless/bash
tag: "gke_distroless_20240607.00_p0" # NOTE: Has to be quoted otherwise it will be treated as a number.
tag: "gke_distroless_20240907.00_p0"
alertmanager:
image: gke.gcr.io/prometheus-engine/alertmanager
tag: "v0.25.1-gmp.8-gke.0"
prometheus:
image: gke.gcr.io/prometheus-engine/prometheus
tag: v2.45.3-gmp.9-gke.0
tag: "v2.45.3-gmp.9-gke.0"
# Waiting for tags on 0.13.1...
configReloader:
image: gke.gcr.io/prometheus-engine/config-reloader@sha256
tag: "21055a361185da47fbd2c21389fb5cd00b54bfed5c784e0dc258b5b416beaf7e"
tag: "d199f266545ee281fa51d30e0a5f9c4da27da23055b153ca93adbf7483d19633"
operator:
image: gke.gcr.io/prometheus-engine/operator@sha256
tag: "0894c65806a6eac0b4119ee73ec8a52f6ca119960b37aded3776f3748a75d182"
tag: "b06adf14b06c9fc809d4b8db41329e4f3c34d9b1baa2abd45542ad817aed3917"
ruleEvaluator:
image: gke.gcr.io/prometheus-engine/rule-evaluator@sha256
tag: "6ae997a8ed636da06b7a9dc7fc950b98ce91c38c135aad2dcc95d6d3dd841ee0"
tag: "2ff728b00f5e0a652045e7a5a877be00cadf049ecb9b026c3654c2391588c045"
datasourceSyncer:
image: gcr.io/gke-release/prometheus-engine/datasource-syncer@sha256
tag: "f065e90e3188ee3fd858cac74a8ed326446aaed51d1f222f29ebd5f7b29d1df7"
tag: "978bd1fa19a70a2aa729e93f7e88b40220f3a2eb47c1a6dd7217fba6f364a01c"
resources:
alertManager:
limits:
Expand Down
4 changes: 2 additions & 2 deletions cmd/datasource-syncer/datasource-syncer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
- linux
containers:
- name: datasource-syncer-init
image: gcr.io/gke-release/prometheus-engine/datasource-syncer@sha256:f065e90e3188ee3fd858cac74a8ed326446aaed51d1f222f29ebd5f7b29d1df7
image: gcr.io/gke-release/prometheus-engine/datasource-syncer@sha256:978bd1fa19a70a2aa729e93f7e88b40220f3a2eb47c1a6dd7217fba6f364a01c
args:
- "--datasource-uids=$DATASOURCE_UIDS"
- "--grafana-api-endpoint=$GRAFANA_API_ENDPOINT"
Expand Down Expand Up @@ -79,7 +79,7 @@ spec:
- linux
containers:
- name: datasource-syncer
image: gcr.io/gke-release/prometheus-engine/datasource-syncer@sha256:f065e90e3188ee3fd858cac74a8ed326446aaed51d1f222f29ebd5f7b29d1df7
image: gcr.io/gke-release/prometheus-engine/datasource-syncer@sha256:978bd1fa19a70a2aa729e93f7e88b40220f3a2eb47c1a6dd7217fba6f364a01c
args:
- "--datasource-uids=$DATASOURCE_UIDS"
- "--grafana-api-endpoint=$GRAFANA_API_ENDPOINT"
Expand Down
24 changes: 12 additions & 12 deletions manifests/operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ spec:
labels:
app: managed-prometheus-collector
app.kubernetes.io/name: collector
app.kubernetes.io/version: 0.13.0
app.kubernetes.io/version: 0.13.1
annotations:
# The emptyDir for the storage and config directories prevents cluster
# autoscaling unless this annotation is set.
Expand All @@ -345,7 +345,7 @@ spec:
priorityClassName: gmp-critical
initContainers:
- name: config-init
image: gke.gcr.io/gke-distroless/bash:gke_distroless_20240607.00_p0
image: gke.gcr.io/gke-distroless/bash:gke_distroless_20240907.00_p0
command: ['/bin/bash', '-c', 'touch /prometheus/config_out/config.yaml']
volumeMounts:
- name: config-out
Expand All @@ -359,7 +359,7 @@ spec:
readOnlyRootFilesystem: true
containers:
- name: config-reloader
image: gke.gcr.io/prometheus-engine/config-reloader@sha256:21055a361185da47fbd2c21389fb5cd00b54bfed5c784e0dc258b5b416beaf7e
image: gke.gcr.io/prometheus-engine/config-reloader@sha256:d199f266545ee281fa51d30e0a5f9c4da27da23055b153ca93adbf7483d19633
args:
- --config-file=/prometheus/config/config.yaml
- --config-file-output=/prometheus/config_out/config.yaml
Expand Down Expand Up @@ -529,14 +529,14 @@ spec:
app.kubernetes.io/component: operator
app.kubernetes.io/name: gmp-operator
app.kubernetes.io/part-of: gmp
app.kubernetes.io/version: 0.13.0
app.kubernetes.io/version: 0.13.1
spec:
serviceAccountName: operator
automountServiceAccountToken: true
priorityClassName: gmp-critical
containers:
- name: operator
image: gke.gcr.io/prometheus-engine/operator@sha256:0894c65806a6eac0b4119ee73ec8a52f6ca119960b37aded3776f3748a75d182
image: gke.gcr.io/prometheus-engine/operator@sha256:b06adf14b06c9fc809d4b8db41329e4f3c34d9b1baa2abd45542ad817aed3917
args:
- "--operator-namespace=gmp-system"
- "--public-namespace=gmp-public"
Expand Down Expand Up @@ -630,7 +630,7 @@ spec:
labels:
app.kubernetes.io/name: rule-evaluator
app: managed-prometheus-rule-evaluator
app.kubernetes.io/version: 0.13.0
app.kubernetes.io/version: 0.13.1
annotations:
# The emptyDir for the storage and config directories prevents cluster
# autoscaling unless this annotation is set.
Expand All @@ -642,7 +642,7 @@ spec:
priorityClassName: gmp-critical
initContainers:
- name: config-init
image: gke.gcr.io/gke-distroless/bash:gke_distroless_20240607.00_p0
image: gke.gcr.io/gke-distroless/bash:gke_distroless_20240907.00_p0
command: ['/bin/bash', '-c', 'touch /prometheus/config_out/config.yaml']
volumeMounts:
- name: config-out
Expand All @@ -656,7 +656,7 @@ spec:
readOnlyRootFilesystem: true
containers:
- name: config-reloader
image: gke.gcr.io/prometheus-engine/config-reloader@sha256:21055a361185da47fbd2c21389fb5cd00b54bfed5c784e0dc258b5b416beaf7e
image: gke.gcr.io/prometheus-engine/config-reloader@sha256:d199f266545ee281fa51d30e0a5f9c4da27da23055b153ca93adbf7483d19633
args:
- --config-file=/prometheus/config/config.yaml
- --config-file-output=/prometheus/config_out/config.yaml
Expand Down Expand Up @@ -697,7 +697,7 @@ spec:
privileged: false
readOnlyRootFilesystem: true
- name: evaluator
image: gke.gcr.io/prometheus-engine/rule-evaluator@sha256:6ae997a8ed636da06b7a9dc7fc950b98ce91c38c135aad2dcc95d6d3dd841ee0
image: gke.gcr.io/prometheus-engine/rule-evaluator@sha256:2ff728b00f5e0a652045e7a5a877be00cadf049ecb9b026c3654c2391588c045
args:
- --config.file=/prometheus/config_out/config.yaml
- --web.listen-address=:19092
Expand Down Expand Up @@ -803,7 +803,7 @@ spec:
labels:
app: managed-prometheus-alertmanager
app.kubernetes.io/name: alertmanager
app.kubernetes.io/version: 0.13.0
app.kubernetes.io/version: 0.13.1
annotations:
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
components.gke.io/component-name: managed_prometheus
Expand All @@ -812,7 +812,7 @@ spec:
automountServiceAccountToken: false
initContainers:
- name: config-init
image: gke.gcr.io/gke-distroless/bash:gke_distroless_20240607.00_p0
image: gke.gcr.io/gke-distroless/bash:gke_distroless_20240907.00_p0
command: ['/bin/bash', '-c', 'touch /alertmanager/config_out/config.yaml && echo -e "receivers:\n - name: noop\nroute:\n receiver: noop" > alertmanager/config_out/config.yaml']
volumeMounts:
- name: alertmanager-config
Expand Down Expand Up @@ -862,7 +862,7 @@ spec:
privileged: false
readOnlyRootFilesystem: true
- name: config-reloader
image: gke.gcr.io/prometheus-engine/config-reloader@sha256:21055a361185da47fbd2c21389fb5cd00b54bfed5c784e0dc258b5b416beaf7e
image: gke.gcr.io/prometheus-engine/config-reloader@sha256:d199f266545ee281fa51d30e0a5f9c4da27da23055b153ca93adbf7483d19633
args:
- --config-file=/alertmanager/config.yaml
- --config-file-output=/alertmanager/config_out/config.yaml
Expand Down
8 changes: 4 additions & 4 deletions manifests/rule-evaluator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -103,20 +103,20 @@ spec:
metadata:
labels:
app.kubernetes.io/name: rule-evaluator
app.kubernetes.io/version: 0.13.0
app.kubernetes.io/version: 0.13.1
spec:
serviceAccountName: rule-evaluator
automountServiceAccountToken: true
initContainers:
- name: config-init
image: gke.gcr.io/gke-distroless/bash:gke_distroless_20240607.00_p0
image: gke.gcr.io/gke-distroless/bash:gke_distroless_20240907.00_p0
command: ['/bin/bash', '-c', 'touch /prometheus/config_out/config.yaml']
volumeMounts:
- name: config-out
mountPath: /prometheus/config_out
containers:
- name: config-reloader
image: gke.gcr.io/prometheus-engine/config-reloader@sha256:21055a361185da47fbd2c21389fb5cd00b54bfed5c784e0dc258b5b416beaf7e
image: gke.gcr.io/prometheus-engine/config-reloader@sha256:d199f266545ee281fa51d30e0a5f9c4da27da23055b153ca93adbf7483d19633
args:
- --config-file=/prometheus/config/config.yaml
- --config-file-output=/prometheus/config_out/config.yaml
Expand Down Expand Up @@ -154,7 +154,7 @@ spec:
privileged: false
readOnlyRootFilesystem: true
- name: evaluator
image: gke.gcr.io/prometheus-engine/rule-evaluator@sha256:6ae997a8ed636da06b7a9dc7fc950b98ce91c38c135aad2dcc95d6d3dd841ee0
image: gke.gcr.io/prometheus-engine/rule-evaluator@sha256:2ff728b00f5e0a652045e7a5a877be00cadf049ecb9b026c3654c2391588c045
args:
- "--config.file=/prometheus/config_out/config.yaml"
- "--web.listen-address=:9092"
Expand Down

0 comments on commit d770a7b

Please sign in to comment.