diff --git a/README.md b/README.md index fd4836c3eb5a9a24932cd4dbe44650ccec44bc78..55c6c29a616eb364b1bfb1b0478bc849cea18a7a 100644 --- a/README.md +++ b/README.md @@ -281,7 +281,6 @@ These are the available fields with their respective default values: names: 'k8s', replicas: 2, rules: {}, - enableAdminAPI: 'false', }, alertmanager+:: { diff --git a/example.jsonnet b/example.jsonnet index 83b439f1040c13119aa43c5ee6fd5fbed74228ff..2a10509c18e5087cf16939eaa9e9534932a50008 100644 --- a/example.jsonnet +++ b/example.jsonnet @@ -1,7 +1,7 @@ local kp = (import 'kube-prometheus/kube-prometheus.libsonnet') + { _config+:: { namespace: 'monitoring', - } + }, }; { ['00namespace-' + name]: kp.kubePrometheus[name] for name in std.objectFields(kp.kubePrometheus) } + diff --git a/jsonnet/kube-prometheus/kube-prometheus.libsonnet b/jsonnet/kube-prometheus/kube-prometheus.libsonnet index 3a25e52ced142ed1fb18662ed7a25014fb8ff417..7dae5f38bd0587b5472f6aef8a4ec9e85aeaedf2 100644 --- a/jsonnet/kube-prometheus/kube-prometheus.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus.libsonnet @@ -82,8 +82,6 @@ local configMapList = k.core.v1.configMapList; prometheusSelector: 'job="prometheus-k8s"', prometheusOperatorSelector: 'job="prometheus-operator"', - enableAdminAPI: 'false', - jobs: { Kubelet: $._config.kubeletSelector, KubeScheduler: $._config.kubeSchedulerSelector, @@ -99,7 +97,6 @@ local configMapList = k.core.v1.configMapList; prometheus+:: { rules: $.prometheusRules + $.prometheusAlerts, - enableAdminAPI: $._config.enableAdminAPI, }, grafana+:: { diff --git a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet index 48bb6c0e0f149dbf07e128be85f45d53a882c979..b9b3810c95e649811188eaa8a01fb52910dd4314 100644 --- a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet +++ b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet @@ -18,7 +18,6 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; prometheus+:: { name: 'k8s', - enableAdminAPI: 'false', replicas: 2, rules: {}, renderedRules: {}, diff --git a/manifests/prometheus-prometheus.yaml b/manifests/prometheus-prometheus.yaml index 2b830347a6d82095f12c106f7cd4f8fa4b7ff559..c16914b09a4bf8dbd1b368f52d96c4cd8db93832 100644 --- a/manifests/prometheus-prometheus.yaml +++ b/manifests/prometheus-prometheus.yaml @@ -12,7 +12,6 @@ spec: namespace: monitoring port: web baseImage: quay.io/prometheus/prometheus - enableAdminAPI: false nodeSelector: beta.kubernetes.io/os: linux replicas: 2