Merge branch 'master' into master

This commit is contained in:
bobahspb
2018-03-31 21:48:39 +03:00
committed by GitHub
141 changed files with 654 additions and 262 deletions

View File

@@ -18,3 +18,5 @@ cloud_provider: gce
kube_encrypt_secret_data: true
prometheus_operator_enabled: true
k8s_metrics_enabled: true
ingress_nginx_enabled: true
cert_manager_enabled: true