Make it easy to rebuild the password file

Signed-off-by: Pete Wall <pete.wall@grafana.com>
grafana · Nov 25, 2024 · fc2f537 · fc2f537
1 parent 2d1654d
commit fc2f537
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/charts/k8s-monitoring/tests/integration/auth/configs/.gitignore b/charts/k8s-monitoring/tests/integration/auth/configs/.gitignore
@@ -0,0 +1 @@
+htpasswd
diff --git a/charts/k8s-monitoring/tests/integration/auth/configs/Makefile b/charts/k8s-monitoring/tests/integration/auth/configs/Makefile
@@ -0,0 +1,6 @@
+htpasswd:
+	htpasswd -c -B -b htpasswd promuser prompassword
+	htpasswd -B -b htpasswd oteluser otelpassword
+
+passwords.yaml: htpasswd
+	kubectl create secret generic passwords --from-file=htpasswd -o yaml --dry-run=client > passwords.yaml
diff --git a/charts/k8s-monitoring/tests/integration/auth/configs/passwords.yaml b/charts/k8s-monitoring/tests/integration/auth/configs/passwords.yaml
@@ -1,9 +1,7 @@
----
 apiVersion: v1
+data:
+  htpasswd: cHJvbXVzZXI6JDJ5JDA1JGhuSkJnLzM2QWFkY0RBUG1xazZacE9UaTl6ZHkycG9uU1FXYjFuZzBQOEsvejlJSnhZUHRTCm90ZWx1c2VyOiQyeSQwNSQ5aHpUdFZGRnBxY3U5NnZWTmRlcmt1Tzc0Tk43M0hiaU1MY0JObTdtWWxlaTluVVJxRGI2aQo=
 kind: Secret
 metadata:
+  creationTimestamp: null
   name: passwords
-stringData:
-  htpasswd: |-
-    promuser:$1$U8rZL/KV$zJKBFBZnXXBc.kztxoGg2.:prompassword
-    oteluser:$1$yO5Ig8p/$j.1w61d8O8rTF9c0xAXPo/:otelpassword