Browse Source

ansible-lint: Don’t compare to literal True/False (#4499)

pull/4561/head
Maxime Guyot 5 years ago
committed by Kubernetes Prow Robot
parent
commit
37eac010c8
11 changed files with 22 additions and 17 deletions
  1. 1
      .ansible-lint
  2. 2
      roles/download/defaults/main.yml
  3. 2
      roles/kubernetes-apps/ansible/tasks/main.yml
  4. 2
      roles/kubernetes-apps/ansible/tasks/nodelocaldns.yml
  5. 10
      roles/kubernetes-apps/cloud_controller/oci/tasks/credentials-check.yml
  6. 2
      roles/kubernetes-apps/network_plugin/cilium/tasks/main.yml
  7. 2
      roles/kubernetes-apps/network_plugin/kube-router/tasks/main.yml
  8. 10
      roles/kubernetes/node/tasks/main.yml
  9. 2
      roles/kubernetes/node/templates/kubelet.kubeadm.env.j2
  10. 2
      roles/kubernetes/preinstall/tasks/0080-system-configurations.yml
  11. 4
      test-infra/image-builder/roles/kubevirt-images/tasks/main.yml

1
.ansible-lint

@ -19,6 +19,5 @@ skip_list:
- '502'
- '503'
- '504'
- '601'
- '602'
- '701'

2
roles/download/defaults/main.yml

@ -528,7 +528,7 @@ downloads:
- kube-node
nodelocaldns:
enabled: "{{ enable_nodelocaldns == True }}"
enabled: "{{ enable_nodelocaldns }}"
container: true
repo: "{{ nodelocaldns_image_repo }}"
tag: "{{ nodelocaldns_image_tag }}"

2
roles/kubernetes-apps/ansible/tasks/main.yml

@ -31,7 +31,7 @@
- name: Kubernetes Apps | nodelocalDNS
import_tasks: "tasks/nodelocaldns.yml"
when:
- enable_nodelocaldns == True
- enable_nodelocaldns
- inventory_hostname == groups['kube-master'] | first
tags:
- nodelocaldns

2
roles/kubernetes-apps/ansible/tasks/nodelocaldns.yml

@ -32,7 +32,7 @@
/etc/resolv.conf
{%- endif -%}
when:
- enable_nodelocaldns == True
- enable_nodelocaldns
- inventory_hostname == groups['kube-master'] | first
tags:
- nodelocaldns

10
roles/kubernetes-apps/cloud_controller/oci/tasks/credentials-check.yml

@ -3,31 +3,31 @@
- name: "OCI Cloud Controller | Credentials Check | oci_private_key"
fail:
msg: "oci_private_key is missing"
when: (oci_use_instance_principals == false) and
when: (not oci_use_instance_principals) and
(oci_private_key is not defined or oci_private_key == "")
- name: "OCI Cloud Controller | Credentials Check | oci_region_id"
fail:
msg: "oci_region_id is missing"
when: (oci_use_instance_principals == false) and
when: (not oci_use_instance_principals) and
(oci_region_id is not defined or oci_region_id == "")
- name: "OCI Cloud Controller | Credentials Check | oci_tenancy_id"
fail:
msg: "oci_tenancy_id is missing"
when: (oci_use_instance_principals == false) and
when: (not oci_use_instance_principals) and
(oci_tenancy_id is not defined or oci_tenancy_id == "")
- name: "OCI Cloud Controller | Credentials Check | oci_user_id"
fail:
msg: "oci_user_id is missing"
when: (oci_use_instance_principals == false) and
when: (not oci_use_instance_principals) and
(oci_user_id is not defined or oci_user_id == "")
- name: "OCI Cloud Controller | Credentials Check | oci_user_fingerprint"
fail:
msg: "oci_user_fingerprint is missing"
when: (oci_use_instance_principals == false) and
when: (not oci_use_instance_principals) and
(oci_user_fingerprint is not defined or oci_user_fingerprint == "")
- name: "OCI Cloud Controller | Credentials Check | oci_compartment_id"

2
roles/kubernetes-apps/network_plugin/cilium/tasks/main.yml

@ -11,7 +11,7 @@
when: inventory_hostname == groups['kube-master'][0] and not item is skipped
- name: Cilium | Wait for pods to run
command: "{{bin_dir}}/kubectl -n kube-system get pods -l k8s-app=cilium -o jsonpath='{.items[?(@.status.containerStatuses[0].ready==false)].metadata.name}'"
command: "{{bin_dir}}/kubectl -n kube-system get pods -l k8s-app=cilium -o jsonpath='{.items[?(@.status.containerStatuses[0].ready==false)].metadata.name}'" # noqa 601
register: pods_not_ready
until: pods_not_ready.stdout.find("cilium")==-1
retries: 30

2
roles/kubernetes-apps/network_plugin/kube-router/tasks/main.yml

@ -12,7 +12,7 @@
- inventory_hostname == groups['kube-master'][0]
- name: kube-router | Wait for kube-router pods to be ready
command: "{{bin_dir}}/kubectl -n kube-system get pods -l k8s-app=kube-router -o jsonpath='{.items[?(@.status.containerStatuses[0].ready==false)].metadata.name}'"
command: "{{bin_dir}}/kubectl -n kube-system get pods -l k8s-app=kube-router -o jsonpath='{.items[?(@.status.containerStatuses[0].ready==false)].metadata.name}'" # noqa 601
register: pods_not_ready
until: pods_not_ready.stdout.find("kube-router")==-1
retries: 30

10
roles/kubernetes/node/tasks/main.yml

@ -18,12 +18,18 @@
- kubelet
- import_tasks: nginx-proxy.yml
when: is_kube_master == false and loadbalancer_apiserver_localhost and loadbalancer_apiserver_type == 'nginx'
when:
- not is_kube_master
- loadbalancer_apiserver_localhost
- loadbalancer_apiserver_type == 'nginx'
tags:
- nginx
- import_tasks: haproxy.yml
when: is_kube_master == false and loadbalancer_apiserver_localhost and loadbalancer_apiserver_type == 'haproxy'
when:
- not is_kube_master
- loadbalancer_apiserver_localhost
- loadbalancer_apiserver_type == 'haproxy'
tags:
- haproxy

2
roles/kubernetes/node/templates/kubelet.kubeadm.env.j2

@ -77,7 +77,7 @@ KUBELET_HOSTNAME="--hostname-override={{ kube_override_hostname }}"
{% else %}
{% set kubelet_args_cluster_dns %}{% endset %}
{% endif %}
{% if enable_nodelocaldns == True %}
{% if enable_nodelocaldns %}
{% set kubelet_args_cluster_dns %}--cluster-dns={{ nodelocaldns_ip }}{% endset %}
{% endif %}
{% set kubelet_args_dns %}{{ kubelet_args_cluster_dns }} --cluster-domain={{ dns_domain }} --resolv-conf={{ kube_resolv_conf }}{% endset %}

2
roles/kubernetes/preinstall/tasks/0080-system-configurations.yml

@ -12,7 +12,7 @@
state: "{{ preinstall_selinux_state }}"
when:
- ansible_os_family == "RedHat"
- slc.stat.exists == True
- slc.stat.exists
changed_when: False
tags:
- bootstrap-os

4
test-infra/image-builder/roles/kubevirt-images/tasks/main.yml

@ -18,7 +18,7 @@
with_dict:
- "{{ images }}"
when:
- item.value.converted|bool != true
- not (item.value.converted|bool)
register: converted
- name: Make sure all images are ending with qcow2
@ -26,7 +26,7 @@
with_dict:
- "{{ images }}"
when:
- item.value.converted|bool == true
- item.value.converted|bool
- name: Resize images
command: qemu-img resize {{ images_dir }}/{{ item.key }}.qcow2 +8G

Loading…
Cancel
Save