summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dan/ele-thetys.yml3
-rw-r--r--inventory/host_vars/ele-thetys.yml11
-rw-r--r--roles/kubernetes/base/tasks/main.yml4
-rw-r--r--roles/kubernetes/standalone/templates/kubelet.service.override.j21
4 files changed, 16 insertions, 3 deletions
diff --git a/dan/ele-thetys.yml b/dan/ele-thetys.yml
index eca748e9..4024989d 100644
--- a/dan/ele-thetys.yml
+++ b/dan/ele-thetys.yml
@@ -8,4 +8,5 @@
- role: admin-user
- role: blackmagic-desktopvideo
- role: apt-repo/spreadspace
- - role: docker
+ - role: kubernetes/base
+ - role: kubernetes/standalone
diff --git a/inventory/host_vars/ele-thetys.yml b/inventory/host_vars/ele-thetys.yml
index 5740b206..51dcf1a0 100644
--- a/inventory/host_vars/ele-thetys.yml
+++ b/inventory/host_vars/ele-thetys.yml
@@ -28,3 +28,14 @@ docker_lvm:
lv: docker
size: 10G
fs: ext4
+
+kubelet_lvm:
+ vg: "{{ host_name }}"
+ lv: kubelet
+ size: 5G
+ fs: ext4
+
+kubernetes_version: 1.17.2
+kubernetes_container_runtime: docker
+kubernetes_standalone_max_pods: 42
+kubernetes_standalone_cni_variant: with-portmap
diff --git a/roles/kubernetes/base/tasks/main.yml b/roles/kubernetes/base/tasks/main.yml
index c3ab1c02..f1802b0c 100644
--- a/roles/kubernetes/base/tasks/main.yml
+++ b/roles/kubernetes/base/tasks/main.yml
@@ -69,11 +69,11 @@
- name: add dummy group with gid 998
group:
name: app
- gid: 998
+ gid: 990
- name: add dummy user with uid 998
user:
name: app
- uid: 998
+ uid: 990
group: app
password: "!"
diff --git a/roles/kubernetes/standalone/templates/kubelet.service.override.j2 b/roles/kubernetes/standalone/templates/kubelet.service.override.j2
index 3a88ccd2..75061e73 100644
--- a/roles/kubernetes/standalone/templates/kubelet.service.override.j2
+++ b/roles/kubernetes/standalone/templates/kubelet.service.override.j2
@@ -6,4 +6,5 @@ ExecStart=/usr/bin/kubelet \
--container-runtime=remote \
--container-runtime-endpoint=unix:///run/containerd/containerd.sock \
{% endif %}
+ --network-plugin=cni \
--cloud-provider=