Skip to content
Snippets Groups Projects
Unverified Commit 53e5d8b3 authored by ChengHao Yang's avatar ChengHao Yang
Browse files

Feat: add kubeadm-client.conf support v1beta4


Remove kubeadm api version condition.
Currently there is not much difference between the files, if there are more changes in the future,
please use different files to distinguish them (you can use the kubeadm_config_api_version variable)

Signed-off-by: default avatarChengHao Yang <17496418+tico88612@users.noreply.github.com>
parent 5929935a
No related branches found
No related tags found
No related merge requests found
......@@ -53,10 +53,6 @@
kubeadm_token: "{{ temp_token.stdout }}"
when: kubeadm_token is not defined
- name: Set kubeadm api version to v1beta3
set_fact:
kubeadmConfig_api_version: v1beta3
- name: Get kubeconfig for join discovery process
command: "{{ kubectl }} -n kube-public get cm cluster-info -o jsonpath='{.data.kubeconfig}'"
register: kubeconfig_file_discovery
......@@ -77,7 +73,7 @@
- name: Create kubeadm client config
template:
src: "kubeadm-client.conf.{{ kubeadmConfig_api_version }}.j2"
src: "kubeadm-client.conf.j2"
dest: "{{ kube_config_dir }}/kubeadm-client.conf"
backup: true
mode: "0640"
......
---
apiVersion: kubeadm.k8s.io/v1beta3
apiVersion: kubeadm.k8s.io/{{ kubeadm_config_api_version }}
kind: JoinConfiguration
discovery:
{% if kubeadm_use_file_discovery %}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment