Remove updates to helm chart, fix typo in flag, add make generated files

This commit is contained in:
Purandare, Aditya
2019-01-16 22:05:47 +05:30
parent e3b989ccd3
commit 95771caf8c
6 changed files with 8 additions and 8 deletions

View File

@@ -281,7 +281,7 @@ These are the available fields with their respective default values:
names: 'k8s',
replicas: 2,
rules: {},
enableAdminApi: 'true',
enableAdminAPI: 'true',
},
alertmanager+:: {

View File

@@ -4,7 +4,7 @@ local kp = (import 'kube-prometheus/kube-prometheus.libsonnet') + {
},
prometheus+:: {
name: 'k8s',
enableAdminApi: 'true',
enableAdminAPI: 'true',
},
};

View File

@@ -82,7 +82,7 @@ local configMapList = k.core.v1.configMapList;
prometheusSelector: 'job="prometheus-k8s"',
prometheusOperatorSelector: 'job="prometheus-operator"',
enableAdminApi: 'true',
enableAdminAPI: 'true',
jobs: {
Kubelet: $._config.kubeletSelector,
@@ -99,7 +99,7 @@ local configMapList = k.core.v1.configMapList;
prometheus+:: {
rules: $.prometheusRules + $.prometheusAlerts,
enableAdminApi: $._config.enableAdminApi,
enableAdminAPI: $._config.enableAdminAPI,
},
grafana+:: {

View File

@@ -18,7 +18,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
prometheus+:: {
name: 'k8s',
enableAdminApi: 'true',
enableAdminAPI: 'true',
replicas: 2,
rules: {},
renderedRules: {},
@@ -169,7 +169,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
replicas: $._config.prometheus.replicas,
version: $._config.versions.prometheus,
baseImage: $._config.imageRepos.prometheus,
enableAdminApi: $._config.prometheus.enableAdminApi,
enableAdminAPI: $._config.prometheus.enableAdminAPI,
serviceAccountName: 'prometheus-' + $._config.prometheus.name,
serviceMonitorSelector: {},
serviceMonitorNamespaceSelector: {},

View File

@@ -1538,7 +1538,7 @@ spec:
required:
- name
type: array
enableAdminApi:
enableAdminAPI:
description: Enable access to prometheus web admin API. More info: https://prometheus.io/docs/prometheus/latest/querying/api/#tsdb-admin-apis
type: boolean
evaluationInterval:

View File

@@ -12,7 +12,7 @@ spec:
namespace: monitoring
port: web
baseImage: quay.io/prometheus/prometheus
enableAdminApi: true
enableAdminAPI: true
nodeSelector:
beta.kubernetes.io/os: linux
replicas: 2