epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2025-12-14 13:54:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update version comparison syntax and optimize whitespace (#12146)

Browse Source 
Signed-off-by: bo.jiang <bo.jiang@daocloud.io>
This commit is contained in:
ERIK
2025-04-24 15:56:31 +08:00
committed by GitHub
parent 38cea5b866
commit 8f41a2886d
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/bootstrap-os/tasks/flatcar.yml
View File

@@ -23,7 +23,7 @@
- name: Make interpreter discovery works on Flatcar - name: Make interpreter discovery works on Flatcar
set_fact: set_fact:
ansible_interpreter_python_fallback: "{{ (ansible_interpreter_python_fallback | default([])) + [ '/opt/bin/python' ] }}" ansible_interpreter_python_fallback: "{{ (ansible_interpreter_python_fallback | default([])) + ['/opt/bin/python'] }}"
- name: Disable auto-upgrade - name: Disable auto-upgrade
systemd_service: systemd_service:

2
roles/container-engine/cri-o/tasks/main.yaml
View File

@@ -180,7 +180,7 @@
dest: /etc/containers/storage.conf dest: /etc/containers/storage.conf
section: storage.options.overlay section: storage.options.overlay
option: mountopt option: mountopt
value: '{{ ''"nodev"'' if ansible_kernel is version_compare(("4.18" if ansible_os_family == "RedHat" else "4.19"), "<") else ''"nodev,metacopy=on"'' }}' value: '{{ ''"nodev"'' if ansible_kernel is version(("4.18" if ansible_os_family == "RedHat" else "4.19"), "<") else ''"nodev,metacopy=on"'' }}'
mode: "0644" mode: "0644"
- name: Cri-o | create directory registries configs - name: Cri-o | create directory registries configs

2
roles/container-engine/docker/tasks/main.yml
View File

@@ -50,7 +50,7 @@
apt_key: apt_key:
id: "{{ item }}" id: "{{ item }}"
url: "{{ docker_repo_key_info.url }}" url: "{{ docker_repo_key_info.url }}"
keyring: "{{ docker_repo_key_keyring|default(omit) }}" keyring: "{{ docker_repo_key_keyring | default(omit) }}"
state: present state: present
register: keyserver_task_result register: keyserver_task_result
until: keyserver_task_result is succeeded until: keyserver_task_result is succeeded

4
roles/etcd/vars/main.yml
View File

@@ -6,5 +6,5 @@ cert_files:
- "{{ etcd_cert_dir }}/admin-{{ inventory_hostname }}.pem" - "{{ etcd_cert_dir }}/admin-{{ inventory_hostname }}.pem"
- "{{ etcd_cert_dir }}/admin-{{ inventory_hostname }}-key.pem" - "{{ etcd_cert_dir }}/admin-{{ inventory_hostname }}-key.pem"
node: node:
- "{{ etcd_cert_dir}}/node-{{ inventory_hostname }}.pem" - "{{ etcd_cert_dir }}/node-{{ inventory_hostname }}.pem"
- "{{ etcd_cert_dir}}/node-{{ inventory_hostname }}-key.pem" - "{{ etcd_cert_dir }}/node-{{ inventory_hostname }}-key.pem"

12
roles/kubernetes-apps/external_cloud_controller/huaweicloud/defaults/main.yml
View File

@@ -2,12 +2,12 @@
# The external cloud controller will need credentials to access # The external cloud controller will need credentials to access
# openstack apis. Per default these values will be # openstack apis. Per default these values will be
# read from the environment. # read from the environment.
external_huaweicloud_auth_url: "{{ lookup('env','OS_AUTH_URL') }}" external_huaweicloud_auth_url: "{{ lookup('env', 'OS_AUTH_URL') }}"
external_huaweicloud_access_key: "{{ lookup('env','OS_ACCESS_KEY') }}" external_huaweicloud_access_key: "{{ lookup('env', 'OS_ACCESS_KEY') }}"
external_huaweicloud_secret_key: "{{ lookup('env','OS_SECRET_KEY') }}" external_huaweicloud_secret_key: "{{ lookup('env', 'OS_SECRET_KEY') }}"
external_huaweicloud_region: "{{ lookup('env','OS_REGION_NAME') }}" external_huaweicloud_region: "{{ lookup('env', 'OS_REGION_NAME') }}"
external_huaweicloud_project_id: "{{ lookup('env','OS_TENANT_ID')| default(lookup('env','OS_PROJECT_ID'),true) }}" external_huaweicloud_project_id: "{{ lookup('env', 'OS_TENANT_ID') | default(lookup('env', 'OS_PROJECT_ID'), true) }}"
external_huaweicloud_cloud: "{{ lookup('env','OS_CLOUD') }}" external_huaweicloud_cloud: "{{ lookup('env', 'OS_CLOUD') }}"
## A dictionary of extra arguments to add to the huawei cloud controller manager deployment ## A dictionary of extra arguments to add to the huawei cloud controller manager deployment
## Format: ## Format: