External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-05-10 10:57:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

[kubeadm] use v1beta3 configuration version

Browse Source 
* extra admission controls now don't have a version in their file names
  eventratelimit.v1beta2.yaml.j2 -> eventratelimit.yaml.j2
* cri_socket variable includes the unix:// prefix to be conformat with
  upstream
This commit is contained in:
Calin Cristian Andrei
2022-06-06 22:25:57 +03:00
committed by Kubernetes Prow Robot
parent 589823bdc1
commit 2cd8c51a07
12 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
roles/kubernetes/control-plane/tasks/kubeadm-setup.yml
View File

@@ -73,9 +73,9 @@
kubeadm_config_api_fqdn: "{{ apiserver_loadbalancer_domain_name|default('lb-apiserver.kubernetes.local') }}"
when: loadbalancer_apiserver is defined
- name: Set kubeadm api version to v1beta2
- name: Set kubeadm api version to v1beta3
set_fact:
kubeadmConfig_api_version: v1beta2
kubeadmConfig_api_version: v1beta3
- name: kubeadm | Create kubeadm config
template:
@@ -92,14 +92,14 @@
- name: kubeadm | Push admission control config file
template:
src: "admission-controls.{{ kubeadmConfig_api_version }}.yaml.j2"
src: "admission-controls.yaml.j2"
dest: "{{ kube_config_dir }}/admission-controls/admission-controls.yaml"
mode: 0640
when: kube_apiserver_admission_control_config_file
- name: kubeadm | Push admission control config files
template:
src: "{{ item|lower }}.{{ kubeadmConfig_api_version }}.yaml.j2"
src: "{{ item|lower }}.yaml.j2"
dest: "{{ kube_config_dir }}/admission-controls/{{ item|lower }}.yaml"
mode: 0640
when: