| commit | 41ffdfa944f6f7857a7c0818cc38b1f9ca0d4f31 | [log] [tgz] |
|---|---|---|
| author | Sergey Kolekonov <skolekonov@mirantis.com> | Tue Oct 30 19:47:23 2018 +0000 |
| committer | Sergey Kolekonov <skolekonov@mirantis.com> | Tue Oct 30 19:47:23 2018 +0000 |
| tree | 92e91f294ffb9fd62ae88ff089c3a267f18a229c | |
| parent | 8ad2959152a428c60faf86ba6f49a2635466f618 [diff] |
Revert "Create k8s server certs directly on ctl nodes" This reverts commit 8ad2959152a428c60faf86ba6f49a2635466f618. Change-Id: Ibbf884173eaf0145f3e4de21f20dad9538138bd0
diff --git a/classes/cluster/sl-k8s-calico/infra/config.yml b/classes/cluster/sl-k8s-calico/infra/config.yml index 4e98584..5cf7d6c 100644 --- a/classes/cluster/sl-k8s-calico/infra/config.yml +++ b/classes/cluster/sl-k8s-calico/infra/config.yml
@@ -5,6 +5,7 @@ - system.salt.master.pkg - system.salt.minion.ca.salt_master - system.salt.master.api +- system.salt.minion.cert.k8s_server - system.mysql.client - system.mysql.client.database.grafana - system.reclass.storage.salt
diff --git a/classes/cluster/sl-k8s-calico/kubernetes/control.yml b/classes/cluster/sl-k8s-calico/kubernetes/control.yml index bd254a5..a316fb8 100644 --- a/classes/cluster/sl-k8s-calico/kubernetes/control.yml +++ b/classes/cluster/sl-k8s-calico/kubernetes/control.yml
@@ -1,6 +1,5 @@ classes: - system.etcd.server.cluster -- system.salt.minion.cert.k8s_server - service.kubernetes.control.cluster - system.haproxy.proxy.listen.kubernetes.apiserver - system.keepalived.cluster.instance.kube_api_server_vip