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

Add support to Ansible 2.9 (#5361)

Browse Source
This commit is contained in:
Maxime Guyot
2019-12-05 16:24:32 +01:00
committed by Kubernetes Prow Robot
parent 7da2083986
commit b15d41a96a
27 changed files with 58 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/kubernetes-apps/cloud_controller/oci/tasks/credentials-check.yml
View File

@@ -57,7 +57,7 @@
fail:
msg: "oci_subnet2_id is missing. Two subnets are required for load balancer high availability"
when:
- oci_cloud_controller_version | version_compare('0.7.0', '<')
- oci_cloud_controller_version is version_compare('0.7.0', '<')
- oci_subnet2_id is not defined or not oci_subnet2_id
- name: "OCI Cloud Controller | Credentials Check | oci_security_list_management"

2
roles/kubernetes-apps/helm/tasks/main.yml
View File

@@ -105,4 +105,4 @@
shell: "umask 022 && {{ bin_dir }}/helm completion bash >/etc/bash_completion.d/helm.sh"
when:
- ((helm_container is defined and helm_container.changed) or (helm_task_result is defined and helm_task_result.changed))
- not ansible_os_family in ["CoreOS", "Container Linux by CoreOS"]
- not ansible_os_family in ["CoreOS", "Coreos", "Container Linux by CoreOS"]