Merge branch 'master' into master

neuvector · Nov 29, 2023 · 92bbb31 · 92bbb31
2 parents 47ee55e + 8c4cc00
commit 92bbb31
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/charts/monitor/README.md b/charts/monitor/README.md
@@ -14,7 +14,7 @@ Parameter | Description | Default | Notes
 `exporter.enabled` | If true, create Prometheus exporter | `false` |
 `exporter.image.repository` | exporter image name | `neuvector/prometheus-exporter` |
 `exporter.image.tag` | exporter image tag | `latest` |
-`exporter.ctrlSercretName` | existing secret that have CTRL_USERNAME and CTRL_PASSWORD fields to login to the controller.  | `nil` | if parameter exists then `exporter.CTRL_USERNAME` & `exporter.CTRL_PASSWORD` will be skipped
+`exporter.ctrlSecretName` | existing secret that have CTRL_USERNAME and CTRL_PASSWORD fields to login to the controller.  | `nil` | if parameter exists then `exporter.CTRL_USERNAME` & `exporter.CTRL_PASSWORD` will be skipped
 `exporter.CTRL_USERNAME` | Username to login to the controller. Suggest to replace the default admin user to a read-only user | `admin` |
 `exporter.CTRL_PASSWORD` | Password to login to the controller. | `admin` |
 `exporter.enforcerStats.enabled` | If true, enable the Enforcers stats | `false` | For the performance reason, by default the exporter does NOT pull CPU/memory usage from enforcers.

diff --git a/charts/monitor/templates/dashboard.yaml b/charts/monitor/templates/dashboard.yaml
@@ -9,6 +9,10 @@ metadata:
 {{- if .Values.exporter.grafanaDashboard.labels }}
     {{- toYaml .Values.exporter.grafanaDashboard.labels | nindent 4}}
 {{- end }}
+{{- if .Values.exporter.grafanaDashboard.annotations }}
+  annotations:
+    {{- toYaml .Values.exporter.grafanaDashboard.annotations | nindent 4}}
+{{- end }}
 data:
   nv_dashboard.json: |
 {{ .Files.Get "dashboards/nv_dashboard.json" | indent 4 }}

diff --git a/charts/monitor/templates/exporter-deployment.yaml b/charts/monitor/templates/exporter-deployment.yaml
@@ -55,8 +55,8 @@ spec:
             {{- end }}
           envFrom:
             - secretRef:
-            {{- if .Values.exporter.ctrlSercretName }}
-                name: {{ .Values.exporter.ctrlSercretName }}
+            {{- if .Values.exporter.ctrlSecretName }}
+                name: {{ .Values.exporter.ctrlSecretName }}
             {{ else }}
                 name: neuvector-prometheus-exporter-pod-secret
             {{- end }}

diff --git a/charts/monitor/templates/secret.yaml b/charts/monitor/templates/secret.yaml
@@ -1,4 +1,4 @@
-{{- if and (.Values.exporter.enabled) (not .Values.exporter.ctrlSercretName)  -}}
+{{- if and (.Values.exporter.enabled) (not .Values.exporter.ctrlSecretName)  -}}
 apiVersion: v1
 kind: Secret
 metadata:

diff --git a/charts/monitor/values.yaml b/charts/monitor/values.yaml
@@ -18,6 +18,7 @@ exporter:
   ctrlSercretName: ''
   enforcerStats:
     enabled: false
+  ctrlSecretName: ''
   apiSvc: neuvector-svc-controller-api:10443
 
   svc:
@@ -32,6 +33,8 @@ exporter:
     enabled: false
     namespace: "" # Release namespace, if empty
     labels: {}
+    # annotations: {}
+      # k8s-sidecar-target-directory: /tmp/dashboards/neuvector
 
   serviceMonitor:
     enabled: false