diff options
| -rw-r--r-- | common/kubernetes-cleanup.yml | 4 | ||||
| -rw-r--r-- | common/kubernetes.yml | 2 | ||||
| -rw-r--r-- | inventory/group_vars/elevate-festival/main.yml | 4 | ||||
| -rw-r--r-- | roles/kubernetes/net/kubeguard/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/kubernetes/net/kubeguard/node/files/kubeguard-interfaces.service (renamed from roles/kubernetes/net/kubeguard/files/kubeguard-interfaces.service) | 0 | ||||
| -rw-r--r-- | roles/kubernetes/net/kubeguard/node/filter_plugins/kubeguard.py (renamed from roles/kubernetes/net/kubeguard/filter_plugins/kubeguard.py) | 0 | ||||
| -rw-r--r-- | roles/kubernetes/net/kubeguard/node/handlers/main.yml (renamed from roles/kubernetes/net/kubeguard/handlers/main.yml) | 0 | ||||
| -rw-r--r-- | roles/kubernetes/net/kubeguard/node/tasks/main.yml (renamed from roles/kubernetes/net/kubeguard/tasks/add.yml) | 0 | ||||
| -rw-r--r-- | roles/kubernetes/net/kubeguard/node/templates/ifupdown.sh.j2 (renamed from roles/kubernetes/net/kubeguard/templates/ifupdown.sh.j2) | 0 | ||||
| -rw-r--r-- | roles/kubernetes/net/kubeguard/node/templates/k8s.json.j2 (renamed from roles/kubernetes/net/kubeguard/templates/k8s.json.j2) | 0 | ||||
| -rw-r--r-- | roles/kubernetes/net/kubeguard/node/templates/kubeguard-peer.service.j2 (renamed from roles/kubernetes/net/kubeguard/templates/kubeguard-peer.service.j2) | 0 | ||||
| -rw-r--r-- | roles/kubernetes/net/kubeguard/reset/tasks/main.yml (renamed from roles/kubernetes/net/kubeguard/tasks/remove.yml) | 0 | ||||
| -rw-r--r-- | roles/kubernetes/net/kubeguard/tasks/main.yml | 3 |
13 files changed, 4 insertions, 11 deletions
diff --git a/common/kubernetes-cleanup.yml b/common/kubernetes-cleanup.yml index 41678204..83d6945c 100644 --- a/common/kubernetes-cleanup.yml +++ b/common/kubernetes-cleanup.yml @@ -32,7 +32,5 @@ hosts: _kubernetes_nodes_remove_ roles: - role: kubernetes/kubeadm/reset - - role: kubernetes/net/kubeguard + - role: kubernetes/net/kubeguard/reset when: hostvars[groups['_kubernetes_primary_master_'][0]].kubernetes_network_plugin == 'kubeguard' - vars: - kubeguard_action: remove diff --git a/common/kubernetes.yml b/common/kubernetes.yml index 27da0bf1..d970c1fe 100644 --- a/common/kubernetes.yml +++ b/common/kubernetes.yml @@ -40,7 +40,7 @@ roles: - role: apt-repo/spreadspace when: kubernetes_network_plugin == 'kubeguard' - - role: kubernetes/net/kubeguard + - role: kubernetes/net/kubeguard/node when: kubernetes_network_plugin == 'kubeguard' - role: kubernetes/base - role: kubernetes/kubeadm/base diff --git a/inventory/group_vars/elevate-festival/main.yml b/inventory/group_vars/elevate-festival/main.yml index eaa11e26..7e0dd111 100644 --- a/inventory/group_vars/elevate-festival/main.yml +++ b/inventory/group_vars/elevate-festival/main.yml @@ -197,13 +197,13 @@ network_zones: vlan: 502 dom_im_berg: - description: "public wifi at Dom im Berg run by Spielstätten, i.e. used for infobeamer" + description: "public wifi at Dom im Berg operated by Spielstätten (used by infobeamer)" wifi: ssid: Dom key: "{{ vault_wifi_keys.dom_im_berg }}" funkfeuer: - description: "funkfeuer access, subnet will be announced using HNA by olsr" + description: "funkfeuer access, subnet will be announced by olsr using HNA" vlan: 511 prefix: 10.12.241.128/28 gateway: 10.12.241.142 diff --git a/roles/kubernetes/net/kubeguard/defaults/main.yml b/roles/kubernetes/net/kubeguard/defaults/main.yml deleted file mode 100644 index acabaa25..00000000 --- a/roles/kubernetes/net/kubeguard/defaults/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -kubeguard_action: add diff --git a/roles/kubernetes/net/kubeguard/files/kubeguard-interfaces.service b/roles/kubernetes/net/kubeguard/node/files/kubeguard-interfaces.service index 35fc8f90..35fc8f90 100644 --- a/roles/kubernetes/net/kubeguard/files/kubeguard-interfaces.service +++ b/roles/kubernetes/net/kubeguard/node/files/kubeguard-interfaces.service diff --git a/roles/kubernetes/net/kubeguard/filter_plugins/kubeguard.py b/roles/kubernetes/net/kubeguard/node/filter_plugins/kubeguard.py index 199ff14b..199ff14b 100644 --- a/roles/kubernetes/net/kubeguard/filter_plugins/kubeguard.py +++ b/roles/kubernetes/net/kubeguard/node/filter_plugins/kubeguard.py diff --git a/roles/kubernetes/net/kubeguard/handlers/main.yml b/roles/kubernetes/net/kubeguard/node/handlers/main.yml index bb7fde2b..bb7fde2b 100644 --- a/roles/kubernetes/net/kubeguard/handlers/main.yml +++ b/roles/kubernetes/net/kubeguard/node/handlers/main.yml diff --git a/roles/kubernetes/net/kubeguard/tasks/add.yml b/roles/kubernetes/net/kubeguard/node/tasks/main.yml index 0658b42c..0658b42c 100644 --- a/roles/kubernetes/net/kubeguard/tasks/add.yml +++ b/roles/kubernetes/net/kubeguard/node/tasks/main.yml diff --git a/roles/kubernetes/net/kubeguard/templates/ifupdown.sh.j2 b/roles/kubernetes/net/kubeguard/node/templates/ifupdown.sh.j2 index 98b38cf4..98b38cf4 100644 --- a/roles/kubernetes/net/kubeguard/templates/ifupdown.sh.j2 +++ b/roles/kubernetes/net/kubeguard/node/templates/ifupdown.sh.j2 diff --git a/roles/kubernetes/net/kubeguard/templates/k8s.json.j2 b/roles/kubernetes/net/kubeguard/node/templates/k8s.json.j2 index 65b1357a..65b1357a 100644 --- a/roles/kubernetes/net/kubeguard/templates/k8s.json.j2 +++ b/roles/kubernetes/net/kubeguard/node/templates/k8s.json.j2 diff --git a/roles/kubernetes/net/kubeguard/templates/kubeguard-peer.service.j2 b/roles/kubernetes/net/kubeguard/node/templates/kubeguard-peer.service.j2 index 72b39c3f..72b39c3f 100644 --- a/roles/kubernetes/net/kubeguard/templates/kubeguard-peer.service.j2 +++ b/roles/kubernetes/net/kubeguard/node/templates/kubeguard-peer.service.j2 diff --git a/roles/kubernetes/net/kubeguard/tasks/remove.yml b/roles/kubernetes/net/kubeguard/reset/tasks/main.yml index d24f9eff..d24f9eff 100644 --- a/roles/kubernetes/net/kubeguard/tasks/remove.yml +++ b/roles/kubernetes/net/kubeguard/reset/tasks/main.yml diff --git a/roles/kubernetes/net/kubeguard/tasks/main.yml b/roles/kubernetes/net/kubeguard/tasks/main.yml deleted file mode 100644 index 10b0d547..00000000 --- a/roles/kubernetes/net/kubeguard/tasks/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -- name: add/remove nodes to overlay network - include_tasks: "{{ kubeguard_action }}.yml" |