summaryrefslogtreecommitdiff
path: root/inventory
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2020-05-16 19:23:20 +0200
committerChristian Pointner <equinox@spreadspace.org>2020-05-16 19:23:20 +0200
commita7e29b93eefbc82c7740d45da0cc1e61a286a241 (patch)
tree5f411d5374fb72c2e6c8b9bbbac6042b465694d2 /inventory
parentadd apt-repo/base and backports (diff)
kubernetes: set cgroup driver to systemd, enable metrics-server and node-local-dns
Diffstat (limited to 'inventory')
-rw-r--r--inventory/group_vars/k8s-emc/main.yml2
-rw-r--r--inventory/group_vars/k8s-lwl/main.yml2
-rw-r--r--inventory/group_vars/kubernetes-cluster/vars.yml2
-rw-r--r--inventory/group_vars/kubernetes/vars.yml6
-rw-r--r--inventory/host_vars/sk-cloudia/vars.yml1
-rw-r--r--inventory/hosts.ini17
6 files changed, 29 insertions, 1 deletions
diff --git a/inventory/group_vars/k8s-emc/main.yml b/inventory/group_vars/k8s-emc/main.yml
index 367fcda9..605c7310 100644
--- a/inventory/group_vars/k8s-emc/main.yml
+++ b/inventory/group_vars/k8s-emc/main.yml
@@ -50,3 +50,5 @@ kubeguard:
ele-helene: eno2
kubernetes_overlay_node_ip: "{{ kubernetes.pod_ip_range | ipsubnet(kubernetes.pod_ip_range_size, kubeguard.node_index[inventory_hostname]) | ipaddr(1) | ipaddr('address') }}"
+
+kubernetes_metrics_server_version: 0.3.6
diff --git a/inventory/group_vars/k8s-lwl/main.yml b/inventory/group_vars/k8s-lwl/main.yml
index 3827841a..791e393f 100644
--- a/inventory/group_vars/k8s-lwl/main.yml
+++ b/inventory/group_vars/k8s-lwl/main.yml
@@ -47,3 +47,5 @@ kubeguard:
lw-helene: eno2
kubernetes_overlay_node_ip: "{{ kubernetes.pod_ip_range | ipsubnet(kubernetes.pod_ip_range_size, kubeguard.node_index[inventory_hostname]) | ipaddr(1) | ipaddr('address') }}"
+
+kubernetes_metrics_server_version: 0.3.6
diff --git a/inventory/group_vars/kubernetes-cluster/vars.yml b/inventory/group_vars/kubernetes-cluster/vars.yml
new file mode 100644
index 00000000..c1149988
--- /dev/null
+++ b/inventory/group_vars/kubernetes-cluster/vars.yml
@@ -0,0 +1,2 @@
+---
+kubernetes_nodelocal_dnscache_ip: 169.254.20.10
diff --git a/inventory/group_vars/kubernetes/vars.yml b/inventory/group_vars/kubernetes/vars.yml
new file mode 100644
index 00000000..a0e08c5c
--- /dev/null
+++ b/inventory/group_vars/kubernetes/vars.yml
@@ -0,0 +1,6 @@
+---
+kubernetes_cri_sockets:
+ containerd: "unix:///run/containerd/containerd.sock"
+ docker: ""
+
+kubernetes_cri_socket: "{{ kubernetes_cri_sockets[kubernetes_container_runtime] }}"
diff --git a/inventory/host_vars/sk-cloudia/vars.yml b/inventory/host_vars/sk-cloudia/vars.yml
index 44090907..afeee13d 100644
--- a/inventory/host_vars/sk-cloudia/vars.yml
+++ b/inventory/host_vars/sk-cloudia/vars.yml
@@ -37,7 +37,6 @@ kubernetes_standalone_max_pods: 42
kubernetes_standalone_resolv_conf: /var/run/systemd/resolve/resolv.conf
kubernetes_standalone_pod_cidr: 192.168.255.0/24
kubernetes_standalone_cni_variant: with-localonly-portmap
-kubernetes_cri_socket: "unix:///run/containerd/containerd.sock"
acmetool_directory_server: "{{ acmetool_directory_server_le_live_v2 }}"
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index 24f2c438..89d073a8 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -296,6 +296,22 @@ ele-dolmetsch-ctl
ele-dolmetsch-raspi
+
+[kubernetes-cluster:children]
+k8s-emc
+k8s-lwl
+
+[standalone-kubelet]
+sk-cloudia
+ele-thetys
+lw-thetys
+
+[kubernetes:children]
+kubernetes-cluster
+standalone-kubelet
+
+
+
### Kubernetes Cluster: emc
[k8s-emc-encoder]
#ele-dione
@@ -323,6 +339,7 @@ elevate
k8s-emc
+
### Kubernetes Cluster: lendwirbel-live
[k8s-lwl-encoder]
lw-dione