Merge branch 'master' into multi-arch-support

This commit is contained in:
Antoine Legrand
2018-08-17 16:35:50 +02:00
committed by GitHub
191 changed files with 2050 additions and 2634 deletions

View File

@@ -60,6 +60,9 @@ dashboard_certs_secret_name: kubernetes-dashboard-certs
dashboard_tls_key_file: dashboard.key
dashboard_tls_cert_file: dashboard.crt
# Override dashboard default settings
dashboard_token_ttl: 900
# SSL
etcd_cert_dir: "/etc/ssl/etcd/ssl"
canal_cert_dir: "/etc/canal/certs"