fix(grafana): fixed use of secret for grafana admin

Signed-off-by: Stefan Benz <[email protected]>
caos · Apr 7, 2020 · 702daf1 · 702daf1
1 parent 331e033
commit 702daf1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/docs/crd.md b/docs/crd.md
@@ -62,7 +62,7 @@
 | `admin`                            | Spec for the definition of the admin account                                    | nil                               |
 | `admin.existingSecret`             | Name of the secret which contains the admin account                             |                                   |
 | `admin.userKey`                    | Key of the username in the secret                                               |                                   |
-| `admin.PasswordKey`                | Key of the password in the secret                                               |                                   |
+| `admin.passwordKey`                | Key of the password in the secret                                               |                                   |
 | `admin`                            | Spec for the definition of the admin account                                    |                                   |
 | `datasources`                      | Spec for additional datasources                                                 | nil                               |
 | `datasources.name`                 | Name of the datasource                                                          |                                   |

diff --git a/internal/bundle/application/applications/grafana/helm.go b/internal/bundle/application/applications/grafana/helm.go
@@ -118,10 +118,13 @@ func (g *Grafana) SpecToHelmValues(monitor mntr.Monitor, toolset *toolsetsv1beta
 	}
 
 	if toolset.Grafana.Admin != nil {
-		values.Grafana.Admin.ExistingSecret = toolset.Grafana.Admin.ExistingSecret
-		values.Grafana.Admin.UserKey = toolset.Grafana.Admin.UserKey
-		values.Grafana.Admin.PasswordKey = toolset.Grafana.Admin.PasswordKey
+		values.Grafana.Admin = &helm.Admin{
+			ExistingSecret: toolset.Grafana.Admin.ExistingSecret,
+			UserKey:        toolset.Grafana.Admin.UserKey,
+			PasswordKey:    toolset.Grafana.Admin.PasswordKey,
+		}
 	}
+
 	if toolset.Grafana.Storage != nil {
 		values.Grafana.Persistence.Enabled = true
 		values.Grafana.Persistence.Size = toolset.Grafana.Storage.Size