diff --git a/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet b/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet index bdbe57a2..a540a1fe 100644 --- a/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet +++ b/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet @@ -141,7 +141,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; spec: { replicas: $._config.alertmanager.replicas, version: $._config.versions.alertmanager, - baseImage: $._config.imageRepos.alertmanager, + image: $._config.imageRepos.alertmanager + ':' + $._config.versions.alertmanager, nodeSelector: { 'kubernetes.io/os': 'linux' }, serviceAccountName: 'alertmanager-' + $._config.alertmanager.name, securityContext: { diff --git a/jsonnet/kube-prometheus/kube-prometheus-thanos-sidecar.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-thanos-sidecar.libsonnet index 07e99483..5d675c79 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-thanos-sidecar.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-thanos-sidecar.libsonnet @@ -30,7 +30,7 @@ local servicePort = k.core.v1.service.mixin.spec.portsType; spec+: { thanos+: { version: $._config.versions.thanos, - baseImage: $._config.imageRepos.thanos, + image: $._config.imageRepos.thanos + ':' + $._config.versions.thanos, objectStorageConfig: $._config.thanos.objectStorageConfig, }, }, diff --git a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet index 2ea5f800..a93bcb43 100644 --- a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet +++ b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet @@ -178,7 +178,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; spec: { replicas: p.replicas, version: $._config.versions.prometheus, - baseImage: $._config.imageRepos.prometheus, + image: $._config.imageRepos.prometheus + ':' + $._config.versions.prometheus, serviceAccountName: 'prometheus-' + p.name, serviceMonitorSelector: {}, podMonitorSelector: {}, diff --git a/manifests/alertmanager-alertmanager.yaml b/manifests/alertmanager-alertmanager.yaml index 87f98b33..17ec2328 100644 --- a/manifests/alertmanager-alertmanager.yaml +++ b/manifests/alertmanager-alertmanager.yaml @@ -6,7 +6,7 @@ metadata: name: main namespace: monitoring spec: - baseImage: quay.io/prometheus/alertmanager + image: quay.io/prometheus/alertmanager:v0.20.0 nodeSelector: kubernetes.io/os: linux replicas: 3 diff --git a/manifests/prometheus-prometheus.yaml b/manifests/prometheus-prometheus.yaml index 1c8422d5..62c1c0b7 100644 --- a/manifests/prometheus-prometheus.yaml +++ b/manifests/prometheus-prometheus.yaml @@ -11,7 +11,7 @@ spec: - name: alertmanager-main namespace: monitoring port: web - baseImage: quay.io/prometheus/prometheus + image: quay.io/prometheus/prometheus:v2.15.2 nodeSelector: kubernetes.io/os: linux podMonitorNamespaceSelector: {}