diff --git a/.gitignore b/.gitignore index 6a2fe53..b251308 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ result result-* gcroots/ +ca diff --git a/clusters/kube1/bootstrap.conf b/clusters/kube1/bootstrap.conf new file mode 100644 index 0000000..c84732f --- /dev/null +++ b/clusters/kube1/bootstrap.conf @@ -0,0 +1,19 @@ +acme_email="innovasjon@itpartner.no" +grafana_smtp_user="utvikling" +grafana_smtp_password="S0m3rp0m@de#21!" +fileserver="fs0-0" +read -r -d '' grafana_ldap_toml << EOM +verbose_logging = true + +[[servers]] +host = "itp-dc1.itpartner.intern" +port = 636 +use_ssl = true +start_tls = false +ssl_skip_verify = true +bind_dn = "gitlab@itpartner.intern" +bind_password = "hipp hopp snipp snopp" +search_filter = "(&(objectClass=user)(objectClass=person)(|(sAMAccountName=%s)(mail=%s)))" +search_base_dns = ["DC=itpartner,DC=intern"] +EOM +# vim:ft=sh diff --git a/lib/k8s.nix b/lib/k8s.nix index 4d06fe2..3781f1a 100644 --- a/lib/k8s.nix +++ b/lib/k8s.nix @@ -18,6 +18,7 @@ let buildCommand = '' mkdir -p $out cp -r $src/* $out + cp ${here}/bootstrap.conf $out/${settings.clusterName}.conf ''; }; diff --git a/lib/kube-system-bootstrap b/lib/kube-system-bootstrap index addf50b..69f3df7 160000 --- a/lib/kube-system-bootstrap +++ b/lib/kube-system-bootstrap @@ -1 +1 @@ -Subproject commit addf50bbc0f35c7d6d4bd91754392102cc4c5cd5 +Subproject commit 69f3df716cdc71dd896366959e5468183995b55b