diff options
| -rw-r--r-- | common/kubernetes.yml | 12 | ||||
| -rw-r--r-- | inventory/group_vars/k8s-test/main.yml | 6 | ||||
| -rw-r--r-- | roles/kubernetes/kubeadm/base/tasks/main.yml | 3 | ||||
| -rw-r--r-- | roles/kubernetes/kubeadm/master/templates/kubeadm-cluster.config.j2 | 2 |
4 files changed, 11 insertions, 12 deletions
diff --git a/common/kubernetes.yml b/common/kubernetes.yml index 45d7cc5d..96b39e5a 100644 --- a/common/kubernetes.yml +++ b/common/kubernetes.yml @@ -48,7 +48,7 @@ run_once: yes tasks: - name: sanity checks for kubeguard - when: kubernetes.network_plugin == 'kubeguard' + when: kubernetes_network_plugin == 'kubeguard' block: - name: check whether every node has a node_index assigned assert: @@ -66,7 +66,7 @@ that: (kubeguard.node_index.values() | min) > 0 - name: make sure the kubernetes_cri_socket variable is configured correctly - when: kubernetes.container_runtime == 'containerd' + when: kubernetes_container_runtime == 'containerd' assert: msg: "The variable kubernetes_cri_socket is not configured correctly for use with containerd!" that: @@ -78,9 +78,9 @@ hosts: _kubernetes_nodes_ roles: - role: kubernetes/net/kubeguard - when: kubernetes.network_plugin == 'kubeguard' - # - role: kubernetes/base - # - role: kubernetes/kubeadm/base + when: kubernetes_network_plugin == 'kubeguard' + - role: kubernetes/base + - role: kubernetes/kubeadm/base # - name: configure kubernetes primary master # hosts: _kubernetes_primary_master_ @@ -126,7 +126,7 @@ # roles: # - role: kubernetes/kubeadm/reset # - role: kubernetes/net/kubeguard -# when: kubernetes.network_plugin == 'kubeguard' +# when: kubernetes_network_plugin == 'kubeguard' # vars: # kubeguard_action: remove diff --git a/inventory/group_vars/k8s-test/main.yml b/inventory/group_vars/k8s-test/main.yml index 7e01d0ab..979cc1a3 100644 --- a/inventory/group_vars/k8s-test/main.yml +++ b/inventory/group_vars/k8s-test/main.yml @@ -1,12 +1,10 @@ --- kubernetes_version: 1.16.4 +kubernetes_container_runtime: containerd +kubernetes_network_plugin: kubeguard kubernetes: cluster_name: k8s-test - version: "{{ kubernetes_version }}" - - container_runtime: containerd - network_plugin: kubeguard dedicated_master: False api_advertise_ip: 89.106.215.23 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 %} |