Skip to content

Commit 7def3ea

Browse files
committed
updating versions for prometheus helm chart
1 parent 3f89ee5 commit 7def3ea

File tree

3 files changed

+22
-15
lines changed

3 files changed

+22
-15
lines changed

docs/developers.md

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@ This document collects some information about things developers of the gop shoul
44
problems they might face when they try to run and test their changes.
55
It provides workarounds or solutions for the given issues.
66

7+
## Disclaimer
8+
9+
The versions listed in this README may not always reflect the most current release.
10+
Please be aware that newer versions may exist.
11+
The versions are also specified in the `Config.groovy` file, so it is recommended to consult that file for the latest version information.
12+
13+
714
## Table of contents
815

916
<!-- Update with ` doctoc --notitle docs/developers.md --maxlevel 4 `. See https://github.com/thlorenz/doctoc -->
@@ -567,11 +574,11 @@ skopeo copy docker://registry.k8s.io/ingress-nginx/controller:v1.9.6 --dest-cred
567574
# Using latest will lead to failure with
568575
# k describe prometheus -n monitoring
569576
# Message: initializing PrometheusRules failed: failed to parse version: Invalid character(s) found in major number "0latest"
570-
skopeo copy docker://quay.io/prometheus/prometheus:v2.55.1 --dest-creds Proxy:Proxy12345 --dest-tls-verify=false docker://localhost:30000/proxy/prometheus:v2.55.1
571-
skopeo copy docker://quay.io/prometheus-operator/prometheus-operator:v0.78.2 --dest-creds Proxy:Proxy12345 --dest-tls-verify=false docker://localhost:30000/proxy/prometheus-operator
572-
skopeo copy docker://quay.io/prometheus-operator/prometheus-config-reloader:v0.78.1 --dest-creds Proxy:Proxy12345 --dest-tls-verify=false docker://localhost:30000/proxy/prometheus-config-reloader
573-
skopeo copy docker://docker.io/grafana/grafana:11.3.1 --dest-creds Proxy:Proxy12345 --dest-tls-verify=false docker://localhost:30000/proxy/grafana
574-
skopeo copy docker://quay.io/kiwigrid/k8s-sidecar:1.28.0 --dest-creds Proxy:Proxy12345 --dest-tls-verify=false docker://localhost:30000/proxy/k8s-sidecar
577+
skopeo copy docker://quay.io/prometheus/prometheus:v3.2.1 --dest-creds Proxy:Proxy12345 --dest-tls-verify=false docker://localhost:30000/proxy/prometheus:v3.2.1
578+
skopeo copy docker://quay.io/prometheus-operator/prometheus-operator:v0.80.1 --dest-creds Proxy:Proxy12345 --dest-tls-verify=false docker://localhost:30000/proxy/prometheus-operator
579+
skopeo copy docker://quay.io/prometheus-operator/prometheus-config-reloader:v0.80.1 --dest-creds Proxy:Proxy12345 --dest-tls-verify=false docker://localhost:30000/proxy/prometheus-config-reloader
580+
skopeo copy docker://docker.io/grafana/grafana:11.5.2 --dest-creds Proxy:Proxy12345 --dest-tls-verify=false docker://localhost:30000/proxy/grafana
581+
skopeo copy docker://quay.io/kiwigrid/k8s-sidecar:1.30.0 --dest-creds Proxy:Proxy12345 --dest-tls-verify=false docker://localhost:30000/proxy/k8s-sidecar
575582
576583
# Cert Manager images
577584
skopeo copy docker://quay.io/jetstack/cert-manager-controller:v1.16.1 --dest-creds Proxy:Proxy12345 --dest-tls-verify=false docker://localhost:30000/proxy/cert-manager-controller
@@ -580,7 +587,7 @@ skopeo copy docker://quay.io/jetstack/cert-manager-webhook:v1.16.1 --dest-creds
580587
581588
# Needed for the builds to work with proxy-registry
582589
skopeo copy docker://bitnami/kubectl:1.29 --dest-creds Proxy:Proxy12345 --dest-tls-verify=false docker://localhost:30000/proxy/bitnami/kubectl:1.29
583-
skopeo copy docker://eclipse-temurin:11-jre-alpine --dest-creds Proxy:Proxy12345 --dest-tls-verify=false docker://localhost:30000/proxy/eclipse-temurin:11-jre-alpine
590+
skopeo copy docker://eclipse-temurin:17-jre-alpine --dest-creds Proxy:Proxy12345 --dest-tls-verify=false docker://localhost:30000/proxy/eclipse-temurin:17-jre-alpine
584591
skopeo copy docker://ghcr.io/cloudogu/helm:3.16.1-1 --dest-creds Proxy:Proxy12345 --dest-tls-verify=false docker://localhost:30000/proxy/helm:latest
585592
```
586593

@@ -607,7 +614,7 @@ docker run --rm -t -u $(id -u) \
607614
--registry-password-read-only=RegistryRead12345 \
608615
--kubectl-image=localhost:30000/proxy/bitnami/kubectl:1.29 \
609616
--helm-image=localhost:30000/proxy/helm:latest \
610-
--petclinic-image=localhost:30000/proxy/eclipse-temurin:11-jre-alpine \
617+
--petclinic-image=localhost:30000/proxy/eclipse-temurin:17-jre-alpine \
611618
--mailhog-image=localhost:30000/proxy/mailhog:latest \
612619
--vault-image=localhost:30000/proxy/vault:latest \
613620
--external-secrets-image=localhost:30000/proxy/external-secrets:latest \
@@ -618,7 +625,7 @@ docker run --rm -t -u $(id -u) \
618625
--cert-manager-image=localhost:30000/proxy/cert-manager-controller:latest \
619626
--cert-manager-webhook-image=localhost:30000/proxy/cert-manager-webhook:latest \
620627
--cert-manager-cainjector-image=localhost:30000/proxy/cert-manager-cainjector:latest \
621-
--prometheus-image=localhost:30000/proxy/prometheus:v2.55.1 \
628+
--prometheus-image=localhost:30000/proxy/prometheus:v3.2.1 \
622629
--prometheus-operator-image=localhost:30000/proxy/prometheus-operator:latest \
623630
--prometheus-config-reloader-image=localhost:30000/proxy/prometheus-config-reloader:latest \
624631
--grafana-image=localhost:30000/proxy/grafana:latest \
@@ -779,11 +786,11 @@ docker run -it -u $(id -u) \
779786
-v ~/.config/k3d/kubeconfig-airgapped-playground.yaml:/home/.kube/config \
780787
--net=host gitops-playground:dev --argocd --yes -x \
781788
--vault=dev --metrics \
782-
--grafana-image localhost:30002/library/grafana:8.2.1 \
783-
--grafana-sidecar-image localhost:30002/library/k8s-sidecar:1.14.2 \
784-
--prometheus-image localhost:30002/library/prometheus:v2.28.1 \
785-
--prometheus-operator-image localhost:30002/library/prometheus-operator:v0.50.0 \
786-
--prometheus-config-reloader-image localhost:30002/library/prometheus-config-reloader:v0.50.0 \
789+
--grafana-image localhost:30002/library/grafana:11.5.2 \
790+
--grafana-sidecar-image localhost:30002/library/k8s-sidecar:1.30.0 \
791+
--prometheus-image localhost:30002/library/prometheus:v3.2.1 \
792+
--prometheus-operator-image localhost:30002/library/prometheus-operator:v0.80.1 \
793+
--prometheus-config-reloader-image localhost:30002/library/prometheus-config-reloader:v0.80.1 \
787794
--external-secrets-image localhost:30002/library/external-secrets:v0.6.1 \
788795
--external-secrets-certcontroller-image localhost:30002/library/external-secrets:v0.6.1 \
789796
--external-secrets-webhook-image localhost:30002/library/external-secrets:v0.6.1 \

src/main/groovy/com/cloudogu/gitops/config/Config.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@ class Config {
545545
chart: 'kube-prometheus-stack',
546546
repoURL: 'https://prometheus-community.github.io/helm-charts',
547547
/* When updating this make sure to also test if air-gapped mode still works */
548-
version: '66.5.0',
548+
version: '69.7.4',
549549
values: [:] // Otherwise values is null 🤷‍♂️
550550
)
551551
static class MonitoringHelmSchema extends HelmConfigWithValues {

src/test/groovy/com/cloudogu/gitops/cli/GitopsPlaygroundCliTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ class GitopsPlaygroundCliTest {
257257

258258
assertThat(cli.lastSchema.features.monitoring.helm.chart).isEqualTo('kube-prometheus-stack')
259259
assertThat(cli.lastSchema.features.monitoring.helm.repoURL).isEqualTo('https://prometheus-community.github.io/helm-chartsTEST')
260-
assertThat(cli.lastSchema.features.monitoring.helm.version).isEqualTo('66.5.0')
260+
assertThat(cli.lastSchema.features.monitoring.helm.version).isEqualTo('69.7.4')
261261
}
262262

263263

0 commit comments

Comments
 (0)