diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2020-01-17 22:24:09 +0100 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2020-01-31 22:31:22 +0100 |
| commit | 8010f57a73885f7abb5c98c1f77c49baa59a7d16 (patch) | |
| tree | 334f5c6c0af02fe3fce098feb398808101a066d9 /roles/kubernetes/kubeadm/master/templates/kubeadm.config.j2 | |
| parent | kubernetes: node cleanup works now (diff) | |
kubernetes: multi master cluster works now
Diffstat (limited to 'roles/kubernetes/kubeadm/master/templates/kubeadm.config.j2')
| -rw-r--r-- | roles/kubernetes/kubeadm/master/templates/kubeadm.config.j2 | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/roles/kubernetes/kubeadm/master/templates/kubeadm.config.j2 b/roles/kubernetes/kubeadm/master/templates/kubeadm.config.j2 index 3c10e59b..869c809f 100644 --- a/roles/kubernetes/kubeadm/master/templates/kubeadm.config.j2 +++ b/roles/kubernetes/kubeadm/master/templates/kubeadm.config.j2 @@ -1,4 +1,4 @@ -{# https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta1 #} +{# https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2 #} {# #} apiVersion: kubeadm.k8s.io/v1beta2 kind: InitConfiguration @@ -6,20 +6,25 @@ kind: InitConfiguration {# better control it's lifetime #} bootstrapTokens: - ttl: "1s" +{% if kubernetes_kubelet_node_ip is defined %} +localAPIEndpoint: + advertiseAddress: {{ kubernetes_kubelet_node_ip }} +{% endif %} --- apiVersion: kubeadm.k8s.io/v1beta2 kind: ClusterConfiguration kubernetesVersion: {{ kubernetes_version }} clusterName: {{ kubernetes.cluster_name }} imageRepository: k8s.gcr.io +{% if kubernetes_kubelet_node_ip is defined %} controlPlaneEndpoint: "{{ kubernetes_kubelet_node_ip }}:6443" +{% endif %} networking: dnsDomain: {{ kubernetes.dns_domain | default('cluster.local') }} podSubnet: {{ kubernetes.pod_ip_range }} serviceSubnet: {{ kubernetes.service_ip_range }} apiServer: - extraArgs: - advertise-address: {{ kubernetes_kubelet_node_ip }} + #extraArgs: # encryption-provider-config: /etc/kubernetes/encryption/config # extraVolumes: # - name: encryption-config |