From 144743e81822a7629f19841185307dfbe4304422 Mon Sep 17 00:00:00 2001
From: Craig Rodrigues <rodrigc@crodrigues.org>
Date: Tue, 9 Jun 2020 06:39:20 -0700
Subject: [PATCH] Fix indentation in a few places so file can be round-tripped
more easily (#6178)
with the Python ruamel.yml library
- Change True/False to true/false in a few places so file can
be more easily round-tripped with the Python ruamel.yml library
---
roles/download/defaults/main.yml | 124 +++++++++++++++----------------
1 file changed, 62 insertions(+), 62 deletions(-)
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 334953b21..29ddf1d42 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -21,26 +21,26 @@ kubeadm_images: {}
# if this is set to true will only download files once. Doesn't work
# on Container Linux by CoreOS unless the download_localhost is true and localhost
# is running another OS type. Default compress level is 1 (fastest).
-download_run_once: False
+download_run_once: false
download_compress: 1
# if this is set to true will download container
-download_container: True
+download_container: true
# if this is set to true, uses the localhost for download_run_once mode
# (requires docker and sudo to access docker). You may want this option for
# local caching of docker images or for Container Linux by CoreOS cluster nodes.
# Otherwise, uses the first node in the kube-master group to store images
# in the download_run_once mode.
-download_localhost: False
+download_localhost: false
# Always pull images if set to True. Otherwise check by the repo's tag/digest.
-download_always_pull: False
+download_always_pull: false
# Some problems may occur when downloading files over https proxy due to ansible bug
# https://github.com/ansible/ansible/issues/32750. Set this variable to False to disable
# SSL validation of get_url module. Note that kubespray will still be performing checksum validation.
-download_validate_certs: True
+download_validate_certs: true
# Use the first kube-master if download_localhost is not set
download_delegate: "{% if download_localhost %}localhost{% else %}{{ groups['kube-master'][0] }}{% endif %}"
@@ -528,7 +528,7 @@ downloads:
tag: "{{ netcheck_server_image_tag }}"
sha256: "{{ netcheck_server_digest_checksum|default(None) }}"
groups:
- - k8s-cluster
+ - k8s-cluster
netcheck_agent:
enabled: "{{ deploy_netchecker }}"
@@ -537,7 +537,7 @@ downloads:
tag: "{{ netcheck_agent_image_tag }}"
sha256: "{{ netcheck_agent_digest_checksum|default(None) }}"
groups:
- - k8s-cluster
+ - k8s-cluster
etcd:
container: "{{ etcd_deployment_type != 'host' }}"
@@ -548,14 +548,14 @@ downloads:
repo: "{{ etcd_image_repo }}"
tag: "{{ etcd_image_tag }}"
sha256: >-
- {{ etcd_binary_checksum if (etcd_deployment_type == 'host')
- else etcd_digest_checksum|d(None) }}
+ {{ etcd_binary_checksum if (etcd_deployment_type == 'host')
+ else etcd_digest_checksum|d(None) }}
url: "{{ etcd_download_url }}"
unarchive: "{{ etcd_deployment_type == 'host' }}"
owner: "root"
mode: "0755"
groups:
- - etcd
+ - etcd
cni:
enabled: true
@@ -568,7 +568,7 @@ downloads:
owner: "root"
mode: "0755"
groups:
- - k8s-cluster
+ - k8s-cluster
kubeadm:
enabled: true
@@ -581,7 +581,7 @@ downloads:
owner: "root"
mode: "0755"
groups:
- - k8s-cluster
+ - k8s-cluster
kubelet:
enabled: true
@@ -594,7 +594,7 @@ downloads:
owner: "root"
mode: "0755"
groups:
- - k8s-cluster
+ - k8s-cluster
kubectl:
enabled: true
@@ -607,7 +607,7 @@ downloads:
owner: "root"
mode: "0755"
groups:
- - kube-master
+ - kube-master
crictl:
file: true
@@ -620,7 +620,7 @@ downloads:
owner: "root"
mode: "0755"
groups:
- - k8s-cluster
+ - k8s-cluster
cilium:
enabled: "{{ kube_network_plugin == 'cilium' }}"
@@ -629,7 +629,7 @@ downloads:
tag: "{{ cilium_image_tag }}"
sha256: "{{ cilium_digest_checksum|default(None) }}"
groups:
- - k8s-cluster
+ - k8s-cluster
cilium_init:
enabled: "{{ kube_network_plugin == 'cilium' }}"
@@ -638,7 +638,7 @@ downloads:
tag: "{{ cilium_init_image_tag }}"
sha256: "{{ cilium_init_digest_checksum|default(None) }}"
groups:
- - k8s-cluster
+ - k8s-cluster
cilium_operator:
enabled: "{{ kube_network_plugin == 'cilium' }}"
@@ -647,7 +647,7 @@ downloads:
tag: "{{ cilium_operator_image_tag }}"
sha256: "{{ cilium_operator_digest_checksum|default(None) }}"
groups:
- - k8s-cluster
+ - k8s-cluster
multus:
enabled: "{{ kube_network_plugin_multus }}"
@@ -656,7 +656,7 @@ downloads:
tag: "{{ multus_image_tag }}"
sha256: "{{ multus_digest_checksum|default(None) }}"
groups:
- - k8s-cluster
+ - k8s-cluster
flannel:
enabled: "{{ kube_network_plugin == 'flannel' or kube_network_plugin == 'canal' }}"
@@ -665,7 +665,7 @@ downloads:
tag: "{{ flannel_image_tag }}"
sha256: "{{ flannel_digest_checksum|default(None) }}"
groups:
- - k8s-cluster
+ - k8s-cluster
calicoctl:
enabled: "{{ kube_network_plugin == 'calico' or kube_network_plugin == 'canal' }}"
@@ -678,7 +678,7 @@ downloads:
owner: "root"
mode: "0755"
groups:
- - k8s-cluster
+ - k8s-cluster
calico_node:
enabled: "{{ kube_network_plugin == 'calico' or kube_network_plugin == 'canal' }}"
@@ -687,7 +687,7 @@ downloads:
tag: "{{ calico_node_image_tag }}"
sha256: "{{ calico_node_digest_checksum|default(None) }}"
groups:
- - k8s-cluster
+ - k8s-cluster
calico_cni:
enabled: "{{ kube_network_plugin == 'calico' or kube_network_plugin == 'canal' }}"
@@ -696,7 +696,7 @@ downloads:
tag: "{{ calico_cni_image_tag }}"
sha256: "{{ calico_cni_digest_checksum|default(None) }}"
groups:
- - k8s-cluster
+ - k8s-cluster
calico_policy:
enabled: "{{ enable_network_policy or kube_network_plugin == 'canal' }}"
@@ -705,7 +705,7 @@ downloads:
tag: "{{ calico_policy_image_tag }}"
sha256: "{{ calico_policy_digest_checksum|default(None) }}"
groups:
- - k8s-cluster
+ - k8s-cluster
calico_typha:
enabled: "{{ typha_enabled }}"
@@ -714,7 +714,7 @@ downloads:
tag: "{{ calico_typha_image_tag }}"
sha256: "{{ calico_typha_digest_checksum|default(None) }}"
groups:
- - k8s-cluster
+ - k8s-cluster
weave_kube:
enabled: "{{ kube_network_plugin == 'weave' }}"
@@ -723,7 +723,7 @@ downloads:
tag: "{{ weave_kube_image_tag }}"
sha256: "{{ weave_kube_digest_checksum|default(None) }}"
groups:
- - k8s-cluster
+ - k8s-cluster
weave_npc:
enabled: "{{ kube_network_plugin == 'weave' }}"
@@ -732,7 +732,7 @@ downloads:
tag: "{{ weave_npc_image_tag }}"
sha256: "{{ weave_npc_digest_checksum|default(None) }}"
groups:
- - k8s-cluster
+ - k8s-cluster
contiv:
enabled: "{{ kube_network_plugin == 'contiv' }}"
@@ -741,7 +741,7 @@ downloads:
tag: "{{ contiv_image_tag }}"
sha256: "{{ contiv_digest_checksum|default(None) }}"
groups:
- - k8s-cluster
+ - k8s-cluster
contiv_auth_proxy:
enabled: "{{ kube_network_plugin == 'contiv' }}"
@@ -750,7 +750,7 @@ downloads:
tag: "{{ contiv_auth_proxy_image_tag }}"
sha256: "{{ contiv_auth_proxy_digest_checksum|default(None) }}"
groups:
- - k8s-cluster
+ - k8s-cluster
contiv_etcd_init:
enabled: "{{ kube_network_plugin == 'contiv' }}"
@@ -759,7 +759,7 @@ downloads:
tag: "{{ contiv_etcd_init_image_tag }}"
sha256: "{{ contiv_etcd_init_digest_checksum|default(None) }}"
groups:
- - k8s-cluster
+ - k8s-cluster
kube_ovn:
enabled: "{{ kube_network_plugin == 'kube-ovn' }}"
@@ -768,7 +768,7 @@ downloads:
tag: "{{ kube_ovn_container_image_tag }}"
sha256: "{{ kube_ovn_digest_checksum|default(None) }}"
groups:
- - k8s-cluster
+ - k8s-cluster
kube_router:
enabled: "{{ kube_network_plugin == 'kube-router' }}"
@@ -777,7 +777,7 @@ downloads:
tag: "{{ kube_router_image_tag }}"
sha256: "{{ kube_router_digest_checksum|default(None) }}"
groups:
- - k8s-cluster
+ - k8s-cluster
pod_infra:
enabled: true
@@ -786,7 +786,7 @@ downloads:
tag: "{{ pod_infra_image_tag }}"
sha256: "{{ pod_infra_digest_checksum|default(None) }}"
groups:
- - k8s-cluster
+ - k8s-cluster
install_socat:
enabled: "{{ ansible_os_family in ['CoreOS', 'Container Linux by CoreOS', 'Flatcar', 'Flatcar Container Linux by Kinvolk'] }}"
@@ -795,7 +795,7 @@ downloads:
tag: "{{ install_socat_image_tag }}"
sha256: "{{ install_socat_digest_checksum|default(None) }}"
groups:
- - k8s-cluster
+ - k8s-cluster
nginx:
enabled: "{{ loadbalancer_apiserver_localhost and loadbalancer_apiserver_type == 'nginx' }}"
@@ -804,7 +804,7 @@ downloads:
tag: "{{ nginx_image_tag }}"
sha256: "{{ nginx_digest_checksum|default(None) }}"
groups:
- - kube-node
+ - kube-node
haproxy:
enabled: "{{ loadbalancer_apiserver_localhost and loadbalancer_apiserver_type == 'haproxy' }}"
@@ -813,7 +813,7 @@ downloads:
tag: "{{ haproxy_image_tag }}"
sha256: "{{ haproxy_digest_checksum|default(None) }}"
groups:
- - kube-node
+ - kube-node
coredns:
enabled: "{{ dns_mode in ['coredns', 'coredns_dual'] }}"
@@ -822,7 +822,7 @@ downloads:
tag: "{{ coredns_image_tag }}"
sha256: "{{ coredns_digest_checksum|default(None) }}"
groups:
- - kube-master
+ - kube-master
nodelocaldns:
enabled: "{{ enable_nodelocaldns }}"
@@ -831,7 +831,7 @@ downloads:
tag: "{{ nodelocaldns_image_tag }}"
sha256: "{{ nodelocaldns_digest_checksum|default(None) }}"
groups:
- - k8s-cluster
+ - k8s-cluster
dnsautoscaler:
enabled: "{{ dns_mode in ['coredns', 'coredns_dual'] }}"
@@ -840,7 +840,7 @@ downloads:
tag: "{{ dnsautoscaler_image_tag }}"
sha256: "{{ dnsautoscaler_digest_checksum|default(None) }}"
groups:
- - kube-master
+ - kube-master
busybox:
enabled: "{{ kube_network_plugin in ['kube-router'] }}"
@@ -849,7 +849,7 @@ downloads:
tag: "{{ busybox_image_tag }}"
sha256: "{{ busybox_digest_checksum|default(None) }}"
groups:
- - k8s-cluster
+ - k8s-cluster
testbox:
enabled: false
@@ -865,7 +865,7 @@ downloads:
tag: "{{ helm_image_tag }}"
sha256: "{{ helm_digest_checksum|default(None) }}"
groups:
- - kube-node
+ - kube-node
tiller:
enabled: "{{ helm_enabled and helm_version is version('v3.0.0', '<') }}"
@@ -874,7 +874,7 @@ downloads:
tag: "{{ tiller_image_tag }}"
sha256: "{{ tiller_digest_checksum|default(None) }}"
groups:
- - kube-node
+ - kube-node
registry:
enabled: "{{ registry_enabled }}"
@@ -883,7 +883,7 @@ downloads:
tag: "{{ registry_image_tag }}"
sha256: "{{ registry_digest_checksum|default(None) }}"
groups:
- - kube-node
+ - kube-node
registry_proxy:
enabled: "{{ registry_enabled }}"
@@ -892,7 +892,7 @@ downloads:
tag: "{{ registry_proxy_image_tag }}"
sha256: "{{ registry_proxy_digest_checksum|default(None) }}"
groups:
- - kube-node
+ - kube-node
metrics_server:
enabled: "{{ metrics_server_enabled }}"
@@ -901,7 +901,7 @@ downloads:
tag: "{{ metrics_server_image_tag }}"
sha256: "{{ metrics_server_digest_checksum|default(None) }}"
groups:
- - kube-master
+ - kube-master
addon_resizer:
# Currently addon_resizer is only used by metrics server
@@ -911,7 +911,7 @@ downloads:
tag: "{{ addon_resizer_image_tag }}"
sha256: "{{ addon_resizer_digest_checksum|default(None) }}"
groups:
- - kube-master
+ - kube-master
local_volume_provisioner:
enabled: "{{ local_volume_provisioner_enabled }}"
@@ -920,7 +920,7 @@ downloads:
tag: "{{ local_volume_provisioner_image_tag }}"
sha256: "{{ local_volume_provisioner_digest_checksum|default(None) }}"
groups:
- - kube-node
+ - kube-node
cephfs_provisioner:
enabled: "{{ cephfs_provisioner_enabled }}"
@@ -929,7 +929,7 @@ downloads:
tag: "{{ cephfs_provisioner_image_tag }}"
sha256: "{{ cephfs_provisioner_digest_checksum|default(None) }}"
groups:
- - kube-node
+ - kube-node
rbd_provisioner:
enabled: "{{ rbd_provisioner_enabled }}"
@@ -938,7 +938,7 @@ downloads:
tag: "{{ rbd_provisioner_image_tag }}"
sha256: "{{ rbd_provisioner_digest_checksum|default(None) }}"
groups:
- - kube-node
+ - kube-node
local_path_provisioner:
enabled: "{{ local_path_provisioner_enabled }}"
@@ -947,7 +947,7 @@ downloads:
tag: "{{ local_path_provisioner_image_tag }}"
sha256: "{{ local_path_provisioner_digest_checksum|default(None) }}"
groups:
- - kube-node
+ - kube-node
ingress_nginx_controller:
enabled: "{{ ingress_nginx_enabled }}"
@@ -956,7 +956,7 @@ downloads:
tag: "{{ ingress_nginx_controller_image_tag }}"
sha256: "{{ ingress_nginx_controller_digest_checksum|default(None) }}"
groups:
- - kube-node
+ - kube-node
ingress_alb_controller:
enabled: "{{ ingress_alb_enabled }}"
@@ -965,7 +965,7 @@ downloads:
tag: "{{ alb_ingress_image_tag }}"
sha256: "{{ ingress_alb_controller_digest_checksum|default(None) }}"
groups:
- - kube-node
+ - kube-node
cert_manager_controller:
enabled: "{{ cert_manager_enabled }}"
@@ -974,7 +974,7 @@ downloads:
tag: "{{ cert_manager_controller_image_tag }}"
sha256: "{{ cert_manager_controller_digest_checksum|default(None) }}"
groups:
- - kube-node
+ - kube-node
csi_attacher:
enabled: "{{ cinder_csi_enabled or aws_ebs_csi_enabled }}"
@@ -983,7 +983,7 @@ downloads:
tag: "{{ csi_attacher_image_tag }}"
sha256: "{{ csi_attacher_digest_checksum|default(None) }}"
groups:
- - kube-node
+ - kube-node
csi_provisioner:
enabled: "{{ cinder_csi_enabled or aws_ebs_csi_enabled }}"
@@ -992,7 +992,7 @@ downloads:
tag: "{{ csi_provisioner_image_tag }}"
sha256: "{{ csi_provisioner_digest_checksum|default(None) }}"
groups:
- - kube-node
+ - kube-node
csi_snapshotter:
enabled: "{{ cinder_csi_enabled or aws_ebs_csi_enabled }}"
@@ -1001,7 +1001,7 @@ downloads:
tag: "{{ csi_snapshotter_image_tag }}"
sha256: "{{ csi_snapshotter_digest_checksum|default(None) }}"
groups:
- - kube-node
+ - kube-node
csi_resizer:
enabled: "{{ cinder_csi_enabled or aws_ebs_csi_enabled }}"
@@ -1010,7 +1010,7 @@ downloads:
tag: "{{ csi_resizer_image_tag }}"
sha256: "{{ csi_resizer_digest_checksum|default(None) }}"
groups:
- - kube-node
+ - kube-node
csi_node_driver_registrar:
enabled: "{{ cinder_csi_enabled or aws_ebs_csi_enabled }}"
@@ -1019,7 +1019,7 @@ downloads:
tag: "{{ csi_node_driver_registrar_image_tag }}"
sha256: "{{ csi_node_driver_registrar_digest_checksum|default(None) }}"
groups:
- - kube-node
+ - kube-node
cinder_csi_plugin:
enabled: "{{ cinder_csi_enabled }}"
@@ -1028,7 +1028,7 @@ downloads:
tag: "{{ cinder_csi_plugin_image_tag }}"
sha256: "{{ cinder_csi_plugin_digest_checksum|default(None) }}"
groups:
- - kube-node
+ - kube-node
aws_ebs_csi_plugin:
enabled: "{{ aws_ebs_csi_enabled }}"
@@ -1037,7 +1037,7 @@ downloads:
tag: "{{ aws_ebs_csi_plugin_image_tag }}"
sha256: "{{ aws_ebs_csi_plugin_digest_checksum|default(None) }}"
groups:
- - kube-node
+ - kube-node
dashboard:
enabled: "{{ dashboard_enabled }}"
@@ -1046,7 +1046,7 @@ downloads:
tag: "{{ dashboard_image_tag }}"
sha256: "{{ dashboard_digest_checksum|default(None) }}"
groups:
- - kube-master
+ - kube-master
dashboard_metrics_scrapper:
enabled: "{{ dashboard_enabled }}"
@@ -1055,7 +1055,7 @@ downloads:
tag: "{{ dashboard_metrics_scraper_tag }}"
sha256: "{{ dashboard_digest_checksum|default(None) }}"
groups:
- - kube-master
+ - kube-master
download_defaults:
container: false
--
GitLab