From 25a978d8ce30bdbb62a0a82443501a4f0d2d6cc2 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 11 Jan 2020 03:03:17 +0100 Subject: kuberntes: base installation works now --- roles/kubernetes/kubeadm/base/tasks/main.yml | 3 ++- roles/kubernetes/kubeadm/master/templates/kubeadm-cluster.config.j2 | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'roles/kubernetes/kubeadm') diff --git a/roles/kubernetes/kubeadm/base/tasks/main.yml b/roles/kubernetes/kubeadm/base/tasks/main.yml index 76953498..414fb67a 100644 --- a/roles/kubernetes/kubeadm/base/tasks/main.yml +++ b/roles/kubernetes/kubeadm/base/tasks/main.yml @@ -21,6 +21,7 @@ name: "/etc/default/kubelet" regexp: '^KUBELET_EXTRA_ARGS=' line: 'KUBELET_EXTRA_ARGS=--node-ip={{ kubernetes_kubelet_node_ip }}' + create: yes - name: add kubectl/kubeadm completion for shells loop: @@ -29,7 +30,7 @@ blockinfile: path: "/root/.{{ item }}rc" create: yes - marker: "### {mark} ANSIBLE MANAGED BLOCK for kubectl ###" + marker: "### {mark} ANSIBLE MANAGED BLOCK for kubectl/kubeadm ###" content: | source <(kubectl completion {{ item }}) source <(kubeadm completion {{ item }}) diff --git a/roles/kubernetes/kubeadm/master/templates/kubeadm-cluster.config.j2 b/roles/kubernetes/kubeadm/master/templates/kubeadm-cluster.config.j2 index 07c4dddd..5ec18614 100644 --- a/roles/kubernetes/kubeadm/master/templates/kubeadm-cluster.config.j2 +++ b/roles/kubernetes/kubeadm/master/templates/kubeadm-cluster.config.j2 @@ -1,7 +1,7 @@ {# https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta1 #} apiVersion: kubeadm.k8s.io/v1beta1 kind: ClusterConfiguration -kubernetesVersion: v{{ kubernetes.version }} +kubernetesVersion: v{{ kubernetes_version }} clusterName: {{ kubernetes.cluster_name }} certificatesDir: /etc/kubernetes/pki {% if kubernetes.api_advertise_ip %} -- cgit v1.2.3