From 95771caf8c5bb77b82329cdc67357ea208a3ed95 Mon Sep 17 00:00:00 2001
From: "Purandare, Aditya" <apurandare@underarmour.com>
Date: Wed, 16 Jan 2019 22:05:47 +0530
Subject: [PATCH] Remove updates to helm chart, fix typo in flag, add make
 generated files

---
 README.md                                                     | 2 +-
 example.jsonnet                                               | 2 +-
 jsonnet/kube-prometheus/kube-prometheus.libsonnet             | 4 ++--
 jsonnet/kube-prometheus/prometheus/prometheus.libsonnet       | 4 ++--
 ...ometheus-operator-0prometheusCustomResourceDefinition.yaml | 2 +-
 manifests/prometheus-prometheus.yaml                          | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 83b1a635..aa3b5674 100644
--- a/README.md
+++ b/README.md
@@ -281,7 +281,7 @@ These are the available fields with their respective default values:
         names: 'k8s',
         replicas: 2,
         rules: {},
-        enableAdminApi: 'true',
+        enableAdminAPI: 'true',
     },
 
     alertmanager+:: {
diff --git a/example.jsonnet b/example.jsonnet
index aa4c50f1..db480ea8 100644
--- a/example.jsonnet
+++ b/example.jsonnet
@@ -4,7 +4,7 @@ local kp = (import 'kube-prometheus/kube-prometheus.libsonnet') + {
   },
   prometheus+:: {
     name: 'k8s',
-    enableAdminApi: 'true',
+    enableAdminAPI: 'true',
   },
 };
 
diff --git a/jsonnet/kube-prometheus/kube-prometheus.libsonnet b/jsonnet/kube-prometheus/kube-prometheus.libsonnet
index 915d363f..814cfe60 100644
--- a/jsonnet/kube-prometheus/kube-prometheus.libsonnet
+++ b/jsonnet/kube-prometheus/kube-prometheus.libsonnet
@@ -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+:: {
diff --git a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet
index 047a6dd0..b6ce301a 100644
--- a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet
+++ b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet
@@ -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: {},
diff --git a/manifests/0prometheus-operator-0prometheusCustomResourceDefinition.yaml b/manifests/0prometheus-operator-0prometheusCustomResourceDefinition.yaml
index a9b3cdfa..abbf266f 100644
--- a/manifests/0prometheus-operator-0prometheusCustomResourceDefinition.yaml
+++ b/manifests/0prometheus-operator-0prometheusCustomResourceDefinition.yaml
@@ -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:
diff --git a/manifests/prometheus-prometheus.yaml b/manifests/prometheus-prometheus.yaml
index 18bdcf74..5abe34b3 100644
--- a/manifests/prometheus-prometheus.yaml
+++ b/manifests/prometheus-prometheus.yaml
@@ -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
-- 
GitLab