Merge pull request #41 from stephenmoloney/feature/use-kubeadm-yaml-2

Introduce yaml files as config for kubeadm for v1.12+

Author: stefanprodan

kubeadm/v1alpha3-config.yaml

@@ -0,0 +1,43 @@
+---
+apiVersion: kubeadm.k8s.io/v1alpha3
+kind: InitConfiguration
+apiEndpoint:
+  advertiseAddress: CONFIG_CLUSTER_PRIVATE_IP
+  bindPort: 6443
+nodeRegistration:
+  kubeletExtraArgs:
+    "feature-gates": "BlockVolume=true,CRIContainerLogRotation=true"
+
+
+---
+apiVersion: kubeadm.k8s.io/v1alpha3
+kind: ClusterConfiguration
+kubernetesVersion: CONFIG_KUBERNETES_VERSION
+apiServerCertSANs:
+  - CONFIG_CLUSTER_PUBLIC_IP
+apiServerExtraArgs:
+  authorization-mode: Node,RBAC
+certificatesDir: /etc/kubernetes/pki
+clusterName: kubernetes
+imageRepository: k8s.gcr.io
+
+
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+containerLogMaxFiles: 1
+containerLogMaxSize: CONFIG_CONTAINER_LOG_MAX_SIZE
+maxPods: 110
+featureGates:
+  BlockVolume: true
+  CRIContainerLogRotation: true
+
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
+kind: KubeProxyConfiguration
+
+
+# ---
+# apiVersion: kubeadm.k8s.io/v1alpha3
+# kind: JoinConfiguration
+

kubeadm/v1beta1-config.yaml

@@ -0,0 +1,52 @@
+---
+apiVersion: kubeadm.k8s.io/v1beta1
+kind: InitConfiguration
+localAPIEndpoint:
+  advertiseAddress: CONFIG_CLUSTER_PRIVATE_IP
+  bindPort: 6443
+nodeRegistration:
+  kubeletExtraArgs:
+    "feature-gates": "BlockVolume=true,CRIContainerLogRotation=true"
+
+
+---
+apiVersion: kubeadm.k8s.io/v1beta1
+kind: ClusterConfiguration
+kubernetesVersion: CONFIG_KUBERNETES_VERSION
+apiServer:
+  extraArgs:
+    authorization-mode: Node,RBAC
+  certSANs:
+    - CONFIG_CLUSTER_PUBLIC_IP
+  timeoutForControlPlane: 4m0s
+controlPlaneEndpoint: CONFIG_CLUSTER_PRIVATE_IP:6443
+controllerManager:
+  extraArgs:
+    "node-cidr-mask-size": "20"
+scheduler:
+  extraArgs:
+    address: CONFIG_CLUSTER_PRIVATE_IP
+certificatesDir: /etc/kubernetes/pki
+imageRepository: k8s.gcr.io
+useHyperKubeImage: false
+
+
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+containerLogMaxFiles: 1
+containerLogMaxSize: CONFIG_CONTAINER_LOG_MAX_SIZE
+maxPods: 110
+featureGates:
+  BlockVolume: true
+  CRIContainerLogRotation: true
+
+
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
+kind: KubeProxyConfiguration
+
+
+# ---
+# apiVersion: kubeadm.k8s.io/v1beta1
+# kind: JoinConfiguration

master.tf

@@ -10,11 +10,6 @@ resource "scaleway_server" "k8s_master" {
   public_ip      = "${element(scaleway_ip.k8s_master_ip.*.ip, count.index)}"
   security_group = "${scaleway_security_group.master_security_group.id}"
 
-  //  volume {
-  //    size_in_gb = 50
-  //    type       = "l_ssd"
-  //  }
-
   connection {
     type        = "ssh"
     user        = "root"
@@ -28,13 +23,18 @@ resource "scaleway_server" "k8s_master" {
     source      = "addons/"
     destination = "/tmp"
   }
+  provisioner "file" {
+    source      = "kubeadm"
+    destination = "/tmp/"
+  }
   provisioner "remote-exec" {
     inline = [
       <<EOT
 #!/bin/bash
 set -e
 chmod +x /tmp/docker-install.sh
 chmod +x /tmp/kubeadm-install.sh
+chmod g+w -R /tmp/kubeadm/
 
 export ubuntu_version=$(echo -n ${var.ubuntu_version} | cut -d " " -f 2 | awk '{print tolower($0)}')
 /tmp/docker-install.sh $${ubuntu_version} ${var.arch} ${var.docker_version} && \
@@ -53,18 +53,37 @@ modify_kube_apiserver_config(){
 if [[ ${var.arch} == "arm" ]]; then modify_kube_apiserver_config & fi
 
 export KUBEADM_VERSION=$(apt-cache madison kubeadm | grep $(echo ${var.k8s_version} | cut -c8-) | \
-  head -1 | awk '{print $3}' | rev | cut -c4- | rev)
+  awk 'NR==1 {print $3}' | rev | cut -c4- | rev)
+
+dpkg --compare-versions "$${KUBEADM_VERSION}" lt 1.13 && \
+  export KUBEADM_CONFIG_FILE=/tmp/kubeadm/v1alpha3-config.yaml || \
+  export KUBEADM_CONFIG_FILE=/tmp/kubeadm/v1beta1-config.yaml
+
+dpkg --compare-versions "$${KUBEADM_VERSION}" lt 1.12 && \
+  export KUBEADM_CONFIG_FILE=""
 
 dpkg --compare-versions "$${KUBEADM_VERSION}" lt 1.11 && \
   export VERBOSITY_EXTRA_ARGS='' || \
   export VERBOSITY_EXTRA_ARGS='--v ${var.kubeadm_verbosity}'
 
-kubeadm init \
-  --apiserver-advertise-address=${self.private_ip} \
-  --apiserver-cert-extra-sans=${self.public_ip} \
-  --kubernetes-version=${var.k8s_version} \
-  --ignore-preflight-errors=KubeletVersion \
-  $${VERBOSITY_EXTRA_ARGS};
+if [[ -z "$${KUBEADM_CONFIG_FILE}" ]]; then
+  kubeadm init \
+    --apiserver-advertise-address=${self.private_ip} \
+    --apiserver-cert-extra-sans=${self.public_ip} \
+    --kubernetes-version=${var.k8s_version} \
+    --ignore-preflight-errors=KubeletVersion \
+     $${VERBOSITY_EXTRA_ARGS};
+else
+  sed -i 's/CONFIG_CLUSTER_PUBLIC_IP/${self.public_ip}/g' $${KUBEADM_CONFIG_FILE} && \
+  sed -i 's/CONFIG_CLUSTER_PRIVATE_IP/${self.private_ip}/g' $${KUBEADM_CONFIG_FILE} && \
+  sed -i "s/CONFIG_KUBERNETES_VERSION/v$${KUBEADM_VERSION}/g" $${KUBEADM_CONFIG_FILE} && \
+  sed -i "s/CONFIG_CONTAINER_LOG_MAX_SIZE/${var.container_log_max_size}/" $${KUBEADM_CONFIG_FILE}
+
+  kubeadm init \
+    --ignore-preflight-errors=KubeletVersion \
+    --config=$${KUBEADM_CONFIG_FILE} \
+     $${VERBOSITY_EXTRA_ARGS};
+fi && \
 
 mkdir -p $HOME/.kube && cp -i /etc/kubernetes/admin.conf $HOME/.kube/config && \
 kubectl create secret -n kube-system generic weave-passwd --from-literal=weave-passwd=${var.weave_passwd} && \

nodes.tf

@@ -10,11 +10,6 @@ resource "scaleway_server" "k8s_node" {
   public_ip      = "${element(scaleway_ip.k8s_node_ip.*.ip, count.index)}"
   security_group = "${scaleway_security_group.node_security_group.id}"
 
-  //  volume {
-  //    size_in_gb = 50
-  //    type       = "l_ssd"
-  //  }
-
   connection {
     type        = "ssh"
     user        = "root"

variables.tf

@@ -34,7 +34,7 @@ EOT
 }
 
 variable "k8s_version" {
-  default = "stable-1.12"
+  default = "stable-1.13"
 }
 
 variable "weave_passwd" {
@@ -77,6 +77,11 @@ variable "private_key" {
   description = "The path to your private key"
 }
 
+variable "container_log_max_size" {
+  default     = "100Mi"
+  description = "The maximum file size for container logs, k8s 1.12+ only"
+}
+
 variable "kubeadm_verbosity" {
   default     = "0"
   description = "The verbosity level of the kubeadm init logs"