fix(chart): Default grafana user in k8s + secret names

unpoller · May 8, 2024 · aac5226 · aac5226
1 parent c59480e
commit aac5226
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/on_unpoller_release.yaml b/.github/workflows/on_unpoller_release.yaml
@@ -31,9 +31,8 @@ jobs:
       - name: Update helm values
         run: |
           UNPOLLER_VERSION=${{ github.event.inputs.unpoller_version }}
-          CHART_VERSION="${UNPOLLER_VERSION:1}"
           yq -i ".appVersion=\"${UNPOLLER_VERSION}\"" charts/unpoller/Chart.yaml
-          yq -i ".version=\"${CHART_VERSION}\"" charts/unpoller/Chart.yaml
+          yq -i ".version=\"${UNPOLLER_VERSION}\"" charts/unpoller/Chart.yaml
           make helm-docs
           
           cp charts/unpoller/README.md README.MD

diff --git a/charts/unpoller/Chart.yaml b/charts/unpoller/Chart.yaml
@@ -14,8 +14,8 @@ description: |
   **Note**: *This is a best effort to keep this chart working for kubernetes.*
 
 type: application
-version: "2.11.2-Chart4"
-appVersion: "2.11.2"
+version: "2.11.2-Chart5"
+appVersion: "v2.11.2"
 keywords:
   - unifi
   - unpoller

diff --git a/charts/unpoller/templates/grafana.yaml b/charts/unpoller/templates/grafana.yaml
@@ -9,9 +9,9 @@ spec:
   external:
     url: http://monitoring-promstack-grafana #Grafana URL
     adminPassword:
-      name: grafana-admin-credentials
+      name: {{ include "unpoller.grafana-secret" . }}
       key: GF_SECURITY_ADMIN_PASSWORD
     adminUser:
-      name: grafana-admin-credentials
+      name: {{ include "unpoller.grafana-secret" . }}
       key: GF_SECURITY_ADMIN_USER
 {{- end }}
diff --git a/charts/unpoller/values.yaml b/charts/unpoller/values.yaml
@@ -86,7 +86,7 @@ dashboards:
       existingSecretName: ""
       # When existingSecretName is not provided, username and password must be provided. A new secret will be
       # created with the provided username and password. GF_SECURITY_ADMIN_USER.
-      username: "prom"
+      username: "admin"
       # Password for username, will create field GF_SECURITY_ADMIN_PASSWORD
       password: "prom-operator"