diff options
-rw-r--r-- | playbooks/k8s-emc.yml | 12 | ||||
-rw-r--r-- | roles/kubernetes/base/files/kubernetes-apt-key.asc (renamed from roles/kubernetes-base/files/kubernetes-apt-key.asc) | 0 | ||||
-rw-r--r-- | roles/kubernetes/base/handlers/main.yml (renamed from roles/kubernetes-base/handlers/main.yml) | 0 | ||||
-rw-r--r-- | roles/kubernetes/base/meta/main.yml (renamed from roles/kubernetes-base/meta/main.yml) | 0 | ||||
-rw-r--r-- | roles/kubernetes/base/tasks/main.yml (renamed from roles/kubernetes-base/tasks/main.yml) | 0 | ||||
-rw-r--r-- | roles/kubernetes/base/templates/20-dns.conf.j2 (renamed from roles/kubernetes-base/templates/20-dns.conf.j2) | 0 | ||||
-rw-r--r-- | roles/kubernetes/base/templates/50-extra.conf.j2 (renamed from roles/kubernetes-base/templates/50-extra.conf.j2) | 0 | ||||
-rw-r--r-- | roles/kubernetes/master/tasks/main.yml (renamed from roles/kubernetes-master/tasks/main.yml) | 2 | ||||
-rw-r--r-- | roles/kubernetes/net/files/daemon.json (renamed from roles/kubernetes-net/files/daemon.json) | 0 | ||||
-rw-r--r-- | roles/kubernetes/net/files/kubenet-interfaces.service (renamed from roles/kubernetes-net/files/kubenet-interfaces.service) | 0 | ||||
-rw-r--r-- | roles/kubernetes/net/filter_plugins/kubenet.py (renamed from roles/kubernetes-net/filter_plugins/kubenet.py) | 0 | ||||
-rw-r--r-- | roles/kubernetes/net/handlers/main.yml (renamed from roles/kubernetes-net/handlers/main.yml) | 0 | ||||
-rw-r--r-- | roles/kubernetes/net/meta/main.yml (renamed from roles/kubernetes-net/meta/main.yml) | 0 | ||||
-rw-r--r-- | roles/kubernetes/net/tasks/add.yml (renamed from roles/kubernetes-net/tasks/add.yml) | 0 | ||||
-rw-r--r-- | roles/kubernetes/net/tasks/main.yml (renamed from roles/kubernetes-net/tasks/main.yml) | 0 | ||||
-rw-r--r-- | roles/kubernetes/net/tasks/remove.yml (renamed from roles/kubernetes-net/tasks/remove.yml) | 0 | ||||
-rw-r--r-- | roles/kubernetes/net/templates/ifupdown.sh.j2 (renamed from roles/kubernetes-net/templates/ifupdown.sh.j2) | 0 | ||||
-rw-r--r-- | roles/kubernetes/net/templates/k8s.json.j2 (renamed from roles/kubernetes-net/templates/k8s.json.j2) | 0 | ||||
-rw-r--r-- | roles/kubernetes/net/templates/kubenet-peer.service.j2 (renamed from roles/kubernetes-net/templates/kubenet-peer.service.j2) | 0 | ||||
-rw-r--r-- | roles/kubernetes/node/tasks/add.yml (renamed from roles/kubernetes-node/tasks/add.yml) | 0 | ||||
-rw-r--r-- | roles/kubernetes/node/tasks/main.yml (renamed from roles/kubernetes-node/tasks/main.yml) | 0 | ||||
-rw-r--r-- | roles/kubernetes/node/tasks/remove.yml (renamed from roles/kubernetes-node/tasks/remove.yml) | 0 |
22 files changed, 7 insertions, 7 deletions
diff --git a/playbooks/k8s-emc.yml b/playbooks/k8s-emc.yml index b47ed5fc..b6f09808 100644 --- a/playbooks/k8s-emc.yml +++ b/playbooks/k8s-emc.yml @@ -34,18 +34,18 @@ ## upon first startup (the first time this playbook runs on a specific host). ## Since it is a tedious task to remove the interface and the firewall rules it is much ## easier to just run `net` before `base` as `net` does not need anything from `base`. - - role: kubernetes-net - - role: kubernetes-base + - role: kubernetes/net + - role: kubernetes/base - name: configure kubernetes master hosts: k8s-emc-master roles: - - role: kubernetes-master + - role: kubernetes/master - name: configure kubernetes nodes hosts: k8s-emc:!k8s-emc-master roles: - - role: kubernetes-node + - role: kubernetes/node ######## - name: check for nodes to be removed @@ -74,8 +74,8 @@ vars: k8s_remove_node: yes roles: - - role: kubernetes-node - - role: kubernetes-net + - role: kubernetes/node + - role: kubernetes/net - name: remove node from api server hosts: k8s-emc-master diff --git a/roles/kubernetes-base/files/kubernetes-apt-key.asc b/roles/kubernetes/base/files/kubernetes-apt-key.asc index 10af13ea..10af13ea 100644 --- a/roles/kubernetes-base/files/kubernetes-apt-key.asc +++ b/roles/kubernetes/base/files/kubernetes-apt-key.asc diff --git a/roles/kubernetes-base/handlers/main.yml b/roles/kubernetes/base/handlers/main.yml index b61c1417..b61c1417 100644 --- a/roles/kubernetes-base/handlers/main.yml +++ b/roles/kubernetes/base/handlers/main.yml diff --git a/roles/kubernetes-base/meta/main.yml b/roles/kubernetes/base/meta/main.yml index 724b20f1..724b20f1 100644 --- a/roles/kubernetes-base/meta/main.yml +++ b/roles/kubernetes/base/meta/main.yml diff --git a/roles/kubernetes-base/tasks/main.yml b/roles/kubernetes/base/tasks/main.yml index cc3bc83a..cc3bc83a 100644 --- a/roles/kubernetes-base/tasks/main.yml +++ b/roles/kubernetes/base/tasks/main.yml diff --git a/roles/kubernetes-base/templates/20-dns.conf.j2 b/roles/kubernetes/base/templates/20-dns.conf.j2 index 9b7ab32c..9b7ab32c 100644 --- a/roles/kubernetes-base/templates/20-dns.conf.j2 +++ b/roles/kubernetes/base/templates/20-dns.conf.j2 diff --git a/roles/kubernetes-base/templates/50-extra.conf.j2 b/roles/kubernetes/base/templates/50-extra.conf.j2 index c722ade6..c722ade6 100644 --- a/roles/kubernetes-base/templates/50-extra.conf.j2 +++ b/roles/kubernetes/base/templates/50-extra.conf.j2 diff --git a/roles/kubernetes-master/tasks/main.yml b/roles/kubernetes/master/tasks/main.yml index 43c21cae..c9092bf3 100644 --- a/roles/kubernetes-master/tasks/main.yml +++ b/roles/kubernetes/master/tasks/main.yml @@ -81,7 +81,7 @@ register: kube_ca_openssl changed_when: False -- name: set variables needed kubernetes-nodes to join the cluster +- name: set variables needed by kubernetes/nodes to join the cluster set_fact: kube_bootstrap_token: "{% if kubeadm_token_generate.stdout is defined %}{{ kubeadm_token_generate.stdout }}{% elif kubeadm_token_create.stdout is defined %}{{ kubeadm_token_create.stdout }}{% endif %}" kube_bootstrap_ca_cert_hash: "sha256:{{ kube_ca_openssl.stdout }}" diff --git a/roles/kubernetes-net/files/daemon.json b/roles/kubernetes/net/files/daemon.json index 28001640..28001640 100644 --- a/roles/kubernetes-net/files/daemon.json +++ b/roles/kubernetes/net/files/daemon.json diff --git a/roles/kubernetes-net/files/kubenet-interfaces.service b/roles/kubernetes/net/files/kubenet-interfaces.service index f27fb85b..f27fb85b 100644 --- a/roles/kubernetes-net/files/kubenet-interfaces.service +++ b/roles/kubernetes/net/files/kubenet-interfaces.service diff --git a/roles/kubernetes-net/filter_plugins/kubenet.py b/roles/kubernetes/net/filter_plugins/kubenet.py index c1312dd8..c1312dd8 100644 --- a/roles/kubernetes-net/filter_plugins/kubenet.py +++ b/roles/kubernetes/net/filter_plugins/kubenet.py diff --git a/roles/kubernetes-net/handlers/main.yml b/roles/kubernetes/net/handlers/main.yml index bb7fde2b..bb7fde2b 100644 --- a/roles/kubernetes-net/handlers/main.yml +++ b/roles/kubernetes/net/handlers/main.yml diff --git a/roles/kubernetes-net/meta/main.yml b/roles/kubernetes/net/meta/main.yml index 03dfcb23..03dfcb23 100644 --- a/roles/kubernetes-net/meta/main.yml +++ b/roles/kubernetes/net/meta/main.yml diff --git a/roles/kubernetes-net/tasks/add.yml b/roles/kubernetes/net/tasks/add.yml index f4e422c6..f4e422c6 100644 --- a/roles/kubernetes-net/tasks/add.yml +++ b/roles/kubernetes/net/tasks/add.yml diff --git a/roles/kubernetes-net/tasks/main.yml b/roles/kubernetes/net/tasks/main.yml index 8c94292e..8c94292e 100644 --- a/roles/kubernetes-net/tasks/main.yml +++ b/roles/kubernetes/net/tasks/main.yml diff --git a/roles/kubernetes-net/tasks/remove.yml b/roles/kubernetes/net/tasks/remove.yml index 6695bd5d..6695bd5d 100644 --- a/roles/kubernetes-net/tasks/remove.yml +++ b/roles/kubernetes/net/tasks/remove.yml diff --git a/roles/kubernetes-net/templates/ifupdown.sh.j2 b/roles/kubernetes/net/templates/ifupdown.sh.j2 index 995d358b..995d358b 100644 --- a/roles/kubernetes-net/templates/ifupdown.sh.j2 +++ b/roles/kubernetes/net/templates/ifupdown.sh.j2 diff --git a/roles/kubernetes-net/templates/k8s.json.j2 b/roles/kubernetes/net/templates/k8s.json.j2 index f457ed1c..f457ed1c 100644 --- a/roles/kubernetes-net/templates/k8s.json.j2 +++ b/roles/kubernetes/net/templates/k8s.json.j2 diff --git a/roles/kubernetes-net/templates/kubenet-peer.service.j2 b/roles/kubernetes/net/templates/kubenet-peer.service.j2 index bee211af..bee211af 100644 --- a/roles/kubernetes-net/templates/kubenet-peer.service.j2 +++ b/roles/kubernetes/net/templates/kubenet-peer.service.j2 diff --git a/roles/kubernetes-node/tasks/add.yml b/roles/kubernetes/node/tasks/add.yml index dd784b35..dd784b35 100644 --- a/roles/kubernetes-node/tasks/add.yml +++ b/roles/kubernetes/node/tasks/add.yml diff --git a/roles/kubernetes-node/tasks/main.yml b/roles/kubernetes/node/tasks/main.yml index d078d2fb..d078d2fb 100644 --- a/roles/kubernetes-node/tasks/main.yml +++ b/roles/kubernetes/node/tasks/main.yml diff --git a/roles/kubernetes-node/tasks/remove.yml b/roles/kubernetes/node/tasks/remove.yml index 95787629..95787629 100644 --- a/roles/kubernetes-node/tasks/remove.yml +++ b/roles/kubernetes/node/tasks/remove.yml |