From caea61f4fb8b66aa2a0dc7aa2d2b8a06477d9706 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Tue, 17 Mar 2020 15:07:43 +0100 Subject: kubernetes role, cleanup and harmonization --- roles/kubernetes/kubeadm/master/tasks/primary-master.yml | 1 + .../kubeadm/master/templates/kubeadm.config.j2 | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'roles/kubernetes/kubeadm/master') diff --git a/roles/kubernetes/kubeadm/master/tasks/primary-master.yml b/roles/kubernetes/kubeadm/master/tasks/primary-master.yml index 115c8616..9bbe9ecc 100644 --- a/roles/kubernetes/kubeadm/master/tasks/primary-master.yml +++ b/roles/kubernetes/kubeadm/master/tasks/primary-master.yml @@ -103,6 +103,7 @@ delegate_facts: True loop: "{{ groups['_kubernetes_nodes_'] }}" + ## Network Plugin # - name: install network plugin diff --git a/roles/kubernetes/kubeadm/master/templates/kubeadm.config.j2 b/roles/kubernetes/kubeadm/master/templates/kubeadm.config.j2 index f48a34f3..bb7f9a96 100644 --- a/roles/kubernetes/kubeadm/master/templates/kubeadm.config.j2 +++ b/roles/kubernetes/kubeadm/master/templates/kubeadm.config.j2 @@ -23,14 +23,14 @@ networking: podSubnet: {{ kubernetes.pod_ip_range }} serviceSubnet: {{ kubernetes.service_ip_range }} apiServer: - # extraArgs: - # encryption-provider-config: /etc/kubernetes/encryption/config - # extraVolumes: - # - name: encryption-config - # hostPath: /etc/kubernetes/encryption - # mountPath: /etc/kubernetes/encryption - # readOnly: true - # pathType: Directory + extraArgs: + encryption-provider-config: /etc/kubernetes/encryption/config + extraVolumes: + - name: encryption-config + hostPath: /etc/kubernetes/encryption + mountPath: /etc/kubernetes/encryption + readOnly: true + pathType: Directory {% if (kubernetes.api_extra_sans | default([]) | length) == 0 %} certSANs: [] {% else %} -- cgit v1.2.3