Merge pull request #6 from solidnerd/add-latest-docker-support

Support now docker 18.06 as default
solidnerd · Oct 10, 2018 · f92413c · f92413c
2 parents d327535 + 1323032
commit f92413c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -18,7 +18,9 @@ $ ./install-plugin.sh
 $ terraform init
 $ terraform apply
 $ KUBECONFIG=secrets/admin.conf kubectl get nodes
-$ KUBECONFIG=secrets/admin.conf kubectl apply -f https://docs.projectcalico.org/v3.0/getting-started/kubernetes/installation/hosted/kubeadm/1.7/calico.yaml
+$ KUBECONFIG=secrets/admin.conf kubectl apply -f https://docs.projectcalico.org/v3.2/getting-started/kubernetes/installation/hosted/etcd.yaml
+$ KUBECONFIG=secrets/admin.conf kubectl apply -f https://docs.projectcalico.org/v3.2/getting-started/kubernetes/installation/rbac.yaml
+$ KUBECONFIG=secrets/admin.conf kubectl apply -f https://docs.projectcalico.org/v3.2/getting-started/kubernetes/installation/hosted/calico.yaml
 $ KUBECONFIG=secrets/admin.conf kubectl get pods --namespace=kube-system -o wide
 $ KUBECONFIG=secrets/admin.conf kubectl run nginx --image=nginx
 $ KUBECONFIG=secrets/admin.conf kubectl expose deploy nginx --port=80 --type NodePort
@@ -37,8 +39,8 @@ $ KUBECONFIG=secrets/admin.conf kubectl expose deploy nginx --port=80 --type Nod
 | `node_type`              | `cx11`          | Machine type for more types have a look at https://www.hetzner.de/cloud | No       |
 | `ssh_private_key`                    | `~/.ssh/id_ed25519`    | Private Key to access the machines       |
 | `ssh_public_key`          | `~/.ssh/id_ed25519.pub`          | Public Key to authorized the access for the machines                                                     | No       |
-| `docker_version`         | `17.03`          | Docker CE version that will be installed                                                     | No       |
-| `kubernetes_version`         | `1.10.0`          | Kubernetes version that will be installed                                                     | No       |
+| `docker_version`         | `18.06`          | Docker CE version that will be installed                                                     | No       |
+| `kubernetes_version`         | `1.12.0`          | Kubernetes version that will be installed                                                     | No       |
 | `core_dns`         | `false`          | Enables CoreDNS as Service Discovery                                                     | No       |
 
 All variables cloud be passed through `environment variables` or a `tfvars` file.

diff --git a/files/10-kubeadm.conf b/files/10-kubeadm.conf
@@ -4,7 +4,6 @@ Environment="KUBELET_SYSTEM_PODS_ARGS=--pod-manifest-path=/etc/kubernetes/manife
 Environment="KUBELET_NETWORK_ARGS=--network-plugin=cni --cni-conf-dir=/etc/cni/net.d --cni-bin-dir=/opt/cni/bin"
 Environment="KUBELET_DNS_ARGS=--cluster-dns=10.96.0.10 --cluster-domain=cluster.local"
 Environment="KUBELET_AUTHZ_ARGS=--authorization-mode=Webhook --client-ca-file=/etc/kubernetes/pki/ca.crt"
-Environment="KUBELET_CADVISOR_ARGS=--cadvisor-port=0"
 Environment="KUBELET_CERTIFICATE_ARGS=--rotate-certificates=true --cert-dir=/var/lib/kubelet/pki"
 ExecStart=
-ExecStart=/usr/bin/kubelet $KUBELET_KUBECONFIG_ARGS $KUBELET_SYSTEM_PODS_ARGS $KUBELET_NETWORK_ARGS $KUBELET_DNS_ARGS $KUBELET_AUTHZ_ARGS $KUBELET_CADVISOR_ARGS $KUBELET_CERTIFICATE_ARGS $KUBELET_EXTRA_ARGS
+ExecStart=/usr/bin/kubelet $KUBELET_KUBECONFIG_ARGS $KUBELET_SYSTEM_PODS_ARGS $KUBELET_NETWORK_ARGS $KUBELET_DNS_ARGS $KUBELET_AUTHZ_ARGS $KUBELET_CERTIFICATE_ARGS $KUBELET_EXTRA_ARGS
diff --git a/variables.tf b/variables.tf
@@ -35,11 +35,11 @@ variable "ssh_public_key" {
 }
 
 variable "docker_version" {
-  default = "17.03"
+  default = "18.06"
 }
 
 variable "kubernetes_version" {
-  default = "1.10.0"
+  default = "1.12.0"
 }
 
 variable "core_dns" {