Delete misnammed kubeadm-version.yml
The important action in kubeadm-version.yml is the templating of the configuration,
not finding / setting the version
Signed-off-by: Etienne Champetier <e.champetier@ateme.com>
(cherry picked from commit a9c97e5253
)
Conflicts:
roles/kubernetes/master/tasks/kubeadm-version.yml
This commit is contained in:
parent
8c693e8739
commit
704a054064
2 changed files with 9 additions and 12 deletions
|
@ -70,8 +70,15 @@
|
||||||
kubeadm_config_api_fqdn: "{{ apiserver_loadbalancer_domain_name|default('lb-apiserver.kubernetes.local') }}"
|
kubeadm_config_api_fqdn: "{{ apiserver_loadbalancer_domain_name|default('lb-apiserver.kubernetes.local') }}"
|
||||||
when: loadbalancer_apiserver is defined
|
when: loadbalancer_apiserver is defined
|
||||||
|
|
||||||
- name: kubeadm | set kubeadm version
|
- name: Set kubeadm api version to v1beta2
|
||||||
import_tasks: kubeadm-version.yml
|
set_fact:
|
||||||
|
kubeadmConfig_api_version: v1beta2
|
||||||
|
|
||||||
|
- name: kubeadm | Create kubeadm config
|
||||||
|
template:
|
||||||
|
src: "kubeadm-config.{{ kubeadmConfig_api_version }}.yaml.j2"
|
||||||
|
dest: "{{ kube_config_dir }}/kubeadm-config.yaml"
|
||||||
|
mode: 0640
|
||||||
|
|
||||||
- name: kubeadm | Check if apiserver.crt contains all needed SANs
|
- name: kubeadm | Check if apiserver.crt contains all needed SANs
|
||||||
command: openssl x509 -noout -in "{{ kube_cert_dir }}/apiserver.crt" -check{{ item|ipaddr|ternary('ip','host') }} "{{ item }}"
|
command: openssl x509 -noout -in "{{ kube_cert_dir }}/apiserver.crt" -check{{ item|ipaddr|ternary('ip','host') }} "{{ item }}"
|
||||||
|
|
|
@ -1,10 +0,0 @@
|
||||||
---
|
|
||||||
- name: Set kubeadm api version to v1beta2
|
|
||||||
set_fact:
|
|
||||||
kubeadmConfig_api_version: v1beta2
|
|
||||||
|
|
||||||
- name: kubeadm | Create kubeadm config
|
|
||||||
template:
|
|
||||||
src: "kubeadm-config.{{ kubeadmConfig_api_version }}.yaml.j2"
|
|
||||||
dest: "{{ kube_config_dir }}/kubeadm-config.yaml"
|
|
||||||
mode: 0640
|
|
Loading…
Reference in a new issue