From fcda42b12315e4dd66c1cfa6dc4fa19547698dd4 Mon Sep 17 00:00:00 2001
From: "Purandare, Aditya" <apurandare@underarmour.com>
Date: Thu, 17 Jan 2019 21:28:30 +0530
Subject: [PATCH] Remove api flag from jsonnet files
---
README.md | 1 -
example.jsonnet | 2 +-
jsonnet/kube-prometheus/kube-prometheus.libsonnet | 3 ---
jsonnet/kube-prometheus/prometheus/prometheus.libsonnet | 1 -
manifests/prometheus-prometheus.yaml | 1 -
5 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/README.md b/README.md
index fd4836c3..55c6c29a 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 83b439f1..2a10509c 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 3a25e52c..7dae5f38 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 48bb6c0e..b9b3810c 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 2b830347..c16914b0 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
--
GitLab