From fce0d3e5b4077fb407c241bfc352873e09024e54 Mon Sep 17 00:00:00 2001 From: Samuli Silvius Date: Mon, 24 Jun 2019 15:11:58 +0000 Subject: Update git submodules * Update docs/submodules/oom/offline-installer.git from branch 'master' to 4ea85321ebdd8b24b3cb732776e3847a03c993e7 - Merge changes from topic "kubernetes-inventory-groups" * changes: Add etcd group support to rke role Add kubernetes-etcd group Make rke to use new group structure Add kubernetes-node group for workers - Add etcd group support to rke role Etcd cluster is now placed in members of kubernetes-etcd group instead of kubernetes-node. Due to defaults, it means infra is the only etcd by default. Change-Id: Iae05a42442849e4a248d73c2d78f5e2b0eae7255 Issue-ID: OOM-1778 Signed-off-by: Michal Zegan - Add kubernetes-etcd group This group will contain kubernetes etcd cluster. It is separated from kubernetes control plane and, especially, nodes. There are of course no restrictions as to which machines can be etcd. Default is infrastructure-server. Change-Id: I8d3ab9b9e4680f57ea8f595d7be3ed6e2d32764c Issue-ID: OOM-1778 Signed-off-by: Michal Zegan - Make rke to use new group structure Rke playbook/role is modified to take advantage of the new group structure. Namely, all members of kubernetes group are treated as cluster members independent of their role. The role itself is selected in cluster.yml.j2 template based on actual membership in either kubernetes-node or kubernetes-control-plane group. Change-Id: I9a5bbfd090aff17018a610a01d6f88d848fc26c4 Issue-ID: OOM-1778 Signed-off-by: Michal Zegan - Add kubernetes-node group for workers Moved all kubernetes nodes from the kubernetes to kubernetes-node group, and made the kubernetes group a parent of both kubernetes-node and kubernetes-control-plane. The reason is that we still need to have separate groups for control planes and for nodes, but some operations are performed equally on any kind of kubernetes cluster member, and currently one would need to separately include all related groups one by one. Example of such common operation is installation of docker, that was not performed for kubernetes-control-plane group, so that docker was not installed on control planes that were neither infra nor nodes. The side effect of this change is that if infrastructure server is also a cluster member, it lands in a kubernetes group by default, and node specific setup would be performed on it. For that reason, playbook is modified to perform this setup on all kubernetes cluster members except the infra server. Change-Id: Ic827002d28e535334dbab7e5ad4aed8aa95c97a9 Issue-ID: OOM-1778 Signed-off-by: Michal Zegan --- docs/submodules/oom/offline-installer.git | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/submodules/oom/offline-installer.git b/docs/submodules/oom/offline-installer.git index 70f9f3024..4ea85321e 160000 --- a/docs/submodules/oom/offline-installer.git +++ b/docs/submodules/oom/offline-installer.git @@ -1 +1 @@ -Subproject commit 70f9f3024318d7e85c3dabe430175dcf03540a0e +Subproject commit 4ea85321ebdd8b24b3cb732776e3847a03c993e7 -- cgit 1.2.3-korg