Added support for tlsConfig for ServiceMonitor (#353)

* Added support for tlsConfig for ServiceMonitor - Added tlsConfig within the ServiceMonitor stanza. - Extended servicemonitor.yaml template to include tlsConfig if defined. * Added the new tlsConfig documentation to the README.md template
cockroachdb · Oct 5, 2023 · 0c8bb79 · 0c8bb79
1 parent 573268c
commit 0c8bb79
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 0 deletions.
diff --git a/build/templates/README.md b/build/templates/README.md
@@ -367,6 +367,7 @@ For details see the [`values.yaml`](values.yaml) file.
 | `serviceMonitor.annotations`                              | Additional annotations of ServiceMonitor                        | `{}`                                                  |
 | `serviceMonitor.interval`                                 | ServiceMonitor scrape metrics interval                          | `10s`                                                 |
 | `serviceMonitor.scrapeTimeout`                            | ServiceMonitor scrape timeout                                   | `nil`                                                 |
+| `serviceMonitor.tlsConfig`                                | Additional TLS configuration of ServiceMonitor                  | `{}`                                                  |
 | `serviceMonitor.namespaced`                               | Limit ServiceMonitor to current namespace                       | `false`                                               |
 | `storage.hostPath`                                        | Absolute path on host to store data                             | `""`                                                  |
 | `storage.persistentVolume.enabled`                        | Whether to use PersistentVolume to store data                   | `yes`                                                 |

diff --git a/build/templates/values.yaml b/build/templates/values.yaml
@@ -349,6 +349,10 @@ serviceMonitor:
   # Limits the ServiceMonitor to the current namespace if set to `true`.
   namespaced: false
 
+  # tlsConfig: TLS configuration to use when scraping the endpoint.
+  # Of type: https://github.com/coreos/prometheus-operator/blob/main/Documentation/api.md#tlsconfig
+  tlsConfig: {}
+
 # CockroachDB's data persistence.
 # If neither `persistentVolume` nor `hostPath` is used, then data will be
 # persisted in ad-hoc `emptyDir`.

diff --git a/cockroachdb/README.md b/cockroachdb/README.md
@@ -368,6 +368,7 @@ For details see the [`values.yaml`](values.yaml) file.
 | `serviceMonitor.annotations`                              | Additional annotations of ServiceMonitor                        | `{}`                                                  |
 | `serviceMonitor.interval`                                 | ServiceMonitor scrape metrics interval                          | `10s`                                                 |
 | `serviceMonitor.scrapeTimeout`                            | ServiceMonitor scrape timeout                                   | `nil`                                                 |
+| `serviceMonitor.tlsConfig`                                | Additional TLS configuration of ServiceMonitor                  | `{}`                                                  |
 | `serviceMonitor.namespaced`                               | Limit ServiceMonitor to current namespace                       | `false`                                               |
 | `storage.hostPath`                                        | Absolute path on host to store data                             | `""`                                                  |
 | `storage.persistentVolume.enabled`                        | Whether to use PersistentVolume to store data                   | `yes`                                                 |

diff --git a/cockroachdb/templates/serviceMonitor.yaml b/cockroachdb/templates/serviceMonitor.yaml
@@ -48,4 +48,7 @@ spec:
     {{- if $serviceMonitor.scrapeTimeout }}
     scrapeTimeout: {{ $serviceMonitor.scrapeTimeout }}
     {{- end }}
+    {{- if .Values.serviceMonitor.tlsConfig }}
+    tlsConfig: {{ toYaml .Values.serviceMonitor.tlsConfig | nindent 6 }}
+    {{- end }}
 {{- end }}
diff --git a/cockroachdb/values.yaml b/cockroachdb/values.yaml
@@ -350,6 +350,10 @@ serviceMonitor:
   # Limits the ServiceMonitor to the current namespace if set to `true`.
   namespaced: false
 
+  # tlsConfig: TLS configuration to use when scraping the endpoint.
+  # Of type: https://github.com/coreos/prometheus-operator/blob/main/Documentation/api.md#tlsconfig
+  tlsConfig: {}
+
 # CockroachDB's data persistence.
 # If neither `persistentVolume` nor `hostPath` is used, then data will be
 # persisted in ad-hoc `emptyDir`.