mirrors/kube-prometheus
1
0
Fork 0
mirror of https://github.com/prometheus-operator/kube-prometheus.git synced 2025-08-31 03:11:06 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #414 from benjaminhuo/master

Browse Source 
Change deprecated BaseImage to Image
This commit is contained in:
Frederic Branczyk 2020-02-18 09:41:15 +01:00 committed by GitHub
commit 3f3d4e2947
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet
View File

@ -141,7 +141,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
spec: { spec: {
replicas: $._config.alertmanager.replicas, replicas: $._config.alertmanager.replicas,
version: $._config.versions.alertmanager, version: $._config.versions.alertmanager,
baseImage: $._config.imageRepos.alertmanager, image: $._config.imageRepos.alertmanager + ':' + $._config.versions.alertmanager,
nodeSelector: { 'kubernetes.io/os': 'linux' }, nodeSelector: { 'kubernetes.io/os': 'linux' },
serviceAccountName: 'alertmanager-' + $._config.alertmanager.name, serviceAccountName: 'alertmanager-' + $._config.alertmanager.name,
securityContext: { securityContext: {

2
jsonnet/kube-prometheus/kube-prometheus-thanos-sidecar.libsonnet
View File

@ -30,7 +30,7 @@ local servicePort = k.core.v1.service.mixin.spec.portsType;
spec+: { spec+: {
thanos+: { thanos+: {
version: $._config.versions.thanos, version: $._config.versions.thanos,
baseImage: $._config.imageRepos.thanos, image: $._config.imageRepos.thanos + ':' + $._config.versions.thanos,
objectStorageConfig: $._config.thanos.objectStorageConfig, objectStorageConfig: $._config.thanos.objectStorageConfig,
}, },
}, },

2
jsonnet/kube-prometheus/prometheus/prometheus.libsonnet
View File

@ -178,7 +178,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
spec: { spec: {
replicas: p.replicas, replicas: p.replicas,
version: $._config.versions.prometheus, version: $._config.versions.prometheus,
baseImage: $._config.imageRepos.prometheus, image: $._config.imageRepos.prometheus + ':' + $._config.versions.prometheus,
serviceAccountName: 'prometheus-' + p.name, serviceAccountName: 'prometheus-' + p.name,
serviceMonitorSelector: {}, serviceMonitorSelector: {},
podMonitorSelector: {}, podMonitorSelector: {},

2
manifests/alertmanager-alertmanager.yaml
View File

@ -6,7 +6,7 @@ metadata:
name: main name: main
namespace: monitoring namespace: monitoring
spec: spec:
baseImage: quay.io/prometheus/alertmanager image: quay.io/prometheus/alertmanager:v0.20.0
nodeSelector: nodeSelector:
kubernetes.io/os: linux kubernetes.io/os: linux
replicas: 3 replicas: 3

2
manifests/prometheus-prometheus.yaml
View File

@ -11,7 +11,7 @@ spec:
- name: alertmanager-main - name: alertmanager-main
namespace: monitoring namespace: monitoring
port: web port: web
baseImage: quay.io/prometheus/prometheus image: quay.io/prometheus/prometheus:v2.15.2
nodeSelector: nodeSelector:
kubernetes.io/os: linux kubernetes.io/os: linux
podMonitorNamespaceSelector: {} podMonitorNamespaceSelector: {}