Add suggestions from code review.

oauth2-proxy · Nov 13, 2023 · 95a6629 · 95a6629
1 parent 06551ac
commit 95a6629
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/helm/oauth2-proxy/README.md b/helm/oauth2-proxy/README.md
@@ -213,7 +213,6 @@ Parameter | Description | Default
 `metrics.serviceMonitor.annotations` | Used to pass annotations that are used by the Prometheus installed in your cluster| `{}`
 `metrics.serviceMonitor.metricRelabelings` | Metric relabel configs to apply to samples before ingestion.| `[]`
 `metrics.serviceMonitor.relabelings` | Relabel configs to apply to samples before ingestion.| `[]`
-`metrics.serviceMonitor.targetLabels` | Attach labels to the ServiceMonitor resource based on Service metadata.| `[]`
 `extraObjects` | Extra K8s manifests to deploy | `[]`
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,

diff --git a/helm/oauth2-proxy/ci/servicemonitor-values.yaml b/helm/oauth2-proxy/ci/servicemonitor-values.yaml
@@ -1,6 +1,6 @@
 metrics:
   enabled: true
-  servicemonitor:
+  serviceMonitor:
     enabled: true
     annotations:
       key: value

diff --git a/helm/oauth2-proxy/templates/servicemonitor.yaml b/helm/oauth2-proxy/templates/servicemonitor.yaml
@@ -2,7 +2,7 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  {{- with .Values.metrics.servicemonitor.annotations }}
+  {{- with .Values.metrics.serviceMonitor.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
@@ -30,27 +30,27 @@ spec:
   endpoints:
   - port: metrics
     path: "/metrics"
-    {{- with .Values.metrics.servicemonitor.interval }}
+    {{- with .Values.metrics.serviceMonitor.interval }}
     interval: {{ . }}
     {{- end }}
-    {{- with .Values.metrics.servicemonitor.scrapeTimeout }}
+    {{- with .Values.metrics.serviceMonitor.scrapeTimeout }}
     scrapeTimeout: {{ . }}
     {{- end }}
-    {{- with .Values.metrics.servicemonitor.scheme }}
+    {{- with .Values.metrics.serviceMonitor.scheme }}
     scheme: {{ . }}
     {{- end }}
-    {{- with .Values.metrics.servicemonitor.bearerTokenFile }}
+    {{- with .Values.metrics.serviceMonitor.bearerTokenFile }}
     bearerTokenFile: {{ . }}
     {{- end }}
-    {{- with .Values.metrics.servicemonitor.tlsConfig }}
+    {{- with .Values.metrics.serviceMonitor.tlsConfig }}
     tlsConfig:
       {{- toYaml .| nindent 4 }}
     {{- end }}
-    {{- with .Values.metrics.servicemonitor.metricRelabelings }}
+    {{- with .Values.metrics.serviceMonitor.metricRelabelings }}
     metricRelabelings:
       {{- toYaml . | nindent 4 }}
     {{- end }}
-    {{- with .Values.metrics.servicemonitor.relabelings }}
+    {{- with .Values.metrics.serviceMonitor.relabelings }}
     relabelings:
       {{- toYaml . | nindent 4 }}
     {{- end }}

diff --git a/helm/oauth2-proxy/values.yaml b/helm/oauth2-proxy/values.yaml
@@ -404,9 +404,6 @@ metrics:
     #   replacement: $1
     #   action: replace
 
-    ## Attach labels to the ServiceMonitor resource based on Service metadata.
-    targetLabels: []
-
 # Extra K8s manifests to deploy
 extraObjects: []
   # - apiVersion: secrets-store.csi.x-k8s.io/v1