From 6f6c4f974edb57f486f6dfd9d6ba0444af8ddb8b Mon Sep 17 00:00:00 2001
From: Nemo <me@captnemo.in>
Date: Sun, 13 Jan 2019 14:14:19 +0530
Subject: [PATCH] [k8s] Run kubelet using --containerized (or maybe not)
---
modules/bootkube/main.tf | 6 +++---
modules/kubelet/main.tf | 16 +++++++++++++---
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/modules/bootkube/main.tf b/modules/bootkube/main.tf
index bd4a860..00b019c 100644
--- a/modules/bootkube/main.tf
+++ a/modules/bootkube/main.tf
@@ -9,11 +9,11 @@
}
command = [
- "bootkube",
+ "/bootkube",
"render",
"--etcd-servers=https://${var.host_ip}:2379",
"--asset-dir=/home/.bootkube",
- "--api-servers=https://kubernetes.default:${var.host_port},https://${var.k8s_host}:${var.host_port},https://${var.host_ip}:${var.host_port}",
+ "--api-servers=https://${var.k8s_host}:${var.host_port},https://${var.host_ip}:${var.host_port}",
"--pod-cidr=${var.pod_cidr}",
"--network-provider=${var.network_provider}",
]
@@ -42,7 +42,7 @@
# "There is no war within the container. Here we are safe. Here we are free."
# - Docker Li agent brainwashing Nemo
command = [
- "bootkube",
+ "/bootkube",
"start",
"--asset-dir=/home/.bootkube",
]
diff --git a/modules/kubelet/main.tf b/modules/kubelet/main.tf
index 130b0b8..ea2eed8 100644
--- a/modules/kubelet/main.tf
+++ a/modules/kubelet/main.tf
@@ -73,6 +73,13 @@
read_only = true
}
+ volumes {
+ container_path = "/rootfs"
+ host_path = "/"
+ read_only = true
+ read_only = true
+ }
+
// Deviates from kubelet-wrapper
volumes {
@@ -88,7 +95,11 @@
"--cert-dir=/var/lib/kubelet/pki",
"--client-ca-file=/etc/kubernetes/ca.crt",
"--cluster_dns=${var.dns_ip}",
+ "--cluster_domain=${var.k8s_host}",
+
+ # "--containerized",
"--exit-on-lock-contention=true",
+
"--hostname-override=${var.host_ip}",
"--kubeconfig=/etc/kubernetes/kubeconfig",
"--lock-file=/var/run/lock/kubelet.lock",
@@ -98,12 +109,7 @@
"--pod-manifest-path=/etc/kubernetes/manifests",
"--read-only-port=0",
"--rotate-certificates",
- "--cluster_domain=${var.k8s_host}",
]
- host {
- host = "kubernetes.default"
- ip = "${var.host_ip}"
- }
host {
host = "${var.k8s_host}"
ip = "${var.host_ip}"
--
rgit 0.1.5