monitoring.enable -> monitoring.enabled

kubedb · Jan 1, 2019 · e01ab89 · e01ab89
1 parent b59d724
commit e01ab89
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/chart/kubedb/README.md b/chart/kubedb/README.md
@@ -72,7 +72,7 @@ The following table lists the configurable parameters of the KubeDB chart and th
 | `apiserver.useKubeapiserverFqdnForAks`  | If true, uses kube-apiserver FQDN for AKS cluster to workaround https://github.com/Azure/AKS/issues/522                                                                    | `true`                                                    |
 | `apiserver.healthcheck.enabled`         | Enable readiness and liveliness probes                                                                                                                                     | `true`                                                    |
 | `enableAnalytics`                       | Send usage events to Google Analytics                                                                                                                                      | `true`                                                    |
-| `monitoring.enable`                     | Specify whether to monitor KubeDB operator.                                                                                                                                | `false`                                                   |
+| `monitoring.enabled`                    | Specify whether to monitor KubeDB operator.                                                                                                                                | `false`                                                   |
 | `monitoring.agent`                      | Specify which monitoring agent to use for monitoring KubeDB operator. It accepts either `prometheus.io/builtin` or `prometheus.io/coreos-operator`.                        | `none`                                                    |
 | `monitoring.prometheus.namespace`       | Specify the namespace where Prometheus server is running or will be deployed.                                                                                              | Release namespace                                         |
 | `monitoring.serviceMonitor.labels`      | Specify the labels for ServiceMonitor. Prometheus crd will select ServiceMonitor using these labels. Only usable when monitoring agent is `prometheus.io/coreos-operator`. | `app: <generated app name>` and `release: <release name>` |

diff --git a/chart/kubedb/templates/apiregistration.yaml b/chart/kubedb/templates/apiregistration.yaml
@@ -48,7 +48,7 @@ data:
   tls.key: {{ b64enc $cert.Key }}
 ---
 {{ $promNamespace:= default .Release.Namespace .Values.monitoring.prometheus.namespace }}
-{{- if (and (ne $promNamespace .Release.Namespace) .Values.monitoring.enable) }}
+{{- if (and (ne $promNamespace .Release.Namespace) .Values.monitoring.enabled) }}
 # if operator monitoring is enabled and prometheus namespace is different than operator
 # create the above secret in prometheus namespace too.
 apiVersion: v1

diff --git a/chart/kubedb/templates/service.yaml b/chart/kubedb/templates/service.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "kubedb.labels" . | nindent 4 }}
-  {{- if and (eq .Values.monitoring.agent "prometheus.io/builtin") .Values.monitoring.enable }}
+  {{- if and (eq .Values.monitoring.agent "prometheus.io/builtin") .Values.monitoring.enabled }}
   annotations:
     prometheus.io/scrape: "true"
     prometheus.io/path: "/metrics"

diff --git a/chart/kubedb/templates/servicemonitor.yaml b/chart/kubedb/templates/servicemonitor.yaml
@@ -1,4 +1,4 @@
-{{- if and (eq .Values.monitoring.agent "prometheus.io/coreos-operator") .Values.monitoring.enable }}
+{{- if and (eq .Values.monitoring.agent "prometheus.io/coreos-operator") .Values.monitoring.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:

diff --git a/chart/kubedb/values.yaml b/chart/kubedb/values.yaml
@@ -92,7 +92,7 @@ enableAnalytics: true
 
 monitoring:
   # specify whether to monitor KubeDB operator
-  enable: false
+  enabled: false
   # specify monitoring agent (either "prometheus.io/builtin" or "prometheus.io/coreos-operator")
   agent: "none"
   # specify where ServiceMonitor crd will be created