Create ServiceMonitor in the same namespace as the operator (#158)

Signed-off-by: Tamal Saha <tamal@appscode.com>
kubedb · Oct 20, 2020 · 2709602 · 2709602
1 parent 3cb27a1
commit 2709602
Show file tree

Hide file tree

Showing 19 changed files with 20 additions and 155 deletions.
diff --git a/api/crds/bindata.go b/api/crds/bindata.go
diff --git a/api/crds/installer.kubedb.com_kubedbenterprises.v1.yaml b/api/crds/installer.kubedb.com_kubedbenterprises.v1.yaml
@@ -721,11 +721,6 @@ spec:
                     type: string
                   enabled:
                     type: boolean
-                  prometheus:
-                    properties:
-                      namespace:
-                        type: string
-                    type: object
                   serviceMonitor:
                     properties:
                       labels:
@@ -735,7 +730,6 @@ spec:
                     type: object
                 required:
                 - agent
-                - prometheus
                 - serviceMonitor
                 type: object
               nameOverride:

diff --git a/api/crds/installer.kubedb.com_kubedbenterprises.yaml b/api/crds/installer.kubedb.com_kubedbenterprises.yaml
@@ -701,11 +701,6 @@ spec:
                   type: string
                 enabled:
                   type: boolean
-                prometheus:
-                  properties:
-                    namespace:
-                      type: string
-                  type: object
                 serviceMonitor:
                   properties:
                     labels:
@@ -715,7 +710,6 @@ spec:
                   type: object
               required:
               - agent
-              - prometheus
               - serviceMonitor
               type: object
             nameOverride:

diff --git a/api/crds/installer.kubedb.com_kubedboperators.v1.yaml b/api/crds/installer.kubedb.com_kubedboperators.v1.yaml
@@ -721,11 +721,6 @@ spec:
                     type: string
                   enabled:
                     type: boolean
-                  prometheus:
-                    properties:
-                      namespace:
-                        type: string
-                    type: object
                   serviceMonitor:
                     properties:
                       labels:
@@ -735,7 +730,6 @@ spec:
                     type: object
                 required:
                 - agent
-                - prometheus
                 - serviceMonitor
                 type: object
               nameOverride:

diff --git a/api/crds/installer.kubedb.com_kubedboperators.yaml b/api/crds/installer.kubedb.com_kubedboperators.yaml
@@ -706,11 +706,6 @@ spec:
                   type: string
                 enabled:
                   type: boolean
-                prometheus:
-                  properties:
-                    namespace:
-                      type: string
-                  type: object
                 serviceMonitor:
                   properties:
                     labels:
@@ -720,7 +715,6 @@ spec:
                   type: object
               required:
               - agent
-              - prometheus
               - serviceMonitor
               type: object
             nameOverride:

diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
@@ -1055,7 +1055,6 @@
       "type": "object",
       "required": [
         "agent",
-        "prometheus",
         "serviceMonitor"
       ],
       "properties": {
@@ -1065,9 +1064,6 @@
         "enabled": {
           "type": "boolean"
         },
-        "prometheus": {
-          "$ref": "#/definitions/dev.kubedb.installer.apis.installer.v1alpha1.PrometheusSpec"
-        },
         "serviceMonitor": {
           "$ref": "#/definitions/dev.kubedb.installer.apis.installer.v1alpha1.ServiceMonitorLabels"
         }
@@ -1100,14 +1096,6 @@
         }
       }
     },
-    "dev.kubedb.installer.apis.installer.v1alpha1.PrometheusSpec": {
-      "type": "object",
-      "properties": {
-        "namespace": {
-          "type": "string"
-        }
-      }
-    },
     "dev.kubedb.installer.apis.installer.v1alpha1.ServiceAccountSpec": {
       "type": "object",
       "required": [

diff --git a/apis/installer/v1alpha1/kubedb_operator_types.go b/apis/installer/v1alpha1/kubedb_operator_types.go
@@ -142,15 +142,9 @@ type Monitoring struct {
 	// +optional
 	Enabled        bool                  `json:"enabled"`
 	Agent          string                `json:"agent"`
-	Prometheus     *PrometheusSpec       `json:"prometheus"`
 	ServiceMonitor *ServiceMonitorLabels `json:"serviceMonitor"`
 }
 
-type PrometheusSpec struct {
-	// +optional
-	Namespace string `json:"namespace"`
-}
-
 type ServiceMonitorLabels struct {
 	// +optional
 	Labels map[string]string `json:"labels"`

diff --git a/apis/installer/v1alpha1/openapi_generated.go b/apis/installer/v1alpha1/openapi_generated.go
diff --git a/apis/installer/v1alpha1/zz_generated.deepcopy.go b/apis/installer/v1alpha1/zz_generated.deepcopy.go
diff --git a/charts/kubedb-enterprise/README.md b/charts/kubedb-enterprise/README.md
@@ -87,7 +87,6 @@ The following table lists the configurable parameters of the `kubedb-enterprise`
 | enableAnalytics                       | If true, sends usage analytics                                                                                                                                                                                                                                                                                                                                               | `true`                                                                |
 | monitoring.enabled                    | If true, enables monitoring KubeDB operator                                                                                                                                                                                                                                                                                                                                  | `false`                                                               |
 | monitoring.agent                      | Name of monitoring agent (either "prometheus.io/operator" or "prometheus.io/builtin")                                                                                                                                                                                                                                                                                        | `"none"`                                                              |
-| monitoring.prometheus.namespace       | Specify the namespace where Prometheus server is running or will be deployed.                                                                                                                                                                                                                                                                                                | `""`                                                                  |
 | monitoring.serviceMonitor.labels      | Specify the labels for ServiceMonitor. Prometheus crd will select ServiceMonitor using these labels. Only usable when monitoring agent is `prometheus.io/operator`.                                                                                                                                                                                                          | `{}`                                                                  |
 | additionalPodSecurityPolicies         | Additional psp names passed to operator <br> Example: <br> `helm template ./chart/kubedb-enterprise \` <br> `--set additionalPodSecurityPolicies[0]=abc \` <br> `--set additionalPodSecurityPolicies[1]=xyz`                                                                                                                                                                 | `[]`                                                                  |
 

diff --git a/charts/kubedb-enterprise/templates/apiregistration.yaml b/charts/kubedb-enterprise/templates/apiregistration.yaml
@@ -63,23 +63,6 @@ data:
   tls.crt: {{ $serverCrt }}
   tls.key: {{ $serverKey }}
 ---
-{{ $promNamespace:= default .Release.Namespace .Values.monitoring.prometheus.namespace }}
-{{- 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
-kind: Secret
-metadata:
-  name: {{ include "kubedb-enterprise.fullname" . }}-apiserver-cert
-  namespace: {{ $promNamespace }}
-  labels:
-    {{- include "kubedb-enterprise.labels" . | nindent 4 }}
-type: kubernetes.io/tls
-data:
-  tls.crt: {{ $serverCrt }}
-  tls.key: {{ $serverKey }}
----
-{{ end }}
 # to read the config for terminating authentication
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding

diff --git a/charts/kubedb-enterprise/templates/servicemonitor.yaml b/charts/kubedb-enterprise/templates/servicemonitor.yaml
@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ include "kubedb-enterprise.fullname" . }}
-  namespace: {{ default .Release.Namespace .Values.monitoring.prometheus.namespace }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- if .Values.monitoring.serviceMonitor.labels }}
     {{- range $key, $val := .Values.monitoring.serviceMonitor.labels }}
@@ -24,6 +24,10 @@ spec:
     bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
     scheme: https
     tlsConfig:
+      ca:
+        secret:
+          name: {{ include "kubedb-enterprise.fullname" . }}-apiserver-cert
+          key: tls.crt
       caFile: /etc/prometheus/secrets/{{ include "kubedb-enterprise.fullname" . }}-apiserver-cert/tls.crt
       serverName: "{{ include "kubedb-enterprise.fullname" . }}.{{ .Release.Namespace }}.svc"
 {{- end }}
diff --git a/charts/kubedb-enterprise/values.openapiv3_schema.yaml b/charts/kubedb-enterprise/values.openapiv3_schema.yaml
@@ -631,11 +631,6 @@ properties:
         type: string
       enabled:
         type: boolean
-      prometheus:
-        properties:
-          namespace:
-            type: string
-        type: object
       serviceMonitor:
         properties:
           labels:
@@ -645,7 +640,6 @@ properties:
         type: object
     required:
     - agent
-    - prometheus
     - serviceMonitor
     type: object
   nameOverride:

diff --git a/charts/kubedb-enterprise/values.yaml b/charts/kubedb-enterprise/values.yaml
@@ -123,10 +123,6 @@ monitoring:
   enabled: false
   # Name of monitoring agent (either "prometheus.io/operator" or "prometheus.io/builtin")
   agent: "none"
-  # specify where ServiceMonitor crd will be created
-  prometheus:
-    # Specify the namespace where Prometheus server is running or will be deployed.
-    namespace: ""
   serviceMonitor:
     # Specify the labels for ServiceMonitor.
     # Prometheus crd will select ServiceMonitor using these labels.

diff --git a/charts/kubedb/README.md b/charts/kubedb/README.md
@@ -87,7 +87,6 @@ The following table lists the configurable parameters of the `kubedb` chart and
 | enableAnalytics                       | If true, sends usage analytics                                                                                                                                                                                                                                                                                                                                                | `true`                                                                |
 | monitoring.enabled                    | If true, enables monitoring KubeDB operator                                                                                                                                                                                                                                                                                                                                   | `false`                                                               |
 | monitoring.agent                      | Name of monitoring agent (either "prometheus.io/operator" or "prometheus.io/builtin")                                                                                                                                                                                                                                                                                         | `"none"`                                                              |
-| monitoring.prometheus.namespace       | Specify the namespace where Prometheus server is running or will be deployed.                                                                                                                                                                                                                                                                                                 | `""`                                                                  |
 | monitoring.serviceMonitor.labels      | Specify the labels for ServiceMonitor. Prometheus crd will select ServiceMonitor using these labels. Only usable when monitoring agent is `prometheus.io/operator`.                                                                                                                                                                                                           | `{}`                                                                  |
 | additionalPodSecurityPolicies         | Additional psp names passed to operator <br> Example: <br> `helm template ./chart/kubedb \` <br> `--set additionalPodSecurityPolicies[0]=abc \` <br> `--set additionalPodSecurityPolicies[1]=xyz`                                                                                                                                                                             | `[]`                                                                  |
 

diff --git a/charts/kubedb/templates/apiregistration.yaml b/charts/kubedb/templates/apiregistration.yaml
@@ -63,23 +63,6 @@ data:
   tls.crt: {{ $serverCrt }}
   tls.key: {{ $serverKey }}
 ---
-{{ $promNamespace:= default .Release.Namespace .Values.monitoring.prometheus.namespace }}
-{{- 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
-kind: Secret
-metadata:
-  name: {{ include "kubedb.fullname" . }}-apiserver-cert
-  namespace: {{ $promNamespace }}
-  labels:
-    {{- include "kubedb.labels" . | nindent 4 }}
-type: kubernetes.io/tls
-data:
-  tls.crt: {{ $serverCrt }}
-  tls.key: {{ $serverKey }}
----
-{{ end }}
 # to read the config for terminating authentication
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding

diff --git a/charts/kubedb/templates/servicemonitor.yaml b/charts/kubedb/templates/servicemonitor.yaml
@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ include "kubedb.fullname" . }}
-  namespace: {{ default .Release.Namespace .Values.monitoring.prometheus.namespace }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- if .Values.monitoring.serviceMonitor.labels }}
     {{- range $key, $val := .Values.monitoring.serviceMonitor.labels }}
@@ -24,6 +24,10 @@ spec:
     bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
     scheme: https
     tlsConfig:
+      ca:
+        secret:
+          name: {{ include "kubedb.fullname" . }}-apiserver-cert
+          key: tls.crt
       caFile: /etc/prometheus/secrets/{{ include "kubedb.fullname" . }}-apiserver-cert/tls.crt
       serverName: "{{ include "kubedb.fullname" . }}.{{ .Release.Namespace }}.svc"
 {{- end }}
diff --git a/charts/kubedb/values.openapiv3_schema.yaml b/charts/kubedb/values.openapiv3_schema.yaml
@@ -631,11 +631,6 @@ properties:
         type: string
       enabled:
         type: boolean
-      prometheus:
-        properties:
-          namespace:
-            type: string
-        type: object
       serviceMonitor:
         properties:
           labels:
@@ -645,7 +640,6 @@ properties:
         type: object
     required:
     - agent
-    - prometheus
     - serviceMonitor
     type: object
   nameOverride:

diff --git a/charts/kubedb/values.yaml b/charts/kubedb/values.yaml
@@ -123,10 +123,6 @@ monitoring:
   enabled: false
   # Name of monitoring agent (either "prometheus.io/operator" or "prometheus.io/builtin")
   agent: "none"
-  # specify where ServiceMonitor crd will be created
-  prometheus:
-    # Specify the namespace where Prometheus server is running or will be deployed.
-    namespace: ""
   serviceMonitor:
     # Specify the labels for ServiceMonitor.
     # Prometheus crd will select ServiceMonitor using these labels.