From c736d1a47bc300b3974cc152e5b0dfc675d46faa Mon Sep 17 00:00:00 2001
From: Benjamin <benjamin@yunify.com>
Date: Fri, 14 Feb 2020 11:57:36 +0800
Subject: [PATCH] Change deprecated BaseImage to Image
Signed-off-by: Benjamin <benjamin@yunify.com>
---
jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet | 2 +-
.../kube-prometheus/kube-prometheus-thanos-sidecar.libsonnet | 2 +-
jsonnet/kube-prometheus/prometheus/prometheus.libsonnet | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
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: {},
--
GitLab