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

fix: use proper image versions in install manifest #1010

Closed
wants to merge 1 commit into from
Closed

fix: use proper image versions in install manifest #1010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions charts/values.global.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,27 +20,27 @@ version: 0.13.0
images:
bash:
image: gke.gcr.io/gke-distroless/bash
tag: "20220419" # NOTE: Has to be quoted otherwise it will be treated as a number.
tag: gke_distroless_20240207.00_p0
alertmanager:
image: gke.gcr.io/prometheus-engine/alertmanager
tag: v0.25.1-gmp.2-gke.0
tag: v0.25.1-gmp.3-gke.0
prometheus:
# TODO(bwplotka): Change to "v2.45.3-gmp.4-gke.0" once tags are cloned.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Can you update the tag in this comment? So it's clear what the SHA points to?

image: gke.gcr.io/prometheus-engine/prometheus@sha256
tag: 7473d52f4a3e563e6377f8a6183091f25192b1e0705dd0933903e800bd69b7b2
tag: 3115cb238c9dd9abe4f4cf8ed3daeb1e6e9ee045bf24f8614e144b3a642f3464
configReloader:
image: gke.gcr.io/prometheus-engine/config-reloader
tag: v0.9.0-gke.1
tag: v0.10.0-gke.6
operator:
image: gke.gcr.io/prometheus-engine/operator
tag: v0.9.0-gke.1
tag: v0.10.0-gke.6
ruleEvaluator:
image: gke.gcr.io/prometheus-engine/rule-evaluator
tag: v0.9.0-gke.1
tag: v0.10.0-gke.6
datasourceSyncer:
image: gcr.io/gke-release/prometheus-engine/datasource-syncer
image: gke.gcr.io/prometheus-engine/datasource-syncer
#TODO(macxamin) Sync CURRENT_DATASOURCE_SYNCER_TAG with CURRENT_TAG
Copy link
Collaborator

@maxamins maxamins Jun 10, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comment can be removed with this change.

tag: v0.10.0-gke.3
tag: v0.10.0-gke.6
resources:
alertManager:
limits:
Expand Down
4 changes: 2 additions & 2 deletions cmd/datasource-syncer/datasource-syncer.yaml
View file
Open in desktop
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:v0.10.0-gke.3
image: gke.gcr.io/prometheus-engine/datasource-syncer:v0.10.0-gke.6
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:v0.10.0-gke.3
image: gke.gcr.io/prometheus-engine/datasource-syncer:v0.10.0-gke.6
args:
- "--datasource-uids=$DATASOURCE_UIDS"
- "--grafana-api-endpoint=$GRAFANA_API_ENDPOINT"
Expand Down
20 changes: 10 additions & 10 deletions manifests/operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ spec:
priorityClassName: gmp-critical
initContainers:
- name: config-init
image: gke.gcr.io/gke-distroless/bash:20220419
image: gke.gcr.io/gke-distroless/bash:gke_distroless_20240207.00_p0
command: ['/bin/bash', '-c', 'touch /prometheus/config_out/config.yaml']
volumeMounts:
- name: config-out
Expand All @@ -357,7 +357,7 @@ spec:
readOnlyRootFilesystem: true
containers:
- name: config-reloader
image: gke.gcr.io/prometheus-engine/config-reloader:v0.9.0-gke.1
image: gke.gcr.io/prometheus-engine/config-reloader:v0.10.0-gke.6
args:
- --config-file=/prometheus/config/config.yaml
- --config-file-output=/prometheus/config_out/config.yaml
Expand Down Expand Up @@ -393,7 +393,7 @@ spec:
privileged: false
readOnlyRootFilesystem: true
- name: prometheus
image: gke.gcr.io/prometheus-engine/prometheus@sha256:7473d52f4a3e563e6377f8a6183091f25192b1e0705dd0933903e800bd69b7b2
image: gke.gcr.io/prometheus-engine/prometheus@sha256:3115cb238c9dd9abe4f4cf8ed3daeb1e6e9ee045bf24f8614e144b3a642f3464
args:
- --config.file=/prometheus/config_out/config.yaml
- --enable-feature=exemplar-storage
Expand Down Expand Up @@ -534,7 +534,7 @@ spec:
priorityClassName: gmp-critical
containers:
- name: operator
image: gke.gcr.io/prometheus-engine/operator:v0.9.0-gke.1
image: gke.gcr.io/prometheus-engine/operator:v0.10.0-gke.6
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I doubt this works due to #1013

(with readOnlyRootFilesystem: true)

Have you tested it?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah yes - indeed #944 breaks this.

@bernot-dev or @TheSpiritXIII do you know if we have an image published we could use that works with that change? Presumably HEAD worked (v0.13.0-rc.0).

OTOH maybe trying to "fix" our nightly manifest in this way isn't a great idea and I should abandon the PR as it isn't possible to always have a working manifest in HEAD anyway due to GKE build pipeline delays...

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mean, you are not making it worse so let's go =D

Good point that we could have issues going forward, but we have same problem with AM and Prometheus and for those we HAVE to make them workable in atomic way otherwise tests won't pass. It's just with PE images we are "allowed" to cheat a bit.

I wonder if splitting manifests to OSS official ones VS source for managed GMP should be different things e.g. for GMP we could simply use helm templates directly and have different values (: We could actually get rid of kustomize (or move kustomize here). cc @TheSpiritXIII

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The alternative (or actually doing both ideas might work) would be to have official "dev" registry we will push ALWAYS and register the version here somehow (maybe "main" tag after all). Not tested, but it will be builded like any other image. Then we can promote to official prod registry and tag on the final release.

args:
- "--operator-namespace=gmp-system"
- "--public-namespace=gmp-public"
Expand Down Expand Up @@ -640,7 +640,7 @@ spec:
priorityClassName: gmp-critical
initContainers:
- name: config-init
image: gke.gcr.io/gke-distroless/bash:20220419
image: gke.gcr.io/gke-distroless/bash:gke_distroless_20240207.00_p0
command: ['/bin/bash', '-c', 'touch /prometheus/config_out/config.yaml']
volumeMounts:
- name: config-out
Expand All @@ -654,7 +654,7 @@ spec:
readOnlyRootFilesystem: true
containers:
- name: config-reloader
image: gke.gcr.io/prometheus-engine/config-reloader:v0.9.0-gke.1
image: gke.gcr.io/prometheus-engine/config-reloader:v0.10.0-gke.6
args:
- --config-file=/prometheus/config/config.yaml
- --config-file-output=/prometheus/config_out/config.yaml
Expand Down Expand Up @@ -695,7 +695,7 @@ spec:
privileged: false
readOnlyRootFilesystem: true
- name: evaluator
image: gke.gcr.io/prometheus-engine/rule-evaluator:v0.9.0-gke.1
image: gke.gcr.io/prometheus-engine/rule-evaluator:v0.10.0-gke.6
args:
- --config.file=/prometheus/config_out/config.yaml
- --web.listen-address=:19092
Expand Down Expand Up @@ -809,7 +809,7 @@ spec:
priorityClassName: gmp-critical
initContainers:
- name: config-init
image: gke.gcr.io/gke-distroless/bash:20220419
image: gke.gcr.io/gke-distroless/bash:gke_distroless_20240207.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 All @@ -823,7 +823,7 @@ spec:
readOnlyRootFilesystem: true
containers:
- name: alertmanager
image: gke.gcr.io/prometheus-engine/alertmanager:v0.25.1-gmp.2-gke.0
image: gke.gcr.io/prometheus-engine/alertmanager:v0.25.1-gmp.3-gke.0
args:
- --config.file=/alertmanager/config_out/config.yaml
- --storage.path=/alertmanager-data
Expand Down Expand Up @@ -859,7 +859,7 @@ spec:
privileged: false
readOnlyRootFilesystem: true
- name: config-reloader
image: gke.gcr.io/prometheus-engine/config-reloader:v0.9.0-gke.1
image: gke.gcr.io/prometheus-engine/config-reloader:v0.10.0-gke.6
args:
- --config-file=/alertmanager/config.yaml
- --config-file-output=/alertmanager/config_out/config.yaml
Expand Down
6 changes: 3 additions & 3 deletions manifests/rule-evaluator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,14 @@ spec:
automountServiceAccountToken: true
initContainers:
- name: config-init
image: gke.gcr.io/gke-distroless/bash:20220419
image: gke.gcr.io/gke-distroless/bash:gke_distroless_20240207.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:v0.9.0-gke.1
image: gke.gcr.io/prometheus-engine/config-reloader:v0.10.0-gke.6
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:v0.9.0-gke.1
image: gke.gcr.io/prometheus-engine/rule-evaluator:v0.10.0-gke.6
args:
- "--config.file=/prometheus/config_out/config.yaml"
- "--web.listen-address=:9092"
Expand Down
Loading