add option to use a grafana api key from helm cli

Signed-off-by: AvivGuiser <[email protected]>

Author: KyriosGN0

charts/grafana-mcp/README.md.gotmpl

@@ -21,7 +21,7 @@ helm repo add grafana https://grafana.github.io/helm-charts
 To install the chart with the release name `my-release`:
 
 ```console
-helm install my-release grafana/grafana-mcp
+helm install --set grafana.apiKey=<Grafana_ApiKey> my-release grafana/grafana-mcp
 ```
 
 

charts/grafana-mcp/ci/default-values.yaml

@@ -1 +1,2 @@
-# Leave this file empty to ensure that CI runs builds against the default configuration in values.yaml.
+grafana:
+  apiKey: "test"

charts/grafana-mcp/templates/deployment.yaml

@@ -92,8 +92,13 @@ spec:
             - name: GRAFANA_API_KEY
               valueFrom:
                 secretKeyRef:
+                  {{- if .Values.grafana.apiKey }}
+                  name: {{ include "grafana-mcp.fullname" . }}
+                  key: api-key
+                  {{- else }}
                   name: {{ .Values.grafana.apiKeySecret.name }}
                   key: {{ .Values.grafana.apiKeySecret.key }}
+                  {{- end }}
             {{- range $key, $value := .Values.env }}
             - name: {{ $key | quote }}
               value: {{ $value | quote }}
@@ -107,6 +112,7 @@ spec:
           envFrom:
             {{- toYaml . | nindent 12 }}
           {{- end }}
+          {{- if or (.Values.debug) (.Values.disabledCategories) (.Values.extraArgs) }}
           args:
             {{- if .Values.debug }}
             - -debug
@@ -117,6 +123,12 @@ spec:
             {{- with .Values.extraArgs }}
             {{- toYaml . | nindent 12 }}
             {{- end }}
+          {{- else -}}
+          {{- with .Values.extraArgs }}
+          args:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- end }}
           {{- with .Values.lifecycle }}
           lifecycle:
             {{- toYaml . | nindent 12 }}

charts/grafana-mcp/templates/secret.yaml

@@ -0,0 +1,16 @@
+{{- if .Values.grafana.apiKey }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "grafana-mcp.fullname" . }}
+  namespace: {{ include "grafana-mcp.namespace" . }}
+  labels:
+    {{- include "grafana-mcp.labels" . | nindent 4 }}
+  {{- with .Values.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+type: Opaque
+stringData:
+  api-key: {{ .Values.grafana.apiKey }}
+{{- end }}

charts/grafana-mcp/values.yaml

@@ -26,12 +26,14 @@ imagePullSecrets: []
 grafana:
   # -- Grafana URL (should point to the main Grafana service)
   url: "http://grafana:3000"
+  # -- Grafana ApiKey (if not using a secret)
+  apiKey: ""
   # -- Secret containing the Grafana API key
   apiKeySecret:
     # -- Name of the secret containing the API key
-    name: "grafana-mcp-api-key"
+    name: ""
     # -- Key within the secret that contains the API key
-    key: "api-key"
+    key: ""
 
 # -- Enable debug mode
 debug: false